Turn the hardcoded straight-line sweep into a strategy system behind three
seams so new patterns are easy to add and, for the first time, testable
without nut.js or a real screen:
- src/device.ts: injectable Device seam over nut.js (autoDelayMs lives
here now); the only module that touches the native lib.
- src/strategies.ts: pure per-pattern path generators + registry + lenient
name resolution. Ships line, diagonal, jitter, walk,
arc, figureEight.
- src/executor.ts: single executePath driver owning bounds policy
(abort/clamp/reflect), pacing, interrupt detection, and
restore-on-clean.
keeper.ts's simulateActivity now selects a strategy and delegates to the
executor; the default `line` pattern is byte-for-byte the previous behavior.
New config surface, layered CLI > file > default with strict validation:
- -p/--pattern <name> movement strategy (names matched case/-/_-insensitive)
- -s/--step-size <px> pixels per step; stepCount is now a step *count*
Robustness for the new edge-seeking patterns: interrupt detection compares
against the last commanded (rounded) point with a 2px tolerance, and
clamp/reflect stay a couple pixels off the screen edge, so sub-pixel cursor
placement on scaled/multi-monitor displays isn't misread as user activity.
jitter's radius scales with sweep length so it moves at the default stepSize.
Tests: new suites for strategies, the executor (all bounds policies,
rounding, interrupt, tolerance, pacing), and the keeper loop; config and
configFile suites extended for pattern/stepSize. editor.test.ts moved to
tests/ for consistency. 64 pass.
133 lines
4.8 KiB
TypeScript
133 lines
4.8 KiB
TypeScript
/**
|
|
* config.test.ts
|
|
* --------------
|
|
* Unit tests for the layered config resolver and the default-path helper.
|
|
* Run via `bun test` (or `bun run test`).
|
|
*/
|
|
|
|
import { afterEach, beforeEach, describe, expect, test } from "bun:test";
|
|
|
|
import { DEFAULT_CONFIG, defaultConfigPath, resolveConfig } from "../src/config.ts";
|
|
import type { ConfigOverrides } from "../src/config.ts";
|
|
import { CliError } from "../src/errors.ts";
|
|
|
|
const NONE: ConfigOverrides = {
|
|
moveInterval: undefined,
|
|
checkInterval: undefined,
|
|
stepDelay: undefined,
|
|
stepCount: undefined,
|
|
stepSize: undefined,
|
|
pattern: undefined,
|
|
verbose: undefined,
|
|
};
|
|
|
|
describe("resolveConfig", () => {
|
|
test("returns DEFAULT_CONFIG when neither layer supplies a value", () => {
|
|
expect(resolveConfig(null, NONE)).toEqual(DEFAULT_CONFIG);
|
|
});
|
|
|
|
test("CLI value wins over file value", () => {
|
|
const file: ConfigOverrides = { ...NONE, moveInterval: 60 };
|
|
const cli: ConfigOverrides = { ...NONE, moveInterval: 30 };
|
|
const cfg = resolveConfig(file, cli);
|
|
expect(cfg.moveInterval).toBe(30 * 1000); // CLI 30s -> 30000ms
|
|
});
|
|
|
|
test("file value wins over default when CLI is undefined", () => {
|
|
const file: ConfigOverrides = { ...NONE, moveInterval: 60 };
|
|
const cfg = resolveConfig(file, NONE);
|
|
expect(cfg.moveInterval).toBe(60 * 1000); // file 60s -> 60000ms
|
|
});
|
|
|
|
test("seconds-to-ms conversion at the boundary for time-valued fields", () => {
|
|
const cli: ConfigOverrides = { ...NONE, moveInterval: 5, checkInterval: 2 };
|
|
const cfg = resolveConfig(null, cli);
|
|
expect(cfg.moveInterval).toBe(5000);
|
|
expect(cfg.checkInterval).toBe(2000);
|
|
});
|
|
|
|
test("stepDelay, stepCount, stepSize pass through untouched (no unit conversion)", () => {
|
|
const cli: ConfigOverrides = { ...NONE, stepDelay: 75, stepCount: 100, stepSize: 4 };
|
|
const cfg = resolveConfig(null, cli);
|
|
expect(cfg.stepDelay).toBe(75);
|
|
expect(cfg.stepCount).toBe(100);
|
|
expect(cfg.stepSize).toBe(4);
|
|
});
|
|
|
|
test("pattern: CLI wins over file, file wins over default", () => {
|
|
expect(resolveConfig({ ...NONE, pattern: "arc" }, { ...NONE, pattern: "walk" }).pattern).toBe("walk");
|
|
expect(resolveConfig({ ...NONE, pattern: "arc" }, NONE).pattern).toBe("arc");
|
|
expect(resolveConfig(null, NONE).pattern).toBe(DEFAULT_CONFIG.pattern);
|
|
});
|
|
|
|
test("verbose: CLI true wins over file false", () => {
|
|
const cfg = resolveConfig(
|
|
{ ...NONE, verbose: false },
|
|
{ ...NONE, verbose: true },
|
|
);
|
|
expect(cfg.verbose).toBe(true);
|
|
});
|
|
|
|
test("verbose: file true wins over default (no CLI)", () => {
|
|
const cfg = resolveConfig({ ...NONE, verbose: true }, NONE);
|
|
expect(cfg.verbose).toBe(true);
|
|
});
|
|
|
|
test("verbose: file false wins over default (no CLI)", () => {
|
|
const cfg = resolveConfig({ ...NONE, verbose: false }, NONE);
|
|
expect(cfg.verbose).toBe(false);
|
|
});
|
|
|
|
test("verbose: falls back to DEFAULT_CONFIG.verbose when neither set", () => {
|
|
const cfg = resolveConfig(null, NONE);
|
|
expect(cfg.verbose).toBe(DEFAULT_CONFIG.verbose);
|
|
});
|
|
});
|
|
|
|
describe("defaultConfigPath", () => {
|
|
let savedXdg: string | undefined;
|
|
let savedHome: string | undefined;
|
|
|
|
beforeEach(() => {
|
|
savedXdg = process.env.XDG_CONFIG_HOME;
|
|
savedHome = process.env.HOME;
|
|
});
|
|
|
|
afterEach(() => {
|
|
if (savedXdg === undefined) delete process.env.XDG_CONFIG_HOME;
|
|
else process.env.XDG_CONFIG_HOME = savedXdg;
|
|
if (savedHome === undefined) delete process.env.HOME;
|
|
else process.env.HOME = savedHome;
|
|
});
|
|
|
|
test("honors XDG_CONFIG_HOME when set", () => {
|
|
process.env.XDG_CONFIG_HOME = "/custom/xdg";
|
|
process.env.HOME = "/should/not/be/used";
|
|
expect(defaultConfigPath()).toBe("/custom/xdg/move/config.json");
|
|
});
|
|
|
|
test("falls back to $HOME/.config when XDG_CONFIG_HOME is unset", () => {
|
|
delete process.env.XDG_CONFIG_HOME;
|
|
process.env.HOME = "/u/test";
|
|
expect(defaultConfigPath()).toBe("/u/test/.config/move/config.json");
|
|
});
|
|
|
|
test("treats empty XDG_CONFIG_HOME as unset (per XDG spec)", () => {
|
|
process.env.XDG_CONFIG_HOME = "";
|
|
process.env.HOME = "/u/test";
|
|
expect(defaultConfigPath()).toBe("/u/test/.config/move/config.json");
|
|
});
|
|
|
|
test("throws CliError when both XDG_CONFIG_HOME and HOME are unset", () => {
|
|
delete process.env.XDG_CONFIG_HOME;
|
|
delete process.env.HOME;
|
|
expect(() => defaultConfigPath()).toThrow(CliError);
|
|
});
|
|
|
|
test("throws CliError when both XDG_CONFIG_HOME and HOME are empty", () => {
|
|
process.env.XDG_CONFIG_HOME = "";
|
|
process.env.HOME = "";
|
|
expect(() => defaultConfigPath()).toThrow(CliError);
|
|
});
|
|
});
|