webdriverio 9.14.0 → 9.16.0

package/build/index.js

@@ -3345,77 +3345,15 @@ function byContextId(context, contextId) {
   return context.context === contextId;
 }
 
-// src/session/polyfill.ts
-import logger4 from "@wdio/logger";
-function getPolyfillManager(browser2) {
-  return SessionManager.getSessionManager(browser2, PolyfillManager);
-}
-var log4 = logger4("webdriverio:PolyfillManager");
+// src/scripts/polyfill.ts
 var polyfillFn = function webdriverioPolyfill() {
-  const __defProp2 = Object.defineProperty;
-  const __name = function(target, value) {
-    return __defProp2(target, "name", { value, configurable: true });
+  var __defProp2 = Object.defineProperty;
+  var __name = function(target, _value) {
+    return __defProp2(target, "name", { value: _value, configurable: true });
   };
-  const __globalThis = typeof globalThis === "object" && globalThis || typeof window === "object" && window;
+  var __globalThis = typeof globalThis === "object" && globalThis || typeof window === "object" && window;
   __globalThis.__name = __name;
 };
-var _initialize, _browser4, _scriptsRegisteredInContexts, _PolyfillManager_instances, registerScripts_fn;
-var _PolyfillManager = class _PolyfillManager extends SessionManager {
-  constructor(browser2) {
-    super(browser2, _PolyfillManager.name);
-    __privateAdd(this, _PolyfillManager_instances);
-    __privateAdd(this, _initialize);
-    __privateAdd(this, _browser4);
-    __privateAdd(this, _scriptsRegisteredInContexts, /* @__PURE__ */ new Set());
-    __privateSet(this, _browser4, browser2);
-    if (!this.isEnabled()) {
-      __privateSet(this, _initialize, Promise.resolve(true));
-      return;
-    }
-    __privateGet(this, _browser4).on("browsingContext.contextCreated", __privateMethod(this, _PolyfillManager_instances, registerScripts_fn).bind(this));
-    __privateSet(this, _initialize, Promise.all([
-      __privateGet(this, _browser4).browsingContextGetTree({}).then(({ contexts }) => {
-        return Promise.all(contexts.map((context) => __privateMethod(this, _PolyfillManager_instances, registerScripts_fn).call(this, context)));
-      }),
-      __privateGet(this, _browser4).sessionSubscribe({
-        events: ["browsingContext.contextCreated"]
-      })
-    ]).then(() => true, () => false));
-  }
-  removeListeners() {
-    super.removeListeners();
-    __privateGet(this, _browser4).off("browsingContext.contextCreated", __privateMethod(this, _PolyfillManager_instances, registerScripts_fn).bind(this));
-  }
-  async initialize() {
-    return __privateGet(this, _initialize);
-  }
-};
-_initialize = new WeakMap();
-_browser4 = new WeakMap();
-_scriptsRegisteredInContexts = new WeakMap();
-_PolyfillManager_instances = new WeakSet();
-registerScripts_fn = function(context) {
-  if (__privateGet(this, _scriptsRegisteredInContexts).has(context.context)) {
-    return;
-  }
-  const functionDeclaration = createFunctionDeclarationFromString(polyfillFn);
-  log4.info("Adding polyfill script to context with id ".concat(context.context));
-  __privateGet(this, _scriptsRegisteredInContexts).add(context.context);
-  return Promise.all([
-    !context.parent ? __privateGet(this, _browser4).scriptAddPreloadScript({
-      functionDeclaration,
-      contexts: [context.context]
-    }).catch(() => {
-    }) : Promise.resolve(),
-    __privateGet(this, _browser4).scriptCallFunction({
-      functionDeclaration,
-      target: context,
-      awaitPromise: false
-    }).catch(() => {
-    })
-  ]);
-};
-var PolyfillManager = _PolyfillManager;
 
 // src/commands/browser/execute.ts
 async function execute(script, ...args) {
@@ -3475,8 +3413,8 @@ async function executeAsync(script, ...args) {
 }
 
 // src/commands/browser/getCookies.ts
-import logger5 from "@wdio/logger";
-var log5 = logger5("webdriverio");
+import logger4 from "@wdio/logger";
+var log4 = logger4("webdriverio");
 async function getCookies(filter) {
   const usesMultipleFilter = Array.isArray(filter) && filter.length > 1;
   if (!this.isBidi || usesMultipleFilter) {
@@ -3495,7 +3433,7 @@ async function getCookiesClassic(names) {
   }
   const usesMultipleFilter = Array.isArray(names) && names.length > 1;
   if (usesMultipleFilter) {
-    log5.warn(
+    log4.warn(
       "Passing a string array as filter for `getCookies` is deprecated and its support will be removed in an upcoming version of WebdriverIO!"
     );
     const allCookies2 = await this.getAllCookies();
@@ -3517,7 +3455,7 @@ function getCookieFilter(names) {
   }
   return (Array.isArray(names) ? names : [names]).map((filter) => {
     if (typeof filter === "string") {
-      log5.warn("Passing string values into `getCookie` is deprecated and its support will be removed in an upcoming version of WebdriverIO!");
+      log4.warn("Passing string values into `getCookie` is deprecated and its support will be removed in an upcoming version of WebdriverIO!");
       return { name: filter };
     }
     return filter;
@@ -3525,9 +3463,9 @@ function getCookieFilter(names) {
 }
 
 // src/commands/browser/getPuppeteer.ts
-import logger6 from "@wdio/logger";
+import logger5 from "@wdio/logger";
 import { userImport } from "@wdio/utils";
-var log6 = logger6("webdriverio");
+var log5 = logger5("webdriverio");
 var DEBUG_PIPE_FLAG = "remote-debugging-pipe";
 async function getPuppeteer() {
   var _a, _b, _c, _d, _e, _f;
@@ -3541,7 +3479,7 @@ async function getPuppeteer() {
     );
   }
   if ((_a = this.puppeteer) == null ? void 0 : _a.connected) {
-    log6.debug("Reusing existing puppeteer session");
+    log5.debug("Reusing existing puppeteer session");
     return this.puppeteer;
   }
   const { headers } = this.options;
@@ -3651,7 +3589,7 @@ async function keys(value) {
 import { getBrowserObject as getBrowserObject6 } from "@wdio/utils";
 
 // src/utils/interception/index.ts
-import logger7 from "@wdio/logger";
+import logger6 from "@wdio/logger";
 import { URLPattern } from "urlpattern-polyfill";
 
 // src/utils/Timer.ts
@@ -3824,16 +3762,16 @@ function getPatternParam(pattern, key) {
 }
 
 // src/utils/interception/index.ts
-var log7 = logger7("WebDriverInterception");
+var log6 = logger6("WebDriverInterception");
 var hasSubscribedToEvents = false;
-var _pattern, _mockId, _filterOptions, _browser5, _eventHandler, _restored, _requestOverwrites, _respondOverwrites, _calls, _responseBodies, _WebDriverInterception_instances, emit_fn, addEventHandler_fn, handleBeforeRequestSent_fn, handleResponseStarted_fn, handleNetworkProvideResponseError_fn, isRequestMatching_fn, matchesFilterOptions_fn, _setOverwrite, ensureNotRestored_fn;
+var _pattern, _mockId, _filterOptions, _browser4, _eventHandler, _restored, _requestOverwrites, _respondOverwrites, _calls, _responseBodies, _WebDriverInterception_instances, emit_fn, addEventHandler_fn, handleBeforeRequestSent_fn, handleResponseStarted_fn, handleNetworkProvideResponseError_fn, isRequestMatching_fn, matchesFilterOptions_fn, _setOverwrite, ensureNotRestored_fn;
 var _WebDriverInterception = class _WebDriverInterception {
   constructor(pattern, mockId, filterOptions, browser2) {
     __privateAdd(this, _WebDriverInterception_instances);
     __privateAdd(this, _pattern);
     __privateAdd(this, _mockId);
     __privateAdd(this, _filterOptions);
-    __privateAdd(this, _browser5);
+    __privateAdd(this, _browser4);
     __privateAdd(this, _eventHandler, /* @__PURE__ */ new Map());
     __privateAdd(this, _restored, false);
     __privateAdd(this, _requestOverwrites, []);
@@ -3849,7 +3787,7 @@ var _WebDriverInterception = class _WebDriverInterception {
     __privateSet(this, _pattern, pattern);
     __privateSet(this, _mockId, mockId);
     __privateSet(this, _filterOptions, filterOptions);
-    __privateSet(this, _browser5, browser2);
+    __privateSet(this, _browser4, browser2);
     browser2.on("network.beforeRequestSent", __privateMethod(this, _WebDriverInterception_instances, handleBeforeRequestSent_fn).bind(this));
     browser2.on("network.responseStarted", __privateMethod(this, _WebDriverInterception_instances, handleResponseStarted_fn).bind(this));
   }
@@ -3862,7 +3800,7 @@ var _WebDriverInterception = class _WebDriverInterception {
           "network.responseStarted"
         ]
       });
-      log7.info("subscribed to network events");
+      log6.info("subscribed to network events");
       hasSubscribedToEvents = true;
     }
     const interception = await browser2.networkAddIntercept({
@@ -3889,7 +3827,7 @@ var _WebDriverInterception = class _WebDriverInterception {
       return null;
     }
     if (/[^A-Za-z0-9+/=\s]/.test(body.value)) {
-      log7.warn("Invalid base64 data for request ".concat(requestId));
+      log6.warn("Invalid base64 data for request ".concat(requestId));
       return null;
     }
     return Buffer.from(body.value, "base64");
@@ -3942,11 +3880,11 @@ var _WebDriverInterception = class _WebDriverInterception {
     this.reset();
     __privateSet(this, _respondOverwrites, []);
     __privateSet(this, _restored, true);
-    const handle = await __privateGet(this, _browser5).getWindowHandle();
-    log7.trace("Restoring mock for ".concat(handle));
+    const handle = await __privateGet(this, _browser4).getWindowHandle();
+    log6.trace("Restoring mock for ".concat(handle));
     SESSION_MOCKS[handle].delete(this);
     if (__privateGet(this, _mockId)) {
-      await __privateGet(this, _browser5).networkRemoveIntercept({ intercept: __privateGet(this, _mockId) });
+      await __privateGet(this, _browser4).networkRemoveIntercept({ intercept: __privateGet(this, _mockId) });
     }
     return this;
   }
@@ -4026,19 +3964,19 @@ var _WebDriverInterception = class _WebDriverInterception {
     return this;
   }
   waitForResponse({
-    timeout = __privateGet(this, _browser5).options.waitforTimeout,
-    interval = __privateGet(this, _browser5).options.waitforInterval,
+    timeout = __privateGet(this, _browser4).options.waitforTimeout,
+    interval = __privateGet(this, _browser4).options.waitforInterval,
     timeoutMsg
   } = {}) {
     if (typeof timeout !== "number") {
-      timeout = __privateGet(this, _browser5).options.waitforTimeout;
+      timeout = __privateGet(this, _browser4).options.waitforTimeout;
     }
     if (typeof interval !== "number") {
-      interval = __privateGet(this, _browser5).options.waitforInterval;
+      interval = __privateGet(this, _browser4).options.waitforInterval;
     }
     const fn = async () => this.calls && (await this.calls).length > 0;
     const timer = new Timer_default(interval, timeout, fn, true);
-    return __privateGet(this, _browser5).call(() => timer.catch((e) => {
+    return __privateGet(this, _browser4).call(() => timer.catch((e) => {
       if (e.message === "timeout") {
         if (typeof timeoutMsg === "string") {
           throw new Error(timeoutMsg);
@@ -4052,7 +3990,7 @@ var _WebDriverInterception = class _WebDriverInterception {
 _pattern = new WeakMap();
 _mockId = new WeakMap();
 _filterOptions = new WeakMap();
-_browser5 = new WeakMap();
+_browser4 = new WeakMap();
 _eventHandler = new WeakMap();
 _restored = new WeakMap();
 _requestOverwrites = new WeakMap();
@@ -4081,7 +4019,7 @@ handleBeforeRequestSent_fn = function(request) {
     return;
   }
   if (!__privateMethod(this, _WebDriverInterception_instances, matchesFilterOptions_fn).call(this, request)) {
-    return __privateGet(this, _browser5).networkContinueRequest({
+    return __privateGet(this, _browser4).networkContinueRequest({
       request: request.request.request
     });
   }
@@ -4091,16 +4029,16 @@ handleBeforeRequestSent_fn = function(request) {
     const { overwrite, abort } = __privateGet(this, _requestOverwrites)[0].once ? __privateGet(this, _requestOverwrites).shift() || {} : __privateGet(this, _requestOverwrites)[0];
     if (abort) {
       __privateMethod(this, _WebDriverInterception_instances, emit_fn).call(this, "fail", request.request.request);
-      return __privateGet(this, _browser5).networkFailRequest({ request: request.request.request });
+      return __privateGet(this, _browser4).networkFailRequest({ request: request.request.request });
     }
     __privateMethod(this, _WebDriverInterception_instances, emit_fn).call(this, "overwrite", request);
-    return __privateGet(this, _browser5).networkContinueRequest({
+    return __privateGet(this, _browser4).networkContinueRequest({
       request: request.request.request,
       ...overwrite ? parseOverwrite(overwrite, request) : {}
     });
   }
   __privateMethod(this, _WebDriverInterception_instances, emit_fn).call(this, "continue", request.request.request);
-  return __privateGet(this, _browser5).networkContinueRequest({
+  return __privateGet(this, _browser4).networkContinueRequest({
     request: request.request.request
   });
 };
@@ -4110,14 +4048,14 @@ handleResponseStarted_fn = function(request) {
   }
   if (!__privateMethod(this, _WebDriverInterception_instances, matchesFilterOptions_fn).call(this, request)) {
     __privateMethod(this, _WebDriverInterception_instances, emit_fn).call(this, "continue", request.request.request);
-    return __privateGet(this, _browser5).networkProvideResponse({
+    return __privateGet(this, _browser4).networkProvideResponse({
       request: request.request.request
     }).catch(__privateMethod(this, _WebDriverInterception_instances, handleNetworkProvideResponseError_fn));
   }
   __privateGet(this, _calls).push(request);
   if (__privateGet(this, _respondOverwrites).length === 0 || !__privateGet(this, _respondOverwrites)[0].overwrite) {
     __privateMethod(this, _WebDriverInterception_instances, emit_fn).call(this, "continue", request.request.request);
-    return __privateGet(this, _browser5).networkProvideResponse({
+    return __privateGet(this, _browser4).networkProvideResponse({
       request: request.request.request
     }).catch(__privateMethod(this, _WebDriverInterception_instances, handleNetworkProvideResponseError_fn));
   }
@@ -4128,13 +4066,13 @@ handleResponseStarted_fn = function(request) {
     if (responseData.body) {
       __privateGet(this, _responseBodies).set(request.request.request, responseData.body);
     }
-    return __privateGet(this, _browser5).networkProvideResponse({
+    return __privateGet(this, _browser4).networkProvideResponse({
       request: request.request.request,
       ...responseData
     }).catch(__privateMethod(this, _WebDriverInterception_instances, handleNetworkProvideResponseError_fn));
   }
   __privateMethod(this, _WebDriverInterception_instances, emit_fn).call(this, "continue", request.request.request);
-  return __privateGet(this, _browser5).networkProvideResponse({
+  return __privateGet(this, _browser4).networkProvideResponse({
     request: request.request.request
   }).catch(__privateMethod(this, _WebDriverInterception_instances, handleNetworkProvideResponseError_fn));
 };
@@ -4224,11 +4162,11 @@ async function mock(url2, filterOptions) {
 }
 
 // src/commands/browser/mockClearAll.ts
-import logger8 from "@wdio/logger";
-var log8 = logger8("webdriverio:mockClearAll");
+import logger7 from "@wdio/logger";
+var log7 = logger7("webdriverio:mockClearAll");
 async function mockClearAll() {
   for (const [handle, mocks] of Object.entries(SESSION_MOCKS)) {
-    log8.trace("Clearing mocks for ".concat(handle));
+    log7.trace("Clearing mocks for ".concat(handle));
     for (const mock2 of mocks) {
       mock2.clear();
     }
@@ -4236,11 +4174,11 @@ async function mockClearAll() {
 }
 
 // src/commands/browser/mockRestoreAll.ts
-import logger9 from "@wdio/logger";
-var log9 = logger9("webdriverio:mockRestoreAll");
+import logger8 from "@wdio/logger";
+var log8 = logger8("webdriverio:mockRestoreAll");
 async function mockRestoreAll() {
   for (const [handle, mocks] of Object.entries(SESSION_MOCKS)) {
-    log9.trace("Clearing mocks for ".concat(handle));
+    log8.trace("Clearing mocks for ".concat(handle));
     for (const mock2 of mocks) {
       await mock2.restore();
     }
@@ -4256,8 +4194,8 @@ function newWindow(url2, windowName, windowFeatures) {
 }
 
 // src/commands/browser/newWindow.ts
-import logger10 from "@wdio/logger";
-var log10 = logger10("webdriverio:newWindow");
+import logger9 from "@wdio/logger";
+var log9 = logger9("webdriverio:newWindow");
 var WAIT_FOR_NEW_HANDLE_TIMEOUT = 3e3;
 async function newWindow2(url2, { type = "window", windowName = "", windowFeatures = "" } = {}) {
   if (typeof url2 !== "string") {
@@ -4267,7 +4205,7 @@ async function newWindow2(url2, { type = "window", windowName = "", windowFeatur
     throw new Error("Invalid type '".concat(type, "' provided to newWindow command. Use either 'tab' or 'window'"));
   }
   if (windowName || windowFeatures) {
-    log10.warn('The "windowName" and "windowFeatures" options are deprecated and only supported in WebDriver Classic sessions.');
+    log9.warn('The "windowName" and "windowFeatures" options are deprecated and only supported in WebDriver Classic sessions.');
   }
   if (this.isMobile) {
     throw new Error("newWindow command is not supported on mobile platforms");
@@ -4374,6 +4312,70 @@ async function react$3(selector, { props = {}, state = {} } = {}) {
 // src/commands/browser/reloadSession.ts
 import logger12 from "@wdio/logger";
 
+// src/session/polyfill.ts
+import logger10 from "@wdio/logger";
+function getPolyfillManager(browser2) {
+  return SessionManager.getSessionManager(browser2, PolyfillManager);
+}
+var log10 = logger10("webdriverio:PolyfillManager");
+var _initialize, _browser5, _scriptsRegisteredInContexts, _PolyfillManager_instances, registerScripts_fn;
+var _PolyfillManager = class _PolyfillManager extends SessionManager {
+  constructor(browser2) {
+    super(browser2, _PolyfillManager.name);
+    __privateAdd(this, _PolyfillManager_instances);
+    __privateAdd(this, _initialize);
+    __privateAdd(this, _browser5);
+    __privateAdd(this, _scriptsRegisteredInContexts, /* @__PURE__ */ new Set());
+    __privateSet(this, _browser5, browser2);
+    if (!this.isEnabled()) {
+      __privateSet(this, _initialize, Promise.resolve(true));
+      return;
+    }
+    __privateGet(this, _browser5).on("browsingContext.contextCreated", __privateMethod(this, _PolyfillManager_instances, registerScripts_fn).bind(this));
+    __privateSet(this, _initialize, Promise.all([
+      __privateGet(this, _browser5).browsingContextGetTree({}).then(({ contexts }) => {
+        return Promise.all(contexts.map((context) => __privateMethod(this, _PolyfillManager_instances, registerScripts_fn).call(this, context)));
+      }),
+      __privateGet(this, _browser5).sessionSubscribe({
+        events: ["browsingContext.contextCreated"]
+      })
+    ]).then(() => true, () => false));
+  }
+  removeListeners() {
+    super.removeListeners();
+    __privateGet(this, _browser5).off("browsingContext.contextCreated", __privateMethod(this, _PolyfillManager_instances, registerScripts_fn).bind(this));
+  }
+  async initialize() {
+    return __privateGet(this, _initialize);
+  }
+};
+_initialize = new WeakMap();
+_browser5 = new WeakMap();
+_scriptsRegisteredInContexts = new WeakMap();
+_PolyfillManager_instances = new WeakSet();
+registerScripts_fn = function(context) {
+  if (__privateGet(this, _scriptsRegisteredInContexts).has(context.context)) {
+    return;
+  }
+  const functionDeclaration = createFunctionDeclarationFromString(polyfillFn);
+  log10.info("Adding polyfill script to context with id ".concat(context.context));
+  __privateGet(this, _scriptsRegisteredInContexts).add(context.context);
+  return Promise.all([
+    !context.parent ? __privateGet(this, _browser5).scriptAddPreloadScript({
+      functionDeclaration,
+      contexts: [context.context]
+    }).catch(() => {
+    }) : Promise.resolve(),
+    __privateGet(this, _browser5).scriptCallFunction({
+      functionDeclaration,
+      target: context,
+      awaitPromise: false
+    }).catch(() => {
+    })
+  ]);
+};
+var PolyfillManager = _PolyfillManager;
+
 // src/session/shadowRoot.ts
 import logger11 from "@wdio/logger";
 
@@ -5083,7 +5085,8 @@ import logger13 from "@wdio/logger";
 var log13 = logger13("webdriverio");
 function scroll(x = 0, y = 0) {
   if (!x && !y) {
-    return log13.warn('"scroll" command was called with no parameters, skipping execution');
+    log13.warn('"scroll" command was called with no parameters, skipping execution');
+    return Promise.resolve();
   }
   if (this.isMobile) {
     return this.execute((x2, y2) => window.scrollBy(x2, y2), x, y);
@@ -5508,7 +5511,7 @@ async function throttleNetwork(params) {
   if (this.isSauce) {
     const browser2 = getBrowserObject9(this);
     await browser2.sauceThrottleNetwork(params);
-    return null;
+    return;
   }
   const failedConnectionMessage = "No Puppeteer connection could be established which is required to use this command";
   await this.getPuppeteer();
@@ -5524,7 +5527,7 @@ async function throttleNetwork(params) {
     "Network.emulateNetworkConditions",
     typeof params === "string" ? NETWORK_PRESETS[params] : params
   );
-  return null;
+  return;
 }
 
 // src/commands/browser/touchAction.ts
@@ -6272,13 +6275,17 @@ var $$2 = $$;
 var $2 = $;
 
 // src/commands/element/addValue.ts
+import { CommandRuntimeOptions } from "webdriver";
 var VALID_TYPES = ["string", "number"];
-function addValue(value) {
+function addValue(value, options) {
   if (!VALID_TYPES.includes(typeof value)) {
     throw new Error(
       'The setValue/addValue command only take string or number values. If you like to use special characters, use the "keys" command.'
     );
   }
+  if (options) {
+    return this.elementSendKeys(this.elementId, value.toString(), new CommandRuntimeOptions(options));
+  }
   return this.elementSendKeys(this.elementId, value.toString());
 }
 
@@ -6447,16 +6454,18 @@ async function dragAndDrop(target, options = {}) {
 // src/commands/element/execute.ts
 import { getBrowserObject as getBrowserObject17 } from "@wdio/utils";
 async function execute2(script, ...args) {
-  const browser2 = getBrowserObject17(this);
-  await this.waitForExist();
-  return browser2.execute(script, this, ...args);
+  const scope = this;
+  const browser2 = getBrowserObject17(scope);
+  await scope.waitForExist();
+  return browser2.execute(script, scope, ...args);
 }
 
 // src/commands/element/executeAsync.ts
 import { getBrowserObject as getBrowserObject18 } from "@wdio/utils";
 async function executeAsync2(script, ...args) {
-  const browser2 = getBrowserObject18(this);
-  return browser2.executeAsync(script, this, ...args);
+  const scope = this;
+  const browser2 = getBrowserObject18(scope);
+  return browser2.executeAsync(script, scope, ...args);
 }
 
 // src/commands/element/getAttribute.ts
@@ -6637,9 +6646,8 @@ async function getHTML2(options = {}) {
       { [ELEMENT_KEY12]: elemId },
       shadowId ? { [ELEMENT_KEY12]: shadowId } : void 0
     ]);
-    const { html, shadowElementHTML } = await browser2.execute(
+    const { html, shadowElementHTML } = await this.execute(
       getHTMLShadow,
-      { [ELEMENT_KEY12]: this.elementId },
       includeSelectorTag,
       elementsWithShadowRootAndIdVerified
     );
@@ -7508,9 +7516,9 @@ async function selectByVisibleText(text) {
 }
 
 // src/commands/element/setValue.ts
-async function setValue(value) {
+async function setValue(value, options) {
   await this.clearValue();
-  return this.addValue(value);
+  return this.addValue(value, options);
 }
 
 // src/commands/element/shadow$$.ts
@@ -9060,10 +9068,8 @@ var remote = async function(params, remoteModifier) {
   const prototype = getPrototype("browser");
   const instance = await Driver.newSession(options, modifier, prototype, wrapCommand3);
   if (params.framework && !isStub(params.automationProtocol)) {
-    const origAddCommand = instance.addCommand.bind(instance);
-    instance.addCommand = (name, fn, attachToElement) => origAddCommand(name, fn, attachToElement);
-    const origOverwriteCommand = instance.overwriteCommand.bind(instance);
-    instance.overwriteCommand = (name, fn, attachToElement) => origOverwriteCommand(name, fn, attachToElement);
+    instance.addCommand = instance.addCommand.bind(instance);
+    instance.overwriteCommand = instance.overwriteCommand.bind(instance);
   }
   instance.addLocatorStrategy = addLocatorStrategyHandler(instance);
   await registerSessionManager(instance);
@@ -9121,7 +9127,7 @@ var multiremote = async function(params, { automationProtocol } = {}) {
     const origAddCommand = driver.addCommand.bind(driver);
     driver.addCommand = (name, fn, attachToElement) => {
       driver.instances.forEach(
-        (instance) => driver.getInstance(instance).addCommand(name, fn, attachToElement)
+        (instanceName) => driver.getInstance(instanceName).addCommand(name, fn, attachToElement)
       );
       return origAddCommand(
         name,