@seleniumhq/side-runtime 4.0.0-alpha.9 → 4.0.1

package/dist/types.d.ts

@@ -1,6 +1,6 @@
-import { CommandShape } from '@seleniumhq/side-model';
+import { CommandShape, ProjectShape } from '@seleniumhq/side-model';
 import { CommandType } from '@seleniumhq/side-model/src/Commands';
-import { Fn } from '@seleniumhq/side-commons/src/types';
+import { Fn } from '@seleniumhq/side-commons/dist/types';
 import WebDriverExecutor, { WebDriverExecutorHooks } from './webdriver';
 export { Capabilities } from 'selenium-webdriver';
 export interface CommandNodeOptions {
@@ -23,40 +23,36 @@ export interface StoreWindowHandleHookInput {
 export interface WindowAppearedHookInput {
     command: CommandShape;
     windowHandleName: CommandShape['windowHandleName'];
-    windowHandle: string;
+    windowHandle?: string;
 }
 export interface WindowSwitchedHookInput {
     windowHandle: string;
 }
-export interface NewCommandShape {
-    command: string;
-    target: string | [string, string][];
-    value: string | [string, string][];
-    insertBeforeLastCommand: boolean;
-    frameLocation: string;
-}
-export interface onCommandRecordedDropResult {
-    action: 'drop';
-}
-export interface OnCommandRecordedUpdateResult {
-    action: 'update';
-    command: NewCommandShape;
-}
-export declare type OnCommandRecordedResult = void | onCommandRecordedDropResult | OnCommandRecordedUpdateResult;
+export type PluginHookInput = {
+    logger: Console;
+    project: ProjectShape;
+} & Record<string, unknown>;
 export interface PluginHooks extends WebDriverExecutorHooks {
-    onBeforePlayAll?: () => Promise<void>;
-    onAfterPlayAll?: () => Promise<void>;
+    onBeforePlayAll?: (input: PluginHookInput) => Promise<void>;
+    onAfterPlayAll?: (input: PluginHookInput) => Promise<void>;
     onMessage?: (...args: any[]) => void;
 }
-export interface PluginShape {
-    commands?: Record<string, CustomCommandShape>;
-    hooks: PluginHooks;
-}
-export interface PluginPreloadOutputShape {
-    hooks: {
-        onCommandRecorded?: (command: NewCommandShape, event: Event | KeyboardEvent | MouseEvent | MutationRecord[] | undefined) => OnCommandRecordedResult;
+export interface FormatShape {
+    opts?: {
+        fileExtension?: string;
+        commandPrefixPadding?: string;
+        terminatingKeyword?: string;
+        commentPrefix?: string;
     };
 }
-export declare type SendMessage = (...args: any[]) => void;
-export declare type PluginPreloadShape = (sendMessage: SendMessage) => PluginPreloadOutputShape;
+/**
+ * A plugin is a javascript module that can be loaded into the Side Runner.
+ * It can be used to extend the functionality of the Side Runner by adding new
+ * commands, formats, or hooks.
+ */
+export interface PluginRuntimeShape {
+    commands?: Record<string, CustomCommandShape>;
+    formats?: FormatShape[];
+    hooks?: PluginHooks;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AACjE,OAAO,EAAE,EAAE,EAAE,MAAM,oCAAoC,CAAA;AACvD,OAAO,iBAAiB,EAAE,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,WAAW,kBAAkB;IACjC,qBAAqB,CAAC,EAAE,EAAE,CAAA;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7E;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAA;IACpB,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,YAAY,CAAA;IACrB,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAA;IAClD,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACnC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IAClC,uBAAuB,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,QAAQ,CAAA;IAChB,OAAO,EAAE,eAAe,CAAA;CACzB;AAED,oBAAY,uBAAuB,GAC/B,IAAI,GACJ,2BAA2B,GAC3B,6BAA6B,CAAA;AAEjC,MAAM,WAAW,WAAY,SAAQ,sBAAsB;IACzD,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACpC,SAAS,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CACrC;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IAC7C,KAAK,EAAE,WAAW,CAAA;CACnB;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE;QACL,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,KAAK,GAAG,aAAa,GAAG,UAAU,GAAG,cAAc,EAAE,GAAG,SAAS,KACrE,uBAAuB,CAAA;KAC7B,CAAA;CACF;AAED,oBAAY,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;AAElD,oBAAY,kBAAkB,GAAG,CAC/B,WAAW,EAAE,WAAW,KACrB,wBAAwB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AACjE,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAA;AACxD,OAAO,iBAAiB,EAAE,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,WAAW,kBAAkB;IACjC,qBAAqB,CAAC,EAAE,EAAE,CAAA;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7E;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAA;IACpB,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,YAAY,CAAA;IACrB,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,YAAY,CAAA;CACtB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAE3B,MAAM,WAAW,WAAY,SAAQ,sBAAsB;IACzD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3D,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1D,SAAS,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CACrC;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE;QACL,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,oBAAoB,CAAC,EAAE,MAAM,CAAA;QAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;KACvB,CAAA;CACF;AAED;;;;GAIG;AAEH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IAC7C,OAAO,CAAC,EAAE,WAAW,EAAE,CAAA;IACvB,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB"}

package/dist/variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,OAAO,OAAO,SAAS;;IAI5B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAE5B,GAAG,CAAC,GAAG,EAAE,MAAM;IAIf,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAI3B,GAAG,CAAC,GAAG,EAAE,MAAM;IAIf,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,KAAK;CAGN"}
+{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,OAAO,OAAO,SAAS;;IAI5B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAE5B,GAAG,CAAC,GAAG,EAAE,MAAM;IAOf,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAI3B,GAAG,CAAC,GAAG,EAAE,MAAM;IAOf,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,KAAK;CAGN"}

package/dist/variables.js

@@ -21,12 +21,18 @@ class Variables {
         this.storedVars = new Map();
     }
     get(key) {
+        if (key.startsWith('env:')) {
+            return process.env[key.slice(4)];
+        }
         return this.storedVars.get(key);
     }
     set(key, value) {
         this.storedVars.set(key, value);
     }
     has(key) {
+        if (key.startsWith('env:')) {
+            return true;
+        }
         return this.storedVars.has(key);
     }
     delete(key) {

package/dist/variables.js.map

@@ -1 +1 @@
-{"version":3,"file":"variables.js","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+DAA+D;AAC/D,wDAAwD;AACxD,6DAA6D;AAC7D,oDAAoD;AACpD,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,+CAA+C;AAC/C,EAAE;AACF,6DAA6D;AAC7D,8DAA8D;AAC9D,yDAAyD;AACzD,4DAA4D;AAC5D,0DAA0D;AAC1D,qBAAqB;;AAErB,MAAqB,SAAS;IAC5B;QACE,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;IAC7B,CAAC;IAGD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAU;QACzB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACjC,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC3D,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;CACF;AAzBD,4BAyBC"}
+{"version":3,"file":"variables.js","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+DAA+D;AAC/D,wDAAwD;AACxD,6DAA6D;AAC7D,oDAAoD;AACpD,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,+CAA+C;AAC/C,EAAE;AACF,6DAA6D;AAC7D,8DAA8D;AAC9D,yDAAyD;AACzD,4DAA4D;AAC5D,0DAA0D;AAC1D,qBAAqB;;AAErB,MAAqB,SAAS;IAC5B;QACE,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;IAC7B,CAAC;IAGD,GAAG,CAAC,GAAW;QACb,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;SACjC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAU;QACzB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACjC,CAAC;IAED,GAAG,CAAC,GAAW;QACb,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC3D,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;CACF;AA/BD,4BA+BC"}

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, StoreWindowHandleHookInput, WindowAppearedHookInput, WindowSwitchedHookInput } from './types';
+export type ExpandedCapabilities = Partial<Capabilities> & {
     browserName: string;
     'goog:chromeOptions'?: Record<string, boolean | number | string | string[]>;
 };
@@ -17,16 +17,16 @@ export interface WindowAPI {
 }
 export interface WebDriverExecutorConstructorArgs {
     capabilities?: ExpandedCapabilities;
-    customCommands?: PluginShape['commands'];
+    customCommands?: PluginRuntimeShape['commands'];
     disableCodeExportCompat?: boolean;
     driver?: WebDriver;
     hooks?: WebDriverExecutorHooks;
     implicitWait?: number;
     server?: string;
-    windowAPI?: WindowAPI;
 }
 export interface WebDriverExecutorInitOptions {
     baseUrl: string;
+    debug?: boolean;
     logger: Console;
     variables: Variables;
 }
@@ -39,26 +39,16 @@ export interface BeforePlayHookInput {
 export interface CommandHookInput {
     command: CommandShape;
 }
-export interface StoreWindowHandleHookInput {
-    windowHandle: string;
-    windowHandleName: string;
-}
-export interface WindowAppearedHookInput {
-    command: CommandShape;
-    windowHandleName: CommandShape['windowHandleName'];
-    windowHandle?: string | Error;
-}
-export interface WindowSwitchedHookInput {
-    windowHandle?: string | Error;
-}
+export type GeneralHook<T> = (input: T) => Promise<void> | void;
 export interface WebDriverExecutorHooks {
-    onBeforePlay?: (input: BeforePlayHookInput) => 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;
@@ -68,33 +58,35 @@ export interface ScriptShape {
     argv: any[];
 }
 export default class WebDriverExecutor {
-    constructor({ customCommands, disableCodeExportCompat, driver, capabilities, server, hooks, implicitWait, windowAPI, }: WebDriverExecutorConstructorArgs);
+    constructor({ customCommands, disableCodeExportCompat, driver, capabilities, server, hooks, implicitWait, }: WebDriverExecutorConstructorArgs);
     baseUrl?: string;
     variables: Variables;
     cancellable?: {
         cancel: () => void;
     };
     capabilities?: ExpandedCapabilities;
-    customCommands: Required<PluginShape>['commands'];
+    customCommands: Required<PluginRuntimeShape>['commands'];
     disableCodeExportCompat: boolean;
     driver: WebDriver;
     server?: string;
-    windowAPI: WindowAPI;
     windowHandle?: string;
     hooks: WebDriverExecutorHooks;
     implicitWait: number;
     initialized: boolean;
     logger?: Console;
     [state]?: any;
-    init({ baseUrl, logger, variables }: WebDriverExecutorInitOptions): Promise<void>;
+    getDriverSync({ debug, logger, }: Pick<WebDriverExecutorInitOptions, 'debug' | 'logger'>): webdriver.ThenableWebDriver;
+    getDriver({ debug, logger, }: Pick<WebDriverExecutorInitOptions, 'debug' | 'logger'>): Promise<webdriver.WebDriver>;
+    init({ baseUrl, debug, logger, variables, }: WebDriverExecutorInitOptions): Promise<void>;
     cancel(): Promise<void>;
-    cleanup(): Promise<void>;
+    cleanup(persistSession?: boolean): Promise<void>;
     isAlive(): boolean;
     name(command: string): string;
-    executeHook<T extends keyof WebDriverExecutorHooks>(hook: T, ...args: Parameters<NonNullable<WebDriverExecutorHooks[T]>>): Promise<void>;
+    nameTransform(command: string): string;
+    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>;
@@ -102,33 +94,34 @@ export default class WebDriverExecutor {
     doSelectWindow(handleLocator: string): Promise<void>;
     doClose(): Promise<void>;
     doSelectFrame(locator: string): Promise<void>;
-    doSubmit(): Promise<void>;
     doAddSelection(locator: string, optionLocator: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doRemoveSelection(locator: string, optionLocator: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doCheck(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doUncheck(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
-    doClick(locator: string, _: string): Promise<void>;
+    doClick(locator: string, _?: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doClickAt(locator: string, coordString: string, commandObject?: Partial<CommandShape>): Promise<void>;
-    doDoubleClick(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
+    doDoubleClick(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
     doDoubleClickAt(locator: string, coordString: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doDragAndDropToObject(dragLocator: string, dropLocator: string, commandObject?: Partial<CommandShape>): Promise<void>;
-    doMouseDown(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
+    doMouseDown(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
     doMouseDownAt(locator: string, coordString: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doMouseMoveAt(locator: string, coordString: string, commandObject?: Partial<CommandShape>): Promise<void>;
-    doMouseOut(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
-    doMouseOver(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
-    doMouseUp(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
+    doMouseOut(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
+    doMouseOver(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
+    doMouseUp(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
     doMouseUpAt(locator: string, coordString: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doSelect(locator: string, optionLocator: string, commandObject?: Partial<CommandShape>): Promise<void>;
+    doSubmit(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
     doEditContent(locator: string, value: string, commandObject?: Partial<CommandShape>): Promise<void>;
     doType(locator: string, value: string, commandObject?: Partial<CommandShape>): Promise<void>;
     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>;
@@ -148,8 +141,8 @@ export default class WebDriverExecutor {
     doAssert(variableName: string, value: string): Promise<void>;
     doAssertAlert(expectedText: string): Promise<void>;
     doAssertConfirmation(expectedText: string): Promise<void>;
-    doAssertEditable(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
-    doAssertNotEditable(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
+    doAssertEditable(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
+    doAssertNotEditable(locator: string, _?: string, _commandObject?: Partial<CommandShape>): Promise<void>;
     doAssertPrompt(expectedText: string): Promise<void>;
     doAssertTitle(title: string): Promise<void>;
     doAssertElementPresent(locator: string, _: string, commandObject?: Partial<CommandShape>): Promise<void>;
@@ -170,11 +163,12 @@ export default class WebDriverExecutor {
     doRun(): Promise<void>;
     doSetSpeed(): Promise<void>;
     evaluateConditional(script: ScriptShape): Promise<WebDriverExecutorCondEvalResult>;
-    waitForElement(locator: string, fallback?: [string, string][]): Promise<WebElementShape>;
+    elementIsLocated(locator: string, ..._fallbacks: (undefined | [string, string][])[]): Promise<WebElementShape | null>;
+    withCancel<T extends () => Promise<any>>(poller: T): () => Promise<any>;
+    waitForElement(locator: string, ...fallbacks: (undefined | [string, string][])[]): Promise<WebElementShape>;
     isElementEditable(element: WebElementShape): Promise<boolean>;
-    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>;
+    waitForElementVisible(locator: string, timeout: number, ...fallbacks: (undefined | [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":"AAiBA,OAAO,SAAS,EAAE,EAChB,YAAY,EACZ,SAAS,EACT,UAAU,IAAI,eAAe,EAC9B,MAAM,oBAAoB,CAAA;AAS3B,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAShB,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG;IACzD,WAAW,EAAE,MAAM,CAAA;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;CAC5E,CAAA;AAKD,QAAA,MAAM,KAAK,eAAkB,CAAA;AAE7B;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,aAAa,EAAE,CACb,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,IAAI,CAAC,CAAA;CACnB;AAED,MAAM,WAAW,gCAAgC;IAC/C,YAAY,CAAC,EAAE,oBAAoB,CAAA;IACnC,cAAc,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAA;IAC/C,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,KAAK,CAAC,EAAE,sBAAsB,CAAA;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,MAAM,WAAW,+BAA+B;IAC9C,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,iBAAiB,CAAA;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;AAE/D,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAA;IAC/C,cAAc,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAA;IAC9C,eAAe,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAA;IAC/C,mBAAmB,CAAC,EAAE,WAAW,CAAC,0BAA0B,CAAC,CAAA;IAC7D,gBAAgB,CAAC,EAAE,WAAW,CAAC,uBAAuB,CAAC,CAAA;IACvD,gBAAgB,CAAC,EAAE,WAAW,CAAC,uBAAuB,CAAC,CAAA;CACxD;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAA;AAEnD,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,GAAG,EAAE,CAAA;CACZ;AAED,MAAM,CAAC,OAAO,OAAO,iBAAiB;gBACxB,EACV,cAAmB,EACnB,uBAA+B,EAC/B,MAAM,EACN,YAAY,EACZ,MAAM,EACN,KAAU,EACV,YAAY,GACb,EAAE,gCAAgC;IAcnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE,CAAA;IACpC,YAAY,CAAC,EAAE,oBAAoB,CAAA;IACnC,cAAc,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAA;IACxD,uBAAuB,EAAE,OAAO,CAAA;IAEhC,MAAM,EAAE,SAAS,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,EAAE,sBAAsB,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAA;IAEb,aAAa,CAAC,EACZ,KAAK,EACL,MAAM,GACP,EAAE,IAAI,CACL,4BAA4B,EAC5B,OAAO,GAAG,QAAQ,CACnB,GAAG,SAAS,CAAC,iBAAiB;IAmBzB,SAAS,CAAC,EACd,KAAK,EACL,MAAM,GACP,EAAE,IAAI,CAAC,4BAA4B,EAAE,OAAO,GAAG,QAAQ,CAAC;IA6CnD,IAAI,CAAC,EACT,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,GACV,EAAE,4BAA4B;IAYzB,MAAM;IAMN,OAAO,CAAC,cAAc,UAAQ;IAcpC,OAAO;IAMP,IAAI,CAAC,OAAO,EAAE,MAAM;IAgBpB,aAAa,CAAC,OAAO,EAAE,MAAM;IAKvB,WAAW,CAAC,CAAC,SAAS,QAAQ,EAClC,IAAI,EAAE,CAAC,EACP,GAAG,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;IAUvD,aAAa,CAAC,aAAa,EAAE,YAAY;IAOzC,YAAY,CAAC,aAAa,EAAE,YAAY;IAgBxC,gBAAgB,CAAC,OAAO,GAAE,MAAa;IA2B7C,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;IAMrC,IAAI;IAKJ,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,eAAe,CAAC,YAAY,EAAE,MAAM;IAKpC,cAAc,CAAC,aAAa,EAAE,MAAM;IAepC,OAAO;IAIP,aAAa,CAAC,OAAO,EAAE,MAAM;IAgD7B,cAAc,CAClB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAkBrC,iBAAiB,CACrB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAuBrC,OAAO,CACX,OAAO,EAAE,MAAM,EACf,CAAC,EAAE,MAAM,EACT,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAarC,SAAS,CACb,OAAO,EAAE,MAAM,EACf,CAAC,EAAE,MAAM,EACT,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAarC,OAAO,CACX,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAYrC,SAAS,CACb,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAYlC,eAAe,CACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,qBAAqB,CACzB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,WAAW,CACf,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAgBlC,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAerC,UAAU,CACd,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAqDlC,WAAW,CACf,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAelC,SAAS,CACb,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAgBlC,WAAW,CACf,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,QAAQ,CACZ,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAYrC,QAAQ,CACZ,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAqBlC,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAerC,MAAM,CACV,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAYrC,UAAU,CACd,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAarC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAYzD,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAY5D,uBAAuB,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,UAAU,GAAE,OAAO,CAAC,YAAY,CAAM;IAelC,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAkB3D,uBAAuB,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,UAAU,GAAE,OAAO,CAAC,YAAY,CAAM;IASlC,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAY3D,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,UAAU,GAAE,OAAO,CAAC,YAAY,CAAM;IAOlC,WAAW,CAAC,MAAM,EAAE,WAAW;IAI/B,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,gBAAgB,CAAC,EAAE,MAAM;IAU9D,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,gBAAgB,CAAC,EAAE,MAAM;IAYnE,aAAa;IAIb,oBAAoB;IAIpB,cAAc,CAAC,SAAS,CAAC,EAAE,MAAM;IAQjC,qBAAqB;IAIrB,eAAe;IAMf,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKxC,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAU3D,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKrD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAK1C,WAAW,CACf,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAYrC,YAAY,CAAC,QAAQ,EAAE,MAAM;IAK7B,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAYrC,mBAAmB,CAAC,QAAQ,EAAE,MAAM;IAWpC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAS5C,aAAa,CAAC,YAAY,EAAE,MAAM;IAclC,oBAAoB,CAAC,YAAY,EAAE,MAAM;IAczC,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAclC,mBAAmB,CACvB,OAAO,EAAE,MAAM,EACf,CAAC,CAAC,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAclC,cAAc,CAAC,YAAY,EAAE,MAAM;IAcnC,aAAa,CAAC,KAAK,EAAE,MAAM;IAS3B,sBAAsB,CAC1B,OAAO,EAAE,MAAM,EACf,CAAC,EAAE,MAAM,EACT,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAKrC,yBAAyB,CAAC,OAAO,EAAE,MAAM;IAOzC,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,eAAe,CACnB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAiBrC,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,eAAe,CACnB,OAAO,EAAE,MAAM,EACf,CAAC,EAAE,MAAM,EACT,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAarC,kBAAkB,CACtB,OAAO,EAAE,MAAM,EACf,CAAC,EAAE,MAAM,EACT,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAarC,qBAAqB,CACzB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,wBAAwB,CAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAgBrC,qBAAqB,CACzB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAwBrC,wBAAwB,CAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAO,CAAC,YAAY,CAAM;IAsBrC,UAAU;IAIV,MAAM,CAAC,MAAM,EAAE,MAAM;IAMrB,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,KAAK;IAIL,UAAU;IAIV,mBAAmB,CACvB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,+BAA+B,CAAC;IAUrC,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,GAAG,UAAU,EAAE,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,GAChD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAalC,UAAU,CAAC,CAAC,SAAS,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IAqB5C,cAAc,CAClB,OAAO,EAAE,MAAM,EACf,GAAG,SAAS,EAAE,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,GAC/C,OAAO,CAAC,eAAe,CAAC;IAarB,iBAAiB,CAAC,OAAO,EAAE,eAAe;IAS1C,qBAAqB,CACzB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,GAAG,SAAS,EAAE,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE;IAkB5C,WAAW,CACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAO;CAcpC"}