@appium/fake-driver 6.0.2 → 6.1.1

package/build/lib/commands/element.js

@@ -3,96 +3,107 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getElements = getElements;
+exports.getElement = getElement;
+exports.getName = getName;
+exports.elementDisplayed = elementDisplayed;
+exports.elementEnabled = elementEnabled;
+exports.elementSelected = elementSelected;
+exports.setValue = setValue;
+exports.getText = getText;
+exports.clear = clear;
+exports.click = click;
+exports.getAttribute = getAttribute;
+exports.getElementRect = getElementRect;
+exports.getSize = getSize;
+exports.equalsElement = equalsElement;
+exports.getCssProperty = getCssProperty;
+exports.getLocation = getLocation;
+exports.getLocationInView = getLocationInView;
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
-const mixin_1 = require("./mixin");
-const ElementsMixin = {
-    getElements(elementIds) {
-        for (const elId of elementIds) {
-            if (!lodash_1.default.has(this.elMap, elId)) {
-                throw new driver_1.errors.StaleElementReferenceError();
-            }
+/** Resolve element ids to FakeElements; throws StaleElementReferenceError if any id is missing. */
+function getElements(elementIds) {
+    for (const elId of elementIds) {
+        if (!lodash_1.default.has(this.elMap, elId)) {
+            throw new driver_1.errors.StaleElementReferenceError();
         }
-        return elementIds.map((e) => this.elMap[e]);
-    },
-    getElement(elementId) {
-        return this.getElements([elementId])[0];
-    },
-    async getName(elementId) {
-        const el = this.getElement(elementId);
-        return el.tagName;
-    },
-    async elementDisplayed(elementId) {
-        const el = this.getElement(elementId);
-        return el.isVisible();
-    },
-    async elementEnabled(elementId) {
-        const el = this.getElement(elementId);
-        return el.isEnabled();
-    },
-    async elementSelected(elementId) {
-        const el = this.getElement(elementId);
-        return el.isSelected();
-    },
-    async setValue(keys, elementId) {
-        let value = keys;
-        if (keys instanceof Array) {
-            value = keys.join('');
-        }
-        const el = this.getElement(elementId);
-        if (el.type !== 'MockInputField') {
-            throw new driver_1.errors.InvalidElementStateError();
-        }
-        el.setAttr('value', value);
-    },
-    async getText(elementId) {
-        const el = this.getElement(elementId);
-        return el.getAttr('value');
-    },
-    async clear(elementId) {
-        await this.setValue('', elementId);
-    },
-    /**
-     * This comment should be displayed instead of the one from ExternalDriver
-     */
-    async click(elementId) {
-        this.assertNoAlert();
-        const el = this.getElement(elementId);
-        if (!el.isVisible()) {
-            throw new driver_1.errors.InvalidElementStateError();
-        }
-        el.click();
-        this.focusedElId = elementId;
-    },
-    async getAttribute(attr, elementId) {
-        const el = this.getElement(elementId);
-        return el.getAttr(attr);
-    },
-    async getElementRect(elementId) {
-        const el = this.getElement(elementId);
-        return el.getElementRect();
-    },
-    async getSize(elementId) {
-        const el = this.getElement(elementId);
-        return el.getSize();
-    },
-    async equalsElement(elementIdA, elementIdB) {
-        const el1 = this.getElement(elementIdA);
-        const el2 = this.getElement(elementIdB);
-        return el1.equals(el2);
-    },
-    async getCssProperty(prop, elementId) {
-        this.assertWebviewContext();
-        const el = this.getElement(elementId);
-        return el.getCss(prop) ?? '';
-    },
-    async getLocation(elementId) {
-        const el = this.getElement(elementId);
-        return el.getLocation();
-    },
-    async getLocationInView(elementId) {
-        return this.getLocation(elementId);
-    },
-};
-(0, mixin_1.mixin)(ElementsMixin);
+    }
+    return elementIds.map((e) => this.elMap[e]);
+}
+function getElement(elementId) {
+    return this.getElements([elementId])[0];
+}
+async function getName(elementId) {
+    const el = this.getElement(elementId);
+    return el.tagName;
+}
+async function elementDisplayed(elementId) {
+    const el = this.getElement(elementId);
+    return el.isVisible();
+}
+async function elementEnabled(elementId) {
+    const el = this.getElement(elementId);
+    return el.isEnabled();
+}
+async function elementSelected(elementId) {
+    const el = this.getElement(elementId);
+    return el.isSelected();
+}
+async function setValue(keys, elementId) {
+    const value = lodash_1.default.isArray(keys) ? keys.join('') : keys;
+    const el = this.getElement(elementId);
+    // Only MockInputField supports value in the fake app XML.
+    if (el.type !== 'MockInputField') {
+        throw new driver_1.errors.InvalidElementStateError();
+    }
+    el.setAttr('value', value);
+}
+async function getText(elementId) {
+    const el = this.getElement(elementId);
+    return el.getAttr('value');
+}
+async function clear(elementId) {
+    await this.setValue('', elementId);
+}
+async function click(elementId) {
+    this.assertNoAlert();
+    const el = this.getElement(elementId);
+    if (!el.isVisible()) {
+        throw new driver_1.errors.InvalidElementStateError();
+    }
+    el.click();
+    this.focusedElId = elementId;
+}
+/** Protocol order: attribute name, then element id (from route /attribute/:name). */
+async function getAttribute(attributeName, elementId) {
+    const el = this.getElement(elementId);
+    return el.getAttr(attributeName);
+}
+async function getElementRect(elementId) {
+    const el = this.getElement(elementId);
+    return el.getElementRect();
+}
+async function getSize(elementId) {
+    const el = this.getElement(elementId);
+    return el.getSize();
+}
+async function equalsElement(elementIdA, elementIdB) {
+    const el1 = this.getElement(elementIdA);
+    const el2 = this.getElement(elementIdB);
+    return el1.equals(el2);
+}
+/** Protocol order: property name, then element id. Requires webview context. */
+async function getCssProperty(propertyName, elementId) {
+    this.assertWebviewContext();
+    const el = this.getElement(elementId);
+    return el.getCss(propertyName) ?? '';
+}
+async function getLocation(elementId) {
+    const el = this.getElement(elementId);
+    return el.getLocation();
+}
+async function getLocationInView(elementId) {
+    return this.getLocation(elementId);
+}
 //# sourceMappingURL=element.js.map

package/build/lib/commands/element.js.map

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

package/build/lib/commands/find.d.ts

@@ -1,19 +1,16 @@
-import { Element } from '@appium/types';
-import { FakeElement } from '../fake-element';
-import { FakeDriver } from '../driver';
-interface FakeDriverFindMixin {
-    getExistingElementForNode(node: FakeElement): string | null;
-    wrapNewEl(obj: FakeElement): Element;
-    findElOrEls(this: FakeDriver, strategy: string, selector: string, mult: true, context?: any): Promise<Element[]>;
-    findElOrEls(this: FakeDriver, strategy: string, selector: string, mult: false, context?: any): Promise<Element>;
-    findElement(strategy: string, selector: string): Promise<Element>;
-    findElements(strategy: string, selector: string): Promise<Element[]>;
-    findElementFromElement(elementId: string, strategy: string, selector: string): Promise<Element>;
-    findElementsFromElement(elementId: string, strategy: string, selector: string): Promise<Element[]>;
-}
-declare module '../driver' {
-    interface FakeDriver extends FakeDriverFindMixin {
-    }
-}
+import type { Element } from '@appium/types';
+import { FakeElement, type XmlNodeLike } from '../fake-element';
+import type { FakeDriver } from '../driver';
+/** Find an existing element id in elMap for the same underlying node (reference equality). */
+export declare function getExistingElementForNode(this: FakeDriver, node: FakeElement): string | null;
+/** Accepts either a FakeElement (reuse existing id) or a raw XmlNodeLike from xpath. */
+export declare function wrapNewEl(this: FakeDriver, obj: FakeElement | XmlNodeLike): Element;
+declare function findElOrElsImpl<Ctx = unknown>(this: FakeDriver, strategy: string, selector: string, mult: true, context?: Ctx): Promise<Element[]>;
+declare function findElOrElsImpl<Ctx = unknown>(this: FakeDriver, strategy: string, selector: string, mult: false, context?: Ctx): Promise<Element>;
+export declare const findElOrEls: typeof findElOrElsImpl;
+export declare function findElement(this: FakeDriver, strategy: string, selector: string): Promise<Element>;
+export declare function findElements(this: FakeDriver, strategy: string, selector: string): Promise<Element[]>;
+export declare function findElementFromElement(this: FakeDriver, strategy: string, selector: string, elementId: string): Promise<Element>;
+export declare function findElementsFromElement(this: FakeDriver, strategy: string, selector: string, elementId: string): Promise<Element[]>;
 export {};
 //# sourceMappingURL=find.d.ts.map

package/build/lib/commands/find.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AA+DrC,UAAU,mBAAmB;IAC3B,yBAAyB,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5D,SAAS,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC;IAErC,WAAW,CACT,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACtB,WAAW,CACT,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,KAAK,EACX,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACrE,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAChG,uBAAuB,CACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CACvB;AAED,OAAO,QAAQ,WAAW,CAAC;IACzB,UAAU,UAAW,SAAQ,mBAAmB;KAAG;CACpD"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAC,WAAW,EAAE,KAAK,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC9D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAK1C,8FAA8F;AAC9F,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,WAAW,GAChB,MAAM,GAAG,IAAI,CAOf;AAED,wFAAwF;AACxF,wBAAgB,SAAS,CACvB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,WAAW,GAAG,WAAW,GAC7B,OAAO,CAuBT;AAED,iBAAe,eAAe,CAAC,GAAG,GAAG,OAAO,EAC1C,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AACtB,iBAAe,eAAe,CAAC,GAAG,GAAG,OAAO,EAC1C,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,KAAK,EACX,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,CAAC,CAAC;AA2CpB,eAAO,MAAM,WAAW,wBAAkB,CAAC;AAE3C,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAElB;AAID,wBAAsB,YAAY,CAChC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,EAAE,CAAC,CAEpB;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,EAAE,CAAC,CAGpB"}

