@wdio/utils 7.13.2 → 7.16.3

package/build/initialisePlugin.js

@@ -16,7 +16,7 @@ function initialisePlugin(name, type) {
      * directly import packages that are scoped or start with an absolute path
      */
     if (name[0] === '@' || path_1.default.isAbsolute(name)) {
-        const service = utils_1.safeRequire(name);
+        const service = (0, utils_1.safeRequire)(name);
         if (service) {
             return service;
         }
@@ -27,14 +27,14 @@ function initialisePlugin(name, type) {
     /**
      * check for scoped version of plugin first (e.g. @wdio/sauce-service)
      */
-    const scopedPlugin = utils_1.safeRequire(`@wdio/${name.toLowerCase()}-${type}`);
+    const scopedPlugin = (0, utils_1.safeRequire)(`@wdio/${name.toLowerCase()}-${type}`);
     if (scopedPlugin) {
         return scopedPlugin;
     }
     /**
      * check for old type of
      */
-    const plugin = utils_1.safeRequire(`wdio-${name.toLowerCase()}-${type}`);
+    const plugin = (0, utils_1.safeRequire)(`wdio-${name.toLowerCase()}-${type}`);
     if (plugin) {
         return plugin;
     }

package/build/initialiseServices.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initialiseWorkerService = exports.initialiseLauncherService = void 0;
 const logger_1 = __importDefault(require("@wdio/logger"));
 const initialisePlugin_1 = __importDefault(require("./initialisePlugin"));
-const log = logger_1.default('@wdio/utils:initialiseServices');
+const log = (0, logger_1.default)('@wdio/utils:initialiseServices');
 /**
  * Maps list of services of a config file into a list of actionable objects
  * @param  {Object}    config            config of running session
@@ -56,7 +56,7 @@ function initialiseServices(services) {
          * ```
          */
         log.debug(`initialise service "${serviceName}" as NPM package`);
-        const service = initialisePlugin_1.default(serviceName, 'service');
+        const service = (0, initialisePlugin_1.default)(serviceName, 'service');
         initialisedServices.push([service, serviceConfig, serviceName]);
     }
     return initialisedServices;

package/build/monad.js

@@ -20,7 +20,7 @@ function WebDriver(options, modifier, propertiesObject = {}) {
     const scopeType = SCOPE_TYPES[((_a = propertiesObject.scope) === null || _a === void 0 ? void 0 : _a.value) || 'browser'];
     delete propertiesObject.scope;
     const prototype = Object.create(scopeType.prototype);
-    const log = logger_1.default('webdriver');
+    const log = (0, logger_1.default)('webdriver');
     const eventHandler = new events_1.EventEmitter();
     const EVENTHANDLER_FUNCTIONS = Object.getPrototypeOf(eventHandler);
     /**
@@ -138,7 +138,7 @@ function WebDriver(options, modifier, propertiesObject = {}) {
      */
     unit.lift = function (name, func, proto, origCommand) {
         (proto || prototype)[name] = function next(...args) {
-            log.info('COMMAND', utils_1.commandCallStructure(name, args));
+            log.info('COMMAND', (0, utils_1.commandCallStructure)(name, args));
             /**
              * set name of function for better error stack
              */

package/build/shim.d.ts

@@ -7,6 +7,7 @@ interface Retries {
 declare global {
     var _HAS_FIBER_CONTEXT: boolean;
     var browser: any;
+    var expectAsync: any;
 }
 declare global {
     namespace NodeJS {

package/build/shim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AAOA,QAAA,IAAI,kBAAkB,SAAQ,CAAA;AAC9B,QAAA,IAAI,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAK,OAAO,CAAA;AAEhI,UAAU,OAAO;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACnB;AAUD,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,kBAAkB,EAAE,OAAO,CAAA;IAC/B,IAAI,OAAO,EAAE,GAAG,CAAA;CACnB;AAED,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM,CAAC;QACb,UAAU,MAAM;YACZ,MAAM,EAAE,GAAG,CAAA;YACX,WAAW,EAAE,GAAG,CAAA;SACnB;KACJ;CACJ;AAeD,wBAAgB,eAAe,CAAE,MAAM,CAAC,EAAE,GAAG,EAAE,WAAW,WAAa,OAgBtE;AAUD,eAAO,IAAI,QAAQ,SAAQ,CAAA;AAC3B,eAAO,IAAI,SAAS,SAAQ,CAAA;AAoB5B,QAAA,IAAI,oBAAoB,gBAAyD,MAAM,UAAS,QAAQ,GAAG,QAAQ,EAAE,SAAa,GAAG,EAAE,2BA+CtI,CAAA;AAED,QAAA,IAAI,mBAAmB,OAAiB,QAAQ,YACrB,GAAG,WAAW,GAAG,EAAE,iBAI7C,CAAA;AAED;;;;GAIG;AACH,QAAA,IAAI,WAAW,mBAAwC,MAAM,MAAM,QAAQ,eAAa,GAAG,eAmL1F,CAAA;AAED;;;;;;;GAOG;AACH,iBAAe,aAAa,CAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAwB3G;AAED;;;;;;;GAOG;AACH,iBAAe,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAkCzG;AAED,QAAA,IAAI,WAAW,sBAAgB,CAAA;AAE/B;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAE,EAAE,EAAE,QAAQ,UACjB,OAAO,WAAW,GAAG,EAAE,SA0BjD;AAeD,OAAO,EACH,oBAAoB,EACpB,mBAAmB,EACnB,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,OAAO,EACV,CAAA"}
+{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AAOA,QAAA,IAAI,kBAAkB,SAAQ,CAAA;AAC9B,QAAA,IAAI,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAK,OAAO,CAAA;AAEhI,UAAU,OAAO;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACnB;AAUD,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,kBAAkB,EAAE,OAAO,CAAA;IAC/B,IAAI,OAAO,EAAE,GAAG,CAAA;IAChB,IAAI,WAAW,EAAE,GAAG,CAAA;CACvB;AAED,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM,CAAC;QACb,UAAU,MAAM;YACZ,MAAM,EAAE,GAAG,CAAA;YACX,WAAW,EAAE,GAAG,CAAA;SACnB;KACJ;CACJ;AAeD,wBAAgB,eAAe,CAAE,MAAM,CAAC,EAAE,GAAG,EAAE,WAAW,WAAa,OAgBtE;AAUD,eAAO,IAAI,QAAQ,SAAQ,CAAA;AAC3B,eAAO,IAAI,SAAS,SAAQ,CAAA;AAoB5B,QAAA,IAAI,oBAAoB,gBAAyD,MAAM,UAAS,QAAQ,GAAG,QAAQ,EAAE,SAAa,GAAG,EAAE,2BA+CtI,CAAA;AAED,QAAA,IAAI,mBAAmB,OAAiB,QAAQ,YACrB,GAAG,WAAW,GAAG,EAAE,iBAI7C,CAAA;AAED;;;;GAIG;AACH,QAAA,IAAI,WAAW,mBAAwC,MAAM,MAAM,QAAQ,eAAa,GAAG,eAmL1F,CAAA;AAED;;;;;;;GAOG;AACH,iBAAe,aAAa,CAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAwB3G;AAED;;;;;;;GAOG;AACH,iBAAe,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAuCzG;AAED,QAAA,IAAI,WAAW,sBAAgB,CAAA;AAE/B;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAE,EAAE,EAAE,QAAQ,UACjB,OAAO,WAAW,GAAG,EAAE,SA0BjD;AAeD,OAAO,EACH,oBAAoB,EACpB,mBAAmB,EACnB,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,OAAO,EACV,CAAA"}

package/build/shim.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runSync = exports.executeAsync = exports.executeSync = exports.hasWdioSyncSupport = exports.wrapCommand = exports.runFnInFiberContext = exports.executeHooksWithArgs = exports.switchSyncFlag = exports.asyncSpec = exports.runAsync = exports.expectAsyncShim = void 0;
 const p_iteration_1 = __importDefault(require("p-iteration"));
 const logger_1 = __importDefault(require("@wdio/logger"));
-const log = logger_1.default('@wdio/utils:shim');
+const log = (0, logger_1.default)('@wdio/utils:shim');
 let inCommandHook = false;
 let hasWdioSyncSupport = false;
 exports.hasWdioSyncSupport = hasWdioSyncSupport;
@@ -293,12 +293,12 @@ async function executeSyncFn(fn, retries, args = []) {
         }
         return res;
     }
-    catch (e) {
+    catch (err) {
         if (retries.limit > retries.attempts) {
             retries.attempts++;
             return await executeSyncFn.call(this, fn, retries, args);
         }
-        return Promise.reject(e);
+        return Promise.reject(err);
     }
 }
 /**
@@ -313,8 +313,10 @@ async function executeAsync(fn, retries, args = []) {
     const isJasmine = global.jasmine && global.expectAsync;
     const asyncSpecBefore = exports.asyncSpec;
     this.wdioRetries = retries.attempts;
+    // @ts-ignore
     expectSync = global.expect;
     if (isJasmine) {
+        // @ts-ignore
         global.expect = expectAsyncShim;
     }
     try {
@@ -322,22 +324,25 @@ async function executeAsync(fn, retries, args = []) {
         exports.asyncSpec = true;
         const result = fn.apply(this, args);
         if (result && typeof result.finally === 'function') {
-            result.finally(() => (exports.asyncSpec = asyncSpecBefore));
+            result
+                .finally(() => (exports.asyncSpec = asyncSpecBefore))
+                .catch((err) => err);
         }
         else {
             exports.asyncSpec = asyncSpecBefore;
         }
         return await result;
     }
-    catch (e) {
+    catch (err) {
         if (retries.limit > retries.attempts) {
             retries.attempts++;
             return await executeAsync.call(this, fn, retries, args);
         }
-        throw e;
+        throw err;
     }
     finally {
         if (isJasmine) {
+            // @ts-ignore
             global.expect = expectSync;
         }
     }

package/build/test-framework/testFnWrapper.js

@@ -34,14 +34,14 @@ exports.testFnWrapper = testFnWrapper;
 const testFrameworkFnWrapper = async function ({ executeHooksWithArgs, executeAsync, runSync }, type, { specFn, specFnArgs }, { beforeFn, beforeFnArgs }, { afterFn, afterFnArgs }, cid, repeatTest = 0) {
     const retries = { attempts: 0, limit: repeatTest };
     const beforeArgs = beforeFnArgs(this);
-    await errorHandler_1.logHookError(`Before${type}`, await executeHooksWithArgs(`before${type}`, beforeFn, beforeArgs), cid);
+    await (0, errorHandler_1.logHookError)(`Before${type}`, await executeHooksWithArgs(`before${type}`, beforeFn, beforeArgs), cid);
     let promise;
     let result;
     let error;
     /**
      * user wants handle async command using promises, no need to wrap in fiber context
      */
-    if (utils_1.isFunctionAsync(specFn) || !runSync) {
+    if ((0, utils_1.isFunctionAsync)(specFn) || !runSync) {
         promise = executeAsync.call(this, specFn, retries, specFnArgs);
     }
     else {
@@ -71,7 +71,7 @@ const testFrameworkFnWrapper = async function ({ executeHooksWithArgs, executeAs
         duration,
         passed: !error
     });
-    await errorHandler_1.logHookError(`After${type}`, await executeHooksWithArgs(`after${type}`, afterFn, [...afterArgs]), cid);
+    await (0, errorHandler_1.logHookError)(`After${type}`, await executeHooksWithArgs(`after${type}`, afterFn, [...afterArgs]), cid);
     if (error && !error.matcherName) {
         throw error;
     }

package/build/test-framework/testInterfaceWrapper.d.ts

@@ -64,5 +64,5 @@ export declare const wrapTestFunction: (this: unknown, origFn: Function, isSpec:
  * @param  {String}   cid           cid
  * @param  {Object}   scope         the scope to run command from, defaults to global
  */
-export declare const runTestInFiberContext: (this: unknown, isSpec: boolean, beforeFn: Function | Function[], beforeArgsFn: HookFnArgs<unknown>, afterFn: Function | Function[], afterArgsFn: HookFnArgs<unknown>, fnName: string, cid: string, scope?: NodeJS.Global & typeof globalThis) => void;
+export declare const runTestInFiberContext: (this: unknown, isSpec: boolean, beforeFn: Function | Function[], beforeArgsFn: HookFnArgs<unknown>, afterFn: Function | Function[], afterArgsFn: HookFnArgs<unknown>, fnName: string, cid: string, scope?: typeof globalThis) => void;
 //# sourceMappingURL=testInterfaceWrapper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"testInterfaceWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testInterfaceWrapper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EACR,UAAU,EAIV,aAAa,EAChB,MAAM,SAAS,CAAA;AAIhB;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO,SACV,OAAO,UACL,QAAQ,UACR,QAAQ,YACN,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,OAC3B,MAAM,cACC,MAAM,WACT,MAAM,QAgClB,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO,SACV,OAAO,aACF,MAAM,UACT,QAAQ,UACR,QAAQ,YACN,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,OAC3B,MAAM,cACC,MAAM,WACT,MAAM,QAgClB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,gBAAgB,SACnB,OAAO,UACL,QAAQ,UACR,OAAO,YACL,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,OAC3B,MAAM,wBAEwB,aAAa,QAgEnD,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qBAAqB,SACxB,OAAO,UACL,OAAO,YACL,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,UACxB,MAAM,OACT,MAAM,oDAcd,CAAA"}
+{"version":3,"file":"testInterfaceWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testInterfaceWrapper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EACR,UAAU,EAIV,aAAa,EAChB,MAAM,SAAS,CAAA;AAIhB;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO,SACV,OAAO,UACL,QAAQ,UACR,QAAQ,YACN,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,OAC3B,MAAM,cACC,MAAM,WACT,MAAM,QAgClB,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO,SACV,OAAO,aACF,MAAM,UACT,QAAQ,UACR,QAAQ,YACN,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,OAC3B,MAAM,cACC,MAAM,WACT,MAAM,QAgClB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,gBAAgB,SACnB,OAAO,UACL,QAAQ,UACR,OAAO,YACL,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,OAC3B,MAAM,wBAEwB,aAAa,QAgEnD,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qBAAqB,SACxB,OAAO,UACL,OAAO,YACL,QAAQ,GAAG,QAAQ,EAAE,gBACjB,WAAW,OAAO,CAAC,WACxB,QAAQ,GAAG,QAAQ,EAAE,eACjB,WAAW,OAAO,CAAC,UACxB,MAAM,OACT,MAAM,oCAcd,CAAA"}

package/build/test-framework/testInterfaceWrapper.js

@@ -29,7 +29,7 @@ const runHook = function (hookFn, origFn, beforeFn, beforeFnArgs, afterFn, after
     return origFn(function (...hookFnArgs) {
         return testFnWrapper_1.testFnWrapper.call(this, 'Hook', {
             specFn: hookFn,
-            specFnArgs: utils_1.filterSpecArgs(hookFnArgs)
+            specFnArgs: (0, utils_1.filterSpecArgs)(hookFnArgs)
         }, {
             beforeFn,
             beforeFnArgs
@@ -58,7 +58,7 @@ const runSpec = function (specTitle, specFn, origFn, beforeFn, beforeFnArgs, aft
     return origFn(specTitle, function (...specFnArgs) {
         return testFnWrapper_1.testFnWrapper.call(this, 'Test', {
             specFn,
-            specFnArgs: utils_1.filterSpecArgs(specFnArgs)
+            specFnArgs: (0, utils_1.filterSpecArgs)(specFnArgs)
         }, {
             beforeFn,
             beforeFnArgs
@@ -114,14 +114,14 @@ const wrapTestFunction = function (origFn, isSpec, beforeFn, beforeArgsFn, after
         const specTitle = specArguments[0];
         if (isSpec) {
             if (specFn) {
-                return exports.runSpec(specTitle, specFn, origFn, beforeFn, beforeArgsFn, afterFn, afterArgsFn, cid, retryCnt, timeout);
+                return (0, exports.runSpec)(specTitle, specFn, origFn, beforeFn, beforeArgsFn, afterFn, afterArgsFn, cid, retryCnt, timeout);
             }
             /**
              * if specFn is undefined we are dealing with a pending function
              */
             return origFn(specTitle);
         }
-        return exports.runHook(specFn, origFn, beforeFn, beforeArgsFn, afterFn, afterArgsFn, cid, retryCnt, timeout);
+        return (0, exports.runHook)(specFn, origFn, beforeFn, beforeArgsFn, afterFn, afterArgsFn, cid, retryCnt, timeout);
     };
 };
 exports.wrapTestFunction = wrapTestFunction;
@@ -141,7 +141,7 @@ exports.wrapTestFunction = wrapTestFunction;
  */
 const runTestInFiberContext = function (isSpec, beforeFn, beforeArgsFn, afterFn, afterArgsFn, fnName, cid, scope = global) {
     const origFn = scope[fnName];
-    scope[fnName] = exports.wrapTestFunction(origFn, isSpec, beforeFn, beforeArgsFn, afterFn, afterArgsFn, cid);
+    scope[fnName] = (0, exports.wrapTestFunction)(origFn, isSpec, beforeFn, beforeArgsFn, afterFn, afterArgsFn, cid);
     addMochaCommands(origFn, scope[fnName]);
 };
 exports.runTestInFiberContext = runTestInFiberContext;

package/build/utils.js

@@ -177,7 +177,7 @@ function safeRequire(name) {
             requirePath = require.resolve(name);
         }
     }
-    catch (e) {
+    catch (err) {
         return null;
     }
     try {
@@ -238,7 +238,7 @@ const canAccess = (file) => {
         fs_1.default.accessSync(file);
         return true;
     }
-    catch (e) {
+    catch (err) {
         return false;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "7.13.2",
+  "version": "7.16.3",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -23,13 +23,13 @@
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "dependencies": {
-    "@wdio/logger": "7.7.0",
-    "@wdio/types": "7.13.2",
+    "@wdio/logger": "7.16.0",
+    "@wdio/types": "7.16.3",
     "p-iteration": "^1.1.8"
   },
   "publishConfig": {
     "access": "public"
   },
   "types": "./build/index.d.ts",
-  "gitHead": "1ea2b99e2e335c0fb517c726cd92da970636aaf9"
+  "gitHead": "23e2af933060e829f03d7518089c377571c654e3"
 }