@allwright.dev/core 0.0.47 → 0.0.49

package/dist/bootstrap.js

@@ -12,7 +12,7 @@ const ALLWRIGHT_HOME_ENV_VAR = "ALLWRIGHT_HOME";
 const ALLWRIGHT_REPOSITORY_ENV_VAR = "ALLWRIGHT_REPOSITORY";
 const ALLWRIGHT_VERSION_ENV_VAR = "ALLWRIGHT_VERSION";
 const DEFAULT_RELEASE_REPOSITORY = "allwright-dev/allwright";
-const DEFAULT_RELEASE_VERSION = "0.0.47";
+const DEFAULT_RELEASE_VERSION = "0.0.49";
 const STARTUP_TIMEOUT_MS = 20_000;
 const PING_TIMEOUT_MS = 1_000;
 const PROTO_ROOT = fileURLToPath(new URL("../proto/", import.meta.url));
@@ -49,12 +49,11 @@ export async function ensureRuntimeReady(serverAddr) {
         managedServerStderr = "";
         managedServerSpawnError = null;
     }
-    const cliPath = await ensureCliAvailable(expectedVersion);
-    ensurePluginsInstalledWithCli(cliPath, expectedVersion, ["web"]);
     let resolvedServerAddr = serverAddr;
     if (status && status.version !== expectedVersion) {
         resolvedServerAddr = await allocateManagedServerAddr(serverAddr);
     }
+    const cliPath = await ensureCliAvailable(expectedVersion);
     managedServer = spawn(cliPath, ["serve", "--listen-addr", cliListenAddr(resolvedServerAddr)], {
         stdio: ["ignore", "pipe", "pipe"],
     });

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { PageImpl } from "./page.js";
 import { setServerAddr, shutdown } from "./runtime.js";
 import type { Browser, BrowserKind, BrowserType, LaunchOptions, Page, ResolveConfigOptions, ResolvedAllwrightConfig } from "./types.js";
 export { findConfigFile, loadConfigFile, resolveConfig, setServerAddr, shutdown };
-export type { AllwrightConfig, Browser, BrowserInfo, BrowserKind, BrowserType, ClickResult, CommandOptions, CountResult, ElementResult, FillResult, HighlightOptions, HighlightResult, LaunchOptions, MobileAndroidConnectOptions, MobileAndroidDevice, MobileAndroidLaunchOptions, MobileAndroidPage, Locator, LocatorInfo, MobileSurfaceNamespace, NavigateResult, Page, PageInfo, PressOptions, PressResult, ResolveConfigOptions, ResolvedAllwrightConfig, RetryConfig, TextResult, WaitForSelectorOptions, WaitForSelectorResult, } from "./types.js";
+export type { AllwrightConfig, Browser, BrowserInfo, BrowserKind, BrowserType, ClickResult, CommandOptions, CountResult, ElementResult, FillResult, HighlightOptions, HighlightResult, LaunchOptions, MobileAndroidConnectOptions, MobileAndroidDevice, MobileAndroidLaunchOptions, MobileAndroidLocator, MobileAndroidPage, Locator, LocatorInfo, MobileSurfaceNamespace, NavigateResult, Page, PageInfo, PressOptions, PressResult, ResolveConfigOptions, ResolvedAllwrightConfig, RetryConfig, TextResult, WaitForSelectorOptions, WaitForSelectorResult, } from "./types.js";
 export declare const chromium: BrowserType;
 export declare const firefox: BrowserType;
 export { mobile };

package/dist/mobile.js

@@ -1,4 +1,5 @@
-import { ensurePluginsInstalled, invokePlugin } from "./bootstrap.js";
+import { invokePlugin } from "./bootstrap.js";
+import { chainMobileSelectorForTransport, normalizeMobileSelectorForTransport } from "./mobileSelectors.js";
 function timeoutMsOf(options) {
     return options?.timeoutMs;
 }