package/build/lib/commands/find.js

@@ -3,13 +3,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.findElOrEls = void 0;
+exports.getExistingElementForNode = getExistingElementForNode;
+exports.wrapNewEl = wrapNewEl;
+exports.findElement = findElement;
+exports.findElements = findElements;
+exports.findElementFromElement = findElementFromElement;
+exports.findElementsFromElement = findElementsFromElement;
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
 const fake_element_1 = require("../fake-element");
 const support_1 = require("appium/support");
-const mixin_1 = require("./mixin");
 const { W3C_WEB_ELEMENT_IDENTIFIER } = support_1.util;
-async function findElOrEls(strategy, selector, mult, context) {
+/** Find an existing element id in elMap for the same underlying node (reference equality). */
+function getExistingElementForNode(node) {
+    for (const [id, el] of lodash_1.default.toPairs(this.elMap)) {
+        if (el.node === node.node) {
+            return id;
+        }
+    }
+    return null;
+}
+/** Accepts either a FakeElement (reuse existing id) or a raw XmlNodeLike from xpath. */
+function wrapNewEl(obj) {
+    const node = lodash_1.default.has(obj, 'node') && obj.node
+        ? obj.node
+        : obj;
+    if (lodash_1.default.has(obj, 'node')) {
+        const existingElId = this.getExistingElementForNode(obj);
+        if (existingElId) {
+            return { ELEMENT: existingElId, [W3C_WEB_ELEMENT_IDENTIFIER]: existingElId };
+        }
+    }
+    else {
+        // raw node: reuse id if we already have an element for this node
+        for (const [id, el] of lodash_1.default.toPairs(this.elMap)) {
+            if (el.node === node) {
+                return { ELEMENT: id, [W3C_WEB_ELEMENT_IDENTIFIER]: id };
+            }
+        }
+    }
+    this.maxElId++;
+    const maxElId = this.maxElId.toString();
+    this.elMap[maxElId] = new fake_element_1.FakeElement(node, this.appModel);
+    return { ELEMENT: maxElId, [W3C_WEB_ELEMENT_IDENTIFIER]: maxElId };
+}
+async function findElOrElsImpl(strategy, selector, mult, context) {
+    // Map WebDriver locator strategy to FakeApp query method name.
     const qMap = {
         xpath: 'xpathQuery',
         id: 'idQuery',
@@ -18,77 +58,40 @@ async function findElOrEls(strategy, selector, mult, context) {
         'tag name': 'classQuery',
         'css selector': 'cssQuery',
     };
-    // TODO this error checking should probably be part of MJSONWP?
     if (!lodash_1.default.includes(lodash_1.default.keys(qMap), strategy)) {
         throw new driver_1.errors.UnknownCommandError();
     }
     if (selector === 'badsel') {
         throw new driver_1.errors.InvalidSelectorError();
     }
-    const els = this.appModel[qMap[strategy]](selector, context);
-    let retval;
+    const methodName = qMap[strategy];
+    const raw = this.appModel[methodName].call(this.appModel, selector, context);
+    const els = lodash_1.default.isArray(raw) ? raw : raw ? [raw] : [];
     if (els.length) {
         if (mult) {
-            const allEls = [];
-            for (const el of els) {
-                allEls.push(this.wrapNewEl(el));
-            }
-            retval = allEls;
+            return els.map((el) => this.wrapNewEl(el));
         }
-        else {
-            retval = this.wrapNewEl(els[0]);
-        }
-    }
-    else if (mult) {
-        retval = [];
+        return this.wrapNewEl(els[0]);
     }
-    else {
-        throw new driver_1.errors.NoSuchElementError();
+    if (mult) {
+        return [];
     }
-    return retval;
+    throw new driver_1.errors.NoSuchElementError();
+}
+exports.findElOrEls = findElOrElsImpl;
+async function findElement(strategy, selector) {
+    return this.findElOrEls(strategy, selector, false);
+}
+// Protocol passes (strategy, selector, elementId) for find-from-element routes.
+async function findElements(strategy, selector) {
+    return this.findElOrEls(strategy, selector, true);
+}
+async function findElementFromElement(strategy, selector, elementId) {
+    const el = this.getElement(elementId);
+    return this.findElOrEls(strategy, selector, false, el.xmlFragment);
+}
+async function findElementsFromElement(strategy, selector, elementId) {
+    const el = this.getElement(elementId);
+    return this.findElOrEls(strategy, selector, true, el.xmlFragment);
 }
-const FindMixin = {
-    getExistingElementForNode(node) {
-        for (const [id, el] of lodash_1.default.toPairs(this.elMap)) {
-            if (el.node === node) {
-                return id;
-            }
-        }
-        return null;
-    },
-    wrapNewEl(obj) {
-        // first check and see if we already have a ref to this element
-        const existingElId = this.getExistingElementForNode(obj);
-        if (existingElId) {
-            return { ELEMENT: existingElId, [W3C_WEB_ELEMENT_IDENTIFIER]: existingElId };
-        }
-        // otherwise add the element to the map
-        this.maxElId++;
-        const maxElId = this.maxElId.toString();
-        this.elMap[maxElId] = new fake_element_1.FakeElement(obj, this.appModel);
-        return { ELEMENT: maxElId, [W3C_WEB_ELEMENT_IDENTIFIER]: maxElId };
-    },
-    findElOrEls,
-    /**
-     * This should override whatever's in ExternalDriver
-     * @param {string} strategy Strategy
-     * @param {string} selector Selector
-     * @this {FakeDriver}
-     */
-    async findElement(strategy, selector) {
-        return this.findElOrEls(strategy, selector, false);
-    },
-    async findElements(strategy, selector) {
-        return this.findElOrEls(strategy, selector, true);
-    },
-    async findElementFromElement(strategy, selector, elementId) {
-        const el = this.getElement(elementId);
-        return this.findElOrEls(strategy, selector, false, el.xmlFragment);
-    },
-    async findElementsFromElement(strategy, selector, elementId) {
-        const el = this.getElement(elementId);
-        return this.findElOrEls(strategy, selector, true, el.xmlFragment);
-    },
-};
-(0, mixin_1.mixin)(FindMixin);
 //# sourceMappingURL=find.js.map

package/build/lib/commands/find.js.map

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

package/build/lib/commands/general.d.ts

@@ -1,29 +1,26 @@
-import { ActionSequence, Location, Rect, Size } from '@appium/types';
-import type { Orientation } from '../driver';
-interface FakeDriverGeneralMixin {
-    title(): Promise<string>;
-    keys(value: string | string[]): Promise<void>;
-    setGeoLocation(location: Location): Promise<Location>;
-    getGeoLocation(): Promise<Location>;
-    getPageSource(): Promise<string>;
-    getOrientation(): Promise<string>;
-    setOrientation(orientation: Orientation): Promise<void>;
-    getScreenshot(): Promise<string>;
-    getWindowSize(): Promise<Size>;
-    getWindowRect(): Promise<Rect>;
-    performActions(actions: ActionSequence[]): Promise<void>;
-    releaseActions(): Promise<void>;
-    mobileShake(): Promise<void>;
-    doubleClick(): Promise<void>;
-    execute(script: string, args: any[]): Promise<any>;
-    fakeAddition(a: number, b: number, c?: number): Promise<number>;
-    getLog(type: string): Promise<any>;
-    getUrl(): Promise<string>;
-    bidiNavigate(context: string, url: string): Promise<void>;
-}
-declare module '../driver' {
-    interface FakeDriver extends FakeDriverGeneralMixin {
-    }
-}
-export {};
+import type { ActionSequence, Location, Rect, Size, Orientation } from '@appium/types';
+import type { FakeDriver } from '../driver';
+/** Requires webview context (title comes from active document). */
+export declare function title(this: FakeDriver): Promise<string>;
+export declare function keys(this: FakeDriver, value: string | string[]): Promise<void>;
+export declare function setGeoLocation(this: FakeDriver, location: Location): Promise<Location>;
+export declare function getGeoLocation(this: FakeDriver): Promise<Location>;
+export declare function getPageSource(this: FakeDriver): Promise<string>;
+export declare function getOrientation(this: FakeDriver): Promise<string>;
+export declare function setOrientation(this: FakeDriver, o: Orientation): Promise<void>;
+export declare function getScreenshot(this: FakeDriver): Promise<string>;
+export declare function getWindowSize(this: FakeDriver): Promise<Size>;
+export declare function getWindowRect(this: FakeDriver): Promise<Rect>;
+export declare function performActions(this: FakeDriver, actions: ActionSequence[]): Promise<void>;
+export declare function releaseActions(this: FakeDriver): Promise<void>;
+/** Supported log types: 'actions'. TODO: add more log types if needed for tests. */
+export declare function getLog(this: FakeDriver, type: string): Promise<ActionSequence[][]>;
+export declare function mobileShake(this: FakeDriver): Promise<void>;
+export declare function doubleClick(this: FakeDriver): Promise<void>;
+export declare function execute(this: FakeDriver, script: string, args: any[]): Promise<any>;
+export declare function fakeAddition(this: FakeDriver, num1: number, num2: number, num3?: number): Promise<number>;
+/** Get current URL. Returns empty string until bidiNavigate (or equivalent) sets one. @see https://w3c.github.io/webdriver/#get-current-url */
+export declare function getUrl(this: FakeDriver): Promise<string>;
+/** Set current URL (used by Bidi browsingContext.navigate). */
+export declare function bidiNavigate(this: FakeDriver, context: string, url: string): Promise<void>;
 //# sourceMappingURL=general.d.ts.map

package/build/lib/commands/general.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAC;AAInE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAI3C,UAAU,sBAAsB;IAC9B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtD,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpC,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACnD,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1B,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED,OAAO,QAAQ,WAAW,CAAC;IACzB,UAAU,UAAW,SAAQ,sBAAsB;KAAG;CACvD"}
+{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAErF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAI1C,mEAAmE;AACnE,wBAAsB,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7D;AAED,wBAAsB,IAAI,CACxB,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,QAAQ,CAAC,CAInB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAExE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAErE;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAEtE;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,UAAU,EAChB,CAAC,EAAE,WAAW,GACb,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAErE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,cAAc,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAG;AAExE,oFAAoF;AACpF,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAO7B;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAG;AAErE,wBAAsB,OAAO,CAC3B,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,EAAE,GACV,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,SAAI,GACP,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,+IAA+I;AAC/I,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAE9D;AAED,+DAA+D;AAC/D,wBAAsB,YAAY,CAChC,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAEf"}