webdriverio 9.6.0 → 9.6.2

package/build/commands/element/isDisplayed.d.ts

@@ -81,11 +81,13 @@
  * </example>
  *
  * @alias element.isDisplayed
- * @param {Boolean} [isWithinViewport=false] set to true to check if element is within viewport
+ * @param {Boolean} [withinViewport=false] `true` to check if the element is within the viewport. `false` by default.
+ * @param {Boolean} [contentVisibilityAuto=true] `true` to check if the element content-visibility property has (or inherits) the value auto, and it is currently skipping its rendering. `true` by default.
+ * @param {Boolean} [opacityProperty=true] `true` to check if the element opacity property has (or inherits) a value of 0. `true` by default.
+ * @param {Boolean} [visibilityProperty=true] `true` to check if the element is invisible due to the value of its visibility property. `true` by default.
  * @return {Boolean} true if element is displayed
  * @uses protocol/elements, protocol/elementIdDisplayed
  * @type state
- *
  */
 export declare function isDisplayed(this: WebdriverIO.Element, commandParams?: IsDisplayedParams): Promise<boolean>;
 interface IsDisplayedParams {

package/build/commands/element/isDisplayed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isDisplayed.d.ts","sourceRoot":"","sources":["../../../src/commands/element/isDisplayed.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwFG;AACH,wBAAsB,WAAW,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,aAAa,GAAE,iBAAkC,oBA8CpD;AASD,UAAU,iBAAiB;IACvB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC/B"}
+{"version":3,"file":"isDisplayed.d.ts","sourceRoot":"","sources":["../../../src/commands/element/isDisplayed.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0FG;AAEH,wBAAsB,WAAW,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,aAAa,GAAE,iBAAkC,oBA8DpD;AASD,UAAU,iBAAiB;IACvB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC/B"}

package/build/constants.d.ts

@@ -1,9 +1,5 @@
 import type { Options, Capabilities } from '@wdio/types';
 import type { RestoreMap } from './types.js';
-export declare enum SupportedAutomationProtocols {
-    webdriver = "webdriver",
-    stub = "./protocol-stub.js"
-}
 export declare const WDIO_DEFAULTS: Options.Definition<Capabilities.WebdriverIOConfig>;
 export declare const W3C_SELECTOR_STRATEGIES: string[];
 export declare const DRIVER_DEFAULT_ENDPOINT: {

package/build/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,oBAAY,4BAA4B;IACpC,SAAS,cAAc;IACvB,IAAI,uBAAuB;CAC9B;AAED,eAAO,MAAM,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,iBAAiB,CA+D5E,CAAA;AAED,eAAO,MAAM,uBAAuB,UAA0E,CAAA;AAE9G,eAAO,MAAM,uBAAuB;;;;;CAKnC,CAAA;AAED,eAAO,MAAM,mBAAmB,2BAA2B,CAAA;AAC3D,eAAO,MAAM,aAAa,QAAQ,CAAA;AAClC,eAAO,MAAM,aAAa,UAAU,CAAA;AAEpC,eAAO,MAAM,YAAY,UAKxB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,sCAA6C,CAAA;AAE1E;;GAEG;AACH,eAAO,MAAM,GAAG;IACZ;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0DG,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,iBAAiB,CAkE5E,CAAA;AAED,eAAO,MAAM,uBAAuB,UAA0E,CAAA;AAE9G,eAAO,MAAM,uBAAuB;;;;;CAKnC,CAAA;AAED,eAAO,MAAM,mBAAmB,2BAA2B,CAAA;AAC3D,eAAO,MAAM,aAAa,QAAQ,CAAA;AAClC,eAAO,MAAM,aAAa,UAAU,CAAA;AAEpC,eAAO,MAAM,YAAY,UAKxB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,sCAA6C,CAAA;AAE1E;;GAEG;AACH,eAAO,MAAM,GAAG;IACZ;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0DG,CAAA"}

package/build/index.js

@@ -269,25 +269,24 @@ var getElements = function getElements2(selector, elemResponse, props = { isReac
 };
 
 // src/constants.ts
+import { resolve } from "import-meta-resolve";
 import { UNICODE_CHARACTERS, HOOK_DEFINITION } from "@wdio/utils";
-var SupportedAutomationProtocols = /* @__PURE__ */ ((SupportedAutomationProtocols2) => {
-  SupportedAutomationProtocols2["webdriver"] = "webdriver";
-  SupportedAutomationProtocols2["stub"] = "./protocol-stub.js";
-  return SupportedAutomationProtocols2;
-})(SupportedAutomationProtocols || {});
 var WDIO_DEFAULTS = {
   /**
    * allows to specify automation protocol
    */
   automationProtocol: {
     type: "string",
-    default: "webdriver" /* webdriver */,
+    default: "webdriver",
     validate: (param) => {
-      if (param.endsWith("driver.js")) {
-        return;
+      if (typeof param !== "string") {
+        throw new Error("automationProtocol should be a string");
       }
-      if (!Object.values(SupportedAutomationProtocols).includes(param.toLowerCase())) {
-        throw new Error('Currently only "webdriver" and "devtools" is supported as automationProtocol, you set "'.concat(param, '"'));
+      try {
+        resolve(param, import.meta.url);
+      } catch (err) {
+        const error = err instanceof Error ? err : new Error("unknown error");
+        throw new Error("Couldn't find automation protocol \"".concat(param, '": ').concat(error.message));
       }
     }
   },
@@ -1108,7 +1107,7 @@ function debug(commandTimeout = 5e3) {
       });
     }
   });
-  return new Promise((resolve) => commandResolve = resolve);
+  return new Promise((resolve2) => commandResolve = resolve2);
 }
 
 // src/commands/browser/deleteCookies.ts
@@ -3019,12 +3018,10 @@ var SessionManager = class {
    * check if session manager should be enabled, if
    */
   isEnabled() {
-    var _a;
     return (
       // we are in a Bidi session
       __privateGet(this, _browser2).isBidi && // we are not running unit tests
-      !process.env.WDIO_UNIT_TESTS && // we are running a WebDriver session
-      ((_a = __privateGet(this, _browser2).options) == null ? void 0 : _a.automationProtocol) === "webdriver"
+      !process.env.WDIO_UNIT_TESTS
     );
   }
   static getSessionManager(browser, Manager) {
@@ -3639,8 +3636,8 @@ var Timer = class {
     __publicField(this, "_timeoutId");
     __publicField(this, "_mainTimeoutId");
     __publicField(this, "_lastError");
-    __privateSet(this, _retPromise, new Promise((resolve, reject) => {
-      this._resolve = resolve;
+    __privateSet(this, _retPromise, new Promise((resolve2, reject) => {
+      this._resolve = resolve2;
       this._reject = reject;
     }));
     this._start();
@@ -4234,7 +4231,7 @@ async function newWindow2(url2, { type = "window", windowName = "", windowFeatur
 
 // src/commands/browser/pause.ts
 function pause(milliseconds = 1e3) {
-  return new Promise((resolve) => setTimeout(resolve, milliseconds));
+  return new Promise((resolve2) => setTimeout(resolve2, milliseconds));
 }
 
 // src/scripts/resq.ts
@@ -4929,7 +4926,7 @@ _type2 = new WeakMap();
 
 // src/session/index.ts
 function registerSessionManager(instance) {
-  if (instance.options.automationProtocol !== "webdriver") {
+  if (typeof instance.capabilities.webSocketUrl !== "string") {
     return;
   }
   return Promise.all([
@@ -6649,18 +6646,26 @@ async function isDisplayed(commandParams = DEFAULT_PARAMS) {
     }
     return await this.isElementDisplayed(this.elementId);
   }
-  const isDisplayed2 = await browser.execute(function checkVisibility(elem, params) {
-    return elem.checkVisibility(params);
-  }, this, commandParams).catch((err) => {
-    if (err.message.includes("checkVisibility is not a function")) {
-      return browser.execute(isElementDisplayed, this);
-    }
-    throw err;
-  });
-  if (isDisplayed2 && (commandParams == null ? void 0 : commandParams.withinViewport)) {
+  let hadToFallback = false;
+  const [isDisplayed2, displayProperty] = await Promise.all([
+    browser.execute(function checkVisibility(elem, params) {
+      return elem.checkVisibility(params);
+    }, this, commandParams).catch((err) => {
+      if (err.message.includes("checkVisibility is not a function")) {
+        hadToFallback = true;
+        return browser.execute(isElementDisplayed, this);
+      }
+      throw err;
+    }),
+    this.getCSSProperty("display")
+  ]);
+  const hasDisplayContentsCSSProperty = displayProperty.value === "contents";
+  const shouldRecheckContentVisibility = !hadToFallback && hasDisplayContentsCSSProperty;
+  const finalResponse = shouldRecheckContentVisibility ? await browser.execute(isElementDisplayed, this).catch(() => false) : isDisplayed2;
+  if (finalResponse && (commandParams == null ? void 0 : commandParams.withinViewport)) {
     return browser.execute(isElementInViewport, this);
   }
-  return isDisplayed2;
+  return finalResponse;
 }
 var DEFAULT_PARAMS = {
   withinViewport: false,
@@ -8574,7 +8579,7 @@ function emulateSessionCapabilities(caps) {
 // src/utils/driver.ts
 var webdriverImport;
 async function getProtocolDriver(options) {
-  if (options.automationProtocol === "./protocol-stub.js" /* stub */) {
+  if (isStub(options.automationProtocol)) {
     return { Driver: ProtocolStub, options };
   }
   if (typeof options.user === "string" && typeof options.key === "string") {
@@ -8617,7 +8622,7 @@ var remote = async function(params, remoteModifier) {
 };
 var attach = async function(attachOptions) {
   const params = {
-    automationProtocol: "webdriver" /* webdriver */,
+    automationProtocol: "webdriver",
     ...attachOptions,
     ...detectBackend(attachOptions.options),
     capabilities: attachOptions.capabilities || {},
@@ -8650,7 +8655,7 @@ var multiremote = async function(params, { automationProtocol } = {}) {
     isW3C: multibrowser.instances[browserNames[0]].isW3C,
     logLevel: multibrowser.instances[browserNames[0]].options.logLevel
   };
-  const ProtocolDriver = automationProtocol && isStub(automationProtocol) ? (await import(
+  const ProtocolDriver = typeof automationProtocol === "string" ? (await import(
     /* @vite-ignore */
     automationProtocol
   )).default : WebDriver;

package/build/node.js

@@ -119,8 +119,8 @@ async function uploadFile(localPath) {
   }
   const zipData = [];
   const source = fs5.createReadStream(localPath);
-  return new Promise((resolve, reject) => {
-    archiver("zip").on("error", (err) => reject(err)).on("data", (data) => zipData.push(data)).on("end", () => this.file(Buffer.concat(zipData).toString("base64")).then((localPath2) => resolve(localPath2), reject)).append(source, { name: path3.basename(localPath) }).finalize();
+  return new Promise((resolve2, reject) => {
+    archiver("zip").on("error", (err) => reject(err)).on("data", (data) => zipData.push(data)).on("end", () => this.file(Buffer.concat(zipData).toString("base64")).then((localPath2) => resolve2(localPath2), reject)).append(source, { name: path3.basename(localPath) }).finalize();
   });
 }
 
@@ -171,8 +171,7 @@ var SessionManager = class {
     return (
       // we are in a Bidi session
       this.#browser.isBidi && // we are not running unit tests
-      !process.env.WDIO_UNIT_TESTS && // we are running a WebDriver session
-      this.#browser.options?.automationProtocol === "webdriver"
+      !process.env.WDIO_UNIT_TESTS
     );
   }
   static getSessionManager(browser, Manager) {
@@ -722,25 +721,24 @@ var getElements = function getElements2(selector, elemResponse, props = { isReac
 };
 
 // src/constants.ts
+import { resolve } from "import-meta-resolve";
 import { UNICODE_CHARACTERS, HOOK_DEFINITION } from "@wdio/utils";
-var SupportedAutomationProtocols = /* @__PURE__ */ ((SupportedAutomationProtocols2) => {
-  SupportedAutomationProtocols2["webdriver"] = "webdriver";
-  SupportedAutomationProtocols2["stub"] = "./protocol-stub.js";
-  return SupportedAutomationProtocols2;
-})(SupportedAutomationProtocols || {});
 var WDIO_DEFAULTS = {
   /**
    * allows to specify automation protocol
    */
   automationProtocol: {
     type: "string",
-    default: "webdriver" /* webdriver */,
+    default: "webdriver",
     validate: (param) => {
-      if (param.endsWith("driver.js")) {
-        return;
+      if (typeof param !== "string") {
+        throw new Error("automationProtocol should be a string");
       }
-      if (!Object.values(SupportedAutomationProtocols).includes(param.toLowerCase())) {
-        throw new Error(`Currently only "webdriver" and "devtools" is supported as automationProtocol, you set "${param}"`);
+      try {
+        resolve(param, import.meta.url);
+      } catch (err) {
+        const error = err instanceof Error ? err : new Error("unknown error");
+        throw new Error(`Couldn't find automation protocol "${param}": ${error.message}`);
       }
     }
   },
@@ -1547,7 +1545,7 @@ function debug(commandTimeout = 5e3) {
       });
     }
   });
-  return new Promise((resolve) => commandResolve = resolve);
+  return new Promise((resolve2) => commandResolve = resolve2);
 }
 
 // src/commands/browser/deleteCookies.ts
@@ -3776,8 +3774,8 @@ var Timer = class {
     this._timeout = _timeout;
     this._fn = _fn;
     this._leading = _leading;
-    this.#retPromise = new Promise((resolve, reject) => {
-      this._resolve = resolve;
+    this.#retPromise = new Promise((resolve2, reject) => {
+      this._resolve = resolve2;
       this._reject = reject;
     });
     this._start();
@@ -4356,7 +4354,7 @@ async function newWindow(url2, { type = "window", windowName = "", windowFeature
 
 // src/commands/browser/pause.ts
 function pause(milliseconds = 1e3) {
-  return new Promise((resolve) => setTimeout(resolve, milliseconds));
+  return new Promise((resolve2) => setTimeout(resolve2, milliseconds));
 }
 
 // src/commands/browser/react$$.ts
@@ -4946,7 +4944,7 @@ var Dialog = class {
 
 // src/session/index.ts
 function registerSessionManager(instance) {
-  if (instance.options.automationProtocol !== "webdriver") {
+  if (typeof instance.capabilities.webSocketUrl !== "string") {
     return;
   }
   return Promise.all([
@@ -6379,18 +6377,26 @@ async function isDisplayed(commandParams = DEFAULT_PARAMS) {
     }
     return await this.isElementDisplayed(this.elementId);
   }
-  const isDisplayed2 = await browser.execute(function checkVisibility(elem, params) {
-    return elem.checkVisibility(params);
-  }, this, commandParams).catch((err) => {
-    if (err.message.includes("checkVisibility is not a function")) {
-      return browser.execute(isElementDisplayedLegacyScript, this);
-    }
-    throw err;
-  });
-  if (isDisplayed2 && commandParams?.withinViewport) {
+  let hadToFallback = false;
+  const [isDisplayed2, displayProperty] = await Promise.all([
+    browser.execute(function checkVisibility(elem, params) {
+      return elem.checkVisibility(params);
+    }, this, commandParams).catch((err) => {
+      if (err.message.includes("checkVisibility is not a function")) {
+        hadToFallback = true;
+        return browser.execute(isElementDisplayedLegacyScript, this);
+      }
+      throw err;
+    }),
+    this.getCSSProperty("display")
+  ]);
+  const hasDisplayContentsCSSProperty = displayProperty.value === "contents";
+  const shouldRecheckContentVisibility = !hadToFallback && hasDisplayContentsCSSProperty;
+  const finalResponse = shouldRecheckContentVisibility ? await browser.execute(isElementDisplayedLegacyScript, this).catch(() => false) : isDisplayed2;
+  if (finalResponse && commandParams?.withinViewport) {
     return browser.execute(isElementInViewportScript, this);
   }
-  return isDisplayed2;
+  return finalResponse;
 }
 var DEFAULT_PARAMS = {
   withinViewport: false,
@@ -8260,7 +8266,7 @@ function emulateSessionCapabilities(caps) {
 // src/utils/driver.ts
 var webdriverImport;
 async function getProtocolDriver(options) {
-  if (options.automationProtocol === "./protocol-stub.js" /* stub */) {
+  if (isStub(options.automationProtocol)) {
     return { Driver: ProtocolStub, options };
   }
   if (typeof options.user === "string" && typeof options.key === "string") {
@@ -8303,7 +8309,7 @@ var remote = async function(params, remoteModifier) {
 };
 var attach = async function(attachOptions) {
   const params = {
-    automationProtocol: "webdriver" /* webdriver */,
+    automationProtocol: "webdriver",
     ...attachOptions,
     ...detectBackend(attachOptions.options),
     capabilities: attachOptions.capabilities || {},
@@ -8336,7 +8342,7 @@ var multiremote = async function(params, { automationProtocol } = {}) {
     isW3C: multibrowser.instances[browserNames[0]].isW3C,
     logLevel: multibrowser.instances[browserNames[0]].options.logLevel
   };
-  const ProtocolDriver = automationProtocol && isStub(automationProtocol) ? (await import(
+  const ProtocolDriver = typeof automationProtocol === "string" ? (await import(
     /* @vite-ignore */
     automationProtocol
   )).default : WebDriver;

package/build/session/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session/session.ts"],"names":[],"mappings":"AAEA,qBAAa,cAAc;;IAIvB;;;;;;OAMG;gBACS,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM;IAiBvD,eAAe;IAIf,UAAU,IAAI,OAAO;IAIrB;;OAEG;IACH,SAAS;IAWT,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC;CAgBxI"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session/session.ts"],"names":[],"mappings":"AAEA,qBAAa,cAAc;;IAIvB;;;;;;OAMG;gBACS,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM;IAiBvD,eAAe;IAIf,UAAU,IAAI,OAAO;IAIrB;;OAEG;IACH,SAAS;IAST,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC;CAgBxI"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "9.6.0",
+  "version": "9.6.2",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -45,7 +45,6 @@
   ],
   "main": "./build/index.cjs",
   "type": "module",
-  "module": "./build/index.js",
   "exports": {
     ".": {
       "types": "./build/index.d.ts",
@@ -78,12 +77,12 @@
   "dependencies": {
     "@types/node": "^20.11.30",
     "@types/sinonjs__fake-timers": "^8.1.5",
-    "@wdio/config": "9.5.0",
+    "@wdio/config": "9.6.2",
     "@wdio/logger": "9.4.4",
     "@wdio/protocols": "9.4.4",
     "@wdio/repl": "9.4.4",
-    "@wdio/types": "9.5.0",
-    "@wdio/utils": "9.5.0",
+    "@wdio/types": "9.6.2",
+    "@wdio/utils": "9.6.2",
     "archiver": "^7.0.1",
     "aria-query": "^5.3.0",
     "cheerio": "^1.0.0-rc.12",
@@ -102,7 +101,7 @@
     "rgb2hex": "0.2.5",
     "serialize-error": "^11.0.3",
     "urlpattern-polyfill": "^10.0.0",
-    "webdriver": "9.6.0"
+    "webdriver": "9.6.2"
   },
   "peerDependencies": {
     "puppeteer-core": "^22.3.0"
@@ -112,5 +111,5 @@
       "optional": true
     }
   },
-  "gitHead": "bea75d896564c2285012cd7c77948dce6ab45804"
+  "gitHead": "918477b20c54c27b98655b08f55a2a304495f0fa"
 }