@vforsh/argus 0.1.13 → 0.1.15

package/dist/commands/domFill.js

@@ -1,12 +1,62 @@
 import { readFile } from 'node:fs/promises';
-import { createOutput } from '../output/io.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { formatError } from '../cli/parse.js';
-import { readStdin } from './evalShared.js';
 import { resolvePath } from '../utils/paths.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
 import { describeElementTarget, parseWaitDuration, requireElementTarget, writeNoElementFound } from './dom/shared.js';
-/** Resolve the fill value from inline argument, --value-file, or --value-stdin. Returns null on error. */
-const resolveValueInput = async (value, options, output) => {
+import { readStdin } from './evalShared.js';
+/** Execute the dom fill command for a watcher id. The first positional arg is the inline value. */
+export const runDomFill = defineWatcherCommand({
+    build: async ([value], options, output) => buildFillPlan(value, options, output),
+    formatHuman: (response, { output, options }) => {
+        const target = { selector: resolveFillSelector(options), ref: options.ref };
+        if (response.matches === 0) {
+            writeNoElementFound(target.selector ?? target.ref, output);
+            return;
+        }
+        const elLabel = response.filled === 1 ? '1 element' : `${response.filled} elements`;
+        output.writeHuman(`Filled ${elLabel} for ${describeElementTarget(target)}`);
+    },
+});
+/** Apply the `--name` shorthand: `--name foo` is equivalent to `--selector '[name="foo"]'`. */
+const resolveFillSelector = (options) => (options.name ? `[name="${options.name}"]` : options.selector);
+/** Resolve `--name` shorthand, the value source, and `--wait` into a `/dom/fill` request plan. */
+const buildFillPlan = async (value, options, output) => {
+    if (options.name && (options.selector || options.ref)) {
+        output.writeWarn('Cannot use --name with --selector or --ref');
+        process.exitCode = 2;
+        return null;
+    }
+    const target = requireElementTarget({ selector: resolveFillSelector(options), ref: options.ref }, output);
+    if (!target)
+        return null;
+    const resolvedValue = await resolveFillValue(value, options, output);
+    if (resolvedValue == null) {
+        process.exitCode = 2;
+        return null;
+    }
+    const waitMs = parseWaitDuration(options.wait, output);
+    if (waitMs == null)
+        return null;
+    const body = {
+        value: resolvedValue,
+        all: options.all ?? false,
+        text: options.text,
+    };
+    if (target.selector)
+        body.selector = target.selector;
+    if (target.ref)
+        body.ref = target.ref;
+    if (waitMs > 0)
+        body.wait = waitMs;
+    return {
+        path: '/dom/fill',
+        method: 'POST',
+        body,
+        timeoutMs: Math.max(30_000, waitMs + 5_000),
+    };
+};
+/** Resolve the fill value from inline arg, --value-file, or --value-stdin. Returns null on error. */
+const resolveFillValue = async (value, options, output) => {
     const wantsStdin = options.valueStdin === true || value === '-';
     const hasInline = value != null && value !== '-';
     const hasFile = options.valueFile != null;
@@ -43,70 +93,9 @@ const resolveValueInput = async (value, options, output) => {
             return null;
         }
     }
-    if (hasInline) {
+    if (hasInline)
         return value;
-    }
     output.writeWarn('Value is required. Provide an inline value, --value-file, or --value-stdin (or pass - as value).');
     return null;
 };
-/** Execute the dom fill command for a watcher id. */
-export const runDomFill = async (id, value, options) => {
-    const output = createOutput(options);
-    if (options.name && (options.selector || options.ref)) {
-        output.writeWarn('Cannot use --name with --selector or --ref');
-        process.exitCode = 2;
-        return;
-    }
-    if (options.name) {
-        options.selector = `[name="${options.name}"]`;
-    }
-    const target = requireElementTarget({ selector: options.selector, ref: options.ref }, output);
-    if (!target) {
-        return;
-    }
-    const resolvedValue = await resolveValueInput(value, options, output);
-    if (resolvedValue == null) {
-        process.exitCode = 2;
-        return;
-    }
-    const waitMs = parseWaitDuration(options.wait, output);
-    if (waitMs == null) {
-        return;
-    }
-    const body = {
-        value: resolvedValue,
-        all: options.all ?? false,
-        text: options.text,
-    };
-    if (target.selector) {
-        body.selector = target.selector;
-    }
-    if (target.ref) {
-        body.ref = target.ref;
-    }
-    if (waitMs > 0) {
-        body.wait = waitMs;
-    }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/fill',
-        method: 'POST',
-        body,
-        timeoutMs: Math.max(30_000, waitMs + 5_000),
-    }, output);
-    if (!result) {
-        return;
-    }
-    const successResp = result.data;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
-    if (successResp.matches === 0) {
-        writeNoElementFound(target.selector ?? target.ref, output);
-        return;
-    }
-    const elLabel = successResp.filled === 1 ? '1 element' : `${successResp.filled} elements`;
-    output.writeHuman(`Filled ${elLabel} for ${describeElementTarget(target)}`);
-};
 //# sourceMappingURL=domFill.js.map

