@vforsh/argus 0.1.14 → 0.1.15

package/dist/commands/domScroll.js

@@ -1,26 +1,28 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { parseXY, writeNoElementFound } from './dom/shared.js';
 /** Execute the dom scroll command (dispatch mouse wheel input) for a watcher id. */
-export const runDomScroll = async (id, options) => {
-    const output = createOutput(options);
+export const runDomScroll = defineWatcherCommand({
+    build: (_args, options, output) => buildDomScrollPlan(options, output),
+    formatHuman: formatDomScrollHuman,
+});
+const buildDomScrollPlan = (options, output) => {
     if (options.by == null) {
         output.writeWarn('--by is required (e.g. --by 0,300)');
         process.exitCode = 2;
-        return;
+        return null;
     }
     const delta = parseXY(options.by);
     if (!delta) {
         output.writeWarn('--by must be in the format "x,y" (e.g. --by 0,300)');
         process.exitCode = 2;
-        return;
+        return null;
     }
     const hasSelector = options.selector != null && options.selector.trim() !== '';
     const hasPos = options.pos != null;
     if (hasSelector && hasPos) {
         output.writeWarn('--selector and --pos are mutually exclusive');
         process.exitCode = 2;
-        return;
+        return null;
     }
     let x;
     let y;
@@ -29,7 +31,7 @@ export const runDomScroll = async (id, options) => {
         if (!parsed) {
             output.writeWarn('--pos must be in the format "x,y" (e.g. --pos 400,300)');
             process.exitCode = 2;
-            return;
+            return null;
         }
         x = parsed.x;
         y = parsed.y;
@@ -46,21 +48,12 @@ export const runDomScroll = async (id, options) => {
         body.x = x;
         body.y = y;
     }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/scroll',
-        method: 'POST',
-        body,
-        timeoutMs: 30_000,
-    }, output);
-    if (!result) {
-        return;
-    }
-    const successResp = result.data;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
+    return { path: '/dom/scroll', method: 'POST', body, timeoutMs: 30_000 };
+};
+function formatDomScrollHuman(successResp, { output, options }) {
+    const delta = parseXY(options.by);
+    const hasSelector = options.selector != null && options.selector.trim() !== '';
+    const hasPos = options.pos != null;
     if (hasSelector) {
         if (successResp.matches === 0) {
             writeNoElementFound(options.selector, output);
@@ -70,10 +63,11 @@ export const runDomScroll = async (id, options) => {
         output.writeHuman(`Emulated scroll on ${successResp.scrolled} ${label} by (${delta.x}, ${delta.y})`);
     }
     else if (hasPos) {
+        const { x, y } = parseXY(options.pos);
         output.writeHuman(`Emulated scroll at (${x}, ${y}) by (${delta.x}, ${delta.y})`);
     }
     else {
         output.writeHuman(`Emulated scroll at viewport center by (${delta.x}, ${delta.y})`);
     }
-};
+}
 //# sourceMappingURL=domScroll.js.map

package/dist/commands/domScroll.js.map

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

package/dist/commands/domScrollTo.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"domScrollTo.d.ts","sourceRoot":"","sources":["../../src/commands/domScrollTo.ts"],"names":[],"mappings":"AAKA,6CAA6C;AAC7C,MAAM,MAAM,kBAAkB,GAAG;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,0DAA0D;AAC1D,eAAO,MAAM,cAAc,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,kBAAkB,KAAG,OAAO,CAAC,IAAI,CAwFtG,CAAA"}
+{"version":3,"file":"domScrollTo.d.ts","sourceRoot":"","sources":["../../src/commands/domScrollTo.ts"],"names":[],"mappings":"AAKA,6CAA6C;AAC7C,MAAM,MAAM,kBAAkB,GAAG;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,0DAA0D;AAC1D,eAAO,MAAM,cAAc,uFAGzB,CAAA"}

package/dist/commands/domScrollTo.js

@@ -1,21 +1,23 @@
-import { createOutput } from '../output/io.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { parseXY, writeNoElementFound } from './dom/shared.js';
 /** Execute the dom scroll-to command for a watcher id. */
