@xbrowser/cli 1.1.2 → 1.2.0

package/dist/{chunk-XVZ6NKRJ.js → chunk-MNFOCOL6.js}

@@ -288,6 +288,22 @@ function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+// src/cdp-driver/selector-utils.ts
+function queryJS(selector) {
+  if (selector.startsWith("xpath=")) {
+    const xpath = JSON.stringify(selector.slice(6));
+    return `document.evaluate(${xpath}, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue`;
+  }
+  return `document.querySelector(${JSON.stringify(selector)})`;
+}
+function queryAllJS(selector) {
+  if (selector.startsWith("xpath=")) {
+    const xpath = JSON.stringify(selector.slice(6));
+    return `(() => { const it = document.evaluate(${xpath}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); const r=[]; for(let i=0;i<it.snapshotLength;i++) r.push(it.snapshotItem(i)); return r; })()`;
+  }
+  return `document.querySelectorAll(${JSON.stringify(selector)})`;
+}
+
 // src/cdp-driver/actionability.ts
 async function waitForActionable(page, selector, opts = {}) {
   const timeout = opts.timeout ?? 3e4;
@@ -312,7 +328,7 @@ async function waitForActionable(page, selector, opts = {}) {
 async function checkActionable(page, selector) {
   const result = await page.evaluate(`
     (function() {
-      const el = document.querySelector(${JSON.stringify(selector)});
+      const el = ${queryJS(selector)};
       if (!el) return { ok: false, reason: 'not_found' };
 
       // Check attached to DOM
@@ -355,7 +371,7 @@ async function checkActionable(page, selector) {
 async function scrollIntoView(page, selector) {
   await page.evaluate(`
     (function() {
-      const el = document.querySelector(${JSON.stringify(selector)});
+      const el = ${queryJS(selector)};
       if (el) el.scrollIntoView({ block: 'center', inline: 'center', behavior: 'instant' });
     })()
   `);
@@ -369,13 +385,21 @@ var XBLocatorImpl = class _XBLocatorImpl {
     this.page = page;
     this.selector = selector;
   }
+  /** Resolve selector to a JS expression that finds a single element (CSS or xpath). */
+  _q(sel) {
+    return queryJS(sel);
+  }
+  /** Resolve selector to a JS expression that finds all matching elements (CSS or xpath). */
+  _qa(sel) {
+    return queryAllJS(sel);
+  }
   // ── Actions ─────────────────────────────────────────────────
   async click(opts = {}) {
     const { rect } = await waitForActionable(this.page, this.selector, opts);
     await scrollIntoView(this.page, this.selector);
     const updatedRect = await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (!el) return null;
         const rect = el.getBoundingClientRect();
         return { x: rect.x, y: rect.y, width: rect.width, height: rect.height };
@@ -395,7 +419,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
     await scrollIntoView(this.page, this.selector);
     await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (!el) throw new Error('Element not found: ${this.selector.replace(/'/g, "\\'")}');
         el.focus();
         el.value = '';
@@ -405,7 +429,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
     await this.page.keyboard.insertText(value);
     await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (el) {
           el.dispatchEvent(new Event('input', { bubbles: true }));
           el.dispatchEvent(new Event('change', { bubbles: true }));
@@ -418,7 +442,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
     await scrollIntoView(this.page, this.selector);
     await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (el) el.focus();
       })()
     `);
@@ -429,7 +453,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
     await scrollIntoView(this.page, this.selector);
     await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (el) el.focus();
       })()
     `);
@@ -446,7 +470,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
       await scrollIntoView(this.page, this.selector);
       const rect = await this.page.evaluate(`
         (function() {
-          const el = document.querySelector(${JSON.stringify(this.selector)});
+          const el = ${this._q(this.selector)};
           if (!el) return { x: 0, y: 0, width: 0, height: 0 };
           const r = el.getBoundingClientRect();
           return { x: r.x, y: r.y, width: r.width, height: r.height };
@@ -464,7 +488,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
     await waitForActionable(this.page, this.selector, { timeout: opts.timeout });
     const isChecked = await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         return el?.checked === true;
       })()
     `);
@@ -476,7 +500,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
     await waitForActionable(this.page, this.selector, { timeout: opts.timeout });
     const isChecked = await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         return el?.checked === true;
       })()
     `);
