@seleniumhq/side-runtime 4.0.0-alpha.3 → 4.0.0-alpha.30

package/dist/webdriver.d.ts

@@ -1,9 +1,9 @@
-import webdriver, { Capabilities, Condition as ConditionShape, WebDriver, WebElement as WebElementShape, WebElementCondition as WebElementConditionShape } from 'selenium-webdriver';
+import webdriver, { Capabilities, WebDriver, WebElement as WebElementShape } from 'selenium-webdriver';
 import Variables from './variables';
 import { Fn } from '@seleniumhq/side-commons';
 import { CommandShape } from '@seleniumhq/side-model';
-import { PluginShape } from './types';
-export declare type ExpandedCapabilities = Partial<Capabilities> & {
+import { PluginRuntimeShape } from './types';
+export type ExpandedCapabilities = Partial<Capabilities> & {
     browserName: string;
     'goog:chromeOptions'?: Record<string, boolean | number | string | string[]>;
 };
@@ -17,7 +17,7 @@ export interface WindowAPI {
 }
 export interface WebDriverExecutorConstructorArgs {
     capabilities?: ExpandedCapabilities;
-    customCommands?: PluginShape['commands'];
+    customCommands?: PluginRuntimeShape['commands'];
     disableCodeExportCompat?: boolean;
     driver?: WebDriver;
     hooks?: WebDriverExecutorHooks;
@@ -33,6 +33,9 @@ export interface WebDriverExecutorInitOptions {
 export interface WebDriverExecutorCondEvalResult {
     value: boolean;
 }
+export interface BeforePlayHookInput {
+    driver: WebDriverExecutor;
+}
 export interface CommandHookInput {
     command: CommandShape;
 }
@@ -43,20 +46,24 @@ export interface StoreWindowHandleHookInput {
 export interface WindowAppearedHookInput {
     command: CommandShape;
     windowHandleName: CommandShape['windowHandleName'];
-    windowHandle: string;
+    windowHandle?: string | Error;
 }
 export interface WindowSwitchedHookInput {
-    windowHandle: string;
+    windowHandle?: string | Error;
 }
+export type GeneralHook<T> = (input: T) => Promise<void> | void;
 export interface WebDriverExecutorHooks {
-    onBeforePlay?: (input: {
-        driver: WebDriverExecutor;
-    }) => void;
-    onAfterCommand?: (input: CommandHookInput) => void;
-    onBeforeCommand?: (input: CommandHookInput) => void;
-    onStoreWindowHandle?: (input: StoreWindowHandleHookInput) => void;
-    onWindowAppeared?: (input: WindowAppearedHookInput) => void;
-    onWindowSwitched?: (input: WindowSwitchedHookInput) => void;
+    onBeforePlay?: GeneralHook<BeforePlayHookInput>;
+    onAfterCommand?: GeneralHook<CommandHookInput>;
+    onBeforeCommand?: GeneralHook<CommandHookInput>;
+    onStoreWindowHandle?: GeneralHook<StoreWindowHandleHookInput>;
+    onWindowAppeared?: GeneralHook<WindowAppearedHookInput>;
+    onWindowSwitched?: GeneralHook<WindowSwitchedHookInput>;
+}
+export type HookKeys = keyof WebDriverExecutorHooks;
+export interface ElementEditableScriptResult {
+    enabled: boolean;
+    readonly: boolean;
 }
 export interface ScriptShape {
     script: string;
@@ -70,7 +77,7 @@ export default class WebDriverExecutor {
         cancel: () => void;
     };
     capabilities?: ExpandedCapabilities;
-    customCommands: Required<PluginShape>['commands'];
+    customCommands: Required<PluginRuntimeShape>['commands'];
     disableCodeExportCompat: boolean;
     driver: WebDriver;
     server?: string;
@@ -86,10 +93,10 @@ export default class WebDriverExecutor {
     cleanup(): Promise<void>;
     isAlive(): boolean;
     name(command: string): string;
-    executeHook(hook: keyof WebDriverExecutorHooks, ...args: any[]): Promise<void>;
+    executeHook<T extends HookKeys>(hook: T, ...args: Parameters<NonNullable<WebDriverExecutorHooks[T]>>): Promise<void>;
     beforeCommand(commandObject: CommandShape): Promise<void>;
     afterCommand(commandObject: CommandShape): Promise<void>;
-    waitForNewWindow(): Promise<string | undefined>;
+    waitForNewWindow(timeout?: number): Promise<string | undefined>;
     registerCommand(commandName: string, fn: Fn): void;
     skip(): Promise<void>;
     doOpen(url: string): Promise<void>;
@@ -120,10 +127,11 @@ export default class WebDriverExecutor {
     doSendKeys(locator: string, value: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doWaitForElementEditable(locator: string, timeout: string): Promise<void>;
     doWaitForElementNotEditable(locator: string, timeout: string): Promise<void>;
-    doWaitForElementPresent(locator: string, timeout: string): Promise<void>;
+    doWaitForElementPresent(locator: string, timeout: string, commandObj?: Partial<CommandShape>): Promise<void>;
     doWaitForElementNotPresent(locator: string, timeout: string): Promise<void>;
-    doWaitForElementVisible(locator: string, timeout: string): Promise<void>;
+    doWaitForElementVisible(locator: string, timeout: string, commandObj?: Partial<CommandShape>): Promise<void>;
     doWaitForElementNotVisible(locator: string, timeout: string): Promise<void>;
+    doWaitForText(locator: string, text: string, commandObj?: Partial<CommandShape>): Promise<void>;
     doRunScript(script: ScriptShape): Promise<void>;
     doExecuteScript(script: ScriptShape, optionalVariable?: string): Promise<void>;
     doExecuteAsyncScript(script: ScriptShape, optionalVariable?: string): Promise<void>;
@@ -165,11 +173,11 @@ export default class WebDriverExecutor {
     doRun(): Promise<void>;
     doSetSpeed(): Promise<void>;
     evaluateConditional(script: ScriptShape): Promise<WebDriverExecutorCondEvalResult>;
+    elementIsLocated(locator: string, fallback?: [string, string][]): Promise<WebElementShape | null>;
     waitForElement(locator: string, fallback?: [string, string][]): Promise<WebElementShape>;
-    isElementEditable(element: WebElementShape): Promise<any>;
-    retryToAllowForIntermittency(locator: string, timeout: number): Promise<webdriver.WebElement>;
-    waitForElementVisible(locator: string, timeout: number): Promise<webdriver.WebElement>;
-    wait<T extends any>(condition: Promise<T> | ConditionShape<T> | WebElementConditionShape, timeout?: number, message?: string, pollTimeout?: number): Promise<T | Error>;
+    isElementEditable(element: WebElementShape): Promise<boolean>;
+    waitForElementVisible(locator: string, timeout: number, fallback?: [string, string][]): Promise<webdriver.WebElement>;
+    waitForText(locator: string, text: string, fallback?: [string, string][]): Promise<void>;
 }
 export {};
 //# sourceMappingURL=webdriver.d.ts.map

package/dist/webdriver.d.ts.map

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

package/dist/webdriver.js

@@ -23,9 +23,7 @@ const selenium_webdriver_1 = __importDefault(require("selenium-webdriver"));
 const utils_1 = require("./utils");
 const preprocessors_1 = require("./preprocessors");
 const errors_1 = require("./errors");
-const { By, Condition, until, Key, WebElement, WebElementCondition, WebElementPromise, } = selenium_webdriver_1.default;
-const { TimeoutError } = selenium_webdriver_1.default.error;
-const POLL_TIMEOUT = 50;
+const { By, Condition, until, Key, WebElementCondition } = selenium_webdriver_1.default;
 const DEFAULT_CAPABILITIES = {
     browserName: 'chrome',
 };
@@ -94,8 +92,11 @@ class WebDriverExecutor {
         }
         const upperCase = command.charAt(0).toUpperCase() + command.slice(1);
         const func = 'do' + upperCase;
-        // @ts-expect-error
+        // @ts-expect-error The functions can be overridden by custom commands and stuff
         if (!this[func]) {
+            if (this.customCommands[command]) {
+                return command;
+            }
             throw new Error(`Unknown command ${command}`);
         }
         return func;
@@ -104,7 +105,7 @@ class WebDriverExecutor {
         const fn = this.hooks[hook];
         if (!fn)
             return;
-        // @ts-expect-error
+        // @ts-expect-error it's okay, this shape is fine
         await fn.apply(this, args);
     }
     async beforeCommand(commandObject) {
@@ -116,7 +117,7 @@ class WebDriverExecutor {
     async afterCommand(commandObject) {
         this.cancellable = undefined;
         if (commandObject.opensWindow) {
-            const handle = await this.wait(this.waitForNewWindow(), commandObject.windowTimeout);
+            const handle = await this.waitForNewWindow(commandObject.windowTimeout);
             this.variables.set(commandObject.windowHandleName, handle);
             await this.executeHook('onWindowAppeared', {
                 command: commandObject,
@@ -126,9 +127,26 @@ class WebDriverExecutor {
         }
         await this.executeHook('onAfterCommand', { command: commandObject });
     }
-    async waitForNewWindow() {
-        const currentHandles = await this.driver.getAllWindowHandles();
-        return currentHandles.find((handle) => !this[state].openedWindows.includes(handle));
+    async waitForNewWindow(timeout = 2000) {
+        const finder = new Promise((resolve) => {
+            const start = Date.now();
+            const findHandle = async () => {
+                if (Date.now() - start > timeout) {
+                    resolve(undefined);
+                    return;
+                }
+                const currentHandles = await this.driver.getAllWindowHandles();
+                const newHandle = currentHandles.find((handle) => !this[state].openedWindows.includes(handle));
+                if (newHandle) {
+                    resolve(newHandle);
+                    return;
+                }
+                // cant find, wait next time.
+                setTimeout(findHandle, 200);
+            };
+            findHandle();
+        });
+        return this.driver.wait(finder, timeout);
     }
     registerCommand(commandName, fn) {
         // @ts-expect-error
@@ -384,32 +402,39 @@ class WebDriverExecutor {
     // wait commands
     async doWaitForElementEditable(locator, timeout) {
         const element = await this.driver.findElement(parseLocator(locator));
-        await this.wait(this.isElementEditable(element), parseInt(timeout), 'Timed out waiting for element to be editable');
+        await this.driver.wait(this.isElementEditable(element), parseInt(timeout), 'Timed out waiting for element to be editable');
     }
     async doWaitForElementNotEditable(locator, timeout) {
         const element = await this.driver.findElement(parseLocator(locator));
-        await this.wait(this.isElementEditable(element), parseInt(timeout), 'Timed out waiting for element to not be editable');
+        await this.driver.wait(this.isElementEditable(element), parseInt(timeout), 'Timed out waiting for element to not be editable');
     }
-    async doWaitForElementPresent(locator, timeout) {
-        await this.wait(until.elementLocated(parseLocator(locator)), parseInt(timeout));
+    async doWaitForElementPresent(locator, timeout, commandObj = {}) {
+        await this.driver.wait(this.elementIsLocated(locator, commandObj.targetFallback), parseInt(timeout));
     }
     async doWaitForElementNotPresent(locator, timeout) {
         const parsedLocator = parseLocator(locator);
         const elements = await this.driver.findElements(parsedLocator);
         if (elements.length !== 0) {
-            await this.wait(until.stalenessOf(elements[0]), parseInt(timeout));
+            const noElementPresentCondition = new Condition('for element to not be present', async () => {
+                const elements = await this.driver.findElements(parsedLocator);
+                return elements.length === 0;
+            });
+            await this.driver.wait(noElementPresentCondition, Number(timeout));
         }
     }
-    async doWaitForElementVisible(locator, timeout) {
-        await this.waitForElementVisible(locator, parseInt(timeout));
+    async doWaitForElementVisible(locator, timeout, commandObj = {}) {
+        await this.waitForElementVisible(locator, parseInt(timeout), commandObj.targetFallback);
     }
     async doWaitForElementNotVisible(locator, timeout) {
         const parsedLocator = parseLocator(locator);
         const elements = await this.driver.findElements(parsedLocator);
         if (elements.length > 0) {
-            await this.wait(until.elementIsNotVisible(elements[0]), parseInt(timeout));
+            await this.driver.wait(until.elementIsNotVisible(elements[0]), parseInt(timeout));
         }
     }
+    async doWaitForText(locator, text, commandObj = {}) {
+        await this.waitForText(locator, text, commandObj.targetFallback);
+    }
     // script commands
     async doRunScript(script) {
         await this.driver.executeScript(script.script, ...script.argv);
@@ -639,7 +664,7 @@ class WebDriverExecutor {
     }
     async doEcho(string) {
         if (this.logger) {
-            this.logger.log(`echo: ${string}`);
+            this.logger.info(`echo: ${string}`);
         }
     }
     async doPause(time) {
@@ -652,154 +677,64 @@ class WebDriverExecutor {
         throw new Error('`set speed` is not supported in this run mode');
     }
     async evaluateConditional(script) {
-        const result = await this.driver.executeScript(`return (${script.script})`, ...script.argv);
+        const result = await this.driver.executeScript((0, preprocessors_1.interpolateScript)(`return (${script.script})`, this.variables).script, ...script.argv);
         return {
             value: !!result,
         };
     }
-    async waitForElement(locator, fallback = []) {
+    async elementIsLocated(locator, fallback = []) {
         const elementLocator = parseLocator(locator);
         try {
-            return (await this.wait(until.elementLocated(elementLocator), this.implicitWait));
-        }
-        catch (err) {
-            if (fallback) {
-                for (let i = 0; i < fallback.length; i++) {
-                    try {
-                        let loc = parseLocator(fallback[i][0]);
-                        return await this.driver.findElement(loc);
-                    }
-                    catch (e) {
-                        // try the next one
-                    }
+            return await this.driver.findElement(elementLocator);
+        }
+        catch (e) {
+            for (let i = 0; i < fallback.length; i++) {
+                try {
+                    let loc = parseLocator(fallback[i][0]);
+                    return await this.driver.findElement(loc);
+                }
+                catch (e) {
+                    // try the next one
                 }
             }
-            throw err;
         }
+        return null;
+    }
+    async waitForElement(locator, fallback = []) {
+        const locatorCondition = new WebElementCondition('for element to be located', async () => {
+            const el = await this.elementIsLocated(locator, fallback);
+            return el;
+        });
+        return await this.driver.wait(locatorCondition, this.implicitWait);
     }
     async isElementEditable(element) {
         const { enabled, readonly } = await this.driver.executeScript('return { enabled: !arguments[0].disabled, readonly: arguments[0].readOnly };', element);
         return enabled && !readonly;
     }
-    async retryToAllowForIntermittency(locator, timeout) {
-        const startTime = Date.now();
-        const element = (await this.wait(until.elementLocated(parseLocator(locator)), timeout));
-        const elapsed = Date.now() - startTime;
-        await this.wait(until.elementIsVisible(element), timeout - elapsed);
-        return element;
-    }
-    async waitForElementVisible(locator, timeout) {
-        const startTime = Date.now();
-        const element = (await this.wait(until.elementLocated(parseLocator(locator)), timeout));
-        const elapsed = Date.now() - startTime;
-        await this.wait(until.elementIsVisible(element), timeout - elapsed);
-        return element;
-    }
-    async wait(condition, timeout = 0, message = '', pollTimeout = POLL_TIMEOUT) {
-        if (typeof timeout !== 'number' || timeout < 0) {
-            throw TypeError('timeout must be a number >= 0: ' + timeout);
-        }
-        if (typeof pollTimeout !== 'number' || pollTimeout < 0) {
-            throw TypeError('pollTimeout must be a number >= 0: ' + pollTimeout);
-        }
-        if (isConditionPromiseLike(condition)) {
-            return new Promise((resolve, reject) => {
-                if (!timeout) {
-                    resolve(condition);
-                    return;
-                }
-                let start = Date.now();
-                let timer = setTimeout(function () {
-                    timer = null;
-                    reject(new TimeoutError((message ? `${message}\n` : '') +
-                        'Timed out waiting for promise to resolve after ' +
-                        (Date.now() - start) +
-                        'ms'));
-                }, timeout);
-                const clearTimer = () => timer && clearTimeout(timer);
-                condition.then(function (value) {
-                    clearTimer();
-                    resolve(value);
-                }, function (error) {
-                    clearTimer();
-                    reject(error);
-                });
-            });
-        }
-        // @ts-expect-error
-        let fn = condition;
-        if (condition instanceof Condition) {
-            message = message || condition.description();
-            fn = condition.fn;
-        }
-        if (typeof fn !== 'function') {
-            throw TypeError('Wait condition must be a promise-like object, function, or a ' +
-                'Condition object');
-        }
-        const { driver } = this;
-        function evaluateCondition() {
-            return new Promise((resolve, reject) => {
-                try {
-                    resolve(fn(driver));
-                }
-                catch (ex) {
-                    reject(ex);
-                }
-            });
-        }
-        let result = new Promise((resolve, reject) => {
-            const startTime = Date.now();
-            let cancelled = false;
-            let resolveCancel;
-            const cancelPromise = new Promise((res) => {
-                resolveCancel = res;
-            });
-            this.cancellable = {
-                cancel: () => {
-                    cancelled = true;
-                    return cancelPromise;
-                },
-            };
-            const pollCondition = async () => {
-                evaluateCondition().then((value) => {
-                    const elapsed = Date.now() - startTime;
-                    if (cancelled) {
-                        resolveCancel();
-                        reject(new Error('Aborted by user'));
-                        this.cancellable = undefined;
-                    }
-                    else if (value) {
-                        resolve(value);
-                        this.cancellable = undefined;
-                    }
-                    else if (timeout && elapsed >= timeout) {
-                        reject(new TimeoutError((message ? `${message}\n` : '') +
-                            `Wait timed out after ${elapsed}ms`));
-                        this.cancellable = undefined;
-                    }
-                    else {
-                        setTimeout(pollCondition, pollTimeout);
-                    }
-                }, reject);
-            };
-            pollCondition();
+    async waitForElementVisible(locator, timeout, fallback = []) {
+        const visibleCondition = new WebElementCondition('for element to be visible', async () => {
+            const el = await this.elementIsLocated(locator, fallback);
+            if (!el)
+                return null;
+            if (!(await el.isDisplayed()))
+                return null;
+            return el;
         });
-        if (condition instanceof WebElementCondition) {
-            result = new WebElementPromise(driver, result.then(function (value) {
-                if (!(value instanceof WebElement)) {
-                    throw TypeError('WebElementCondition did not resolve to a WebElement: ' +
-                        Object.prototype.toString.call(value));
-                }
-                return value;
-            }));
-        }
-        return result;
+        return await this.driver.wait(visibleCondition, timeout);
+    }
+    async waitForText(locator, text, fallback = []) {
+        const timeout = this.implicitWait;
+        const textCondition = new Condition('for text to be present in element', async () => {
+            const el = await this.elementIsLocated(locator, fallback);
+            if (!el)
+                return null;
+            const elText = await el.getText();
+            return elText === text;
+        });
+        await this.driver.wait(textCondition, timeout);
     }
 }
 exports.default = WebDriverExecutor;
-function isConditionPromiseLike(condition) {
-    return condition && typeof condition.then === 'function';
-}
 WebDriverExecutor.prototype.doOpen = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, WebDriverExecutor.prototype.doOpen);
 WebDriverExecutor.prototype.doSetWindowSize = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, WebDriverExecutor.prototype.doSetWindowSize);
 WebDriverExecutor.prototype.doSelectWindow = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, WebDriverExecutor.prototype.doSelectWindow);
@@ -866,10 +801,28 @@ WebDriverExecutor.prototype.doAssert = (0, preprocessors_1.composePreprocessors)
 WebDriverExecutor.prototype.doAssertAlert = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, WebDriverExecutor.prototype.doAssertAlert);
 WebDriverExecutor.prototype.doAssertConfirmation = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, WebDriverExecutor.prototype.doAssertConfirmation);
 WebDriverExecutor.prototype.doAssertEditable = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, { targetFallback: (0, preprocessors_1.preprocessArray)(preprocessors_1.interpolateString) }, WebDriverExecutor.prototype.doAssertEditable);
+WebDriverExecutor.prototype.doAssertElementPresent = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, WebDriverExecutor.prototype.doAssertElementPresent);
+WebDriverExecutor.prototype.doAssertElementNotPresent = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, WebDriverExecutor.prototype.doAssertElementNotPresent);
 WebDriverExecutor.prototype.doAssertNotEditable = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, { targetFallback: (0, preprocessors_1.preprocessArray)(preprocessors_1.interpolateString) }, WebDriverExecutor.prototype.doAssertNotEditable);
 WebDriverExecutor.prototype.doAssertPrompt = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, WebDriverExecutor.prototype.doAssertPrompt);
+WebDriverExecutor.prototype.doAssertSelectedLabel = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, preprocessors_1.interpolateString, { targetFallback: (0, preprocessors_1.preprocessArray)(preprocessors_1.interpolateString) }, WebDriverExecutor.prototype.doAssertSelectedLabel);
 WebDriverExecutor.prototype.doAssertText = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, preprocessors_1.interpolateString, WebDriverExecutor.prototype.doAssertText);
+WebDriverExecutor.prototype.doAssertTitle = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, null, WebDriverExecutor.prototype.doAssertTitle);
+WebDriverExecutor.prototype.doAssertValue = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, preprocessors_1.interpolateString, { targetFallback: (0, preprocessors_1.preprocessArray)(preprocessors_1.interpolateString) }, WebDriverExecutor.prototype.doAssertValue);
 WebDriverExecutor.prototype.doEcho = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, WebDriverExecutor.prototype.doEcho);
+const waitCommands = [
+    'doWaitForElementEditable',
+    'doWaitForElementNotEditable',
+    'doWaitForElementPresent',
+    'doWaitForElementNotPresent',
+    'doWaitForElementVisible',
+    'doWaitForElementNotVisible',
+    'doWaitForText',
+];
+waitCommands.forEach((cmd) => {
+    // @ts-expect-error - Whatever who cares
+    WebDriverExecutor.prototype[cmd] = (0, preprocessors_1.composePreprocessors)(preprocessors_1.interpolateString, preprocessors_1.interpolateString, WebDriverExecutor.prototype[cmd]);
+});
 function createVerifyCommands(Executor) {
     // @ts-expect-error
     Object.getOwnPropertyNames(Executor.prototype)