package/dist/commands/domFill.js.map

@@ -1 +1 @@
-{"version":3,"file":"domFill.js","sourceRoot":"","sources":["../../src/commands/domFill.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"domFill.js","sourceRoot":"","sources":["../../src/commands/domFill.ts"],"names":[],"mappings":"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"}

package/dist/commands/domFocus.d.ts

@@ -7,5 +7,5 @@ export type DomFocusOptions = {
     json?: boolean;
 };
 /** Execute the dom focus command for a watcher id. */
-export declare const runDomFocus: (id: string | undefined, options: DomFocusOptions) => Promise<void>;
+export declare const runDomFocus: import("../cli/defineWatcherCommand.js").WatcherCommandRunner<[], DomFocusOptions>;
 //# sourceMappingURL=domFocus.d.ts.map

package/dist/commands/domFocus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"domFocus.d.ts","sourceRoot":"","sources":["../../src/commands/domFocus.ts"],"names":[],"mappings":"AAKA,yCAAyC;AACzC,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,sDAAsD;AACtD,eAAO,MAAM,WAAW,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,eAAe,KAAG,OAAO,CAAC,IAAI,CAuChG,CAAA"}
+{"version":3,"file":"domFocus.d.ts","sourceRoot":"","sources":["../../src/commands/domFocus.ts"],"names":[],"mappings":"AAIA,yCAAyC;AACzC,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,sDAAsD;AACtD,eAAO,MAAM,WAAW,oFAyBtB,CAAA"}

package/dist/commands/domFocus.js

@@ -1,38 +1,30 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { describeElementTarget, requireElementTarget, writeNoElementFound } from './dom/shared.js';
 /** Execute the dom focus command for a watcher id. */
-export const runDomFocus = async (id, options) => {
-    const output = createOutput(options);
-    const target = requireElementTarget({ selector: options.selector, ref: options.ref }, output);
-    if (!target) {
-        return;
-    }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/focus',
-        method: 'POST',
-        body: {
-            selector: target.selector,
-            ref: target.ref,
-            all: options.all ?? false,
-            text: options.text,
-        },
-        timeoutMs: 30_000,
-    }, output);
-    if (!result) {
-        return;
-    }
-    const successResp = result.data;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
-    if (successResp.matches === 0) {
-        writeNoElementFound(target.selector ?? target.ref, output);
-        return;
-    }
-    const label = successResp.focused === 1 ? 'element' : 'elements';
-    output.writeHuman(`Focused ${successResp.focused} ${label} for ${describeElementTarget(target)}`);
-};
+export const runDomFocus = defineWatcherCommand({
+    build: (_args, options, output) => {
+        const target = requireElementTarget({ selector: options.selector, ref: options.ref }, output);
+        if (!target)
+            return null;
+        return {
+            path: '/dom/focus',
+            method: 'POST',
+            body: {
+                selector: target.selector,
+                ref: target.ref,
+                all: options.all ?? false,
+                text: options.text,
+            },
+        };
+    },
+    formatHuman: (response, { output, options }) => {
+        const target = { selector: options.selector, ref: options.ref };
+        if (response.matches === 0) {
+            writeNoElementFound(target.selector ?? target.ref, output);
+            return;
+        }
+        const label = response.focused === 1 ? 'element' : 'elements';
+        output.writeHuman(`Focused ${response.focused} ${label} for ${describeElementTarget(target)}`);
+    },
+});
 //# sourceMappingURL=domFocus.js.map

package/dist/commands/domFocus.js.map

