@wdio/config 6.10.6 → 6.12.1

package/build/lib/ConfigParser.d.ts

@@ -3,11 +3,15 @@
 /// <reference types="webdriverio" />
 /// <reference types="@wdio/cucumber-framework" />
 import type { ConfigOptions, Hooks } from '../types';
+interface MergeConfig extends Omit<Partial<ConfigOptions>, 'specs' | 'exclude'> {
+    specs?: string | string[];
+    exclude?: string | string[];
+}
 export default class ConfigParser {
     private _config;
     private _capabilities;
     addConfigFile(filename: string): void;
-    merge(object?: Partial<ConfigOptions>): void;
+    merge(object?: MergeConfig): void;
     addService(service: Hooks): void;
     getSpecs(capSpecs?: string[], capExclude?: string[]): string[];
     setFilePathToFilterOptions(cliArgFileList: string[], config: string[]): string[];
@@ -15,4 +19,5 @@ export default class ConfigParser {
     getCapabilities(i?: number): WebDriver.DesiredCapabilities | WebDriver.W3CCapabilities | import("webdriverio").MultiRemoteCapabilities | (WebDriver.DesiredCapabilities | WebDriver.W3CCapabilities)[];
     static getFilePaths(patterns: string[], omitWarnings?: boolean): string[];
 }
+export {};
 //# sourceMappingURL=ConfigParser.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/lib/ConfigParser.ts"],"names":[],"mappings":";;;;AAQA,OAAO,KAAK,EAAgB,aAAa,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAKlE,MAAM,CAAC,OAAO,OAAO,YAAY;IAC7B,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,aAAa,CAAoB;IAMzC,aAAa,CAAE,QAAQ,EAAE,MAAM;IA0D/B,KAAK,CAAE,MAAM,GAAE,OAAO,CAAC,aAAa,CAAM;IA6C1C,UAAU,CAAE,OAAO,EAAE,KAAK;IAkC1B,QAAQ,CAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE;IA8DpD,0BAA0B,CAAE,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;IA2BtE,SAAS;IAOT,eAAe,CAAE,CAAC,CAAC,EAAE,MAAM;IAc3B,MAAM,CAAC,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,OAAO;CAgClE"}
+{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/lib/ConfigParser.ts"],"names":[],"mappings":";;;;AAWA,OAAO,KAAK,EAAgB,aAAa,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAKlE,UAAU,WAAY,SAAQ,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3E,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC9B;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAC7B,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,aAAa,CAAoB;IAMzC,aAAa,CAAE,QAAQ,EAAE,MAAM;IAuD/B,KAAK,CAAE,MAAM,GAAE,WAAgB;IA6C/B,UAAU,CAAE,OAAO,EAAE,KAAK;IAkC1B,QAAQ,CAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE;IA8DpD,0BAA0B,CAAE,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;IA2BtE,SAAS;IAOT,eAAe,CAAE,CAAC,CAAC,EAAE,MAAM;IAc3B,MAAM,CAAC,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,OAAO;CAgClE"}

package/build/lib/ConfigParser.js

@@ -23,6 +23,7 @@ class ConfigParser {
         }
         const filePath = path_1.default.resolve(process.cwd(), filename);
         try {
+            utils_1.loadTypeScriptCompiler();
             const fileConfig = deepmerge_1.default(require(filePath).config, {}, MERGE_OPTIONS);
             const defaultTo = Array.isArray(this._capabilities) ? [] : {};
             this._capabilities = deepmerge_1.default(this._capabilities, fileConfig.capabilities || defaultTo, MERGE_OPTIONS);
@@ -32,8 +33,7 @@ class ConfigParser {
                 delete fileConfig[hookName];
             }
             this._config = deepmerge_1.default(this._config, fileConfig, MERGE_OPTIONS);
-            const isRDC = Array.isArray(this._capabilities) && this._capabilities.some(capability => 'testobject_api_key' in capability);
-            this._config = deepmerge_1.default(utils_1.detectBackend(this._config, isRDC), this._config, MERGE_OPTIONS);
+            this._config = deepmerge_1.default(utils_1.detectBackend(this._config), this._config, MERGE_OPTIONS);
             delete this._config.watch;
         }
         catch (e) {

package/build/types.d.ts

@@ -5,16 +5,21 @@ export declare type Hooks = {
     [k in keyof WebdriverIO.HookFunctions]: WebdriverIO.HookFunctions[k] | NonNullable<WebdriverIO.HookFunctions[k]>[];
 };
 export declare type Capabilities = (WebDriver.DesiredCapabilities | WebDriver.W3CCapabilities)[] | WebdriverIO.MultiRemoteCapabilities;
+export declare type Capability = WebDriver.DesiredCapabilities | WebDriver.W3CCapabilities | WebdriverIO.MultiRemoteCapabilities;
 export interface ConfigOptions extends Omit<WebdriverIO.Config, 'capabilities' | keyof WebdriverIO.Hooks>, Hooks {
-    automationProtocol?: 'webdriver' | 'devtools';
+    automationProtocol?: 'webdriver' | 'devtools' | './protocol-stub';
     spec?: string[];
     suite?: string[];
     capabilities?: Capabilities;
     specFileRetryAttempts?: number;
     cucumberFeaturesWithLineNumbers?: string[];
     specFileRetriesDeferred?: boolean;
+    specFileRetries?: number;
     maxInstances?: number;
 }
+export interface SingleConfigOption extends Omit<ConfigOptions, 'capabilities'> {
+    capabilities: Capability;
+}
 export declare type DefaultOptions<T> = {
     [k in keyof T]?: {
         type: 'string' | 'number' | 'object' | 'boolean' | 'function';

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AACA,oBAAY,KAAK,GAAG;KACf,CAAC,IAAI,MAAM,WAAW,CAAC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE;CACrH,CAAA;AAED,oBAAY,YAAY,GAAG,CAAC,SAAS,CAAC,mBAAmB,GAAG,SAAS,CAAC,eAAe,CAAC,EAAE,GAAG,WAAW,CAAC,uBAAuB,CAAC;AAE/H,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,EAAE,KAAK;IAC5G,kBAAkB,CAAC,EAAE,WAAW,GAAG,UAAU,CAAA;IAC7C,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,+BAA+B,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1C,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,YAAY,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,oBAAY,cAAc,CAAC,CAAC,IAAI;KAC3B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;QACb,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAA;QAC7D,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QACd,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;QACjC,KAAK,CAAC,EAAE,MAAM,CAAA;KACjB;CACJ,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AACA,oBAAY,KAAK,GAAG;KACf,CAAC,IAAI,MAAM,WAAW,CAAC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE;CACrH,CAAA;AAED,oBAAY,YAAY,GAAG,CAAC,SAAS,CAAC,mBAAmB,GAAG,SAAS,CAAC,eAAe,CAAC,EAAE,GAAG,WAAW,CAAC,uBAAuB,CAAC;AAC/H,oBAAY,UAAU,GAAG,SAAS,CAAC,mBAAmB,GAAG,SAAS,CAAC,eAAe,GAAG,WAAW,CAAC,uBAAuB,CAAC;AAEzH,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,EAAE,KAAK;IAC5G,kBAAkB,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,iBAAiB,CAAA;IACjE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,+BAA+B,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1C,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC;IAC3E,YAAY,EAAE,UAAU,CAAA;CAC3B;AAED,oBAAY,cAAc,CAAC,CAAC,IAAI;KAC3B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;QACb,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAA;QAC7D,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QACd,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;QACjC,KAAK,CAAC,EAAE,MAAM,CAAA;KACjB;CACJ,CAAA"}

package/build/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="webdriver" />
 /// <reference types="webdriverio/webdriverio-core" />
-import type { DefaultOptions } from './types';
+import type { DefaultOptions, Capabilities } from './types';
 declare const REGION_MAPPING: {
     us: string;
     eu: string;
@@ -8,7 +8,10 @@ declare const REGION_MAPPING: {
     'us-east-1': string;
 };
 export declare const validObjectOrArray: (object: any) => object is object | any[];
-export declare function getSauceEndpoint(region: keyof typeof REGION_MAPPING, isRDC?: boolean): string;
+export declare function getSauceEndpoint(region: keyof typeof REGION_MAPPING, { isRDC, isVisual }?: {
+    isRDC?: boolean;
+    isVisual?: boolean;
+}): string;
 export declare function removeLineNumbers(filePath: string): string;
 export declare function isCucumberFeatureWithLineNumber(spec: string | string[]): boolean;
 export declare function isCloudCapability(capabilities: WebDriver.DesiredCapabilities | WebdriverIO.MultiRemoteBrowserOptions): boolean;
@@ -21,13 +24,15 @@ interface BackendConfigurations {
     region?: string;
     headless?: boolean;
     path?: string;
+    capabilities?: Capabilities | WebDriver.DesiredCapabilities | WebDriver.W3CCapabilities;
 }
-export declare function detectBackend(options?: BackendConfigurations, isRDC?: boolean): {
+export declare function detectBackend(options?: BackendConfigurations): {
     hostname: string | undefined;
     port: number | undefined;
     protocol: string | undefined;
     path: string | undefined;
 };
 export declare function validateConfig<T>(defaults: DefaultOptions<T>, options: T, keysToKeep?: (keyof T)[]): T;
+export declare function loadTypeScriptCompiler(): void;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAQ7C,QAAA,MAAM,cAAc;;;;;CAKnB,CAAA;AAED,eAAO,MAAM,kBAAkB,WAAY,GAAG,6BACoB,CAAA;AAElE,wBAAgB,gBAAgB,CAAE,MAAM,EAAE,MAAM,OAAO,cAAc,EAAE,KAAK,CAAC,EAAE,OAAO,UAOrF;AAQD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,UAMjD;AAOD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,WAGtE;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,mBAAmB,GAAG,WAAW,CAAC,yBAAyB,WAGpH;AAED,UAAU,qBAAqB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;AAKD,wBAAgB,aAAa,CAAC,OAAO,GAAE,qBAA0B,EAAE,KAAK,UAAQ;;;;;EAoF/E;AAQD,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,cAAoB,KA+CxG"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAU3D,QAAA,MAAM,cAAc;;;;;CAKnB,CAAA;AAED,eAAO,MAAM,kBAAkB,WAAY,GAAG,6BACoB,CAAA;AAElE,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,MAAM,OAAO,cAAc,EACnC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,UAUpE;AAQD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,UAMjD;AAOD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,WAGtE;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,mBAAmB,GAAG,WAAW,CAAC,yBAAyB,WAGpH;AAED,UAAU,qBAAqB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC,mBAAmB,GAAG,SAAS,CAAC,eAAe,CAAA;CAC1F;AAKD,wBAAgB,aAAa,CAAC,OAAO,GAAE,qBAA0B;;;;;EAuFhE;AAQD,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,cAAoB,KA+CxG;AAED,wBAAgB,sBAAsB,SAOrC"}

package/build/utils.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateConfig = exports.detectBackend = exports.isCloudCapability = exports.isCucumberFeatureWithLineNumber = exports.removeLineNumbers = exports.getSauceEndpoint = exports.validObjectOrArray = void 0;
+exports.loadTypeScriptCompiler = exports.validateConfig = exports.detectBackend = exports.isCloudCapability = exports.isCucumberFeatureWithLineNumber = exports.removeLineNumbers = exports.getSauceEndpoint = exports.validObjectOrArray = void 0;
+const logger_1 = __importDefault(require("@wdio/logger"));
+const log = logger_1.default('@wdio/config:utils');
 const DEFAULT_HOSTNAME = '127.0.0.1';
 const DEFAULT_PORT = 4444;
 const DEFAULT_PROTOCOL = 'http';
@@ -14,11 +19,14 @@ const REGION_MAPPING = {
 };
 exports.validObjectOrArray = (object) => (Array.isArray(object) && object.length > 0) ||
     (typeof object === 'object' && Object.keys(object).length > 0);
-function getSauceEndpoint(region, isRDC) {
+function getSauceEndpoint(region, { isRDC, isVisual } = {}) {
     const shortRegion = REGION_MAPPING[region] ? region : 'us';
     if (isRDC) {
         return `${shortRegion}1.appium.testobject.com`;
     }
+    else if (isVisual) {
+        return 'hub.screener.io';
+    }
     return `ondemand.${REGION_MAPPING[shortRegion]}saucelabs.com`;
 }
 exports.getSauceEndpoint = getSauceEndpoint;
@@ -40,8 +48,9 @@ function isCloudCapability(capabilities) {
     return Boolean(caps && (caps['bstack:options'] || caps['sauce:options'] || caps['tb:options']));
 }
 exports.isCloudCapability = isCloudCapability;
-function detectBackend(options = {}, isRDC = false) {
-    let { port, hostname, user, key, protocol, region, headless, path } = options;
+function detectBackend(options = {}) {
+    var _a, _b;
+    let { port, hostname, user, key, protocol, region, headless, path, capabilities } = options;
     if (typeof user === 'string' && typeof key === 'string' && key.length === 20) {
         return {
             protocol: protocol || 'https',
@@ -58,13 +67,14 @@ function detectBackend(options = {}, isRDC = false) {
             path: path || LEGACY_PATH
         };
     }
+    const isRDC = Boolean(!Array.isArray(capabilities) && ((_a = capabilities) === null || _a === void 0 ? void 0 : _a.testobject_api_key));
+    const isVisual = Boolean(!Array.isArray(capabilities) && capabilities && ((_b = capabilities['sauce:visual']) === null || _b === void 0 ? void 0 : _b.apiKey));
     if ((typeof user === 'string' && typeof key === 'string' && key.length === 36) ||
-        (typeof user === 'string' && isRDC) ||
-        isRDC) {
+        (isRDC || isVisual)) {
         const sauceRegion = headless ? 'us-east-1' : region;
         return {
             protocol: protocol || 'https',
-            hostname: hostname || getSauceEndpoint(sauceRegion, isRDC),
+            hostname: hostname || getSauceEndpoint(sauceRegion, { isRDC, isVisual }),
             port: port || 443,
             path: path || LEGACY_PATH
         };
@@ -122,3 +132,13 @@ function validateConfig(defaults, options, keysToKeep = []) {
     return params;
 }
 exports.validateConfig = validateConfig;
+function loadTypeScriptCompiler() {
+    try {
+        require.resolve('ts-node');
+        require('ts-node').register({ transpileOnly: true });
+    }
+    catch (e) {
+        return log.debug('Couldn\'t find ts-node package, no TypeScript compiling');
+    }
+}
+exports.loadTypeScriptCompiler = loadTypeScriptCompiler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/config",
-  "version": "6.10.6",
+  "version": "6.12.1",
   "description": "A helper utility to parse and validate WebdriverIO options",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/master/packages/wdio-config",
@@ -23,12 +23,12 @@
   },
   "types": "./build/index.d.ts",
   "dependencies": {
-    "@wdio/logger": "6.10.4",
+    "@wdio/logger": "6.10.10",
     "deepmerge": "^4.0.0",
     "glob": "^7.1.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c3fa466d4e0fece382f2d04ead5f19f97eaa71fe"
+  "gitHead": "063970498c9b1142482a1a035aa699c64cc8215c"
 }