@vforsh/argus 0.1.12 → 0.1.14

package/dist/commands/domClick.js

@@ -1,87 +1,105 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
-import { parseWaitDuration, parseXY, writeNoElementFound } from './dom/shared.js';
+import { domClickRequestSchema } from '@vforsh/argus-core';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
+import { describeElementTarget, parseWaitDuration, parseXY, requireElementTarget, writeNoElementFound } from './dom/shared.js';
+import { resolveTestId } from './resolveTestId.js';
+/** CLI definition for the top-level `argus click` command. */
+export const domClickCommandDefinition = {
+    name: 'click',
+    description: 'Click at coordinates or on element(s) matching a CSS selector',
+    arguments: [{ flags: '[id]', description: 'Watcher id to query' }],
+    options: [
+        { flags: '--selector <css>', description: 'CSS selector to match element(s)' },
+        { flags: '--testid <id>', description: 'Shorthand for --selector "[data-testid=\'<id>\']"' },
+        { flags: '--ref <elementRef>', description: 'Stable element ref from snapshot/locate output' },
+        { flags: '--pos <x,y>', description: 'Viewport coordinates or offset from element top-left' },
+        { flags: '--button <type>', description: 'Mouse button: left, middle, right (default: left)' },
+        { flags: '--all', description: 'Allow multiple matches (default: error if >1 match)' },
+        { flags: '--text <string>', description: 'Filter by textContent (trimmed). Supports /regex/flags syntax' },
+        { flags: '--wait <duration>', description: 'Wait for selector to appear (e.g. 5s, 500ms)' },
+        { flags: '--json', description: 'Output JSON for automation' },
+    ],
+    examples: [
+        'argus click app --pos 100,200',
+        'argus click app --selector "#btn"',
+        'argus click app --testid "submit-btn"',
+        'argus click app --ref e5',
+        'argus click app --selector "#btn" --pos 10,5',
+        'argus click app --selector ".item" --all',
+        'argus click app --selector "#btn" --button right',
+        'argus click app --pos 100,200 --button middle',
+    ],
+    action: async (id, options) => {
+        if (!resolveTestId(options))
+            return;
+        await runDomClick(id, options);
+    },
+};
 /** Execute the dom click command for a watcher id. */