@@ -1 +1 @@
-{"version":3,"file":"domFocus.js","sourceRoot":"","sources":["../../src/commands/domFocus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAWlG,sDAAsD;AACtD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAwB,EAAiB,EAAE;IACpG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;IAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACxC;QACC,EAAE;QACF,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK;YACzB,IAAI,EAAE,OAAO,CAAC,IAAI;SAClB;QACD,SAAS,EAAE,MAAM;KACjB,EACD,MAAM,CACN,CAAA;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAM;IACP,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAA;IAE/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QAC7B,OAAM;IACP,CAAC;IAED,IAAI,WAAW,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAC/B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAI,EAAE,MAAM,CAAC,CAAA;QAC3D,OAAM;IACP,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;IAChE,MAAM,CAAC,UAAU,CAAC,WAAW,WAAW,CAAC,OAAO,IAAI,KAAK,QAAQ,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAClG,CAAC,CAAA"}
+{"version":3,"file":"domFocus.js","sourceRoot":"","sources":["../../src/commands/domFocus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAWlG,sDAAsD;AACtD,MAAM,CAAC,MAAM,WAAW,GAAG,oBAAoB,CAAoC;IAClF,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;QAC7F,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAA;QAExB,OAAO;YACN,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK;gBACzB,IAAI,EAAE,OAAO,CAAC,IAAI;aAClB;SACD,CAAA;IACF,CAAC;IACD,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAA;QAC/D,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YAC5B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAI,EAAE,MAAM,CAAC,CAAA;YAC3D,OAAM;QACP,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;QAC7D,MAAM,CAAC,UAAU,CAAC,WAAW,QAAQ,CAAC,OAAO,IAAI,KAAK,QAAQ,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC/F,CAAC;CACD,CAAC,CAAA"}

package/dist/commands/domHover.d.ts

@@ -7,5 +7,5 @@ export type DomHoverOptions = {
     json?: boolean;
 };
 /** Execute the dom hover command for a watcher id. */
-export declare const runDomHover: (id: string | undefined, options: DomHoverOptions) => Promise<void>;
+export declare const runDomHover: import("../cli/defineWatcherCommand.js").WatcherCommandRunner<[], DomHoverOptions>;
 //# sourceMappingURL=domHover.d.ts.map

package/dist/commands/domHover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"domHover.d.ts","sourceRoot":"","sources":["../../src/commands/domHover.ts"],"names":[],"mappings":"AAKA,yCAAyC;AACzC,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,sDAAsD;AACtD,eAAO,MAAM,WAAW,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,eAAe,KAAG,OAAO,CAAC,IAAI,CAuChG,CAAA"}
+{"version":3,"file":"domHover.d.ts","sourceRoot":"","sources":["../../src/commands/domHover.ts"],"names":[],"mappings":"AAIA,yCAAyC;AACzC,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,sDAAsD;AACtD,eAAO,MAAM,WAAW,oFAyBtB,CAAA"}

package/dist/commands/domHover.js

@@ -1,38 +1,30 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { describeElementTarget, requireElementTarget, writeNoElementFound } from './dom/shared.js';
 /** Execute the dom hover command for a watcher id. */
-export const runDomHover = async (id, options) => {
-    const output = createOutput(options);
-    const target = requireElementTarget({ selector: options.selector, ref: options.ref }, output);
-    if (!target) {
-        return;
-    }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/hover',
-        method: 'POST',
-        body: {
-            selector: target.selector,
-            ref: target.ref,
-            all: options.all ?? false,
-            text: options.text,
-        },
-        timeoutMs: 30_000,
-    }, output);
-    if (!result) {
-        return;
-    }
-    const successResp = result.data;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
-    if (successResp.matches === 0) {
-        writeNoElementFound(target.selector ?? target.ref, output);
-        return;
-    }
-    const label = successResp.hovered === 1 ? 'element' : 'elements';
-    output.writeHuman(`Hovered ${successResp.hovered} ${label} for ${describeElementTarget(target)}`);
-};
+export const runDomHover = defineWatcherCommand({
+    build: (_args, options, output) => {
+        const target = requireElementTarget({ selector: options.selector, ref: options.ref }, output);
+        if (!target)
+            return null;
+        return {
+            path: '/dom/hover',
+            method: 'POST',
+            body: {
+                selector: target.selector,
+                ref: target.ref,
+                all: options.all ?? false,
+                text: options.text,
+            },
+        };
+    },
+    formatHuman: (response, { output, options }) => {
+        const target = { selector: options.selector, ref: options.ref };
+        if (response.matches === 0) {
+            writeNoElementFound(target.selector ?? target.ref, output);
+            return;
+        }
+        const label = response.hovered === 1 ? 'element' : 'elements';
+        output.writeHuman(`Hovered ${response.hovered} ${label} for ${describeElementTarget(target)}`);
+    },
+});
 //# sourceMappingURL=domHover.js.map

