@wdio/config 9.10.1 → 9.11.0

package/build/node/ConfigParser.d.ts

@@ -16,6 +16,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;AAO7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAM9C,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAK7B,UAAU,+BAAgC,SAAQ,OAAO,CAAC,UAAU;IAChE,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,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,YAAY,CAAC,sBAAsB,CAAA;IAClD,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;CACxB;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;IAVxB,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAC,CAA0C;gBAG5D,cAAc,EAAE,MAAM;IACtB;;;OAGG;IACK,cAAc,GAAE,OAAO,CAAC,+BAA+B,CAAM,EAC7D,YAAY,GAAE,WAAyC;IAmBnE;;OAEG;IACG,UAAU,CAAC,MAAM,GAAE,WAAgB;IAgCzC;;;OAGG;YACW,aAAa;IA2D3B;;;;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;IAgDlE;;OAEG;IACH,SAAS,IAIkB,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;IAGvD;;OAEG;IACH,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,sBAAsB,GAAG,YAAY,CAAC,+BAA+B;IAY/G;;;;;;;;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;AAO7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAM9C,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAK7B,UAAU,+BAAgC,SAAQ,OAAO,CAAC,UAAU;IAChE,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,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,YAAY,CAAC,sBAAsB,CAAA;IAClD,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;CACxB;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;IAVxB,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAC,CAA0C;gBAG5D,cAAc,EAAE,MAAM;IACtB;;;OAGG;IACK,cAAc,GAAE,OAAO,CAAC,+BAA+B,CAAM,EAC7D,YAAY,GAAE,WAAyC;IAmBnE;;OAEG;IACG,UAAU,CAAC,MAAM,GAAE,WAAgB;IAgCzC;;;OAGG;YACW,aAAa;IA2D3B;;;;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;IAgDnF;;OAEG;IACH,SAAS,IAIkB,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;IAGvD;;OAEG;IACH,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,sBAAsB,GAAG,YAAY,CAAC,+BAA+B;IAY/G;;;;;;;;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/index.d.ts

@@ -1,3 +1,4 @@
 import ConfigParser from './ConfigParser.js';
-export { ConfigParser };
+import FileSystemPathService from './FileSystemPathService.js';
+export { ConfigParser, FileSystemPathService };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,mBAAmB,CAAA;AAC5C,OAAO,qBAAqB,MAAM,4BAA4B,CAAA;AAE9D,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAA"}

package/build/node/index.js

@@ -68,7 +68,7 @@ function makeRelativeToCWD(files = []) {
       continue;
     }
     returnFiles.push(
-      file.startsWith("file:///") ? url2.fileURLToPath(file) : file.includes("/") ? path2.resolve(process.cwd(), file) : file
+      file.startsWith("file:///") ? url2.fileURLToPath(file) : file.includes("/") && !file.includes("*") ? path2.resolve(process.cwd(), file) : file
     );
   }
   return returnFiles;
@@ -325,7 +325,7 @@ var ConfigParser = class _ConfigParser {
       this._config.cucumberFeaturesWithLineNumbers = Array.isArray(this._config.spec) ? [...new Set(this._config.spec)] : [this._config.spec];
     }
     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);
     }
     if (exclude.length > 0 && allKeywordsContainPath(exclude)) {
       this._config.exclude = this.setFilePathToFilterOptions(exclude, this._config.exclude);
@@ -396,7 +396,7 @@ var ConfigParser = class _ConfigParser {
       }
       specs = isSpecParamPassed ? [...specs, ...suiteSpecs] : suiteSpecs;
     }
-    specs = [...new Set(specs)];
+    specs = filterDublicationArrayItems(specs);
     const hasSubsetOfSpecsDefined = isSpecParamPassed || suites.length > 0;
     if (repeat && hasSubsetOfSpecsDefined) {
       specs = Array.from({ length: repeat }, () => specs).flat();
@@ -416,13 +416,13 @@ var ConfigParser = class _ConfigParser {
    * cli argument
    * @return {String[]} List of files that should be included or excluded
    */
-  setFilePathToFilterOptions(cliArgFileList, specs) {
+  setFilePathToFilterOptions(cliArgFileList, specs, group) {
     const filesToFilter = /* @__PURE__ */ new Set();
     const fileList = _ConfigParser.getFilePaths(specs, this._config.rootDir, this._pathService);
     cliArgFileList.forEach((filteredFile) => {
       filteredFile = removeLineNumbers(filteredFile);
       const globMatchedFiles = _ConfigParser.getFilePaths(
-        this._pathService.glob(filteredFile, path3.dirname(this.#configFilePath)),
+        group ? [[filteredFile]] : [filteredFile],
         this._config.rootDir,
         this._pathService
       );
@@ -438,12 +438,12 @@ var ConfigParser = class _ConfigParser {
       } else {
         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);
               }
             });
@@ -537,7 +537,7 @@ var ConfigParser = class _ConfigParser {
    */
   filterSpecs(specs, excludeList) {
     if (allKeywordsContainPath(excludeList)) {
-      return specs.reduce((returnVal, currSpec) => {
+      const filteredSpec2 = specs.reduce((returnVal, currSpec) => {
         if (Array.isArray(currSpec)) {
           returnVal.push(currSpec.filter((specItem) => !excludeList.includes(specItem)));
         } else if (excludeList.indexOf(currSpec) === -1) {
@@ -545,8 +545,9 @@ var ConfigParser = class _ConfigParser {
         }
         return returnVal;
       }, []);
+      return filterEmptyArrayItems(filteredSpec2);
     }
-    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))));
       }
@@ -556,6 +557,7 @@ var ConfigParser = class _ConfigParser {
       }
       return returnVal;
     }, []);
+    return filterEmptyArrayItems(filteredSpec);
   }
   shard(specs) {
     if (!this._config.shard || this._config.shard.total === 1) {
@@ -569,8 +571,23 @@ var ConfigParser = 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;
+  }
 }
 export {
-  ConfigParser
+  ConfigParser,
+  FileSystemPathService
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/config",
-  "version": "9.10.1",
+  "version": "9.11.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": "9.4.4",
     "@wdio/types": "9.10.1",
-    "@wdio/utils": "9.10.1",
+    "@wdio/utils": "9.11.0",
     "deepmerge-ts": "^7.0.3",
     "glob": "^10.2.2",
     "import-meta-resolve": "^4.0.0"
@@ -49,5 +49,5 @@
   "devDependencies": {
     "minimatch": "^9.0.0"
   },
-  "gitHead": "dc41a90e711d7b7a10e8129fb74650ad7a5956d0"
+  "gitHead": "79a39e09a5eeabebac2f068b8d29f0ae4921fa20"
 }