@@ -489,7 +513,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
     const values = Array.isArray(value) ? value : [value];
     const selected = await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (!el || el.tagName !== 'SELECT') throw new Error('Not a select element');
 
         const values = ${JSON.stringify(values)};
@@ -517,10 +541,15 @@ var XBLocatorImpl = class _XBLocatorImpl {
   }
   async screenshot(opts = {}) {
     await waitForActionable(this.page, this.selector);
-    const nodeId = await this.page.querySelector(this.selector);
-    if (!nodeId) throw new Error(`Element not found: ${this.selector}`);
-    const box = await this.page.getBoxModel(nodeId);
-    if (!box) throw new Error("Element has no box");
+    const box = await this.page.evaluate(`
+      (function() {
+        const el = ${this._q(this.selector)};
+        if (!el) return null;
+        const r = el.getBoundingClientRect();
+        return { x: r.x, y: r.y, width: r.width, height: r.height };
+      })()
+    `);
+    if (!box) throw new Error(`Element not found: ${this.selector}`);
     return this.page.screenshot({
       ...opts,
       clip: { x: box.x, y: box.y, width: box.width, height: box.height }
@@ -532,14 +561,14 @@ var XBLocatorImpl = class _XBLocatorImpl {
   }
   async count() {
     return this.page.evaluate(`
-      document.querySelectorAll(${JSON.stringify(this.selector)}).length
+      ${this._qa(this.selector)}.length
     `);
   }
   async isVisible() {
     try {
       const result = await this.page.evaluate(`
         (function() {
-          const el = document.querySelector(${JSON.stringify(this.selector)});
+          const el = ${this._q(this.selector)};
           if (!el) return false;
           if (!el.isConnected) return false;
           const style = window.getComputedStyle(el);
@@ -559,7 +588,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
   async isEnabled() {
     return this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (!el) return false;
         return !el.disabled;
       })()
@@ -569,15 +598,20 @@ var XBLocatorImpl = class _XBLocatorImpl {
     return !await this.isEnabled();
   }
   async boundingBox() {
-    const nodeId = await this.page.querySelector(this.selector);
-    if (!nodeId) return null;
-    return this.page.getBoxModel(nodeId);
+    return this.page.evaluate(`
+      (function() {
+        const el = ${this._q(this.selector)};
+        if (!el) return null;
+        const r = el.getBoundingClientRect();
+        return { x: r.x, y: r.y, width: r.width, height: r.height };
+      })()
+    `);
   }
   // ── Text/HTML ───────────────────────────────────────────────
   async textContent() {
     return this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         return el?.textContent ?? null;
       })()
     `);
@@ -585,7 +619,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
   async innerText() {
     return this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (!el) throw new Error('Element not found');
         return el.innerText;
       })()
@@ -594,7 +628,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
   async innerHTML() {
     return this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (!el) throw new Error('Element not found');
         return el.innerHTML;
       })()
@@ -603,7 +637,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
   async getAttribute(name) {
     return this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         return el?.getAttribute(${JSON.stringify(name)}) ?? null;
       })()
     `);
@@ -611,13 +645,17 @@ var XBLocatorImpl = class _XBLocatorImpl {
   // ── Evaluate ────────────────────────────────────────────────
   async evaluate(fn, ...args) {
     const fnBody = typeof fn === "function" ? fn.toString() : fn;
+    const sel = JSON.stringify(this.selector);
+    const xpathPrefix = this.selector.startsWith("xpath=") ? JSON.stringify(this.selector.slice(6)) : "null";
     return this.page.evaluate(
-      `(function(sel, fnStr, ...evalArgs) {
-        const el = document.querySelector(sel);
+      `(function(sel, xpathExpr, fnStr, ...evalArgs) {
+        const el = xpathExpr
+          ? document.evaluate(xpathExpr, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
+          : document.querySelector(sel);
         if (!el) throw new Error('No element found for selector: ' + sel);
         const fn = new Function('return ' + fnStr)();
         return fn(el, ...evalArgs);
-      })(${JSON.stringify(this.selector)}, ${JSON.stringify(fnBody)}${args.length > 0 ? ", " + args.map((a) => JSON.stringify(a)).join(", ") : ""})`
+      })(${sel}, ${xpathPrefix}, ${JSON.stringify(fnBody)}${args.length > 0 ? ", " + args.map((a) => JSON.stringify(a)).join(", ") : ""})`
     );
   }
   async ariaSnapshot() {
@@ -644,7 +682,7 @@ var XBLocatorImpl = class _XBLocatorImpl {
   }
   async all() {
     const n = await this.page.evaluate(`
-      document.querySelectorAll(${JSON.stringify(this.selector)}).length
+      ${this._qa(this.selector)}.length
     `);
     const locators = [];
     for (let i = 0; i < n; i++) {
@@ -655,16 +693,33 @@ var XBLocatorImpl = class _XBLocatorImpl {
   async focus() {
     await this.page.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(this.selector)});
+        const el = ${this._q(this.selector)};
         if (el) el.focus();
       })()
     `);
   }
 };
 var FilteredLocator = class extends XBLocatorImpl {
+  index;
   constructor(page, selector, index) {
-    const indexedSelector = index === -1 ? `${selector}:last-of-type` : `${selector}:nth-of-type(${index + 1})`;
+    const indexedSelector = selector.startsWith("xpath=") ? selector : index === -1 ? `${selector}:last-of-type` : `${selector}:nth-of-type(${index + 1})`;
     super(page, indexedSelector);
+    this.index = index;
+    this._rawSelector = selector;
+  }
+  /** Original selector before index filtering */
+  _rawSelector;
+  /** For xpath selectors, override _q to return the nth element from evaluate results */
+  _q(sel) {
+    if (!sel.startsWith("xpath=")) return super._q(sel);
+    const xpath = JSON.stringify(this._rawSelector.slice(6));
+    return `(() => { const it = document.evaluate(${xpath}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); return ${this.index === -1 ? "it.snapshotItem(it.snapshotLength - 1)" : `it.snapshotItem(${this.index})`}; })()`;
+  }
+  /** For xpath selectors, override _qa to return all matching elements from evaluate */
+  _qa(sel) {
+    if (!sel.startsWith("xpath=")) return super._qa(sel);
+    const xpath = JSON.stringify(this._rawSelector.slice(6));
+    return `(() => { const it = document.evaluate(${xpath}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); const r=[]; for(let i=0;i<it.snapshotLength;i++) r.push(it.snapshotItem(i)); return r; })()`;
   }
 };
 var VisibleFilteredLocator = class extends XBLocatorImpl {
@@ -672,7 +727,7 @@ var VisibleFilteredLocator = class extends XBLocatorImpl {
     const tag = `data-xb-vt-${Date.now()}-${Math.floor(Math.random() * 1e6)}`;
     const found = await this.page.evaluate(`
       (function() {
-        const els = document.querySelectorAll(${JSON.stringify(this.selector)});
+        const els = ${this._qa(this.selector)};
         for (const el of els) {
           if (!el.isConnected) continue;
           const style = window.getComputedStyle(el);
@@ -690,7 +745,7 @@ var VisibleFilteredLocator = class extends XBLocatorImpl {
       return await fn(`[${tag}]`);
     } finally {
       await this.page.evaluate(`
-        document.querySelectorAll(${JSON.stringify(`[${tag}]`)}).forEach(el => el.removeAttribute(${JSON.stringify(tag)}))
+        ${this._qa(`[${tag}]`)}.forEach(el => el.removeAttribute(${JSON.stringify(tag)}))
       `);
     }
   }
@@ -710,7 +765,7 @@ var VisibleFilteredLocator = class extends XBLocatorImpl {
     return this.page.evaluate(`
       (function() {
         let count = 0;
-        const els = document.querySelectorAll(${JSON.stringify(this.selector)});
+        const els = ${this._qa(this.selector)};
         for (const el of els) {
           if (!el.isConnected) continue;
           const style = window.getComputedStyle(el);
@@ -727,7 +782,7 @@ var VisibleFilteredLocator = class extends XBLocatorImpl {
     try {
       const result = await this.page.evaluate(`
         (function() {
-          const els = document.querySelectorAll(${JSON.stringify(this.selector)});
+          const els = ${this._qa(this.selector)};
           for (const el of els) {
             if (!el.isConnected) continue;
             const style = window.getComputedStyle(el);
@@ -1172,20 +1227,20 @@ var XBPageImpl = class _XBPageImpl {
     const deadline = Date.now() + timeout;
     while (Date.now() < deadline) {
       const exists = await this.evaluate(
-        `(function() { const el = document.querySelector(${JSON.stringify(selector)}); return !!el; })()`
+        `(function() { const el = ${queryJS(selector)}; return !!el; })()`
       );
       if (state === "attached" && exists) return;
       if (state === "detached" && !exists) return;
       if (state === "visible" && exists) {
         const visible = await this.evaluate(
-          `(function() { const el = document.querySelector(${JSON.stringify(selector)}); if (!el) return false; const rect = el.getBoundingClientRect(); const style = window.getComputedStyle(el); return rect.width > 0 && rect.height > 0 && style.visibility !== 'hidden' && style.display !== 'none'; })()`
+          `(function() { const el = ${queryJS(selector)}; if (!el) return false; const rect = el.getBoundingClientRect(); const style = window.getComputedStyle(el); return rect.width > 0 && rect.height > 0 && style.visibility !== 'hidden' && style.display !== 'none'; })()`
         );
         if (visible) return;
       }
       if (state === "hidden") {
         if (!exists) return;
         const visible = await this.evaluate(
-          `(function() { const el = document.querySelector(${JSON.stringify(selector)}); if (!el) return false; const rect = el.getBoundingClientRect(); const style = window.getComputedStyle(el); return rect.width > 0 && rect.height > 0 && style.visibility !== 'hidden' && style.display !== 'none'; })()`
+          `(function() { const el = ${queryJS(selector)}; if (!el) return false; const rect = el.getBoundingClientRect(); const style = window.getComputedStyle(el); return rect.width > 0 && rect.height > 0 && style.visibility !== 'hidden' && style.display !== 'none'; })()`
         );
         if (!visible) return;
       }
@@ -1228,6 +1283,8 @@ Last error: ${lastError.message}` : "";
   // ── Evaluation ──────────────────────────────────────────────
   async evaluate(fn, ...args) {
     if (this._closed) throw new Error("Page is closed");
+    this.conn.send("Page.handleJavaScriptDialog", { accept: false }, this.sessionId).catch(() => {
+    });
     let expression;
     if (typeof fn === "string") {
       expression = fn;
@@ -1267,23 +1324,31 @@ Last error: ${lastError.message}` : "";
   }
   async $eval(selector, fn, ...args) {
     const fnBody = typeof fn === "function" ? fn.toString() : fn;
+    const selJSON = JSON.stringify(selector);
+    const xpathPrefix = selector.startsWith("xpath=") ? JSON.stringify(selector.slice(6)) : "null";
     return this.evaluate(
-      `(function(sel, fnStr, ...evalArgs) {
-        const el = document.querySelector(sel);
+      `(function(sel, xpathExpr, fnStr, ...evalArgs) {
+        const el = xpathExpr
+          ? document.evaluate(xpathExpr, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
+          : document.querySelector(sel);
         if (!el) throw new Error('No element found for selector: ' + sel);
         const fn = new Function('return ' + fnStr)();
         return fn(el, ...evalArgs);
-      })(${JSON.stringify(selector)}, ${JSON.stringify(fnBody)}${args.length > 0 ? ", " + args.map((a) => JSON.stringify(a)).join(", ") : ""})`
+      })(${selJSON}, ${xpathPrefix}, ${JSON.stringify(fnBody)}${args.length > 0 ? ", " + args.map((a) => JSON.stringify(a)).join(", ") : ""})`
     );
   }
   async $$eval(selector, fn, ...args) {
     const fnBody = typeof fn === "function" ? fn.toString() : fn;
+    const selJSON = JSON.stringify(selector);
+    const xpathPrefix = selector.startsWith("xpath=") ? JSON.stringify(selector.slice(6)) : "null";
     return this.evaluate(
-      `(function(sel, fnStr, ...evalArgs) {
-        const els = Array.from(document.querySelectorAll(sel));
+      `(function(sel, xpathExpr, fnStr, ...evalArgs) {
+        const els = xpathExpr
+          ? (() => { const it = document.evaluate(xpathExpr, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); const r=[]; for(let i=0;i<it.snapshotLength;i++) r.push(it.snapshotItem(i)); return r; })()
+          : Array.from(document.querySelectorAll(sel));
         const fn = new Function('return ' + fnStr)();
         return fn(els, ...evalArgs);
-      })(${JSON.stringify(selector)}, ${JSON.stringify(fnBody)}${args.length > 0 ? ", " + args.map((a) => JSON.stringify(a)).join(", ") : ""})`
+      })(${selJSON}, ${xpathPrefix}, ${JSON.stringify(fnBody)}${args.length > 0 ? ", " + args.map((a) => JSON.stringify(a)).join(", ") : ""})`
     );
   }
   // ── Locator ─────────────────────────────────────────────────
@@ -1356,22 +1421,22 @@ Last error: ${lastError.message}` : "";
   // ── Convenience selectors ───────────────────────────────────
   async textContent(selector) {
     return this.evaluate(
-      `(function() { const el = document.querySelector(${JSON.stringify(selector)}); return el?.textContent ?? null; })()`
+      `(function() { const el = ${queryJS(selector)}; return el?.textContent ?? null; })()`
     );
   }
   async innerText(selector) {
     return this.evaluate(
-      `(function() { const el = document.querySelector(${JSON.stringify(selector)}); if (!el) throw new Error('Element not found'); return el.innerText; })()`
+      `(function() { const el = ${queryJS(selector)}; if (!el) throw new Error('Element not found'); return el.innerText; })()`
     );
   }
   async innerHTML(selector) {
     return this.evaluate(
-      `(function() { const el = document.querySelector(${JSON.stringify(selector)}); if (!el) throw new Error('Element not found'); return el.innerHTML; })()`
+      `(function() { const el = ${queryJS(selector)}; if (!el) throw new Error('Element not found'); return el.innerHTML; })()`
     );
   }
   async getAttribute(selector, name) {
     return this.evaluate(
-      `(function() { const el = document.querySelector(${JSON.stringify(selector)}); return el?.getAttribute(${JSON.stringify(name)}) ?? null; })()`
+      `(function() { const el = ${queryJS(selector)}; return el?.getAttribute(${JSON.stringify(name)}) ?? null; })()`
     );
   }
   // ── Query ───────────────────────────────────────────────────
@@ -1677,7 +1742,7 @@ Last error: ${lastError.message}` : "";
         setTimeout(() => {
           this.conn.send("Page.handleJavaScriptDialog", { accept: false }, this.sessionId).catch(() => {
           });
-        }, 100);
+        }, 0);
       })
     );
     this._subscriptions.push(
@@ -1992,7 +2057,7 @@ Last error: ${lastError.message}` : "";
     await this.evaluate(`
       (function() {
         var selector = ${JSON.stringify(selector)};
-        var input = document.querySelector(selector);
+        var input = ${queryJS(selector)};
         if (!input) throw new Error('Element not found: ' + selector);
 
         var fileList = ${JSON.stringify(fileList)};
@@ -2017,7 +2082,7 @@ Last error: ${lastError.message}` : "";
   async dragAndDrop(source, target) {
     const sourceRect = await this.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(source)});
+        const el = ${queryJS(source)};
         if (!el) throw new Error('Source not found: ${source}');
         el.scrollIntoView({ behavior: 'instant', block: 'center' });
         const r = el.getBoundingClientRect();
@@ -2026,7 +2091,7 @@ Last error: ${lastError.message}` : "";
     `);
     const targetRect = await this.evaluate(`
       (function() {
-        const el = document.querySelector(${JSON.stringify(target)});
+        const el = ${queryJS(target)};
         if (!el) throw new Error('Target not found: ${target}');
         el.scrollIntoView({ behavior: 'instant', block: 'center' });
         const r = el.getBoundingClientRect();