@wdio/utils 8.0.8 → 8.0.10

package/build/initialiseServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialiseServices.d.ts","sourceRoot":"","sources":["../src/initialiseServices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAqFlE;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,mBAAmB;;;GAiDvK;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,IAAI,EAAE,YAAY,CAAC,mBAAmB,EACtC,qBAAqB,GAAE,MAAM,EAAO,GACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CA6BrC"}
+{"version":3,"file":"initialiseServices.d.ts","sourceRoot":"","sources":["../src/initialiseServices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAqFlE;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,mBAAmB;;;GAmDvK;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,IAAI,EAAE,YAAY,CAAC,mBAAmB,EACtC,qBAAqB,GAAE,MAAM,EAAO,GACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CA+BrC"}

package/build/initialiseServices.js

@@ -76,6 +76,7 @@ function sanitizeServiceArray(service) {
 export async function initialiseLauncherService(config, caps) {
     const ignoredWorkerServices = [];
     const launcherServices = [];
+    let serviceLabelToBeInitialised = 'unknown';
     try {
         const services = await initialiseServices(config.services.map(sanitizeServiceArray));
         for (const [service, serviceConfig, serviceName] of services) {
@@ -83,6 +84,7 @@ export async function initialiseLauncherService(config, caps) {
              * add custom services as object or function
              */
             if (typeof service === 'object' && !serviceName) {
+                serviceLabelToBeInitialised = 'object';
                 launcherServices.push(service);
                 continue;
             }
@@ -91,16 +93,19 @@ export async function initialiseLauncherService(config, caps) {
              */
             const Launcher = service.launcher;
             if (typeof Launcher === 'function' && serviceName) {
+                serviceLabelToBeInitialised = `"${serviceName}"`;
                 launcherServices.push(new Launcher(serviceConfig, caps, config));
             }
             /**
              * add class service from passed in class
              */
             if (typeof service === 'function' && !serviceName) {
+                serviceLabelToBeInitialised = `"${service.constructor?.name || service.toString()}"`;
                 launcherServices.push(new service(serviceConfig, caps, config));
             }
             /**
-             * check if service has a default export
+             * check if service has a default export, if not we can later filter it out so the
+             * service module is not even loaded in the worker process
              */
             if (serviceName &&
                 typeof service.default !== 'function' &&
@@ -110,10 +115,7 @@ export async function initialiseLauncherService(config, caps) {
         }
     }
     catch (err) {
-        /**
-         * don't break if service can't be initiated
-         */
-        log.error(err);
+        throw new Error(`Failed to initilialise launcher service ${serviceLabelToBeInitialised}: ${err.stack}`);
     }
     return { ignoredWorkerServices, launcherServices };
 }
@@ -126,29 +128,32 @@ export async function initialiseLauncherService(config, caps) {
  * @return {Object[]}                      list if worker initiated worker services
  */
 export async function initialiseWorkerService(config, caps, ignoredWorkerServices = []) {
+    let serviceLabelToBeInitialised = 'unknown';
+    const initialisedServices = [];
     const workerServices = config.services
         .map(sanitizeServiceArray)
         .filter(([serviceName]) => !ignoredWorkerServices.includes(serviceName));
     try {
         const services = await initialiseServices(workerServices);
-        return services.map(([service, serviceConfig, serviceName]) => {
+        for (const [service, serviceConfig, serviceName] of services) {
             /**
              * add object service
              */
             if (typeof service === 'object' && !serviceName) {
-                return service;
+                serviceLabelToBeInitialised = 'object';
+                initialisedServices.push(service);
+                continue;
             }
             const Service = service.default || service;
             if (typeof Service === 'function') {
-                return new Service(serviceConfig, caps, config);
+                serviceLabelToBeInitialised = serviceName || Service.constructor?.name || Service.toString();
+                initialisedServices.push(new Service(serviceConfig, caps, config));
+                continue;
             }
-        }).filter((service) => Boolean(service));
+        }
+        return initialisedServices;
     }
     catch (err) {
-        /**
-         * don't break if service can't be initiated
-         */
-        log.error(err);
-        return [];
+        throw new Error(`Failed to initilialise service ${serviceLabelToBeInitialised}: ${err.stack}`);
     }
 }

package/build/shim.d.ts

@@ -13,7 +13,7 @@ declare global {
         }
     }
 }
-declare let executeHooksWithArgs: <T>(hookName: string, hooks?: Function | Function[], args?: any[]) => Promise<(Error | T)[]>;
+declare let executeHooksWithArgs: <T>(this: any, hookName: string, hooks?: Function | Function[], args?: any[]) => Promise<(Error | T)[]>;
 /**
  * wrap command to enable before and after command to be executed
  * @param commandName name of the command (e.g. getTitle)

package/build/shim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AAQA,UAAU,OAAO;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACnB;AAED,OAAO,CAAC,MAAM,CAAC;IACX,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;AAaD,QAAA,IAAI,oBAAoB,gBAAyD,MAAM,UAAS,QAAQ,GAAG,QAAQ,EAAE,SAAa,GAAG,EAAE,2BA6CtI,CAAA;AAED;;;;GAIG;AACH,QAAA,IAAI,WAAW,mBAAwC,MAAM,MAAM,QAAQ,eAAa,GAAG,eAkL1F,CAAA;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,CAmBzG;AAED,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,YAAY,GACf,CAAA"}
+{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AAQA,UAAU,OAAO;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACnB;AAED,OAAO,CAAC,MAAM,CAAC;IACX,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;AAaD,QAAA,IAAI,oBAAoB,YAAqD,GAAG,YAAY,MAAM,UAAS,QAAQ,GAAG,QAAQ,EAAE,SAAa,GAAG,EAAE,2BA6CjJ,CAAA;AAED;;;;GAIG;AACH,QAAA,IAAI,WAAW,mBAAwC,MAAM,MAAM,QAAQ,eAAa,GAAG,eAkL1F,CAAA;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,CAmBzG;AAED,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,YAAY,GACf,CAAA"}

package/build/shim.js

@@ -28,7 +28,7 @@ let executeHooksWithArgs = async function executeHooksWithArgsShim(hookName, hoo
     const hooksPromises = hooks.map((hook) => new Promise((resolve) => {
         let result;
         try {
-            result = hook.apply(null, args);
+            result = hook.apply(this, args);
         }
         catch (e) {
             log.error(e.stack);

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,aAAa,CAAA;AAMpD;;;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,8 +1,7 @@
 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);
+import { resolve } from 'import-meta-resolve';
 const SCREENSHOT_REPLACEMENT = '"<Screenshot[base64]>"';
 const SCRIPT_PLACEHOLDER = '"<Script[base64]>"';
 const REGEX_SCRIPT_NAME = /return \(function (\w+)/;
@@ -149,44 +148,43 @@ export function getArgumentType(arg) {
  * @return {object}       package content
  */
 export async function safeImport(name) {
-    let requirePath = name;
+    console.info('AHHH', name);
+    let importPath = name;
     try {
         /**
-         * Check if cli command was called from local directory, if not require
-         * the plugin from the place where the command is called. This avoids
-         * issues where user have the @wdio/cli package installed globally
-         * but run on a project where wdio packages are installed locally. It
-         * also allows to link the package to a random place and have plugins
-         * imported correctly (for dev purposes).
+         * Initially we will search for the package by using the standard package
+         * resolution starting from the path given by 'import.meta.url' (which
+         * returns the path to this file). The default mechanism will then search
+         * upwards through the hierarchy in the file system in node_modules directories
+         * until it finds the package or reaches the root of the file system.
+         *
+         * In the case where a user has installed the @wdio/cli package globally,
+         * then clearly the search will be performed in the global area and not
+         * in the project specific area.  Consequently, if the package we are
+         * looking for is installed within the project it will not be found and
+         * then we also need to search in the project, we do that by defining
+         * 'localNodeModules' and searching from that also.
+         *
+         * Note that import-meta-resolve will resolve to CJS no ESM export is found
          */
         const localNodeModules = path.join(process.cwd(), 'node_modules');
-        /* istanbul ignore if */
-        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);
+        try {
+            importPath = await resolve(name, import.meta.url);
         }
-        if (!requirePath.startsWith('file://')) {
-            requirePath = pathToFileURL(requirePath).href;
+        catch (err) {
+            try {
+                importPath = await resolve(name, pathToFileURL(localNodeModules).toString());
+            }
+            catch (err) {
+                return null;
+            }
         }
     }
     catch (err) {
         return null;
     }
     try {
-        const pkg = await import(requirePath);
+        const pkg = await import(importPath);
         /**
          * CJS packages build with TS imported through an ESM context can end up being this:
          *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "8.0.8",
+  "version": "8.0.10",
   "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",
@@ -28,11 +28,12 @@
   },
   "dependencies": {
     "@wdio/logger": "8.0.0",
-    "@wdio/types": "8.0.8",
+    "@wdio/types": "8.0.10",
+    "import-meta-resolve": "^2.2.0",
     "p-iteration": "^1.1.8"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c07255fefc67137fd27f23da5f0792c10157f8c0"
+  "gitHead": "1c350a14144ecc5f1ebc598c385bae6aa80739c3"
 }