@wdio/utils 9.22.0 → 9.23.1

package/README.md

@@ -1,4 +1,4 @@
-WDIO Repl
+WDIO Utils
 =========
 
-> A WDIO helper utility to provide a repl interface WebdriverIO
+> A WDIO helper utility to provide several utility functions used across the project.

package/build/index.js

@@ -1099,15 +1099,16 @@ function wrapCommand(commandName, fn) {
 }
 async function executeAsync(fn, retries, args = [], timeout = 2e4) {
   this.wdioRetries = retries.attempts;
+  let done = false;
+  let timer;
   try {
     const runnableTimeout = this?._runnable?._timeout;
     const frameworkTimeout = runnableTimeout ?? globalThis.jasmine?.DEFAULT_TIMEOUT_INTERVAL ?? timeout;
     const _timeout = (frameworkTimeout ?? timeout) - TIME_BUFFER;
-    let done = false;
     const result = await Promise.race([
       fn.apply(this, args),
       new Promise((resolve, reject) => {
-        setTimeout(() => {
+        timer = setTimeout(() => {
           if (done) {
             resolve();
           } else {
@@ -1117,14 +1118,21 @@ async function executeAsync(fn, retries, args = [], timeout = 2e4) {
       })
     ]);
     done = true;
+    if (timer) {
+      clearTimeout(timer);
+    }
     if (result !== null && typeof result === "object" && "finally" in result && typeof result.finally === "function") {
       result.catch((err) => err);
     }
     return await result;
   } catch (err) {
+    done = true;
+    if (timer) {
+      clearTimeout(timer);
+    }
     if (retries.limit > retries.attempts) {
       retries.attempts++;
-      return await executeAsync.call(this, fn, retries, args);
+      return await executeAsync.call(this, fn, retries, args, timeout);
     }
     throw err;
   }
@@ -1174,6 +1182,7 @@ var testFrameworkFnWrapper = async function({ executeHooksWithArgs: executeHooks
   let result;
   let error;
   let skip = false;
+  let autoSkipError;
   const testStart = Date.now();
   try {
     result = await executeAsync2.call(this, specFn, retries, specFnArgs, timeout);
@@ -1195,6 +1204,7 @@ var testFrameworkFnWrapper = async function({ executeHooksWithArgs: executeHooks
       error = err;
     } else {
       skip = true;
+      autoSkipError = _err;
     }
   }
   const duration = Date.now() - testStart;
@@ -1214,6 +1224,9 @@ var testFrameworkFnWrapper = async function({ executeHooksWithArgs: executeHooks
   if (error && !error.matcherName) {
     throw error;
   }
+  if (skip && autoSkipError) {
+    throw autoSkipError;
+  }
   return result;
 };
 var filterStackTrace = (stack) => {

package/build/shim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAuBhE;;;GAGG;AACH,UAAU,mBAAoB,SAAQ,QAAQ,CAAC,KAAK;IAChD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAC,UAAU,CAAA;IAC3B,SAAS,EAAE,QAAQ,CAAA;IACnB,EAAE,EAAE,QAAQ,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACnC;AAED,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,GAAE,QAAQ,GAAG,QAAQ,EAAO,EAAE,IAAI,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAuE9J;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAiOpG;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,mBAAmB,EACzB,EAAE,EAAE,QAAQ,EACZ,OAAO,EAAE,UAAU,CAAC,WAAW,EAC/B,IAAI,GAAE,OAAO,EAAO,EACpB,OAAO,GAAE,MAAc,GACxB,OAAO,CAAC,OAAO,CAAC,CA8ClB"}
+{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAuBhE;;;GAGG;AACH,UAAU,mBAAoB,SAAQ,QAAQ,CAAC,KAAK;IAChD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAC,UAAU,CAAA;IAC3B,SAAS,EAAE,QAAQ,CAAA;IACnB,EAAE,EAAE,QAAQ,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACnC;AAED,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,GAAE,QAAQ,GAAG,QAAQ,EAAO,EAAE,IAAI,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAuE9J;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAiOpG;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,mBAAmB,EACzB,EAAE,EAAE,QAAQ,EACZ,OAAO,EAAE,UAAU,CAAC,WAAW,EAC/B,IAAI,GAAE,OAAO,EAAO,EACpB,OAAO,GAAE,MAAc,GACxB,OAAO,CAAC,OAAO,CAAC,CA0DlB"}

package/build/test-framework/testFnWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testFnWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testFnWrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,cAAc,EACjB,MAAM,YAAY,CAAA;AAEnB,OAAO,CAAC,MAAM,CAAC;IAGX,IAAI,kCAAkC,EAAE,GAAG,GAAG,SAAS,CAAA;IAEvD,IAAI,kBAAkB,EAAE,GAAG,GAAG,SAAS,CAAA;CAC1C;AAUD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,aAAa,GACtB,MAAM,OAAO,EACb,GAAG,MAAM,CACL,MAAM,EACN,YAAY,EACZ,eAAe,CAAC,OAAO,CAAC,EACxB,cAAc,CAAC,OAAO,CAAC,EACvB,MAAM,EACN,MAAM,EACN,MAAM,CAAC,EACP,MAAM,CAAC,CACV,iBAGJ,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,GAC/B,MAAM,OAAO,EACb,wCAAwC,cAAc,EACtD,MAAM,MAAM,EACZ,wBAAwB,YAAY,EACpC,4BAA4B,eAAe,CAAC,OAAO,CAAC,EACpD,0BAA0B,cAAc,CAAC,OAAO,CAAC,EACjD,KAAK,MAAM,EACX,mBAAc,EACd,WAAW,MAAM,EACjB,UAAU,MAAM,iBA8DnB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,MAAM,KAAG,MAMhD,CAAA"}
+{"version":3,"file":"testFnWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testFnWrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,cAAc,EACjB,MAAM,YAAY,CAAA;AAEnB,OAAO,CAAC,MAAM,CAAC;IAGX,IAAI,kCAAkC,EAAE,GAAG,GAAG,SAAS,CAAA;IAEvD,IAAI,kBAAkB,EAAE,GAAG,GAAG,SAAS,CAAA;CAC1C;AAUD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,aAAa,GACtB,MAAM,OAAO,EACb,GAAG,MAAM,CACL,MAAM,EACN,YAAY,EACZ,eAAe,CAAC,OAAO,CAAC,EACxB,cAAc,CAAC,OAAO,CAAC,EACvB,MAAM,EACN,MAAM,EACN,MAAM,CAAC,EACP,MAAM,CAAC,CACV,iBAGJ,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,GAC/B,MAAM,OAAO,EACb,wCAAwC,cAAc,EACtD,MAAM,MAAM,EACZ,wBAAwB,YAAY,EACpC,4BAA4B,eAAe,CAAC,OAAO,CAAC,EACpD,0BAA0B,cAAc,CAAC,OAAO,CAAC,EACjD,KAAK,MAAM,EACX,mBAAc,EACd,WAAW,MAAM,EACjB,UAAU,MAAM,iBAmEnB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,MAAM,KAAG,MAMhD,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "9.22.0",
+  "version": "9.23.1",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@puppeteer/browsers": "^2.2.0",
     "@wdio/logger": "9.18.0",
-    "@wdio/types": "9.20.0",
+    "@wdio/types": "9.23.1",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^7.0.3",
     "edgedriver": "^6.1.2",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c858cd9cfb667283c325c4ac722a0227138acc0"
+  "gitHead": "19ac2c1dd86f3bdd967bc6c22c5bcdd78907b988"
 }