@allwright.dev/core 0.0.30 → 0.0.32

package/dist/index.js

@@ -12,6 +12,39 @@ const PROTO_ROOT = path.join(PACKAGE_ROOT, "proto");
 const ENGINE_PROTO_PATH = path.join(PROTO_ROOT, "engine", "v1", "engine.proto");
 let runtimePromise = null;
 let serverAddrOverride = null;
+function parseSelectorForTransport(selector) {
+    const trimmed = selector.trim();
+    const lower = trimmed.toLowerCase();
+    if (lower.startsWith("xpath=") || lower.startsWith("xpath:")) {
+        return { flavor: "xpath", body: trimmed.slice(6).trim() };
+    }
+    if (lower.startsWith("css=") || lower.startsWith("css:")) {
+        return { flavor: "css", body: trimmed.slice(4).trim() };
+    }
+    if (trimmed.startsWith("//") ||
+        trimmed.startsWith(".//") ||
+        trimmed.startsWith("../") ||
+        trimmed.startsWith("/") ||
+        trimmed.startsWith("(")) {
+        return { flavor: "xpath", body: trimmed };
+    }
+    return { flavor: "css", body: trimmed };
+}
+function normalizeSelectorForTransport(selector) {
+    const parsed = parseSelectorForTransport(selector);
+    return `${parsed.flavor}=${JSON.stringify(parsed.body)}`;
+}
+function chainSelectorForTransport(parent, child) {
+    const parentSelector = normalizeSelectorForTransport(parent);
+    const childSelector = normalizeSelectorForTransport(child);
+    if (!parentSelector) {
+        return childSelector;
+    }
+    if (!childSelector) {
+        return parentSelector;
+    }
+    return `${parentSelector} ${childSelector}`;
+}
 const CONFIG_FILENAMES = [
     "allwright.config.yaml",
     "allwright.config.yml",
@@ -199,7 +232,7 @@ class PageImpl {
     sessionId;
     browserSessionId;
     locator(selector) {
-        return new LocatorImpl({ page: this, selector });
+        return new LocatorImpl({ page: this, selector: normalizeSelectorForTransport(selector) });
     }
     async goto(url, options = {}) {
         const handle = await this.#getHandle();
@@ -244,11 +277,12 @@ class PageImpl {
     async click(selector, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             clickElement: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
             },
         });
@@ -273,11 +307,12 @@ class PageImpl {
     async count(selector, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             countElements: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
             },
         });
@@ -302,11 +337,12 @@ class PageImpl {
     async highlight(selector, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             highlightElements: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 durationMs: options.durationMs,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
             },
@@ -332,11 +368,12 @@ class PageImpl {
     async focus(selector, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             focusElement: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
             },
         });
@@ -360,11 +397,12 @@ class PageImpl {
     async fill(selector, value, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             fillElement: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 value,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
             },
@@ -390,11 +428,12 @@ class PageImpl {
     async hover(selector, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             hoverElement: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
             },
         });
@@ -418,11 +457,12 @@ class PageImpl {
     async press(selector, key, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             pressKey: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 key,
                 text: options.text,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
@@ -455,11 +495,12 @@ class PageImpl {
     async waitForSelector(selector, options = {}) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write({
             browserSessionId: this.browserSessionId,
             tabSessionId: this.sessionId,
             waitForSelector: {
-                cssSelector: selector,
+                cssSelector: transportSelector,
                 visible: options.visible,
                 retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
             },
@@ -540,12 +581,13 @@ class PageImpl {
     async #readText(selector, options, textContent) {
         const handle = await this.#getHandle();
         this.#ensureOpen(handle);
+        const transportSelector = normalizeSelectorForTransport(selector);
         handle.stream.write(textContent
             ? {
                 browserSessionId: this.browserSessionId,
                 tabSessionId: this.sessionId,
                 getTextContent: {
-                    cssSelector: selector,
+                    cssSelector: transportSelector,
                     retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
                 },
             }
@@ -553,7 +595,7 @@ class PageImpl {
                 browserSessionId: this.browserSessionId,
                 tabSessionId: this.sessionId,
                 getInnerText: {
-                    cssSelector: selector,
+                    cssSelector: transportSelector,
                     retryOptions: options.timeoutMs ? { timeoutMs: options.timeoutMs } : undefined,
                 },
             });
@@ -634,7 +676,7 @@ class LocatorImpl {
     locator(selector) {
         return new LocatorImpl({
             page: this.page,
-            selector: `${this.selector} ${selector}`,
+            selector: chainSelectorForTransport(this.selector, selector),
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allwright.dev/core",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "High-level TypeScript client for the allwright automation engine.",
   "license": "MIT",
   "type": "module",