@@ -22,12 +23,15 @@ class MobileAndroidPageImpl {
     get sessionId() {
         return this.pageSession.page_id;
     }
+    locator(selector) {
+        return new MobileAndroidLocatorImpl(this, normalizeMobileSelectorForTransport(selector));
+    }
     async click(selector, options = {}) {
         const result = await invokeAndroidExpected("click", {
             command: "click_element",
             browser_session: this.browserSession,
             page_session: this.pageSession,
-            selector,
+            selector: normalizeMobileSelectorForTransport(selector),
             timeout_ms: timeoutMsOf(options),
         });
         return {
@@ -41,7 +45,7 @@ class MobileAndroidPageImpl {
             command: "fill_element",
             browser_session: this.browserSession,
             page_session: this.pageSession,
-            selector,
+            selector: normalizeMobileSelectorForTransport(selector),
             value,
             timeout_ms: timeoutMsOf(options),
         });
@@ -52,6 +56,23 @@ class MobileAndroidPageImpl {
         };
     }
 }
+class MobileAndroidLocatorImpl {
+    page;
+    selector;
+    constructor(page, selector) {
+        this.page = page;
+        this.selector = selector;
+    }
+    async click(options = {}) {
+        return this.page.click(this.selector, options);
+    }
+    async fill(value, options = {}) {
+        return this.page.fill(this.selector, value, options);
+    }
+    locator(selector) {
+        return new MobileAndroidLocatorImpl(this.page, chainMobileSelectorForTransport(this.selector, selector));
+    }
+}
 class MobileAndroidDeviceImpl {
     connectInfoRaw;
     #initialPage;
@@ -86,7 +107,6 @@ class MobileAndroidDeviceImpl {
 }
 class MobileAndroidSurfaceImpl {
     async connect(options = {}) {
-        await ensurePluginsInstalled(["mobile-android"]);
         const connectInfo = await invokeAndroidExpected("connect", {
             command: "connect",
             platform: "android",

package/dist/mobileSelectors.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizeMobileSelectorForTransport(selector: string): string;
+export declare function chainMobileSelectorForTransport(parent: string, child: string): string;

package/dist/mobileSelectors.js

@@ -0,0 +1,168 @@
+const UIAUTOMATOR_SELECTOR_KEYS = new Set([
+    "text",
+    "textcontains",
+    "textmatches",
+    "textstartswith",
+    "classname",
+    "classnamematches",
+    "description",
+    "desc",
+    "descriptioncontains",
+    "desccontains",
+    "descriptionmatches",
+    "descmatches",
+    "descriptionstartswith",
+    "descstartswith",
+    "checkable",
+    "checked",
+    "clickable",
+    "longclickable",
+    "scrollable",
+    "enabled",
+    "focusable",
+    "focused",
+    "selected",
+    "packagename",
+    "package",
+    "packagenamematches",
+    "resourceid",
+    "resourceidmatches",
+    "index",
+    "instance",
+]);
+const SELECTOR_PREFIXES = ["xpath=", "xpath:", "css=", "css:", "uia=", "uia:"];
+function decodeSelectorBody(body) {
+    const candidate = body.trim();
+    if (candidate.startsWith("\"") && candidate.endsWith("\"")) {
+        try {
+            return JSON.parse(candidate);
+        }
+        catch {
+            return candidate;
+        }
+    }
+    return candidate;
+}
+function parseExplicitSelectorPrefix(selector) {
+    const lowered = selector.toLowerCase();
+    if (lowered.startsWith("xpath=") || lowered.startsWith("xpath:")) {
+        return { flavor: "xpath", prefixLength: 6 };
+    }
+    if (lowered.startsWith("css=") || lowered.startsWith("css:")) {
+        return { flavor: "css", prefixLength: 4 };
+    }
+    if (lowered.startsWith("uia=") || lowered.startsWith("uia:")) {
+        return { flavor: "uia", prefixLength: 4 };
+    }
+    return null;
+}
+function findJsonStringEnd(value) {
+    if (!value.startsWith("\"")) {
+        return null;
+    }
+    let escaped = false;
+    for (let index = 1; index < value.length; index += 1) {
+        const char = value[index];
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (char === "\\") {
+            escaped = true;
+            continue;
+        }
+        if (char === "\"") {
+            return index + 1;
+        }
+    }
+    return null;
+}
+function isNormalizedTransportSelector(selector) {
+    const trimmed = selector.trim();
+    if (!trimmed) {
+        return false;
+    }
+    let index = 0;
+    while (index < trimmed.length) {
+        const prefix = parseExplicitSelectorPrefix(trimmed.slice(index));
+        if (!prefix) {
+            return false;
+        }
+        index += prefix.prefixLength;
+        const remainder = trimmed.slice(index);
+        if (!remainder.startsWith("\"")) {
+            return false;
+        }
+        const jsonEnd = findJsonStringEnd(remainder);
+        if (!jsonEnd) {
+            return false;
+        }
+        index += jsonEnd;
+        const tail = trimmed.slice(index);
+        if (!tail) {
+            return true;
+        }
+        if (!/^\s+/.test(tail)) {
+            return false;
+        }
+        const nextIndex = index + tail.match(/^\s+/)?.[0].length;
+        const nextSegment = trimmed.slice(nextIndex).toLowerCase();
+        if (!SELECTOR_PREFIXES.some((prefixValue) => nextSegment.startsWith(prefixValue))) {
+            return false;
+        }
+        index = nextIndex;
+    }
+    return true;
+}
+function parseUiAutomatorSelectorPrefix(selector) {
+    const separatorIndex = selector.search(/[=:]/);
+    if (separatorIndex <= 0) {
+        return null;
+    }
+    const key = selector.slice(0, separatorIndex).trim().toLowerCase();
+    if (!UIAUTOMATOR_SELECTOR_KEYS.has(key)) {
+        return null;
+    }
+    return separatorIndex + 1;
+}
+function parseSelectorForTransport(selector) {
+    const trimmed = selector.trim();
+    const explicit = parseExplicitSelectorPrefix(trimmed);
+    if (explicit) {
+        return { flavor: explicit.flavor, body: decodeSelectorBody(trimmed.slice(explicit.prefixLength)) };
+    }
+    const uiAutomatorPrefix = parseUiAutomatorSelectorPrefix(trimmed);
+    if (uiAutomatorPrefix) {
+        return { flavor: "uia", body: `${trimmed.slice(0, uiAutomatorPrefix - 1)}=${trimmed.slice(uiAutomatorPrefix)}` };
+    }
+    if (trimmed.startsWith("//") ||
+        trimmed.startsWith(".//") ||
+        trimmed.startsWith("../") ||
+        trimmed.startsWith("/") ||
+        trimmed.startsWith("(")) {
+        return { flavor: "xpath", body: trimmed };
+    }
+    return { flavor: "css", body: trimmed };
+}
+export function normalizeMobileSelectorForTransport(selector) {
+    const trimmed = selector.trim();
+    if (!trimmed) {
+        return "";
+    }
+    if (isNormalizedTransportSelector(trimmed)) {
+        return trimmed;
+    }
+    const parsed = parseSelectorForTransport(selector);
+    return `${parsed.flavor}=${JSON.stringify(parsed.body)}`;
+}
+export function chainMobileSelectorForTransport(parent, child) {
+    const parentSelector = normalizeMobileSelectorForTransport(parent);
+    const childSelector = normalizeMobileSelectorForTransport(child);
+    if (!parentSelector) {
+        return childSelector;
+    }
+    if (!childSelector) {
+        return parentSelector;
+    }
+    return `${parentSelector} ${childSelector}`;
+}

package/dist/types.d.ts

@@ -127,8 +127,16 @@ export interface MobileAndroidLaunchOptions {
     stopBeforeLaunch?: boolean;
     timeoutMs?: number;
 }
+export interface MobileAndroidLocator {
+    readonly page: MobileAndroidPage;
+    readonly selector: string;
+    click(options?: CommandOptions): Promise<ClickResult>;
+    fill(value: string, options?: CommandOptions): Promise<FillResult>;
+    locator(selector: string): MobileAndroidLocator;
+}
 export interface MobileAndroidPage {
     readonly sessionId: string;
+    locator(selector: string): MobileAndroidLocator;
     click(selector: string, options?: CommandOptions): Promise<ClickResult>;
     fill(selector: string, value: string, options?: CommandOptions): Promise<FillResult>;
 }

package/package.json

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