-export const runDomScrollTo = async (id, options) => {
-    const output = createOutput(options);
+export const runDomScrollTo = defineWatcherCommand({
+    build: (_args, options, output) => buildDomScrollToPlan(options, output),
+    formatHuman: formatDomScrollToHuman,
+});
+const buildDomScrollToPlan = (options, output) => {
     const hasSelector = options.selector != null && options.selector.trim() !== '';
     const hasTo = options.to != null;
     const hasBy = options.by != null;
     if (!hasSelector && !hasTo && !hasBy) {
         output.writeWarn('--selector, --to, or --by is required');
         process.exitCode = 2;
-        return;
+        return null;
     }
     if (hasTo && hasBy) {
         output.writeWarn('--to and --by are mutually exclusive');
         process.exitCode = 2;
-        return;
+        return null;
     }
     let to;
     let by;
@@ -24,7 +26,7 @@ export const runDomScrollTo = async (id, options) => {
         if (!parsed) {
             output.writeWarn('--to must be in the format "x,y" (e.g. --to 0,1000)');
             process.exitCode = 2;
-            return;
+            return null;
         }
         to = parsed;
     }
@@ -33,7 +35,7 @@ export const runDomScrollTo = async (id, options) => {
         if (!parsed) {
             output.writeWarn('--by must be in the format "x,y" (e.g. --by 0,500)');
             process.exitCode = 2;
-            return;
+            return null;
         }
         by = parsed;
     }
@@ -51,21 +53,10 @@ export const runDomScrollTo = async (id, options) => {
     if (by) {
         body.by = by;
     }
-    const result = await requestWatcherAction({
-        id,
-        path: '/dom/scroll-to',
-        method: 'POST',
-        body,
-        timeoutMs: 30_000,
-    }, output);
-    if (!result) {
-        return;
-    }
-    const successResp = result.data;
-    if (options.json) {
-        output.writeJson(successResp);
-        return;
-    }
+    return { path: '/dom/scroll-to', method: 'POST', body, timeoutMs: 30_000 };
+};
+function formatDomScrollToHuman(successResp, { output, options }) {
+    const hasSelector = options.selector != null && options.selector.trim() !== '';
     if (hasSelector && successResp.matches === 0) {
         writeNoElementFound(options.selector, output);
         return;
@@ -77,5 +68,5 @@ export const runDomScrollTo = async (id, options) => {
     else {
         output.writeHuman(`Scrolled viewport (scrollX=${successResp.scrollX}, scrollY=${successResp.scrollY})`);
     }
-};
+}
 //# sourceMappingURL=domScrollTo.js.map

package/dist/commands/domScrollTo.js.map

@@ -1 +1 @@
-{"version":3,"file":"domScrollTo.js","sourceRoot":"","sources":["../../src/commands/domScrollTo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAY9D,0DAA0D;AAC1D,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,EAAsB,EAAE,OAA2B,EAAiB,EAAE;IAC1G,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAEpC,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA;IAC9E,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,IAAI,IAAI,CAAA;IAChC,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,IAAI,IAAI,CAAA;IAEhC,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;QACtC,MAAM,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAA;QACzD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;QACpB,MAAM,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAA;QACxD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,IAAI,EAAwC,CAAA;IAC5C,IAAI,EAAwC,CAAA;IAE5C,IAAI,KAAK,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,EAAG,CAAC,CAAA;QACnC,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,CAAC,SAAS,CAAC,qDAAqD,CAAC,CAAA;YACvE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAM;QACP,CAAC;QACD,EAAE,GAAG,MAAM,CAAA;IACZ,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,EAAG,CAAC,CAAA;QACnC,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,CAAC,SAAS,CAAC,oDAAoD,CAAC,CAAA;YACtE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAM;QACP,CAAC;QACD,EAAE,GAAG,MAAM,CAAA;IACZ,CAAC;IAED,MAAM,IAAI,GAA4B,EAAE,CAAA;IACxC,IAAI,WAAW,EAAE,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,KAAK,CAAA;QAC/B,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACzB,CAAC;IACF,CAAC;IACD,IAAI,EAAE,EAAE,CAAC;QACR,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;IACb,CAAC;IACD,IAAI,EAAE,EAAE,CAAC;QACR,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACxC;QACC,EAAE;QACF,IAAI,EAAE,gBAAgB;QACtB,MAAM,EAAE,MAAM;QACd,IAAI;QACJ,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,IAAI,WAAW,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAC9C,mBAAmB,CAAC,OAAO,CAAC,QAAS,EAAE,MAAM,CAAC,CAAA;QAC9C,OAAM;IACP,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;QACjE,MAAM,CAAC,UAAU,CAAC,YAAY,WAAW,CAAC,QAAQ,IAAI,KAAK,aAAa,WAAW,CAAC,OAAO,aAAa,WAAW,CAAC,OAAO,GAAG,CAAC,CAAA;IAChI,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,UAAU,CAAC,8BAA8B,WAAW,CAAC,OAAO,aAAa,WAAW,CAAC,OAAO,GAAG,CAAC,CAAA;IACxG,CAAC;AACF,CAAC,CAAA"}
+{"version":3,"file":"domScrollTo.js","sourceRoot":"","sources":["../../src/commands/domScrollTo.ts"],"names":[],"mappings":"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"}

package/dist/commands/domTree.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"domTree.d.ts","sourceRoot":"","sources":["../../src/commands/domTree.ts"],"names":[],"mappings":"AAOA,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,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,CAsD9F,CAAA"}
+{"version":3,"file":"domTree.d.ts","sourceRoot":"","sources":["../../src/commands/domTree.ts"],"names":[],"mappings":"AAOA,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,qDAAqD;AACrD,eAAO,MAAM,UAAU,mFAWrB,CAAA"}

package/dist/commands/domTree.js

@@ -1,29 +1,37 @@
 import { formatDomTree } 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 { requireSelector, writeNoElementFound } from './dom/shared.js';
 /** Execute the dom tree command for a watcher id. */
-export const runDomTree = async (id, options) => {
-    const output = createOutput(options);
+export const runDomTree = defineWatcherCommand({
+    build: (_args, options, output) => buildDomTreePlan(options, output),
+    formatHuman: (response, { output, options }) => {
+        if (response.matches === 0) {
+            writeNoElementFound(options.selector, output);
+            return;
+        }
+        const formatted = formatDomTree(response.roots, response.truncated, response.truncatedReason);
+        output.writeHuman(formatted);
+    },
+});
+const buildDomTreePlan = (options, output) => {
     const selector = requireSelector(options, output);
     if (!selector) {
-        return;
+        return null;
     }
     const depth = parsePositiveInt(options.depth, { allowZero: true });
     if (options.depth !== undefined && depth === undefined) {
         output.writeWarn('--depth must be a non-negative integer');
         process.exitCode = 2;
-        return;
+        return null;
     }
     const maxNodes = parsePositiveInt(options.maxNodes);
     if (options.maxNodes !== undefined && maxNodes === undefined) {
         output.writeWarn('--max-nodes must be a positive integer');
         process.exitCode = 2;
-        return;
+        return null;
     }
-    const result = await requestWatcherAction({
-        id,
+    return {
         path: '/dom/tree',
         method: 'POST',
         body: {
@@ -34,20 +42,6 @@ export const runDomTree = 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(selector, output);
-        return;
-    }
-    const formatted = formatDomTree(successResp.roots, successResp.truncated, successResp.truncatedReason);
-    output.writeHuman(formatted);
+    };
 };
 //# sourceMappingURL=domTree.js.map

package/dist/commands/domTree.js.map

@@ -1 +1 @@
-{"version":3,"file":"domTree.js","sourceRoot":"","sources":["../../src/commands/domTree.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,eAAe,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAYtE,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,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAM;IACP,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAClE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxD,MAAM,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAA;QAC1D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnD,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9D,MAAM,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAA;QAC1D,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;YACR,KAAK;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,SAAS,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACtG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AAC7B,CAAC,CAAA"}
+{"version":3,"file":"domTree.js","sourceRoot":"","sources":["../../src/commands/domTree.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,eAAe,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAYtE,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,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YAC5B,mBAAmB,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAC7C,OAAM;QACP,CAAC;QAED,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;QAC7F,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,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAClE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxD,MAAM,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAA;QAC1D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnD,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9D,MAAM,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAA;QAC1D,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;YACR,KAAK;YACL,QAAQ;YACR,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK;YACzB,IAAI,EAAE,OAAO,CAAC,IAAI;SAClB;QACD,SAAS,EAAE,MAAM;KACjB,CAAA;AACF,CAAC,CAAA"}

package/dist/commands/eval.d.ts

@@ -14,6 +14,8 @@ export type EvalOptions = {
     file?: string;
     /** Read expression from stdin. Also activated when expression is `-`. */
     stdin?: boolean;
+    /** Read setup code from a file and run it before the expression. */
+    inject?: string;
     /** CSS selector for iframe to eval in via postMessage (extension mode). */
     iframe?: string;
     /** Message type prefix for iframe eval (default: argus). */

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

@@ -1 +1 @@
-{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../../src/commands/eval.ts"],"names":[],"mappings":"AAoBA,oCAAoC;AACpC,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,4DAA4D;IAC5D,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,qEAAqE;IACrE,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iEAAiE;IACjE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;CACd,CAAA;AAED,iDAAiD;AACjD,eAAO,MAAM,OAAO,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,eAAe,MAAM,GAAG,SAAS,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CAmJ3H,CAAA"}
+{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../../src/commands/eval.ts"],"names":[],"mappings":"AAgBA,oCAAoC;AACpC,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,oEAAoE;IACpE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,4DAA4D;IAC5D,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,qEAAqE;IACrE,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iEAAiE;IACjE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;CACd,CAAA;AAED,iDAAiD;AACjD,eAAO,MAAM,OAAO,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,eAAe,MAAM,GAAG,SAAS,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CA0H3H,CAAA"}

package/dist/commands/eval.js

@@ -1,29 +1,16 @@
 import { evalWithRetries } from '../eval/evalClient.js';
 import { createOutput } from '../output/io.js';
 import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
-import { formatError, hasEvalArgs, parseCount, parseEvalArgs, parseIntervalMs, parseNumber, parseRetryCount, printError, printSuccess, resolveExpression, sleep, wrapExpressionWithArgs, wrapForIframeEval, } from './evalShared.js';
+import { pollEval } from './evalPolling.js';
+import { formatError, parseCount, parseIntervalMs, parseNumber, parseRetryCount, prepareEvalExpression, printError, printSuccess, } from './evalShared.js';
 /** Execute the eval command for a watcher id. */
 export const runEval = async (id, rawExpression, options) => {
     const output = createOutput(options);
-    const evalArgs = parseEvalArgs(options.arg);
-    if (evalArgs.error) {
-        output.writeWarn(evalArgs.error);
+    const prepared = await prepareEvalExpression(rawExpression, options, output);
+    if (prepared == null) {
         process.exitCode = 2;
         return;
     }
-    const resolvedExpression = await resolveExpression(rawExpression, options, output);
-    if (resolvedExpression == null) {
-        process.exitCode = 2;
-        return;
-    }
-    const requestArgs = !options.iframe && hasEvalArgs(evalArgs.value) ? evalArgs.value : undefined;
-    const expression = options.iframe
-        ? wrapForIframeEval(wrapExpressionWithArgs(resolvedExpression, evalArgs.value), {
-            selector: options.iframe,
-            namespace: options.iframeNamespace ?? 'argus',
-            timeoutMs: parseNumber(options.iframeTimeout) ?? 5000,
-        })
-        : resolvedExpression;
     const retryCount = parseRetryCount(options.retry);
     if (retryCount.error) {
         output.writeWarn(retryCount.error);
@@ -66,8 +53,8 @@ export const runEval = async (id, rawExpression, options) => {
     if (intervalMs.value == null) {
         const singleResult = await evalWithRetries({
             watcher,
-            expression,
-            args: requestArgs,
+            expression: prepared.expression,
+            args: prepared.args,
             awaitPromise: options.await ?? true,
             returnByValue: options.returnByValue ?? true,
             timeoutMs,
@@ -82,51 +69,45 @@ export const runEval = async (id, rawExpression, options) => {
         printSuccess(singleResult.response, options, output, false);
         return;
     }
-    let running = true;
-    const stop = () => {
-        running = false;
-    };
-    process.on('SIGINT', stop);
-    process.on('SIGTERM', stop);
-    let iteration = 0;
-    while (running) {
-        iteration += 1;
-        const iterationResult = await evalWithRetries({
-            watcher,
-            expression,
-            args: requestArgs,
-            awaitPromise: options.await ?? true,
-            returnByValue: options.returnByValue ?? true,
-            timeoutMs,
-            failOnException: options.failOnException ?? true,
-            retryCount: retryCount.value,
-        });
-        if (!iterationResult.ok) {
-            printError(iterationResult, options, output);
-            process.exitCode = 1;
-            return;
-        }
-        printSuccess(iterationResult.response, options, output, true);
-        if (untilEvaluator.evaluator) {
+    const pollResult = await pollEval({
+        watcher,
+        expression: prepared.expression,
+        args: prepared.args,
+        awaitPromise: options.await ?? true,
+        returnByValue: options.returnByValue ?? true,
+        timeoutMs,
+        failOnException: options.failOnException ?? true,
+        retryCount: retryCount.value,
+        intervalMs: intervalMs.value,
+        count: countValue.value,
+        onResult: (response) => {
+            printSuccess(response, options, output, true);
+        },
+        shouldStop: (context) => {
+            if (!untilEvaluator.evaluator) {
+                return { ok: true, matched: false };
+            }
             const untilResult = untilEvaluator.evaluator({
-                result: iterationResult.response.result,
-                exception: iterationResult.response.exception ?? null,
-                iteration,
-                attempt: iterationResult.attempt,
+                result: context.response.result,
+                exception: context.response.exception ?? null,
+                iteration: context.iteration,
+                attempt: context.attempt,
             });
-            if (!untilResult.ok) {
-                printError({ kind: 'until', error: untilResult.error }, options, output);
-                process.exitCode = 1;
-                return;
-            }
-            if (untilResult.matched) {
-                return;
-            }
-        }
-        if (countValue.value != null && iteration >= countValue.value) {
-            return;
-        }
-        await sleep(intervalMs.value);
+            return untilResult.ok ? { ok: true, matched: untilResult.matched } : { ok: false, error: untilResult.error };
+        },
+    });
+    if (pollResult.kind === 'eval-error') {
+        printError(pollResult.failure, options, output);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'condition-error') {
+        printError({ kind: 'until', error: pollResult.error }, options, output);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'interrupted') {
+        process.exitCode = 130;
     }
 };
 const compileUntil = (condition) => {

package/dist/commands/eval.js.map

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

package/dist/commands/evalPolling.d.ts

@@ -0,0 +1,55 @@
+import type { EvalResponse, WatcherRecord } from '@vforsh/argus-core';
+import { type EvalAttemptResult } from '../eval/evalClient.js';
+type PollStopContext = {
+    response: EvalResponse;
+    iteration: number;
+    attempt: number;
+};
+type PollStopResult = {
+    ok: true;
+    matched: boolean;
+} | {
+    ok: false;
+    error: string;
+};
+export type EvalPollInput = {
+    watcher: Pick<WatcherRecord, 'id' | 'host' | 'port'>;
+    expression: string;
+    args?: Record<string, string>;
+    awaitPromise: boolean;
+    returnByValue: boolean;
+    timeoutMs?: number;
+    failOnException: boolean;
+    retryCount: number;
+    intervalMs: number;
+    count?: number;
+    totalTimeoutMs?: number;
+    shouldStop?: (context: PollStopContext) => PollStopResult;
+    onResult?: (response: EvalResponse, context: PollStopContext) => void;
+};
+export type EvalPollOutcome = {
+    kind: 'matched';
+    response: EvalResponse;
+    iteration: number;
+    attempt: number;
+} | {
+    kind: 'exhausted';
+    iterations: number;
+} | {
+    kind: 'timeout';
+    elapsedMs: number;
+} | {
+    kind: 'interrupted';
+} | {
+    kind: 'eval-error';
+    failure: Extract<EvalAttemptResult, {
+        ok: false;
+    }>;
+} | {
+    kind: 'condition-error';
+    error: string;
+};
+/** Shared polling engine for `eval --interval` and `eval-until` so loop semantics stay identical. */
+export declare const pollEval: (input: EvalPollInput) => Promise<EvalPollOutcome>;
+export {};
+//# sourceMappingURL=evalPolling.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"evalPolling.d.ts","sourceRoot":"","sources":["../../src/commands/evalPolling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACrE,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAG/E,KAAK,eAAe,GAAG;IACtB,QAAQ,EAAE,YAAY,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,cAAc,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEnF,MAAM,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IACpD,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,cAAc,CAAA;IACzD,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;CACrE,CAAA;AAED,MAAM,MAAM,eAAe,GACxB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,EAAE;QAAE,EAAE,EAAE,KAAK,CAAA;KAAE,CAAC,CAAA;CAAE,GAC1E;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7C,qGAAqG;AACrG,eAAO,MAAM,QAAQ,GAAU,OAAO,aAAa,KAAG,OAAO,CAAC,eAAe,CA+D5E,CAAA"}

package/dist/commands/evalPolling.js

@@ -0,0 +1,59 @@
+import { evalWithRetries } from '../eval/evalClient.js';
+import { sleep } from './evalShared.js';
+/** Shared polling engine for `eval --interval` and `eval-until` so loop semantics stay identical. */
+export const pollEval = async (input) => {
+    let running = true;
+    const stop = () => {
+        running = false;
+    };
+    process.on('SIGINT', stop);
+    process.on('SIGTERM', stop);
+    try {
+        const startTime = Date.now();
+        let iteration = 0;
+        while (running) {
+            if (input.totalTimeoutMs != null) {
+                const elapsed = Date.now() - startTime;
+                if (elapsed >= input.totalTimeoutMs) {
+                    return { kind: 'timeout', elapsedMs: elapsed };
+                }
+            }
+            iteration += 1;
+            const result = await evalWithRetries({
+                watcher: input.watcher,
+                expression: input.expression,
+                args: input.args,
+                awaitPromise: input.awaitPromise,
+                returnByValue: input.returnByValue,
+                timeoutMs: input.timeoutMs,
+                failOnException: input.failOnException,
+                retryCount: input.retryCount,
+            });
+            if (!result.ok) {
+                return { kind: 'eval-error', failure: result };
+            }
+            const context = { response: result.response, iteration, attempt: result.attempt };
+            // Streaming commands print the matched iteration too, so emit before checking stop conditions.
+            input.onResult?.(result.response, context);
+            const stopResult = input.shouldStop?.(context);
+            if (stopResult) {
+                if (!stopResult.ok) {
+                    return { kind: 'condition-error', error: stopResult.error };
+                }
+                if (stopResult.matched) {
+                    return { kind: 'matched', response: result.response, iteration, attempt: result.attempt };
+                }
+            }
+            if (input.count != null && iteration >= input.count) {
+                return { kind: 'exhausted', iterations: iteration };
+            }
+            await sleep(input.intervalMs);
+        }
+        return { kind: 'interrupted' };
+    }
+    finally {
+        process.off('SIGINT', stop);
+        process.off('SIGTERM', stop);
+    }
+};
+//# sourceMappingURL=evalPolling.js.map

package/dist/commands/evalPolling.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"evalPolling.js","sourceRoot":"","sources":["../../src/commands/evalPolling.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAA0B,MAAM,uBAAuB,CAAA;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAkCvC,qGAAqG;AACrG,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAoB,EAA4B,EAAE;IAChF,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,MAAM,IAAI,GAAG,GAAS,EAAE;QACvB,OAAO,GAAG,KAAK,CAAA;IAChB,CAAC,CAAA;IAED,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAE3B,IAAI,CAAC;QACJ,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,IAAI,SAAS,GAAG,CAAC,CAAA;QAEjB,OAAO,OAAO,EAAE,CAAC;YAChB,IAAI,KAAK,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;gBACtC,IAAI,OAAO,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;oBACrC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,CAAA;gBAC/C,CAAC;YACF,CAAC;YAED,SAAS,IAAI,CAAC,CAAA;YACd,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;gBACpC,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,UAAU,EAAE,KAAK,CAAC,UAAU;aAC5B,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,CAAA;YAC/C,CAAC;YAED,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAA;YACjF,+FAA+F;YAC/F,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAE1C,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAA;YAC9C,IAAI,UAAU,EAAE,CAAC;gBAChB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;oBACpB,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAA;gBAC5D,CAAC;gBACD,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;oBACxB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAA;gBAC1F,CAAC;YACF,CAAC;YAED,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACrD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA;YACpD,CAAC;YAED,MAAM,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC9B,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAA;IAC/B,CAAC;YAAS,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAC3B,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC;AACF,CAAC,CAAA"}