@wdio/config 8.41.0 → 8.45.0

package/build/node/ConfigParser.d.ts

@@ -15,6 +15,7 @@ interface MergeConfig extends Omit<Partial<TestrunnerOptionsWithParameters>, 'sp
     'wdio:specs'?: Spec[];
     exclude?: string[];
     'wdio:exclude'?: string[];
+    group?: boolean;
 }
 export default class ConfigParser {
     #private;
@@ -67,7 +68,7 @@ export default class ConfigParser {
      * cli argument
      * @return {String[]} List of files that should be included or excluded
      */
-    setFilePathToFilterOptions(cliArgFileList: string[], specs: Spec[]): string[];
+    setFilePathToFilterOptions(cliArgFileList: string[], specs: Spec[], group?: boolean): string[];
     /**
      * return configs
      */

package/build/node/ConfigParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/node/ConfigParser.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAa,QAAQ,EAAE,MAAM,aAAa,CAAA;AAQ7E,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAMnE,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAK7B,UAAU,+BAAgC,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACtF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAAA;IAC9C,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,UAAU,WAAY,SAAQ,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7F,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,YAAY,CAAC,EAAE,IAAI,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;;IAQzB;;;OAGG;IACH,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB;IAXjC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAsC;gBAGvD,cAAc,EAAE,MAAM;IACtB;;;OAGG;IACK,cAAc,GAAE,OAAO,CAAC,+BAA+B,CAAM,EAC7D,YAAY,GAAE,WAAyC,EACvD,qBAAqB,GAAE,mBAA0C;IA2B7E;;OAEG;IACG,UAAU,CAAC,MAAM,GAAE,WAAgB;IA+BzC;;;OAGG;YACW,aAAa;IAsD3B;;;;OAIG;IACH,OAAO,CAAC,KAAK;IA4Eb;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK;IAkClC;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE;IA4D/C;;;;;;;;OAQG;IACH,0BAA0B,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;IA8ClE;;OAEG;IACH,SAAS,IAIkB,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;IAGvD;;OAEG;IACH,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM;IAY1B;;;;;;;;OAQG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAE,WAAyC,EAAE,cAAc,CAAC,EAAE,MAAM;IAkDtI;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE;IAyBhD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE;CAWtB"}
+{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/node/ConfigParser.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAa,QAAQ,EAAE,MAAM,aAAa,CAAA;AAQ7E,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAMnE,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAK7B,UAAU,+BAAgC,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACtF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAAA;IAC9C,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,UAAU,WAAY,SAAQ,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7F,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,YAAY,CAAC,EAAE,IAAI,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,KAAK,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;;IAQzB;;;OAGG;IACH,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB;IAXjC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAsC;gBAGvD,cAAc,EAAE,MAAM;IACtB;;;OAGG;IACK,cAAc,GAAE,OAAO,CAAC,+BAA+B,CAAM,EAC7D,YAAY,GAAE,WAAyC,EACvD,qBAAqB,GAAE,mBAA0C;IA2B7E;;OAEG;IACG,UAAU,CAAC,MAAM,GAAE,WAAgB;IA+BzC;;;OAGG;YACW,aAAa;IAsD3B;;;;OAIG;IACH,OAAO,CAAC,KAAK;IA4Eb;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK;IAkClC;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE;IA4D/C;;;;;;;;OAQG;IACH,0BAA0B,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO;IA8CnF;;OAEG;IACH,SAAS,IAIkB,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;IAGvD;;OAEG;IACH,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM;IAY1B;;;;;;;;OAQG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAE,WAAyC,EAAE,cAAc,CAAC,EAAE,MAAM;IAkDtI;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE;IA2BhD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE;CAWtB"}

package/build/node/ConfigParser.js

@@ -187,7 +187,7 @@ export default class ConfigParser {
          * run single spec file only, regardless of multiple-spec specification
          */
         if (addPathToSpecs && spec.length > 0) {
-            this._config.specs = this.setFilePathToFilterOptions(spec, this._config.specs);
+            this._config.specs = this.setFilePathToFilterOptions(spec, this._config.specs, object.group);
         }
         /**
          * At this step function allKeywordsContainPath() allows us to make sure
@@ -284,7 +284,7 @@ export default class ConfigParser {
             specs = isSpecParamPassed ? [...specs, ...suiteSpecs] : suiteSpecs;
         }
         // Remove any duplicate tests from the final specs array
-        specs = [...new Set(specs)];
+        specs = filterDublicationArrayItems(specs);
         // If the --multi-run flag is set, duplicate the specs array N times
         // Ensure that when --multi-run is used that either --spec or --suite is also used
         const hasSubsetOfSpecsDefined = isSpecParamPassed || suites.length > 0;
@@ -305,14 +305,14 @@ export default class ConfigParser {
      * cli argument
      * @return {String[]} List of files that should be included or excluded
      */
-    setFilePathToFilterOptions(cliArgFileList, specs) {
+    setFilePathToFilterOptions(cliArgFileList, specs, group) {
         const filesToFilter = new Set();
         const fileList = ConfigParser.getFilePaths(specs, this._config.rootDir, this._pathService);
         cliArgFileList.forEach(filteredFile => {
             filteredFile = removeLineNumbers(filteredFile);
-            // Send single file/file glob to getFilePaths - not supporting hierarchy in spec/exclude
-            // Return value will always be string[]
-            const globMatchedFiles = ConfigParser.getFilePaths(this._pathService.glob(filteredFile, path.dirname(this.#configFilePath)), this._config.rootDir, this._pathService);
+            // Send wildcard or single file glob to getFilePaths
+            // Return value will always be string[] or string [][]
+            const globMatchedFiles = ConfigParser.getFilePaths(group ? [[filteredFile]] : [filteredFile], this._config.rootDir, this._pathService);
             if (this._pathService.isFile(filteredFile)) {
                 filesToFilter.add(this._pathService.ensureAbsolutePath(filteredFile, path.dirname(this.#configFilePath)));
             }
@@ -323,13 +323,13 @@ export default class ConfigParser {
                 // fileList can be a string[] or a string[][]
                 fileList.forEach(file => {
                     if (typeof file === 'string') {
-                        if (file.match(filteredFile)) {
+                        if (isValidRegex(filteredFile) && file.match(filteredFile)) {
                             filesToFilter.add(file);
                         }
                     }
                     else if (Array.isArray(file)) {
                         file.forEach(subFile => {
-                            if (subFile.match(filteredFile)) {
+                            if (isValidRegex(filteredFile) && subFile.match(filteredFile)) {
                                 filesToFilter.add(subFile);
                             }
                         });
@@ -429,7 +429,7 @@ export default class ConfigParser {
     filterSpecs(specs, excludeList) {
         // If 'exclude' is array of paths
         if (allKeywordsContainPath(excludeList)) {
-            return specs.reduce((returnVal, currSpec) => {
+            const filteredSpec = specs.reduce((returnVal, currSpec) => {
                 if (Array.isArray(currSpec)) {
                     returnVal.push(currSpec.filter(specItem => !excludeList.includes(specItem)));
                 }
@@ -438,9 +438,10 @@ export default class ConfigParser {
                 }
                 return returnVal;
             }, []);
+            return filterEmptyArrayItems(filteredSpec);
         }
         // If 'exclude' is array of keywords
-        return specs.reduce((returnVal, currSpec) => {
+        const filteredSpec = specs.reduce((returnVal, currSpec) => {
             if (Array.isArray(currSpec)) {
                 returnVal.push(currSpec.filter(specItem => !excludeList.some(excludeVal => specItem.includes(excludeVal))));
             }
@@ -450,6 +451,7 @@ export default class ConfigParser {
             }
             return returnVal;
         }, []);
+        return filterEmptyArrayItems(filteredSpec);
     }
     shard(specs) {
         if (!this._config.shard || this._config.shard.total === 1) {
@@ -463,5 +465,20 @@ export default class ConfigParser {
     }
 }
 function allKeywordsContainPath(excludedSpecList) {
-    return excludedSpecList.every(val => val.includes('/') || val.includes('\\'));
+    return excludedSpecList.every(val => val.includes('/') || val.includes('\\') || val.includes('*'));
+}
+function filterEmptyArrayItems(specList) {
+    return specList.filter(item => (Array.isArray(item) && item.length) || !Array.isArray(item));
+}
+function filterDublicationArrayItems(specList) {
+    return [...new Set(specList.map(item => Array.isArray(item) ? [...new Set(item)] : item))];
+}
+function isValidRegex(expression) {
+    try {
+        new RegExp(expression);
+        return true;
+    }
+    catch {
+        return false;
+    }
 }

package/build/node/utils.js

@@ -40,7 +40,7 @@ export function makeRelativeToCWD(files = []) {
         }
         returnFiles.push(file.startsWith('file:///')
             ? url.fileURLToPath(file)
-            : file.includes('/')
+            : file.includes('/') && !file.includes('*')
                 ? path.resolve(process.cwd(), file)
                 : file);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/config",
-  "version": "8.41.0",
+  "version": "8.45.0",
   "description": "A helper utility to parse and validate WebdriverIO options",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-config",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@wdio/logger": "8.38.0",
     "@wdio/types": "8.41.0",
-    "@wdio/utils": "8.41.0",
+    "@wdio/utils": "8.45.0",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^5.0.0",
     "glob": "^10.2.2",
@@ -51,5 +51,5 @@
     "minimatch": "^9.0.0",
     "tsconfig-paths": "^4.1.0"
   },
-  "gitHead": "a33b7bfba8013d0f65e54123acc206bd11d38d10"
+  "gitHead": "7836fbee7a85a16f2b7faa592969f914c504ba8a"
 }