package/dist/commands/domHover.js.map

@@ -1 +1 @@
-{"version":3,"file":"domHover.js","sourceRoot":"","sources":["../../src/commands/domHover.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAWlG,sDAAsD;AACtD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAwB,EAAiB,EAAE;IACpG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;IAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACxC;QACC,EAAE;QACF,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK;YACzB,IAAI,EAAE,OAAO,CAAC,IAAI;SAClB;QACD,SAAS,EAAE,MAAM;KACjB,EACD,MAAM,CACN,CAAA;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAM;IACP,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAA;IAE/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QAC7B,OAAM;IACP,CAAC;IAED,IAAI,WAAW,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAC/B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAI,EAAE,MAAM,CAAC,CAAA;QAC3D,OAAM;IACP,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;IAChE,MAAM,CAAC,UAAU,CAAC,WAAW,WAAW,CAAC,OAAO,IAAI,KAAK,QAAQ,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAClG,CAAC,CAAA"}
+{"version":3,"file":"domHover.js","sourceRoot":"","sources":["../../src/commands/domHover.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAWlG,sDAAsD;AACtD,MAAM,CAAC,MAAM,WAAW,GAAG,oBAAoB,CAAoC;IAClF,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;QAC7F,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAA;QAExB,OAAO;YACN,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK;gBACzB,IAAI,EAAE,OAAO,CAAC,IAAI;aAClB;SACD,CAAA;IACF,CAAC;IACD,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAA;QAC/D,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YAC5B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAI,EAAE,MAAM,CAAC,CAAA;YAC3D,OAAM;QACP,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;QAC7D,MAAM,CAAC,UAAU,CAAC,WAAW,QAAQ,CAAC,OAAO,IAAI,KAAK,QAAQ,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC/F,CAAC;CACD,CAAC,CAAA"}

package/dist/commands/domInfo.d.ts

@@ -8,5 +8,5 @@ export type DomInfoOptions = {
     json?: boolean;
 };
 /** Execute the dom info command for a watcher id. */
-export declare const runDomInfo: (id: string | undefined, options: DomInfoOptions) => Promise<void>;
+export declare const runDomInfo: import("../cli/defineWatcherCommand.js").WatcherCommandRunner<[], DomInfoOptions>;
 //# sourceMappingURL=domInfo.d.ts.map

package/dist/commands/domInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"domInfo.d.ts","sourceRoot":"","sources":["../../src/commands/domInfo.ts"],"names":[],"mappings":"AAOA,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,qDAAqD;AACrD,eAAO,MAAM,UAAU,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CA+C9F,CAAA"}
+{"version":3,"file":"domInfo.d.ts","sourceRoot":"","sources":["../../src/commands/domInfo.ts"],"names":[],"mappings":"AAOA,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,qDAAqD;AACrD,eAAO,MAAM,UAAU,mFAYrB,CAAA"}

package/dist/commands/domInfo.js

@@ -1,23 +1,32 @@
 import { formatDomInfo } from '../output/dom.js';
-import { createOutput } from '../output/io.js';
 import { parsePositiveInt } from '../cli/parse.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { requireElementTarget, writeNoElementFound } from './dom/shared.js';
 /** Execute the dom info command for a watcher id. */
-export const runDomInfo = async (id, options) => {
-    const output = createOutput(options);
+export const runDomInfo = defineWatcherCommand({
+    build: (_args, options, output) => buildDomInfoPlan(options, output),
+    formatHuman: (response, { output, options }) => {
+        const target = { selector: options.selector, ref: options.ref };
+        if (response.matches === 0) {
+            writeNoElementFound(target.selector ?? target.ref, output);
+            return;
+        }
+        const formatted = formatDomInfo(response.elements);
+        output.writeHuman(formatted);
+    },
+});
+const buildDomInfoPlan = (options, output) => {
     const target = requireElementTarget({ selector: options.selector, ref: options.ref }, output);
     if (!target) {
-        return;
+        return null;
     }
     const outerHtmlMaxChars = parsePositiveInt(options.outerHtmlMax);
     if (options.outerHtmlMax !== undefined && outerHtmlMaxChars === undefined) {
         output.writeWarn('--outer-html-max must be a positive integer');
         process.exitCode = 2;
-        return;
+        return null;
     }
-    const result = await requestWatcherAction({
-        id,
+    return {
         path: '/dom/info',
         method: 'POST',
         body: {
@@ -28,20 +37,6 @@ export const runDomInfo = async (id, options) => {
             text: options.text,
         },
         timeoutMs: 30_000,
-    }, output);
-    if (!result) {
-        return;
-    }
-    const successResp = result.data;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
-    if (successResp.matches === 0) {
-        writeNoElementFound(target.selector ?? target.ref, output);
-        return;
-    }
-    const formatted = formatDomInfo(successResp.elements);
-    output.writeHuman(formatted);
+    };
 };
 //# sourceMappingURL=domInfo.js.map

package/dist/commands/domInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"domInfo.js","sourceRoot":"","sources":["../../src/commands/domInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAY3E,qDAAqD;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAuB,EAAiB,EAAE;IAClG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;IAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAM;IACP,CAAC;IAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IAChE,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QAC3E,MAAM,CAAC,SAAS,CAAC,6CAA6C,CAAC,CAAA;QAC/D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACxC;QACC,EAAE;QACF,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK;YACzB,iBAAiB;YACjB,IAAI,EAAE,OAAO,CAAC,IAAI;SAClB;QACD,SAAS,EAAE,MAAM;KACjB,EACD,MAAM,CACN,CAAA;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAM;IACP,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAA;IAE/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QAC7B,OAAM;IACP,CAAC;IAED,IAAI,WAAW,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAC/B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAI,EAAE,MAAM,CAAC,CAAA;QAC3D,OAAM;IACP,CAAC;IAED,MAAM,SAAS,GAAG,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;IACrD,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AAC7B,CAAC,CAAA"}
+{"version":3,"file":"domInfo.js","sourceRoot":"","sources":["../../src/commands/domInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAA2B,MAAM,gCAAgC,CAAA;AAE9F,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAY3E,qDAAqD;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAkC;IAC/E,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC;IACpE,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAA;QAC/D,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YAC5B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAI,EAAE,MAAM,CAAC,CAAA;YAC3D,OAAM;QACP,CAAC;QAED,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAClD,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IAC7B,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAAuB,EAAE,MAAc,EAA6B,EAAE;IAC/F,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;IAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IAChE,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QAC3E,MAAM,CAAC,SAAS,CAAC,6CAA6C,CAAC,CAAA;QAC/D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK;YACzB,iBAAiB;YACjB,IAAI,EAAE,OAAO,CAAC,IAAI;SAClB;QACD,SAAS,EAAE,MAAM;KACjB,CAAA;AACF,CAAC,CAAA"}

package/dist/commands/domKeydown.d.ts

@@ -6,5 +6,5 @@ export type DomKeydownOptions = {
     json?: boolean;
 };
 /** Execute the dom keydown command for a watcher id. */
-export declare const runDomKeydown: (id: string | undefined, options: DomKeydownOptions) => Promise<void>;
+export declare const runDomKeydown: import("../cli/defineWatcherCommand.js").WatcherCommandRunner<[], DomKeydownOptions>;
 //# sourceMappingURL=domKeydown.d.ts.map

package/dist/commands/domKeydown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"domKeydown.d.ts","sourceRoot":"","sources":["../../src/commands/domKeydown.ts"],"names":[],"mappings":"AAIA,2CAA2C;AAC3C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,aAAa,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,iBAAiB,KAAG,OAAO,CAAC,IAAI,CA8CpG,CAAA"}
+{"version":3,"file":"domKeydown.d.ts","sourceRoot":"","sources":["../../src/commands/domKeydown.ts"],"names":[],"mappings":"AAGA,2CAA2C;AAC3C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,aAAa,sFAqBxB,CAAA"}

package/dist/commands/domKeydown.js

@@ -1,46 +1,25 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherJson, writeRequestError } from '../watchers/requestWatcher.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 /** Execute the dom keydown command for a watcher id. */
-export const runDomKeydown = async (id, options) => {
-    const output = createOutput(options);
-    if (!options.key || options.key.trim() === '') {
-        output.writeWarn('--key is required');
-        process.exitCode = 2;
-        return;
-    }
-    const result = await requestWatcherJson({
-        id,
-        path: '/dom/keydown',
-        method: 'POST',
-        body: {
-            key: options.key,
-            selector: options.selector,
-            modifiers: options.modifiers,
-        },
-        timeoutMs: 30_000,
-        returnErrorResponse: true,
-    });
-    if (!result.ok) {
-        writeRequestError(result, output);
-        return;
-    }
-    const response = result.data;
-    if (!response.ok) {
-        const errorResp = response;
-        if (options.json) {
-            output.writeJson(response);
+export const runDomKeydown = defineWatcherCommand({
+    build: (_args, options, output) => {
+        if (!options.key || options.key.trim() === '') {
+            output.writeWarn('--key is required');
+            process.exitCode = 2;
+            return null;
         }
-        else {
-            output.writeWarn(`Error: ${errorResp.error.message}`);
-        }
-        process.exitCode = 1;
-        return;
-    }
-    const successResp = response;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
-    output.writeHuman(`Dispatched keydown: ${successResp.key}`);
-};
+        return {
+            path: '/dom/keydown',
+            method: 'POST',
+            body: {
+                key: options.key,
+                selector: options.selector,
+                modifiers: options.modifiers,
+            },
+            timeoutMs: 30_000,
+        };
+    },
+    formatHuman: (response, { output }) => {
+        output.writeHuman(`Dispatched keydown: ${response.key}`);
+    },
+});
 //# sourceMappingURL=domKeydown.js.map

package/dist/commands/domKeydown.js.map

@@ -1 +1 @@
-{"version":3,"file":"domKeydown.js","sourceRoot":"","sources":["../../src/commands/domKeydown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAUrF,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,EAAsB,EAAE,OAA0B,EAAiB,EAAE;IACxG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC/C,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;QACrC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAqC;QAC3E,EAAE;QACF,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE;YACL,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;SAC5B;QACD,SAAS,EAAE,MAAM;QACjB,mBAAmB,EAAE,IAAI;KACzB,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAChB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACjC,OAAM;IACP,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAA;IAC5B,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,SAAS,GAAG,QAAyB,CAAA;QAC3C,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC3B,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,SAAS,CAAC,UAAU,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACtD,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,WAAW,GAAG,QAA8B,CAAA;IAElD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QAC7B,OAAM;IACP,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,uBAAuB,WAAW,CAAC,GAAG,EAAE,CAAC,CAAA;AAC5D,CAAC,CAAA"}
+{"version":3,"file":"domKeydown.js","sourceRoot":"","sources":["../../src/commands/domKeydown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAUrE,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAwC;IACxF,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACjC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC/C,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;YACrC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAO,IAAI,CAAA;QACZ,CAAC;QACD,OAAO;YACN,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;aAC5B;YACD,SAAS,EAAE,MAAM;SACjB,CAAA;IACF,CAAC;IACD,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrC,MAAM,CAAC,UAAU,CAAC,uBAAuB,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAA;IACzD,CAAC;CACD,CAAC,CAAA"}

package/dist/commands/domModify.js

@@ -1,37 +1,34 @@
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
 import { requireSelector, writeNoElementFound } from './dom/shared.js';
 const executeModify = async (id, options, payload, successMessage) => {
-    const output = createOutput(options);
-    const selector = requireSelector(options, output);
-    if (!selector) {
-        return;
-    }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/modify',
-        method: 'POST',
-        body: {
-            ...payload,
-            selector,
-            ...(options.text != null ? { text: options.text } : {}),
-        },
-        timeoutMs: 30_000,
-    }, output);
-    if (!result) {
-        return;
-    }
-    const successResp = result.data;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
-    if (successResp.matches === 0) {
-        writeNoElementFound(selector, output);
-        return;
-    }
-    output.writeHuman(successMessage(successResp));
+    await runDomModifyRequest(id, payload, successMessage, options);
 };
+const runDomModifyRequest = defineWatcherCommand({
+    build: ([payload], options, output) => {
+        const selector = requireSelector(options, output);
+        if (!selector) {
+            return null;
+        }
+        return {
+            path: '/dom/modify',
+            method: 'POST',
+            body: {
+                ...payload,
+                selector,
+                ...(options.text != null ? { text: options.text } : {}),
+            },
+            timeoutMs: 30_000,
+        };
+    },
+    formatHuman: (successResp, { output, options, args }) => {
+        if (successResp.matches === 0) {
+            writeNoElementFound(options.selector, output);
+            return;
+        }
+        output.writeHuman(args[1](successResp));
+    },
+});
 /**
  * Parse attribute arguments: "name" (boolean) or "name=value".
  */