@wdio/utils 8.0.0-alpha.537 → 8.0.0-alpha.558

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

@@ -1,5 +1,5 @@
 import type { executeHooksWithArgs, executeAsync } from '../shim';
-export declare type HookFnArgs<T> = (ctx: T) => [unknown, T];
+export type HookFnArgs<T> = (ctx: T) => [unknown, T];
 export interface WrapperMethods {
     executeHooksWithArgs: typeof executeHooksWithArgs;
     executeAsync: typeof executeAsync;
@@ -19,7 +19,7 @@ export interface AfterHookParam<T> {
 export interface JasmineContext {
     failedExpectations: Array<Record<string, unknown>>;
 }
-export declare type SpecArguments = (
+export type SpecArguments = (
 /**
  * e.g. before(() => { ... })
  */

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/test-framework/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEjE,oBAAY,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;AAEpD,MAAM,WAAW,cAAc;IAC3B,oBAAoB,EAAE,OAAO,oBAAoB,CAAA;IACjD,YAAY,EAAE,OAAO,YAAY,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IACzB,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,GAAG,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAC9B,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAA;IAC/B,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAC9B;AAED,MAAM,WAAW,cAAc,CAAC,CAAC;IAC7B,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAA;IAC9B,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAC7B;AAED,MAAM,WAAW,cAAc;IAC3B,kBAAkB,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CACrD;AAED,oBAAY,aAAa,GAAG;AACxB;;GAEG;AACH;IAAC,QAAQ;CAAC;AACV;;GAEG;AACH;IAAC,QAAQ;IAAE,MAAM;CAAC;AAClB;;GAEG;AACH;IAAC,MAAM;IAAE,QAAQ;CAAC;AAClB;;GAEG;AACH;IAAC,MAAM;IAAE,QAAQ;IAAE,MAAM;CAAC,CAC7B,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/test-framework/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEjE,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;AAEpD,MAAM,WAAW,cAAc;IAC3B,oBAAoB,EAAE,OAAO,oBAAoB,CAAA;IACjD,YAAY,EAAE,OAAO,YAAY,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IACzB,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,GAAG,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAC9B,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAA;IAC/B,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAC9B;AAED,MAAM,WAAW,cAAc,CAAC,CAAC;IAC7B,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAA;IAC9B,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAC7B;AAED,MAAM,WAAW,cAAc;IAC3B,kBAAkB,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CACrD;AAED,MAAM,MAAM,aAAa,GAAG;AACxB;;GAEG;AACH;IAAC,QAAQ;CAAC;AACV;;GAEG;AACH;IAAC,QAAQ;IAAE,MAAM;CAAC;AAClB;;GAEG;AACH;IAAC,MAAM;IAAE,QAAQ;CAAC;AAClB;;GAEG;AACH;IAAC,MAAM;IAAE,QAAQ;IAAE,MAAM;CAAC,CAC7B,CAAA"}

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,aAAa,CAAA;AAQpD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE;IAAE,sBAAsB,CAAC,EAAE;QAAE,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,QAsCzH;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UA+BrE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAE,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;EAapF;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAE,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,WA8B/D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAE,GAAG,EAAE,GAAG,wGAExC;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,CA2BtF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAE,EAAE,EAAE,QAAQ,WAE5C;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAE,IAAI,EAAE,GAAG,EAAE,SAE1C;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,WAanC;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,UAAW,MAAM,YAWtC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,mCAAoD,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,aAAa,CAAA;AAQpD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE;IAAE,sBAAsB,CAAC,EAAE;QAAE,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,QAsCzH;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UA+BrE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAE,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;EAapF;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAE,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,WA8B/D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAE,GAAG,EAAE,GAAG,wGAExC;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,CA8DtF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAE,EAAE,EAAE,QAAQ,WAE5C;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAE,IAAI,EAAE,GAAG,EAAE,SAE1C;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,WAanC;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,UAAW,MAAM,YAWtC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,mCAAoD,CAAA"}

package/build/utils.js

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
@@ -158,19 +159,53 @@ export async function safeImport(name) {
          * also allows to link the package to a random place and have plugins
          * imported correctly (for dev purposes).
          */
+        const localNodeModules = path.join(process.cwd(), 'node_modules');
         /* istanbul ignore if */
-        if (require.resolve) {
-            requirePath = await require.resolve(name);
-            if (!requirePath.startsWith('file://')) {
-                requirePath = pathToFileURL(requirePath).href;
-            }
+        if (!require.resolve.paths(name)?.includes(localNodeModules)) {
+            const resolveLocation = [
+                ...(require.resolve.paths(name) || []),
+                localNodeModules
+            ];
+            /**
+             * don't set requireOpts when running unit tests as it
+             * confuses Jest require magic
+             */
+            const requireOpts = process.env.VITEST_WORKER_ID
+                ? {}
+                : { paths: resolveLocation };
+            requirePath = require.resolve(name, requireOpts);
+        }
+        else {
+            requirePath = require.resolve(name);
+        }
+        if (!requirePath.startsWith('file://')) {
+            requirePath = pathToFileURL(requirePath).href;
         }
     }
     catch (err) {
         return null;
     }
     try {
-        return await import(requirePath);
+        const pkg = await import(requirePath);
+        /**
+         * CJS packages build with TS imported through an ESM context can end up being this:
+         *
+         * [Module: null prototype] {
+         *   __esModule: true,
+         *   default: {
+         *       launcher: [class SmokeServiceLauncher],
+         *       default: [class SmokeService]
+         *   },
+         *   launcher: [class SmokeServiceLauncher]
+         * }
+         *
+         * In order to not have the testrunner ignore importing a service we should double check if
+         * a nested default is given and return that.
+         */
+        if (pkg.default && pkg.default.default) {
+            return pkg.default;
+        }
+        return pkg;
     }
     catch (e) {
         throw new Error(`Couldn't initialise "${name}".\n${e.stack}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "8.0.0-alpha.537+c2761a175",
+  "version": "8.0.0-alpha.558+9156ec0f4",
   "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",
@@ -27,12 +27,12 @@
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "dependencies": {
-    "@wdio/logger": "8.0.0-alpha.537+c2761a175",
-    "@wdio/types": "8.0.0-alpha.537+c2761a175",
+    "@wdio/logger": "8.0.0-alpha.558+9156ec0f4",
+    "@wdio/types": "8.0.0-alpha.558+9156ec0f4",
     "p-iteration": "^1.1.8"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c2761a17597c5dfbd349445fc203183fb004c3f5"
+  "gitHead": "9156ec0f422b7e784ea148e569fe423ba21a0355"
 }