-export const runDomClick = async (id, options) => {
-    const output = createOutput(options);
-    const hasSelector = options.selector != null && options.selector.trim() !== '';
-    const hasPos = options.pos != null;
-    if (!hasSelector && !hasPos) {
-        output.writeWarn('--selector or --pos is required');
-        process.exitCode = 2;
-        return;
-    }
-    let x;
-    let y;
-    if (hasPos) {
-        const point = parseXY(options.pos);
-        if (!point) {
-            output.writeWarn('--pos must be in the format "x,y" (e.g. --pos 100,200)');
-            process.exitCode = 2;
+export const runDomClick = defineWatcherCommand({
+    schema: domClickRequestSchema,
+    build: (_args, options, output) => buildClickPlan(options, output),
+    formatHuman: (response, { output, options }) => {
+        const target = hasElementTarget(options) ? { selector: options.selector, ref: options.ref } : null;
+        const xy = options.pos ? parseXY(options.pos) : null;
+        // Coordinate-only click (no selector/ref): build never set matches/clicked beyond 1.
+        if (!target) {
+            output.writeHuman(`Clicked at (${xy?.x}, ${xy?.y})`);
             return;
         }
-        x = point.x;
-        y = point.y;
-    }
-    const waitMs = parseWaitDuration(options.wait, output);
-    if (waitMs == null) {
-        return;
+        if (response.matches === 0) {
+            writeNoElementFound(target.selector ?? target.ref, output);
+            return;
+        }
+        const label = response.clicked === 1 ? 'element' : 'elements';
+        const desc = describeElementTarget(target);
+        const offset = xy ? ` at offset (${xy.x}, ${xy.y})` : '';
+        output.writeHuman(`Clicked ${response.clicked} ${label} for ${desc}${offset}`);
+    },
+});
+const hasElementTarget = (options) => Boolean(options.selector?.trim() || options.ref?.trim());
+/** Validate options and assemble the `/dom/click` request plan. */
+const buildClickPlan = (options, output) => {
+    const target = hasElementTarget(options) ? requireElementTarget({ selector: options.selector, ref: options.ref }, output) : null;
+    if (hasElementTarget(options) && !target)
+        return null;
+    const xy = options.pos != null ? parseXY(options.pos) : undefined;
+    if (options.pos != null && !xy) {
+        output.writeWarn('--pos must be in the format "x,y" (e.g. --pos 100,200)');
+        process.exitCode = 2;
+        return null;
     }
-    const validButtons = ['left', 'middle', 'right'];
-    const button = options.button ?? 'left';
-    if (!validButtons.includes(button)) {
-        output.writeWarn(`--button must be one of: ${validButtons.join(', ')}`);
+    if (!target && !xy) {
+        output.writeWarn('--selector, --testid, --ref, or --pos is required');
         process.exitCode = 2;
-        return;
+        return null;
     }
+    const waitMs = parseWaitDuration(options.wait, output);
+    if (waitMs == null)
+        return null;
     const body = {};
-    if (hasSelector) {
-        body.selector = options.selector;
+    if (target) {
+        if (target.selector)
+            body.selector = target.selector;
+        if (target.ref)
+            body.ref = target.ref;
         body.all = options.all ?? false;
-        if (options.text != null) {
+        if (options.text != null)
             body.text = options.text;
-        }
-    }
-    if (hasPos) {
-        body.x = x;
-        body.y = y;
     }
-    if (button !== 'left') {
-        body.button = button;
+    if (xy) {
+        body.x = xy.x;
+        body.y = xy.y;
     }
-    if (waitMs > 0) {
+    if (options.button)
+        body.button = options.button;
+    if (waitMs > 0)
         body.wait = waitMs;
-    }
-    const result = await requestWatcherAction({
-        id,
+    // `wait` may exceed 30s; bump request timeout proportionally so the watcher reply is not cut off.
+    return {
         path: '/dom/click',
         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;
-    }
-    // Coordinate-only click
-    if (!hasSelector) {
-        output.writeHuman(`Clicked at (${x}, ${y})`);
-        return;
-    }
-    if (successResp.matches === 0) {
-        writeNoElementFound(options.selector, output);
-        return;
-    }
-    const label = successResp.clicked === 1 ? 'element' : 'elements';
-    if (hasPos) {
-        output.writeHuman(`Clicked ${successResp.clicked} ${label} for selector: ${options.selector} at offset (${x}, ${y})`);
-    }
-    else {
-        output.writeHuman(`Clicked ${successResp.clicked} ${label} for selector: ${options.selector}`);
-    }
+    };
 };
 //# sourceMappingURL=domClick.js.map

package/dist/commands/domClick.js.map

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

package/dist/commands/domFill.d.ts

@@ -1,6 +1,7 @@
 /** Options for the dom fill command. */
 export type DomFillOptions = {
     selector?: string;
+    ref?: string;
     name?: string;
     valueFile?: string;
     valueStdin?: boolean;
@@ -9,6 +10,6 @@ export type DomFillOptions = {
     wait?: string;
     json?: boolean;
 };
-/** Execute the dom fill command for a watcher id. */
-export declare const runDomFill: (id: string | undefined, value: string | undefined, options: DomFillOptions) => Promise<void>;
+/** Execute the dom fill command for a watcher id. The first positional arg is the inline value. */
+export declare const runDomFill: import("../cli/defineWatcherCommand.js").WatcherCommandRunner<[value: string | undefined], DomFillOptions>;
 //# sourceMappingURL=domFill.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"domFill.d.ts","sourceRoot":"","sources":["../../src/commands/domFill.ts"],"names":[],"mappings":"AASA,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAkDD,qDAAqD;AACrD,eAAO,MAAM,UAAU,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,OAAO,MAAM,GAAG,SAAS,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAmEzH,CAAA"}
+{"version":3,"file":"domFill.d.ts","sourceRoot":"","sources":["../../src/commands/domFill.ts"],"names":[],"mappings":"AASA,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,mGAAmG;AACnG,eAAO,MAAM,UAAU,4GAWrB,CAAA"}

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 { parseWaitDuration, 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 { describeElementTarget, parseWaitDuration, requireElementTarget, writeNoElementFound } from './dom/shared.js';
+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,66 +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) {
-        output.writeWarn('Cannot use both --name and --selector');
-        process.exitCode = 2;
-        return;
-    }
-    if (options.name) {
-        options.selector = `[name="${options.name}"]`;
-    }
-    if (!options.selector || options.selector.trim() === '') {
-        output.writeWarn('--selector, --name, or --testid is required');
-        process.exitCode = 2;
-        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 = {
-        selector: options.selector,
-        value: resolvedValue,
-        all: options.all ?? false,
-        text: options.text,
-    };
-    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(options.selector, output);
-        return;
-    }
-    const elLabel = successResp.filled === 1 ? '1 element' : `${successResp.filled} elements`;
-    output.writeHuman(`Filled ${elLabel} for selector: ${options.selector}`);
-};
 //# 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

@@ -1,10 +1,11 @@
 /** Options for the dom focus command. */
 export type DomFocusOptions = {
-    selector: string;
+    selector?: string;
+    ref?: string;
     all?: boolean;
     text?: string;
     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,EAAE,MAAM,CAAA;IAChB,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,CAsChG,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,37 +1,30 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
-import { requireSelector, writeNoElementFound } from './dom/shared.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 selector = requireSelector(options, output);
-    if (!selector) {
-        return;
-    }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/focus',
-        method: 'POST',
-        body: {
-            selector,
-            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(selector, output);
-        return;
-    }
-    const label = successResp.focused === 1 ? 'element' : 'elements';
-    output.writeHuman(`Focused ${successResp.focused} ${label} for selector: ${selector}`);
-};
+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,eAAe,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAUtE,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,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,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;YACR,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,QAAQ,EAAE,MAAM,CAAC,CAAA;QACrC,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,kBAAkB,QAAQ,EAAE,CAAC,CAAA;AACvF,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

@@ -1,10 +1,11 @@
 /** Options for the dom hover command. */
 export type DomHoverOptions = {
-    selector: string;
+    selector?: string;
+    ref?: string;
     all?: boolean;
     text?: string;
     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,EAAE,MAAM,CAAA;IAChB,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,CAsChG,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,37 +1,30 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
-import { requireSelector, writeNoElementFound } from './dom/shared.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 selector = requireSelector(options, output);
-    if (!selector) {
-        return;
-    }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/hover',
-        method: 'POST',
-        body: {
-            selector,
-            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(selector, output);
-        return;
-    }
-    const label = successResp.hovered === 1 ? 'element' : 'elements';
-    output.writeHuman(`Hovered ${successResp.hovered} ${label} for selector: ${selector}`);
-};
+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,eAAe,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAUtE,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,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,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;YACR,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,QAAQ,EAAE,MAAM,CAAC,CAAA;QACrC,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,kBAAkB,QAAQ,EAAE,CAAC,CAAA;AACvF,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

@@ -1,6 +1,7 @@
 /** Options for the dom info command. */
 export type DomInfoOptions = {
-    selector: string;
+    selector?: string;
+    ref?: string;
     all?: boolean;
     outerHtmlMax?: string;
     text?: string;

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,EAAE,MAAM,CAAA;IAChB,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,CA8C9F,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,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CA+C9F,CAAA"}