@wdio/utils 7.18.0 → 7.19.2

package/build/shim.js

@@ -197,7 +197,7 @@ let wrapCommand = function wrapCommand(commandName, fn) {
                  * await $('foo').$('bar')
                  * ```
                  */
-                if (ELEMENT_QUERY_COMMANDS.includes(prop)) {
+                if (ELEMENT_QUERY_COMMANDS.includes(prop) || prop.endsWith('$')) {
                     // this: WebdriverIO.Element
                     return wrapCommand(prop, function (...args) {
                         return this[prop].apply(this, args);
@@ -270,7 +270,7 @@ let wrapCommand = function wrapCommand(commandName, fn) {
          */
         const command = hasWdioSyncSupport && wdioSync && Boolean(global.browser) && !exports.runAsync && !exports.asyncSpec
             ? wdioSync.wrapCommand(commandName, fn)
-            : ELEMENT_QUERY_COMMANDS.includes(commandName)
+            : ELEMENT_QUERY_COMMANDS.includes(commandName) || commandName.endsWith('$')
                 ? chainElementQuery
                 : wrapCommandFn;
         return command.apply(this, args);

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

@@ -24,4 +24,10 @@ export declare const testFnWrapper: (this: unknown, args_0: string, args_1: Spec
  * @return  {*}                     specFn result
  */
 export declare const testFrameworkFnWrapper: (this: unknown, { executeHooksWithArgs, executeAsync, runSync }: WrapperMethods, type: string, { specFn, specFnArgs }: SpecFunction, { beforeFn, beforeFnArgs }: BeforeHookParam<unknown>, { afterFn, afterFnArgs }: AfterHookParam<unknown>, cid: string, repeatTest?: number) => Promise<unknown>;
+/**
+ * Filter out internal stacktraces. exporting to allow testing of the function
+ * @param   {string} stack Stacktrace
+ * @returns {string}
+ */
+export declare const filterStackTrace: (stack: string) => string;
 //# sourceMappingURL=testFnWrapper.d.ts.map

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":"AAIA,OAAO,KAAK,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,cAAc,EAEjB,MAAM,SAAS,CAAA;AAEhB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa,SAChB,OAAO,8JAWhB,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,SACzB,OAAO,mDACoC,cAAc,QACzD,MAAM,0BACY,YAAY,8BACR,gBAAgB,OAAO,CAAC,4BAC1B,eAAe,OAAO,CAAC,OAC5C,MAAM,0CAmDd,CAAA"}
+{"version":3,"file":"testFnWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testFnWrapper.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,cAAc,EAEjB,MAAM,SAAS,CAAA;AAShB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa,SAChB,OAAO,8JAWhB,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,SACzB,OAAO,mDACoC,cAAc,QACzD,MAAM,0BACY,YAAY,8BACR,gBAAgB,OAAO,CAAC,4BAC1B,eAAe,OAAO,CAAC,OAC5C,MAAM,0CAuDd,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,UAAW,MAAM,KAAG,MAKhD,CAAA"}

package/build/test-framework/testFnWrapper.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testFrameworkFnWrapper = exports.testFnWrapper = void 0;
+exports.filterStackTrace = exports.testFrameworkFnWrapper = exports.testFnWrapper = void 0;
 const utils_1 = require("../utils");
 const errorHandler_1 = require("./errorHandler");
 const shim_1 = require("../shim");
+const STACKTRACE_FILTER = [
+    'node_modules/webdriver/',
+    'node_modules/webdriverio/',
+    'node_modules/@wdio/',
+    '(internal/process/task',
+];
 /**
  * wraps test framework spec/hook function with WebdriverIO before/after hooks
  *
@@ -52,6 +58,9 @@ const testFrameworkFnWrapper = async function ({ executeHooksWithArgs, executeAs
         result = await promise;
     }
     catch (err) {
+        if (err.stack) {
+            err.stack = (0, exports.filterStackTrace)(err.stack);
+        }
         error = err;
     }
     const duration = Date.now() - testStart;
@@ -78,3 +87,15 @@ const testFrameworkFnWrapper = async function ({ executeHooksWithArgs, executeAs
     return result;
 };
 exports.testFrameworkFnWrapper = testFrameworkFnWrapper;
+/**
+ * Filter out internal stacktraces. exporting to allow testing of the function
+ * @param   {string} stack Stacktrace
+ * @returns {string}
+ */
+const filterStackTrace = (stack) => {
+    return stack
+        .split('\n')
+        .filter(line => !STACKTRACE_FILTER.some(l => line.includes(l)))
+        .join('\n');
+};
+exports.filterStackTrace = filterStackTrace;

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,aAAa,CAAA;AAKpD;;;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;;;EAQpF;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,wBAAgB,WAAW,CAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,aAAa,GAAG,IAAI,CAoCxE;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,SAAU,MAAM,YAWrC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,mCAAoD,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,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;;;EAWpF;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,wBAAgB,WAAW,CAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,aAAa,GAAG,IAAI,CAoCxE;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,SAAU,MAAM,YAWrC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,mCAAoD,CAAA"}

package/build/utils.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const SCREENSHOT_REPLACEMENT = '"<Screenshot[base64]>"';
 const SCRIPT_PLACEHOLDER = '"<Script[base64]>"';
+const REGEX_SCRIPT_NAME = /return \(function (\w+)/;
 /**
  * overwrite native element commands with user defined
  * @param {object} propertiesObject propertiesObject
@@ -96,6 +97,10 @@ function transformCommandLogResult(result) {
     else if (typeof result.script === 'string' && isBase64(result.script)) {
         return SCRIPT_PLACEHOLDER;
     }
+    else if (typeof result.script === 'string' && result.script.match(REGEX_SCRIPT_NAME)) {
+        const newScript = result.script.match(REGEX_SCRIPT_NAME)[1];
+        return { ...result, script: `${newScript}(...) [${Buffer.byteLength(result.script, 'utf-8')} bytes]` };
+    }
     return result;
 }
 exports.transformCommandLogResult = transformCommandLogResult;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@wdio/utils",
-  "version": "7.18.0",
+  "version": "7.19.2",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
-  "author": "Christian Bromann <christian@saucelabs.com>",
+  "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
   "license": "MIT",
   "main": "./build/index",
@@ -23,13 +23,13 @@
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "dependencies": {
-    "@wdio/logger": "7.17.3",
-    "@wdio/types": "7.18.0",
+    "@wdio/logger": "7.19.0",
+    "@wdio/types": "7.19.1",
     "p-iteration": "^1.1.8"
   },
   "publishConfig": {
     "access": "public"
   },
   "types": "./build/index.d.ts",
-  "gitHead": "44729cdd585af3ad69f2093f32377f297f5ac344"
+  "gitHead": "71fb35a12db8691194b346ab5abd2acf84829385"
 }