appium 3.0.0-beta.0 → 3.0.0-beta.1

package/build/lib/appium.d.ts

@@ -135,12 +135,13 @@ export class AppiumDriver extends DriverCore<{
     getCliArgsForDriver(extName: string): StringRecord | undefined;
     /**
      * Create a new session
-     * @param {W3CAppiumDriverCaps} jsonwpCaps JSONWP formatted desired capabilities
-     * @param {W3CAppiumDriverCaps} [reqCaps] Required capabilities (JSONWP standard)
-     * @param {W3CAppiumDriverCaps} [w3cCapabilities] W3C capabilities
+     *
+     * @param {W3CAppiumDriverCaps} w3cCapabilities1 W3C capabilities
+     * @param {W3CAppiumDriverCaps} [w3cCapabilities2] W3C capabilities (legacy)
+     * @param {W3CAppiumDriverCaps} [w3cCapabilities3] W3C capabilities (legacy)
      * @returns {Promise<SessionHandlerCreateResult>}
      */
-    createSession(jsonwpCaps: W3CAppiumDriverCaps, reqCaps?: W3CAppiumDriverCaps, w3cCapabilities?: W3CAppiumDriverCaps): Promise<SessionHandlerCreateResult>;
+    createSession(w3cCapabilities1: W3CAppiumDriverCaps, w3cCapabilities2?: W3CAppiumDriverCaps, w3cCapabilities3?: W3CAppiumDriverCaps): Promise<SessionHandlerCreateResult>;
     /**
      *
      * @param {ExternalDriver} driver

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

@@ -1 +1 @@
-{"version":3,"file":"appium.d.ts","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"appium.d.ts","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"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"}

package/build/lib/appium.js

@@ -195,41 +195,33 @@ class AppiumDriver extends base_driver_1.DriverCore {
     }
     /**
      * Create a new session
-     * @param {W3CAppiumDriverCaps} jsonwpCaps JSONWP formatted desired capabilities
-     * @param {W3CAppiumDriverCaps} [reqCaps] Required capabilities (JSONWP standard)
-     * @param {W3CAppiumDriverCaps} [w3cCapabilities] W3C capabilities
+     *
+     * @param {W3CAppiumDriverCaps} w3cCapabilities1 W3C capabilities
+     * @param {W3CAppiumDriverCaps} [w3cCapabilities2] W3C capabilities (legacy)
+     * @param {W3CAppiumDriverCaps} [w3cCapabilities3] W3C capabilities (legacy)
      * @returns {Promise<SessionHandlerCreateResult>}
      */
-    async createSession(jsonwpCaps, reqCaps, w3cCapabilities) {
+    async createSession(w3cCapabilities1, w3cCapabilities2, w3cCapabilities3) {
         const defaultCapabilities = lodash_1.default.cloneDeep(this.args.defaultCapabilities);
         const defaultSettings = (0, utils_1.pullSettings)(defaultCapabilities);
-        jsonwpCaps = lodash_1.default.cloneDeep(jsonwpCaps);
-        const jwpSettings = { ...defaultSettings, ...(0, utils_1.pullSettings)(jsonwpCaps) };
-        w3cCapabilities = lodash_1.default.cloneDeep(w3cCapabilities);
-        if (!lodash_1.default.isPlainObject(w3cCapabilities) ||
-            !(lodash_1.default.isArray(w3cCapabilities?.firstMatch) || lodash_1.default.isPlainObject(w3cCapabilities?.alwaysMatch))) {
+        const w3cCapabilities = lodash_1.default.cloneDeep([w3cCapabilities3, w3cCapabilities2, w3cCapabilities1].find(base_driver_1.isW3cCaps));
+        if (!w3cCapabilities) {
             throw (0, utils_1.makeNonW3cCapsError)();
         }
-        // It is possible that the client only provides caps using JSONWP standard,
-        // although firstMatch/alwaysMatch properties are still present.
-        // In such case we assume the client understands W3C protocol and merge the given
-        // JSONWP caps to W3C caps
         const w3cSettings = {
-            ...jwpSettings,
-            ...(0, utils_1.pullSettings)((w3cCapabilities ?? {}).alwaysMatch ?? {}),
+            ...defaultSettings,
+            ...(0, utils_1.pullSettings)(w3cCapabilities.alwaysMatch ?? {}),
         };
-        for (const firstMatchEntry of (w3cCapabilities ?? {}).firstMatch ?? []) {
+        for (const firstMatchEntry of w3cCapabilities.firstMatch ?? []) {
             Object.assign(w3cSettings, (0, utils_1.pullSettings)(firstMatchEntry));
         }
-        /** @type {string|undefined} */
-        let protocol;
+        const protocol = base_driver_1.PROTOCOLS.W3C;
         let innerSessionId, dCaps;
         try {
             // Parse the caps into a format that the InnerDriver will accept
-            const parsedCaps = (0, utils_1.parseCapsForInnerDriver)(jsonwpCaps, (0, base_driver_1.promoteAppiumOptions)(/** @type {W3CAppiumDriverCaps} */ (w3cCapabilities)), this.desiredCapConstraints, defaultCapabilities ? (0, base_driver_1.promoteAppiumOptionsForObject)(defaultCapabilities) : undefined);
-            const { desiredCaps, processedJsonwpCapabilities, processedW3CCapabilities } = 
+            const parsedCaps = (0, utils_1.parseCapsForInnerDriver)((0, base_driver_1.promoteAppiumOptions)(/** @type {W3CAppiumDriverCaps} */ (w3cCapabilities)), this.desiredCapConstraints, defaultCapabilities ? (0, base_driver_1.promoteAppiumOptionsForObject)(defaultCapabilities) : undefined);
+            const { desiredCaps, processedW3CCapabilities } = 
             /** @type {import('./utils').ParsedDriverCaps<AppiumDriverConstraints>} */ (parsedCaps);
-            protocol = parsedCaps.protocol;
             const error = /** @type {import('./utils').InvalidCaps<AppiumDriverConstraints>} */ (parsedCaps).error;
             // If the parsing of the caps produced an error, throw it in here
             if (error) {
@@ -300,8 +292,8 @@ class AppiumDriver extends base_driver_1.DriverCore {
                 this.pendingDrivers[InnerDriver.name].push(driverInstance);
             });
             try {
-                [innerSessionId, dCaps] = await driverInstance.createSession(processedJsonwpCapabilities, reqCaps, processedW3CCapabilities, [...runningDriversData, ...otherPendingDriversData]);
-                protocol = driverInstance.protocol;
+                [innerSessionId, dCaps] = await driverInstance.createSession(
+                /** @type {any} */ (processedW3CCapabilities), processedW3CCapabilities, processedW3CCapabilities, [...runningDriversData, ...otherPendingDriversData]);
                 this.sessions[innerSessionId] = driverInstance;
             }
             finally {
@@ -320,11 +312,6 @@ class AppiumDriver extends base_driver_1.DriverCore {
                     JSON.stringify(w3cSettings));
                 await driverInstance.updateSettings(w3cSettings);
             }
-            else if (driverInstance.isMjsonwpProtocol() && !lodash_1.default.isEmpty(jwpSettings)) {
-                this.log.info(`Applying the initial values to Appium settings parsed from MJSONWP caps: ` +
-                    JSON.stringify(jwpSettings));
-                await driverInstance.updateSettings(jwpSettings);
-            }
             // if the user has asked for bidi support, send our bidi url back to the user. The inner
             // driver will need to have already saved any internal bidi urls it might want to proxy to,
             // cause we are going to overwrite that information here!

package/build/lib/appium.js.map

@@ -1 +1 @@
-{"version":3,"file":"appium.js","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"appium.js","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,qCAAmE;AACnE,qDAe6B;AAC7B,4DAAmC;AACnC,mCAKiB;AACjB,6CAAqC;AACrC,qCAAiD;AACjD,2CAAwD;AACxD,8DAAgD;AAChD,wEAA0D;AAE1D,MAAM,4BAA4B,GAAG,oBAAoB,CAAC,CAAC;IACzD,cAAc,EAAE;QACd,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;KACf;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;KACf;CACF,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,IAAI,oBAAS,EAAE,CAAC;AAC1C,MAAM,mBAAmB,GAAG,IAAI,oBAAS,EAAE,CAAC;AAE5C;;GAEG;AACH,MAAM,YAAa,SAAQ,wBAAU;IA+DnC;;OAEG;IACH,YAAY,IAAI;QACd,gEAAgE;QAChE,+EAA+E;QAC/E,yDAAyD;QACzD,oEAAoE;QACpE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3C,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,CAAC;QA8wBd,qBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;QACjD,kBAAa,GAAG,YAAY,CAAC,aAAa,CAAC;QAC3C,sBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;QACnD,uBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC;QAErD,iBAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC;QAC9C,mBAAc,GAAG,iBAAiB,CAAC,cAAc,CAAC;QAlxBhD,IAAI,CAAC,IAAI,GAAG,EAAC,GAAG,IAAI,EAAC,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,qBAAqB,GAAG,4BAA4B,CAAC;QAC1D,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAE7B,wDAAwD;QACxD,CAAC,KAAK,IAAI,EAAE;YACV,IAAI,CAAC;gBACH,MAAM,IAAA,wBAAe,GAAE,CAAC;YAC1B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,uEAAuE;gBACvE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACjE,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAED;;OAEG;IACH,IAAI,sBAAsB;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,aAAa,CAAC,SAAS;QACrB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,UAAU,IAAI,UAAU,CAAC,SAAS,KAAK,IAAI,CAAC;IACrD,CAAC;IAED,gBAAgB,CAAC,SAAS;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,8CAA8C;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe;YACpC,CAAC,CAAC;gBACE,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,6BAA6B;aACvC;YACH,CAAC,CAAC;gBACE,KAAK,EAAE,IAAI;gBACX,OAAO,EAAE,+CAA+C;aACzD,CAAC;QACN,OAAO;YACL,GAAG,SAAS;YACZ,KAAK,EAAE,gBAAC,CAAC,KAAK,CAAC,IAAA,qBAAY,GAAE,CAAC;SAC/B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI;QAC1B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAC3B,KAAK,EAAE,IAAI;YACX,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YACrD,EAAE;YACF,YAAY,EAAE,sDAAsD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;SACnF,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,IAAI,oBAAM,CAAC,mBAAmB,CAAC,uBAAuB;YAC1D,8EAA8E,CAAC,CAAC;IACpF,CAAC;IAED,2BAA2B,CAAC,UAAU,EAAE,aAAa,EAAE,iBAAiB;QACtE,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,aAAa;YACX,CAAC,CAAC,WAAW,mBAAU,iBAAiB,UAAU,MAAM,aAAa,WAAW;YAChF,CAAC,CAAC,WAAW,mBAAU,iBAAiB,UAAU,UAAU,CAC/D,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+CAA+C,UAAU,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,YAAY,CAAC,WAAW;YACtB,CAAC,CAAC,kCAAkC,YAAY,CAAC,WAAW,EAAE;YAC9D,CAAC,CAAC,iDAAiD,CACtD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,iBAAiB;YACf,CAAC,CAAC,GAAG,UAAU,4BAA4B,iBAAiB,EAAE;YAC9D,CAAC,CAAC,uBAAuB,UAAU,uBAAuB,CAC7D,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,OAAO;QACzB,OAAO,2BAA2B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAED;;;;;;;;OAQG;IACH,mBAAmB,CAAC,OAAO;QACzB,MAAM,gBAAgB,GAAG,qCAAqC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7F,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,IAAA,gCAAuB,EAAC,uBAAW,EAAE,OAAO,CAAC,CAAC;YAC/D,MAAM,OAAO,GAAG,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACjC,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,gBAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;YAChF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxB,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB;QACtE,MAAM,mBAAmB,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,IAAA,oBAAY,EAAC,mBAAmB,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,gBAAC,CAAC,SAAS,CACjC,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,IAAI,CAAC,uBAAS,CAAC,CACvE,CAAC;QACF,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAA,2BAAmB,GAAE,CAAC;QAC9B,CAAC;QACD,MAAM,WAAW,GAAG;YAClB,GAAG,eAAe;YAClB,GAAG,IAAA,oBAAY,EAAC,eAAe,CAAC,WAAW,IAAI,EAAE,CAAC;SACnD,CAAC;QACF,KAAK,MAAM,eAAe,IAAI,eAAe,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YAC/D,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,IAAA,oBAAY,EAAC,eAAe,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,QAAQ,GAAG,uBAAS,CAAC,GAAG,CAAC;QAC/B,IAAI,cAAc,EAAE,KAAK,CAAC;QAC1B,IAAI,CAAC;YACH,gEAAgE;YAChE,MAAM,UAAU,GAAG,IAAA,+BAAuB,EACxC,IAAA,kCAAoB,EAAC,kCAAkC,CAAC,CAAC,eAAe,CAAC,CAAC,EAC1E,IAAI,CAAC,qBAAqB,EAC1B,mBAAmB,CAAC,CAAC,CAAC,IAAA,2CAA6B,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CACrF,CAAC;YAEF,MAAM,EAAC,WAAW,EAAE,wBAAwB,EAAC;YAC3C,0EAA0E,CAAC,CAAC,UAAU,CAAC,CAAC;YAC1F,MAAM,KAAK,GAAG,qEAAqE,CAAC,CAClF,UAAU,CACX,CAAC,KAAK,CAAC;YACR,iEAAiE;YACjE,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,KAAK,CAAC;YACd,CAAC;YAED,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,aAAa,EACtB,UAAU,GACX,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC5D,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;YAE3F,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC9B,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACjC,CAAC;YAED;;eAEG;YACH,IAAI,kBAAkB,GAAG,EAAE,CAAC;YAC5B;;eAEG;YACH,IAAI,uBAAuB,GAAG,EAAE,CAAC;YAEjC,MAAM,cAAc,GAAG,6BAA6B,CAAC,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YAExF,uEAAuE;YACvE,wEAAwE;YACxE,uEAAuE;YACvE,kEAAkE;YAClE,IAAI,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,iCAAiC,WAAW,CAAC,IAAI,WAAW;oBAC1D,8DAA8D;oBAC9D,uDAAuD,CAC1D,CAAC;gBACF,cAAc,CAAC,sBAAsB,GAAG,IAAI,CAAC;YAC/C,CAAC;YAED,4FAA4F;YAC5F,2FAA2F;YAC3F,uCAAuC;YACvC,IAAI,gBAAC,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACpD,cAAc,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;YACvE,CAAC;YAED,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;gBACjE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7D,cAAc,CAAC,YAAY,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACzE,CAAC;YAED,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;gBAC/D,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC9D,cAAc,CAAC,aAAa,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3E,CAAC;YAED,4FAA4F;YAC5F,yFAAyF;YACzF,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YACrD,IAAI,CAAC,gBAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5B,cAAc,CAAC,OAAO,GAAG,OAAO,CAAC;YACnC,CAAC;YAED,sFAAsF;YACtF,gEAAgE;YAEhE,4CAA4C;YAC5C,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YACpC,cAAc,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YAC9C,cAAc,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAC3C,cAAc,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;YAE/C,IAAI,CAAC;gBACH,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/E,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,oBAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACrD,CAAC;YACD,MAAM,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE;gBACxD,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACpF,uBAAuB,GAAG,gBAAC,CAAC,OAAO,CACjC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CACnE,CAAC;gBACF,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC;gBACH,CAAC,cAAc,EAAE,KAAK,CAAC,GAAG,MAAM,cAAc,CAAC,aAAa;gBAC1D,kBAAkB,CAAC,CAAC,wBAAwB,CAAC,EAC7C,wBAAwB,EACxB,wBAAwB,EACxB,CAAC,GAAG,kBAAkB,EAAE,GAAG,uBAAuB,CAAC,CACpD,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;YACjD,CAAC;oBAAS,CAAC;gBACT,MAAM,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE;oBACxD,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,cAAc,CAAC,CAAC;gBAChE,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,+BAA+B,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YAErE,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,OAAO,WAAW,CAAC,IAAI,yCAAyC;gBAC9D,GAAG,cAAc,+BAA+B,CACnD,CAAC;YAEF,mDAAmD;YACnD,MAAM,cAAc,CAAC,sBAAsB,EAAE,CAAC;YAE9C,wDAAwD;YACxD,IAAI,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC9D,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,uEAAuE;oBACrE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAC9B,CAAC;gBACF,MAAM,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YACnD,CAAC;YAED,wFAAwF;YACxF,2FAA2F;YAC3F,yDAAyD;YACzD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,EAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;gBAC5C,MAAM,MAAM,GAAG,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBACxD,MAAM,IAAI,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACrD,MAAM,OAAO,GAAG,GAAG,MAAM,MAAM,IAAI,IAAI,IAAI,GAAG,QAAQ,GAAG,0BAAc,IAAI,cAAc,EAAE,CAAC;gBAC5F,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,+CAA+C,KAAK,CAAC,YAAY,oBAAoB;oBACrF,GAAG,OAAO,yBAAyB,CACpC,CAAC;gBACF,wFAAwF;gBACxF,uFAAuF;gBACvF,+BAA+B;gBAC/B,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,QAAQ;gBACR,KAAK;aACN,CAAC;QACJ,CAAC;QAED,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC;SACzC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,+BAA+B,CAAC,MAAM,EAAE,cAAc;QACpD,MAAM,UAAU,GAAG,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE;YACxD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;YAE9D,IAAI,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;gBACxC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;oBACzD,IAAI,gBAAC,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;wBAC9C,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,UAAU,MAAM,CAAC,IAAI,yDAAyD,CAC/E,CAAC;wBACF,IAAI,CAAC;4BACH,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;wBAC7C,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,oCAAoC,MAAM,CAAC,IAAI,sBAAsB,CAAC,EAAE,CACzE,CAAC;wBACJ,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,MAAM,CAAC,IAAI,iDAAiD,CAAC,CAAC;oBACzF,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,cAAc,gCAAgC,CAAC,CAAC;YACnF,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACrC,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAC7C,CAAC,CAAC;QAEF,IAAI,gBAAC,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC9C,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,qDAAqD;gBACnD,mDAAmD,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,CACjF,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,uBAAuB,CAAC,WAAW;QACvC,MAAM,IAAI,GAAG,gBAAC,CAAC,OAAO,CACpB,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,CAAC;aACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAC5B,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CACb,+CAA+C;oBAC7C,GAAG,WAAW,CAAC,IAAI,uCAAuC,CAC7D,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,SAAS;QAC3B,IAAI,QAAQ,CAAC;QACb,IAAI,CAAC;YACH,IAAI,iBAAiB,CAAC;YACtB,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE;gBACzE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9B,OAAO;gBACT,CAAC;gBACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;gBACrE,iBAAiB,GAAG,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;qBACzC,MAAM,CACL,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB,IAAI,GAAG,KAAK,SAAS,CACrF;qBACA,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACxC,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAC5C,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,SAAS,+BAA+B,CAAC,CAAC;gBAC5E,wEAAwE;gBACxE,sEAAsE;gBACtE,kBAAkB;gBAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAChC,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBAEtC,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;gBAEnC,OAAO,UAAU,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,8FAA8F;YAC9F,gBAAgB;YAChB,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC;YACD,OAAO;gBACL,QAAQ;gBACR,KAAK,EAAE,MAAM,UAAU,CAAC,aAAa,CAAC,SAAS,EAAE,iBAAiB,CAAC;aACpE,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,SAAS,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACxE,OAAO;gBACL,QAAQ;gBACR,KAAK,EAAE,CAAC;aACT,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAI,GAAG,EAAE;QAC/B,MAAM,aAAa,GAAG,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,EAAC,KAAK,GAAG,KAAK,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,cAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACvF,MAAM,eAAe,GAAG,KAAK;YAC3B,CAAC,CAAC,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClC,GAAG,CAAC,uBAAuB,CAAC,MAAM,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CACzD;YACH,CAAC,CAAC,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,MAAM,cAAc,CAAC;YACvB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,iBAAiB,CAAC,SAAS,GAAG,IAAI;QAChC,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,IAAA,qCAAuB,EAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC;YAChF,CAAC;YACD,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACzD,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED;;;;;;;;;OASG;IACH,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;QACtC,uFAAuF;QACvF,mEAAmE;QACnE,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,gBAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CACtD,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,QAAQ,GAAG,IAAI;QACnC,uBAAuB;QACvB,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACxD,IAAI,gBAAC,CAAC,UAAU,CAAC,qCAAqC,CAAA,CAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACnF,0DAA0D;gBAC1D,qCAAqC,CAAA,CAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;YACtG,CAAC;YACD,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,IAAI;QAC/B,4DAA4D;QAC5D,8FAA8F;QAC9F,iFAAiF;QACjF,6FAA6F;QAC7F,wEAAwE;QACxE,qCAAqC;QACrC,2FAA2F;QAC3F,8BAA8B;QAE9B,MAAM,WAAW,GAAG,GAAG,KAAK,gCAAkB,CAAC;QAC/C,MAAM,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,IAAA,8BAAgB,EAAC,GAAG,CAAC,CAAC;QAE3C,6FAA6F;QAC7F,8FAA8F;QAC9F,uCAAuC;QACvC,MAAM,WAAW,GAAG,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;QAC9C,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QAED,2FAA2F;QAC3F,6FAA6F;QAC7F,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,oCAAoC;QACpC,4DAA4D;QAC5D,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,YAAY,EAAE,CAAC;YACjB,SAAS,GAAG,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,SAAS,kBAAkB,CAAC,CAAC;YACvE,CAAC;YACD,uFAAuF;YACvF,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,GAAG,UAAU,CAAC;YACtB,CAAC;QACH,CAAC;QAED,gEAAgE;QAChE,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAExD,uFAAuF;QACvF,yFAAyF;QACzF,+DAA+D;QAC/D,IAAI,OAAO,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,qFAAqF,CACtF,CAAC;YACF,MAAM,UAAU,CAAC,sBAAsB,EAAE,CAAC;QAC5C,CAAC;QAED,iGAAiG;QACjG,4FAA4F;QAC5F,6FAA6F;QAC7F,6FAA6F;QAC7F,6FAA6F;QAC7F,wEAAwE;QACxE,MAAM,YAAY,GAAG,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;QAEtC,4FAA4F;QAC5F,6FAA6F;QAC7F,+FAA+F;QAC/F,sBAAsB;QACtB,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;YACjC,wFAAwF;YACxF,4FAA4F;YAC5F,yBAAyB;YACzB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oDAAoD,GAAG,GAAG,CAAC,CAAC;YAC5E,CAAC;YAED,mEAAmE;YACnE,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAE5B,IAAI,WAAW,EAAE,CAAC;gBAChB,0FAA0F;gBAC1F,0FAA0F;gBAC1F,8EAA8E;gBAC9E,6CAA6C;gBAC7C,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC;oBAC9B,MAAM,IAAI,yBAAyB,EAAE,CAAC;gBACxC,CAAC;gBACD,OAAO,MAAM,UAAU,CAAC,YAAY,CAClC,WAAW,CAAC,WAAW,EACvB,WAAW,CAAC,MAAM,EAClB,WAAW,CAAC,IAAI,CACjB,CAAC;YACJ,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,CAAC;YAED,IAAI,aAAa,EAAE,CAAC;gBAClB,sFAAsF;gBACtF,0BAA0B;gBAC1B,OAAO,MAAM,wBAAU,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAC5E,CAAC;YAED,wFAAwF;YACxF,OAAO,MAAM,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC5E,CAAC,CAAC;QAEF,yFAAyF;QACzF,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC;YAC7C,MAAM;YACN,GAAG;YACH,IAAI;YACJ,OAAO;YACP,YAAY;YACZ,IAAI,EAAE,eAAe;SACtB,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,EAAC,UAAU,EAAE,QAAQ,EAAC,CAAC,CAAC;QAErE,0FAA0F;QAC1F,wCAAwC;QACxC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,EAAC,GAAG,EAAE,YAAY,EAAC,CAAC,CAAC;QAE1D,6FAA6F;QAC7F,yFAAyF;QACzF,yEAAyE;QACzE,IACE,UAAU;YACV,CAAC,YAAY,CAAC,OAAO;YACrB,UAAU,CAAC,sBAAsB;YACjC,GAAG,KAAK,oCAAsB,EAC9B,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,0EAA0E;gBACxE,kCAAkC,CACrC,CAAC;YACF,MAAM,UAAU,CAAC,sBAAsB,EAAE,CAAC;QAC5C,CAAC;QAED,2FAA2F;QAC3F,2FAA2F;QAC3F,wDAAwD;QACxD,IAAI,GAAG,KAAK,oCAAsB,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACnF,MAAM,SAAS,GAAG,gBAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,aAAa,IAAI,CAAC,kBAAkB,CAAC,MAAM,sCAAsC;gBAC/E,iBAAiB,SAAS,EAAE,CAC/B,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC;YACzD,KAAK,MAAM,CAAC,IAAI,yCAAyC,CAAA,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBAC1F,IAAI,gBAAC,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC;oBACpC,2DAA2D;oBAC3D,CAAC,CAAC,eAAe,CAAC,GAAG,IAAA,qCAAuB,EAAC,CAAC,CAAC,KAAK,IAAA,qCAAuB,EAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC5G,CAAC;YACH,CAAC;YACD,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;QAC/B,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,sBAAsB,CAAC,EAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAC;QACrE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxF,CAAC;QAED,8FAA8F;QAC9F,gDAAgD;QAChD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,2FAA2F;YAC3F,oFAAoF;YACpF,2FAA2F;YAC3F,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,8DAA8D;YACjG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;gBAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,IAAI,yBAAyB,GAAG,GAAG,CAAC,CAAC;gBACpE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,8DAA8D;gBAChG,mFAAmF;gBACnF,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChB,OAAO,MAAM,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;gBACnD,CAAC;gBACD,8CAA8C;gBAC9C,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACX,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sBAAsB,CAAC,OAAO,EAAE,EAAC,GAAG,EAAE,YAAY,EAAC;QACjD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,uFAAuF;QACvF,uFAAuF;QACvF,uFAAuF;QACvF,yFAAyF;QACzF,uFAAuF;QACvF,YAAY;QACZ,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9E,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,YAAY,GAAG,mEAAmE;gBAChF,6CAA6C,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ;gBAChF,mCAAmC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,EAAC,UAAU,EAAE,QAAQ,EAAC;QAChD,IAAI,MAAM,EACR,MAAM,EACN,GAAG,GAAG,EAAE,CAAC;QACX,IAAI,CAAC;YACH,0FAA0F;YAC1F,2FAA2F;YAC3F,QAAQ;YACR,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,CAAC,CAAC;QACb,CAAC;QAED,8FAA8F;QAC9F,6FAA6F;QAC7F,oEAAoE;QACpE,IAAI,gBAAC,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YACzD,GAAG,GAAG,MAAM,CAAC;QACf,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC;YACnB,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC;YACnB,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC1B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,WAAW,CAAC,SAAS;QACnB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,UAAU,IAAI,gBAAC,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACjG,CAAC;IAED;;;;OAIG;IACH,iBAAiB,CAAC,SAAS;QACzB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,CAAC;IAED,QAAQ,CAAC,SAAS;QAChB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,UAAU,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;CASF;AAqCO,oCAAY;AAnCpB;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAG;IAChC,OAAO,CAAC,IAAA,8BAAgB,EAAC,GAAG,CAAC;WACxB,gBAAC,CAAC,QAAQ,CAAC;YACZ,oCAAsB;YACtB,0CAA4B;YAC5B,4CAA8B;SAC/B,EAAE,GAAG,CAAC,CAAC;AACZ,CAAC;AAED;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,KAAK;IAMlD;QACE,KAAK,CACH,qEAAqE;YACnE,mEAAmE;YACnE,yEAAyE;YACzE,6DAA6D,CAChE,CAAC;QAXJ;;WAEG;QACH,SAAI,GAAG,kCAAkC,CAAC;IAS1C,CAAC;CACF;AAdD,8DAcC;AAID;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;GAEG;AAEH;;;;;;;;GAQG;AAEH;;;GAGG"}

package/build/lib/constants.d.ts

@@ -19,9 +19,11 @@ export const SETUP_SUBCOMMAND: "setup";
  */
 export const USE_ALL_PLUGINS: "all";
 export const KNOWN_PLUGINS: Readonly<{
-    readonly images: "@appium/images-plugin";
     readonly 'execute-driver': "@appium/execute-driver-plugin";
+    readonly images: "@appium/images-plugin";
+    readonly inspector: "appium-inspector-plugin";
     readonly 'relaxed-caps': "@appium/relaxed-caps-plugin";
+    readonly storage: "@appium/storage-plugin";
     readonly 'universal-xml': "@appium/universal-xml-plugin";
 }>;
 export const MOBILE_DRIVERS: Readonly<{

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":"AAEA;;GAEG;AACH,0BAA2B,QAAQ,CAAC;AAEpC;;GAEG;AACH,0BAA2B,QAAQ,CAAC;AAEpC;;GAEG;AACH,gCAAiC,QAAQ,CAAC;AAE1C;;GAEG;AACH,+BAAgC,OAAO,CAAC;AAGxC;;GAEG;AACH,8BAA+B,KAAK,CAAC;AAMrC;;;;;GAOE;AAEF;;;;GAME;AAEF;;;GAKE;AAEF;;;;GAME;AAMF;;;;;;;;;GAME;AAEF;;GAEG;AACH,6CAAqF;AAErF;;GAEG;AACH,gDAA6F;AAE7F,kCAAmC,MAAM,CAAC;AAC1C,qCAAsC,SAAS,CAAC;AAChD,uCAAwC,WAAW,CAAC;AACpD,oCAAqC,QAAQ,CAAC;AAC9C,iCAAkC,KAAK,CAAC;AACxC,oCAAqC,QAAQ,CAAC;AAE9C;;GAEG;AACH,iCAAkC,CAAC,CAAC;AAEpC;;;;;GAKG;AACH,oCAAqC,GAAG,CAAC;AAEzC;;GAEG;AACH,6BAA8B,OAAO,CAAC;AAEtC;;;GAGG;AACH,8BAA+B,WAAW,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":"AAEA;;GAEG;AACH,0BAA2B,QAAQ,CAAC;AAEpC;;GAEG;AACH,0BAA2B,QAAQ,CAAC;AAEpC;;GAEG;AACH,gCAAiC,QAAQ,CAAC;AAE1C;;GAEG;AACH,+BAAgC,OAAO,CAAC;AAGxC;;GAEG;AACH,8BAA+B,KAAK,CAAC;AAMrC;;;;;;;GASE;AAEF;;;;GAME;AAEF;;;GAKE;AAEF;;;;GAME;AAMF;;;;;;;;;GAME;AAEF;;GAEG;AACH,6CAAqF;AAErF;;GAEG;AACH,gDAA6F;AAE7F,kCAAmC,MAAM,CAAC;AAC1C,qCAAsC,SAAS,CAAC;AAChD,uCAAwC,WAAW,CAAC;AACpD,oCAAqC,QAAQ,CAAC;AAC9C,iCAAkC,KAAK,CAAC;AACxC,oCAAqC,QAAQ,CAAC;AAE9C;;GAEG;AACH,iCAAkC,CAAC,CAAC;AAEpC;;;;;GAKG;AACH,oCAAqC,GAAG,CAAC;AAEzC;;GAEG;AACH,6BAA8B,OAAO,CAAC;AAEtC;;;GAGG;AACH,8BAA+B,WAAW,CAAC"}

package/build/lib/constants.js

@@ -31,9 +31,11 @@ exports.USE_ALL_PLUGINS = 'all';
 // npm package. I.e., these are the officially recognized plugins.
 exports.KNOWN_PLUGINS = Object.freeze(
 /** @type {const} */ ({
-    images: '@appium/images-plugin',
     'execute-driver': '@appium/execute-driver-plugin',
+    images: '@appium/images-plugin',
+    inspector: 'appium-inspector-plugin',
     'relaxed-caps': '@appium/relaxed-caps-plugin',
+    storage: '@appium/storage-plugin',
     'universal-xml': '@appium/universal-xml-plugin',
 }));
 exports.MOBILE_DRIVERS = Object.freeze(

package/build/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACU,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAGxC;;GAEG;AACU,QAAA,eAAe,GAAG,KAAK,CAAC;AAErC,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,kEAAkE;AACrD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM;AACxC,oBAAoB,CAAC,CAAC;IACpB,MAAM,EAAE,uBAAuB;IAC/B,gBAAgB,EAAE,+BAA+B;IACjD,cAAc,EAAE,6BAA6B;IAC7C,eAAe,EAAE,8BAA8B;CAChD,CAAC,CACH,CAAC;AAEW,QAAA,cAAc,GAAG,MAAM,CAAC,MAAM;AACzC,oBAAoB,CAAC,CAAC;IACpB,YAAY,EAAE,4BAA4B;IAC1C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;CACnC,CAAC,CACH,CAAC;AAEW,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM;AAC1C,oBAAoB,CAAC,CAAC;IACpB,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,uBAAuB;CACjC,CAAC,CACH,CAAC;AAEW,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM;AAC3C,oBAAoB,CAAC,CAAC;IACpB,MAAM,EAAE,sBAAsB;IAC9B,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,wBAAwB;CACnC,CAAC,CACH,CAAC;AAEF,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,kEAAkE;AACrD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM;AACxC,oBAAoB,CAAC,CAAC;IACpB,GAAG,sBAAc;IACjB,GAAG,uBAAe;IAClB,GAAG,wBAAgB;CACpB,CAAC,CACH,CAAC;AAEF;;GAEG;AACU,QAAA,uBAAuB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAErF;;GAEG;AACU,QAAA,0BAA0B,GAAG,cAAI,CAAC,IAAI,CAAC,+BAAuB,EAAE,cAAc,CAAC,CAAC;AAEhF,QAAA,mBAAmB,GAAG,MAAM,CAAC;AAC7B,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,wBAAwB,GAAG,WAAW,CAAC;AACvC,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,kBAAkB,GAAG,KAAK,CAAC;AAC3B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAE9C;;GAEG;AACU,QAAA,kBAAkB,GAAG,CAAC,CAAC;AAEpC;;;;;GAKG;AACU,QAAA,qBAAqB,GAAG,GAAG,CAAC;AAEzC;;GAEG;AACU,QAAA,cAAc,GAAG,OAAO,CAAC;AAEtC;;;GAGG;AACU,QAAA,eAAe,GAAG,WAAW,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACU,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAGxC;;GAEG;AACU,QAAA,eAAe,GAAG,KAAK,CAAC;AAErC,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,kEAAkE;AACrD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM;AACxC,oBAAoB,CAAC,CAAC;IACpB,gBAAgB,EAAE,+BAA+B;IACjD,MAAM,EAAE,uBAAuB;IAC/B,SAAS,EAAE,yBAAyB;IACpC,cAAc,EAAE,6BAA6B;IAC7C,OAAO,EAAE,wBAAwB;IACjC,eAAe,EAAE,8BAA8B;CAChD,CAAC,CACH,CAAC;AAEW,QAAA,cAAc,GAAG,MAAM,CAAC,MAAM;AACzC,oBAAoB,CAAC,CAAC;IACpB,YAAY,EAAE,4BAA4B;IAC1C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;CACnC,CAAC,CACH,CAAC;AAEW,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM;AAC1C,oBAAoB,CAAC,CAAC;IACpB,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,uBAAuB;CACjC,CAAC,CACH,CAAC;AAEW,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM;AAC3C,oBAAoB,CAAC,CAAC;IACpB,MAAM,EAAE,sBAAsB;IAC9B,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,wBAAwB;CACnC,CAAC,CACH,CAAC;AAEF,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,kEAAkE;AACrD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM;AACxC,oBAAoB,CAAC,CAAC;IACpB,GAAG,sBAAc;IACjB,GAAG,uBAAe;IAClB,GAAG,wBAAgB;CACpB,CAAC,CACH,CAAC;AAEF;;GAEG;AACU,QAAA,uBAAuB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAErF;;GAEG;AACU,QAAA,0BAA0B,GAAG,cAAI,CAAC,IAAI,CAAC,+BAAuB,EAAE,cAAc,CAAC,CAAC;AAEhF,QAAA,mBAAmB,GAAG,MAAM,CAAC;AAC7B,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,wBAAwB,GAAG,WAAW,CAAC;AACvC,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,kBAAkB,GAAG,KAAK,CAAC;AAC3B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAE9C;;GAEG;AACU,QAAA,kBAAkB,GAAG,CAAC,CAAC;AAEpC;;;;;GAKG;AACU,QAAA,qBAAqB,GAAG,GAAG,CAAC;AAEzC;;GAEG;AACU,QAAA,cAAc,GAAG,OAAO,CAAC;AAEtC;;;GAGG;AACU,QAAA,eAAe,GAAG,WAAW,CAAC"}

package/build/lib/utils.d.ts

@@ -9,14 +9,12 @@ export function makeNonW3cCapsError(): Error;
  * into caps that can be used by the inner drivers.
  *
  * @template {Constraints} C
- * @template [J=any]
- * @param {J} jsonwpCapabilities
  * @param {W3CCapabilities<C>} w3cCapabilities
  * @param {C} constraints
  * @param {NSCapabilities<C>} [defaultCapabilities]
- * @returns {ParsedDriverCaps<C,J>|InvalidCaps<C,J>}
+ * @returns {ParsedDriverCaps<C>|InvalidCaps<C>}
  */
-export function parseCapsForInnerDriver<C extends Constraints, J = any>(jsonwpCapabilities: J, w3cCapabilities: W3CCapabilities<C>, constraints?: C, defaultCapabilities?: NSCapabilities<C>): ParsedDriverCaps<C, J> | InvalidCaps<C, J>;
+export function parseCapsForInnerDriver<C extends Constraints>(w3cCapabilities: W3CCapabilities<C>, constraints?: C, defaultCapabilities?: NSCapabilities<C>): ParsedDriverCaps<C> | InvalidCaps<C>;
 /**
  * Takes a capabilities objects and prefixes capabilities with `appium:`
  * @template {Constraints} [C={}]
@@ -194,11 +192,9 @@ export type ParsedDriverCaps<C extends Constraints = {
     readonly printPageSourceOnFindFailure: {
         readonly isBoolean: true;
     };
-}, J = any> = {
+}> = {
     desiredCaps: Capabilities<C>;
-    protocol: string;
-    processedJsonwpCapabilities?: J | undefined;
-    processedW3CCapabilities?: import("@appium/types").W3CCapabilities<C> | undefined;
+    processedW3CCapabilities: W3CCapabilities<C>;
 };
 export type InvalidCaps<C extends Constraints = {
     readonly platformName: {
@@ -250,11 +246,9 @@ export type InvalidCaps<C extends Constraints = {
     readonly printPageSourceOnFindFailure: {
         readonly isBoolean: true;
     };
-}, J = any> = {
+}> = {
     error: Error;
-    protocol: string;
     desiredCaps?: import("@appium/types").ConstraintsToCaps<C> | undefined;
-    processedJsonwpCapabilities?: J | undefined;
     processedW3CCapabilities?: import("@appium/types").W3CCapabilities<C> | undefined;
 };
 export type Capabilities<C extends Constraints> = import("@appium/types").Capabilities<C>;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}

package/build/lib/utils.js

@@ -66,106 +66,75 @@ exports.inspect = lodash_1.default.flow(lodash_1.default.partialRight(
  * into caps that can be used by the inner drivers.
  *
  * @template {Constraints} C
- * @template [J=any]
- * @param {J} jsonwpCapabilities
  * @param {W3CCapabilities<C>} w3cCapabilities
  * @param {C} constraints
  * @param {NSCapabilities<C>} [defaultCapabilities]
- * @returns {ParsedDriverCaps<C,J>|InvalidCaps<C,J>}
+ * @returns {ParsedDriverCaps<C>|InvalidCaps<C>}
  */
-function parseCapsForInnerDriver(jsonwpCapabilities, w3cCapabilities, constraints = /** @type {C} */ ({}), defaultCapabilities = {}) {
-    // Check if the caller sent JSONWP caps, W3C caps, or both
-    const hasW3CCaps = lodash_1.default.isPlainObject(w3cCapabilities) &&
-        (lodash_1.default.has(w3cCapabilities, 'alwaysMatch') || lodash_1.default.has(w3cCapabilities, 'firstMatch'));
-    const hasJSONWPCaps = lodash_1.default.isPlainObject(jsonwpCapabilities);
-    let desiredCaps = /** @type {ParsedDriverCaps<C>['desiredCaps']} */ ({});
-    /** @type {ParsedDriverCaps<C>['processedW3CCapabilities']} */
-    let processedW3CCapabilities;
-    /** @type {ParsedDriverCaps<C>['processedJsonwpCapabilities']} */
-    let processedJsonwpCapabilities;
-    if (!hasW3CCaps) {
+function parseCapsForInnerDriver(w3cCapabilities, constraints = /** @type {C} */ ({}), defaultCapabilities = {}) {
+    if (!(0, base_driver_1.isW3cCaps)(w3cCapabilities)) {
         return /** @type {InvalidCaps<C>} */ ({
-            protocol: base_driver_1.PROTOCOLS.W3C,
             error: makeNonW3cCapsError(),
         });
     }
-    const { W3C } = base_driver_1.PROTOCOLS;
-    const protocol = W3C;
+    let desiredCaps = /** @type {ParsedDriverCaps<C>['desiredCaps']} */ ({});
+    /** @type {ParsedDriverCaps<C>['processedW3CCapabilities'] | undefined} */
+    let processedW3CCapabilities;
     // Make sure we don't mutate the original arguments
-    jsonwpCapabilities = lodash_1.default.cloneDeep(jsonwpCapabilities);
     w3cCapabilities = lodash_1.default.cloneDeep(w3cCapabilities);
     defaultCapabilities = lodash_1.default.cloneDeep(defaultCapabilities);
     if (!lodash_1.default.isEmpty(defaultCapabilities)) {
-        if (hasW3CCaps) {
-            for (const [defaultCapKey, defaultCapValue] of lodash_1.default.toPairs(defaultCapabilities)) {
-                let isCapAlreadySet = false;
-                // Check if the key is already present in firstMatch entries
-                for (const firstMatchEntry of w3cCapabilities.firstMatch ?? []) {
-                    if (lodash_1.default.isPlainObject(firstMatchEntry) &&
-                        lodash_1.default.has(removeAppiumPrefixes(firstMatchEntry), removeAppiumPrefix(defaultCapKey))) {
-                        isCapAlreadySet = true;
-                        break;
-                    }
-                }
-                // Check if the key is already present in alwaysMatch entries
-                isCapAlreadySet =
-                    isCapAlreadySet ||
-                        (lodash_1.default.isPlainObject(w3cCapabilities.alwaysMatch) &&
-                            lodash_1.default.has(removeAppiumPrefixes(w3cCapabilities.alwaysMatch), removeAppiumPrefix(defaultCapKey)));
-                if (isCapAlreadySet) {
-                    // Skip if the key is already present in the provided caps
-                    continue;
-                }
-                // Only add the default capability if it is not overridden
-                if (lodash_1.default.isEmpty(w3cCapabilities.firstMatch)) {
-                    w3cCapabilities.firstMatch = /** @type {W3CCapabilities<C>['firstMatch']} */ ([
-                        { [defaultCapKey]: defaultCapValue },
-                    ]);
-                }
-                else {
-                    w3cCapabilities.firstMatch[0][defaultCapKey] = defaultCapValue;
+        for (const [defaultCapKey, defaultCapValue] of lodash_1.default.toPairs(defaultCapabilities)) {
+            let isCapAlreadySet = false;
+            // Check if the key is already present in firstMatch entries
+            for (const firstMatchEntry of w3cCapabilities.firstMatch ?? []) {
+                if (lodash_1.default.isPlainObject(firstMatchEntry) &&
+                    lodash_1.default.has(removeAppiumPrefixes(firstMatchEntry), removeAppiumPrefix(defaultCapKey))) {
+                    isCapAlreadySet = true;
+                    break;
                 }
             }
-        }
-        if (hasJSONWPCaps) {
-            jsonwpCapabilities = {
-                ...removeAppiumPrefixes(defaultCapabilities),
-                ...jsonwpCapabilities,
-            };
+            // Check if the key is already present in alwaysMatch entries
+            isCapAlreadySet =
+                isCapAlreadySet ||
+                    (lodash_1.default.isPlainObject(w3cCapabilities.alwaysMatch) &&
+                        lodash_1.default.has(removeAppiumPrefixes(w3cCapabilities.alwaysMatch), removeAppiumPrefix(defaultCapKey)));
+            if (isCapAlreadySet) {
+                // Skip if the key is already present in the provided caps
+                continue;
+            }
+            // Only add the default capability if it is not overridden
+            if (lodash_1.default.isEmpty(w3cCapabilities.firstMatch)) {
+                w3cCapabilities.firstMatch = /** @type {W3CCapabilities<C>['firstMatch']} */ ([
+                    { [defaultCapKey]: defaultCapValue },
+                ]);
+            }
+            else {
+                w3cCapabilities.firstMatch[0][defaultCapKey] = defaultCapValue;
+            }
         }
     }
-    // Get MJSONWP caps
-    if (hasJSONWPCaps) {
-        processedJsonwpCapabilities = { ...jsonwpCapabilities };
+    // Call the process capabilities algorithm to find matching caps on the W3C
+    // (see: https://github.com/jlipps/simple-wd-spec#processing-capabilities)
+    try {
+        desiredCaps = (0, base_driver_1.processCapabilities)(w3cCapabilities, constraints, true);
     }
-    // Get W3C caps
-    if (hasW3CCaps) {
-        // Call the process capabilities algorithm to find matching caps on the W3C
-        // (see: https://github.com/jlipps/simple-wd-spec#processing-capabilities)
-        try {
-            desiredCaps = (0, base_driver_1.processCapabilities)(w3cCapabilities, constraints, true);
-        }
-        catch (error) {
-            logger_1.default.info(`Could not parse W3C capabilities: ${error.message}`);
-            return /** @type {InvalidCaps<C,J>} */ ({
-                desiredCaps,
-                processedJsonwpCapabilities,
-                processedW3CCapabilities,
-                protocol,
-                error,
-            });
-        }
-        // Create a new w3c capabilities payload that contains only the matching caps in `alwaysMatch`
-        processedW3CCapabilities = {
-            alwaysMatch: { ...insertAppiumPrefixes(desiredCaps) },
-            firstMatch: [{}],
-        };
+    catch (error) {
+        logger_1.default.info(`Could not parse W3C capabilities: ${error.message}`);
+        return /** @type {InvalidCaps<C>} */ ({
+            desiredCaps,
+            processedW3CCapabilities,
+            error,
+        });
     }
-    return /** @type {ParsedDriverCaps<C,J>} */ ({
+    // Create a new w3c capabilities payload that contains only the matching caps in `alwaysMatch`
+    processedW3CCapabilities = {
+        alwaysMatch: { ...insertAppiumPrefixes(desiredCaps) },
+        firstMatch: [{}],
+    };
+    return /** @type {ParsedDriverCaps<C>} */ ({
         desiredCaps,
-        processedJsonwpCapabilities,
         processedW3CCapabilities,
-        protocol,
     });
 }
 /**
@@ -440,20 +409,19 @@ function isBroadcastIp(address) {
  */
 function validateFeatures(features) {
     const validator = (/** @type {string} */ fullName) => {
+        const errMsg = `The full feature name must include both the destination automation name or the ` +
+            `'${ALL_DRIVERS_MATCH}' wildcard to apply the feature to all installed drivers, and ` +
+            `the feature name split by a colon. Got '${fullName}' instead`;
         const separatorPos = fullName.indexOf(FEATURE_NAME_SEPARATOR);
-        // TODO: This is for the backward compatibility with Appium2
-        // TODO: In Appium3 the separator will be mandatory
         if (separatorPos < 0) {
-            return `${ALL_DRIVERS_MATCH}${FEATURE_NAME_SEPARATOR}${fullName}`;
+            throw new Error(errMsg);
         }
         const [automationName, featureName] = [
             fullName.substring(0, separatorPos),
             fullName.substring(separatorPos + 1)
         ];
         if (!automationName || !featureName) {
-            throw new Error(`The full feature name must include both the destination automation name or the ` +
-                `'${ALL_DRIVERS_MATCH}' wildcard to apply the feature to all installed drivers, and ` +
-                `the feature name split by a colon, got '${fullName}' instead`);
+            throw new Error(errMsg);
         }
         return fullName;
     };
@@ -465,22 +433,16 @@ function validateFeatures(features) {
  */
 /**
  * @template {Constraints} [C=BaseDriverCapConstraints]
- * @template [J=any]
  * @typedef ParsedDriverCaps
  * @property {Capabilities<C>} desiredCaps
- * @property {string} protocol
- * @property {J} [processedJsonwpCapabilities]
- * @property {W3CCapabilities<C>} [processedW3CCapabilities]
+ * @property {W3CCapabilities<C>} processedW3CCapabilities
  */
 /**
  * @todo protocol is more specific
  * @template {Constraints} [C=BaseDriverCapConstraints]
- * @template [J=any]
  * @typedef InvalidCaps
  * @property {Error} error
- * @property {string} protocol
  * @property {Capabilities<C>} [desiredCaps]
- * @property {J} [processedJsonwpCapabilities]
  * @property {W3CCapabilities<C>} [processedW3CCapabilities]
  */
 /**

package/build/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}

package/lib/appium.js

@@ -5,6 +5,7 @@ import {
   DriverCore,
   errors,
   isSessionCommand,
+  PROTOCOLS,
   CREATE_SESSION_COMMAND,
   DELETE_SESSION_COMMAND,
   GET_STATUS_COMMAND,
@@ -13,6 +14,7 @@ import {
   promoteAppiumOptions,
   promoteAppiumOptionsForObject,
   generateDriverLogPrefix,
+  isW3cCaps,
 } from '@appium/base-driver';
 import AsyncLock from 'async-lock';
 import {
@@ -253,50 +255,41 @@ class AppiumDriver extends DriverCore {
 
   /**
    * Create a new session
-   * @param {W3CAppiumDriverCaps} jsonwpCaps JSONWP formatted desired capabilities
-   * @param {W3CAppiumDriverCaps} [reqCaps] Required capabilities (JSONWP standard)
-   * @param {W3CAppiumDriverCaps} [w3cCapabilities] W3C capabilities
+   *
+   * @param {W3CAppiumDriverCaps} w3cCapabilities1 W3C capabilities
+   * @param {W3CAppiumDriverCaps} [w3cCapabilities2] W3C capabilities (legacy)
+   * @param {W3CAppiumDriverCaps} [w3cCapabilities3] W3C capabilities (legacy)
    * @returns {Promise<SessionHandlerCreateResult>}
    */
-  async createSession(jsonwpCaps, reqCaps, w3cCapabilities) {
+  async createSession(w3cCapabilities1, w3cCapabilities2, w3cCapabilities3) {
     const defaultCapabilities = _.cloneDeep(this.args.defaultCapabilities);
     const defaultSettings = pullSettings(defaultCapabilities);
-    jsonwpCaps = _.cloneDeep(jsonwpCaps);
-    const jwpSettings = {...defaultSettings, ...pullSettings(jsonwpCaps)};
-    w3cCapabilities = _.cloneDeep(w3cCapabilities);
-    if (
-      !_.isPlainObject(w3cCapabilities) ||
-      !(_.isArray(w3cCapabilities?.firstMatch) || _.isPlainObject(w3cCapabilities?.alwaysMatch))
-    ) {
+    const w3cCapabilities = _.cloneDeep(
+      [w3cCapabilities3, w3cCapabilities2, w3cCapabilities1].find(isW3cCaps)
+    );
+    if (!w3cCapabilities) {
       throw makeNonW3cCapsError();
     }
-    // It is possible that the client only provides caps using JSONWP standard,
-    // although firstMatch/alwaysMatch properties are still present.
-    // In such case we assume the client understands W3C protocol and merge the given
-    // JSONWP caps to W3C caps
     const w3cSettings = {
-      ...jwpSettings,
-      ...pullSettings((w3cCapabilities ?? {}).alwaysMatch ?? {}),
+      ...defaultSettings,
+      ...pullSettings(w3cCapabilities.alwaysMatch ?? {}),
     };
-    for (const firstMatchEntry of (w3cCapabilities ?? {}).firstMatch ?? []) {
+    for (const firstMatchEntry of w3cCapabilities.firstMatch ?? []) {
       Object.assign(w3cSettings, pullSettings(firstMatchEntry));
     }
 
-    /** @type {string|undefined} */
-    let protocol;
+    const protocol = PROTOCOLS.W3C;
     let innerSessionId, dCaps;
     try {
       // Parse the caps into a format that the InnerDriver will accept
       const parsedCaps = parseCapsForInnerDriver(
-        jsonwpCaps,
         promoteAppiumOptions(/** @type {W3CAppiumDriverCaps} */ (w3cCapabilities)),
         this.desiredCapConstraints,
         defaultCapabilities ? promoteAppiumOptionsForObject(defaultCapabilities) : undefined,
       );
 
-      const {desiredCaps, processedJsonwpCapabilities, processedW3CCapabilities} =
+      const {desiredCaps, processedW3CCapabilities} =
         /** @type {import('./utils').ParsedDriverCaps<AppiumDriverConstraints>} */ (parsedCaps);
-      protocol = parsedCaps.protocol;
       const error = /** @type {import('./utils').InvalidCaps<AppiumDriverConstraints>} */ (
         parsedCaps
       ).error;
@@ -390,12 +383,11 @@ class AppiumDriver extends DriverCore {
 
       try {
         [innerSessionId, dCaps] = await driverInstance.createSession(
-          processedJsonwpCapabilities,
-          reqCaps,
+          /** @type {any} */ (processedW3CCapabilities),
+          processedW3CCapabilities,
           processedW3CCapabilities,
           [...runningDriversData, ...otherPendingDriversData],
         );
-        protocol = driverInstance.protocol;
         this.sessions[innerSessionId] = driverInstance;
       } finally {
         await pendingDriversGuard.acquire(AppiumDriver.name, () => {
@@ -420,12 +412,6 @@ class AppiumDriver extends DriverCore {
             JSON.stringify(w3cSettings),
         );
         await driverInstance.updateSettings(w3cSettings);
-      } else if (driverInstance.isMjsonwpProtocol() && !_.isEmpty(jwpSettings)) {
-        this.log.info(
-          `Applying the initial values to Appium settings parsed from MJSONWP caps: ` +
-            JSON.stringify(jwpSettings),
-        );
-        await driverInstance.updateSettings(jwpSettings);
       }
 
       // if the user has asked for bidi support, send our bidi url back to the user. The inner

package/lib/constants.js

@@ -32,9 +32,11 @@ export const USE_ALL_PLUGINS = 'all';
 // npm package. I.e., these are the officially recognized plugins.
 export const KNOWN_PLUGINS = Object.freeze(
   /** @type {const} */ ({
-    images: '@appium/images-plugin',
     'execute-driver': '@appium/execute-driver-plugin',
+    images: '@appium/images-plugin',
+    inspector: 'appium-inspector-plugin',
     'relaxed-caps': '@appium/relaxed-caps-plugin',
+    storage: '@appium/storage-plugin',
     'universal-xml': '@appium/universal-xml-plugin',
   }),
 );

package/lib/utils.js

@@ -2,9 +2,9 @@ import _ from 'lodash';
 import logger from './logger';
 import {
   processCapabilities,
-  PROTOCOLS,
   STANDARD_CAPS,
   errors,
+  isW3cCaps,
 } from '@appium/base-driver';
 import {inspect as dump} from 'util';
 import {node, fs} from '@appium/support';
@@ -61,124 +61,89 @@ export const inspect = _.flow(
  * into caps that can be used by the inner drivers.
  *
  * @template {Constraints} C
- * @template [J=any]
- * @param {J} jsonwpCapabilities
  * @param {W3CCapabilities<C>} w3cCapabilities
  * @param {C} constraints
  * @param {NSCapabilities<C>} [defaultCapabilities]
- * @returns {ParsedDriverCaps<C,J>|InvalidCaps<C,J>}
+ * @returns {ParsedDriverCaps<C>|InvalidCaps<C>}
  */
 export function parseCapsForInnerDriver(
-  jsonwpCapabilities,
   w3cCapabilities,
   constraints = /** @type {C} */ ({}),
   defaultCapabilities = {}
 ) {
-  // Check if the caller sent JSONWP caps, W3C caps, or both
-  const hasW3CCaps =
-    _.isPlainObject(w3cCapabilities) &&
-    (_.has(w3cCapabilities, 'alwaysMatch') || _.has(w3cCapabilities, 'firstMatch'));
-  const hasJSONWPCaps = _.isPlainObject(jsonwpCapabilities);
-  let desiredCaps = /** @type {ParsedDriverCaps<C>['desiredCaps']} */ ({});
-  /** @type {ParsedDriverCaps<C>['processedW3CCapabilities']} */
-  let processedW3CCapabilities;
-  /** @type {ParsedDriverCaps<C>['processedJsonwpCapabilities']} */
-  let processedJsonwpCapabilities;
-
-  if (!hasW3CCaps) {
+  if (!isW3cCaps(w3cCapabilities)) {
     return /** @type {InvalidCaps<C>} */ ({
-      protocol: PROTOCOLS.W3C,
       error: makeNonW3cCapsError(),
     });
   }
 
-  const {W3C} = PROTOCOLS;
-  const protocol = W3C;
+  let desiredCaps = /** @type {ParsedDriverCaps<C>['desiredCaps']} */ ({});
+  /** @type {ParsedDriverCaps<C>['processedW3CCapabilities'] | undefined} */
+  let processedW3CCapabilities;
 
   // Make sure we don't mutate the original arguments
-  jsonwpCapabilities = _.cloneDeep(jsonwpCapabilities);
   w3cCapabilities = _.cloneDeep(w3cCapabilities);
   defaultCapabilities = _.cloneDeep(defaultCapabilities);
 
   if (!_.isEmpty(defaultCapabilities)) {
-    if (hasW3CCaps) {
-      for (const [defaultCapKey, defaultCapValue] of _.toPairs(defaultCapabilities)) {
-        let isCapAlreadySet = false;
-        // Check if the key is already present in firstMatch entries
-        for (const firstMatchEntry of w3cCapabilities.firstMatch ?? []) {
-          if (
-            _.isPlainObject(firstMatchEntry) &&
-            _.has(removeAppiumPrefixes(firstMatchEntry), removeAppiumPrefix(defaultCapKey))
-          ) {
-            isCapAlreadySet = true;
-            break;
-          }
-        }
-        // Check if the key is already present in alwaysMatch entries
-        isCapAlreadySet =
-          isCapAlreadySet ||
-          (_.isPlainObject(w3cCapabilities.alwaysMatch) &&
-            _.has(
-              removeAppiumPrefixes(w3cCapabilities.alwaysMatch),
-              removeAppiumPrefix(defaultCapKey)
-            ));
-        if (isCapAlreadySet) {
-          // Skip if the key is already present in the provided caps
-          continue;
+    for (const [defaultCapKey, defaultCapValue] of _.toPairs(defaultCapabilities)) {
+      let isCapAlreadySet = false;
+      // Check if the key is already present in firstMatch entries
+      for (const firstMatchEntry of w3cCapabilities.firstMatch ?? []) {
+        if (
+          _.isPlainObject(firstMatchEntry) &&
+          _.has(removeAppiumPrefixes(firstMatchEntry), removeAppiumPrefix(defaultCapKey))
+        ) {
+          isCapAlreadySet = true;
+          break;
         }
+      }
+      // Check if the key is already present in alwaysMatch entries
+      isCapAlreadySet =
+        isCapAlreadySet ||
+        (_.isPlainObject(w3cCapabilities.alwaysMatch) &&
+          _.has(
+            removeAppiumPrefixes(w3cCapabilities.alwaysMatch),
+            removeAppiumPrefix(defaultCapKey)
+          ));
+      if (isCapAlreadySet) {
+        // Skip if the key is already present in the provided caps
+        continue;
+      }
 
-        // Only add the default capability if it is not overridden
-        if (_.isEmpty(w3cCapabilities.firstMatch)) {
-          w3cCapabilities.firstMatch = /** @type {W3CCapabilities<C>['firstMatch']} */ ([
-            {[defaultCapKey]: defaultCapValue},
-          ]);
-        } else {
-          w3cCapabilities.firstMatch[0][defaultCapKey] = defaultCapValue;
-        }
+      // Only add the default capability if it is not overridden
+      if (_.isEmpty(w3cCapabilities.firstMatch)) {
+        w3cCapabilities.firstMatch = /** @type {W3CCapabilities<C>['firstMatch']} */ ([
+          {[defaultCapKey]: defaultCapValue},
+        ]);
+      } else {
+        w3cCapabilities.firstMatch[0][defaultCapKey] = defaultCapValue;
       }
     }
-    if (hasJSONWPCaps) {
-      jsonwpCapabilities = {
-        ...removeAppiumPrefixes(defaultCapabilities),
-        ...jsonwpCapabilities,
-      };
-    }
   }
 
-  // Get MJSONWP caps
-  if (hasJSONWPCaps) {
-    processedJsonwpCapabilities = {...jsonwpCapabilities};
+  // Call the process capabilities algorithm to find matching caps on the W3C
+  // (see: https://github.com/jlipps/simple-wd-spec#processing-capabilities)
+  try {
+    desiredCaps = processCapabilities(w3cCapabilities, constraints, true);
+  } catch (error) {
+    logger.info(`Could not parse W3C capabilities: ${error.message}`);
+    return /** @type {InvalidCaps<C>} */ ({
+      desiredCaps,
+      processedW3CCapabilities,
+      error,
+    });
   }
 
-  // Get W3C caps
-  if (hasW3CCaps) {
-    // Call the process capabilities algorithm to find matching caps on the W3C
-    // (see: https://github.com/jlipps/simple-wd-spec#processing-capabilities)
-    try {
-      desiredCaps = processCapabilities(w3cCapabilities, constraints, true);
-    } catch (error) {
-      logger.info(`Could not parse W3C capabilities: ${error.message}`);
-      return /** @type {InvalidCaps<C,J>} */ ({
-        desiredCaps,
-        processedJsonwpCapabilities,
-        processedW3CCapabilities,
-        protocol,
-        error,
-      });
-    }
-
-    // Create a new w3c capabilities payload that contains only the matching caps in `alwaysMatch`
-    processedW3CCapabilities = {
-      alwaysMatch: {...insertAppiumPrefixes(desiredCaps)},
-      firstMatch: [{}],
-    };
-  }
+  // Create a new w3c capabilities payload that contains only the matching caps in `alwaysMatch`
+  processedW3CCapabilities = {
+    alwaysMatch: {...insertAppiumPrefixes(desiredCaps)},
+    firstMatch: [{}],
+  };
 
-  return /** @type {ParsedDriverCaps<C,J>} */ ({
+  return /** @type {ParsedDriverCaps<C>} */ ({
     desiredCaps,
-    processedJsonwpCapabilities,
     processedW3CCapabilities,
-    protocol,
   });
 }
 
@@ -416,8 +381,7 @@ export function adler32(str, seed = null) {
 			c = str.charCodeAt(i++);
 			if (c < 0x80) {
         a += c;
-      }
-			else if (c < 0x800) {
+      } else if (c < 0x800) {
 				a += 192 | ((c >> 6) & 31);
         b += a;
         --M;
@@ -471,23 +435,20 @@ export function isBroadcastIp(address) {
  */
 export function validateFeatures(features) {
   const validator = (/** @type {string} */ fullName) => {
+    const errMsg = `The full feature name must include both the destination automation name or the ` +
+      `'${ALL_DRIVERS_MATCH}' wildcard to apply the feature to all installed drivers, and ` +
+      `the feature name split by a colon. Got '${fullName}' instead`;
+
     const separatorPos = fullName.indexOf(FEATURE_NAME_SEPARATOR);
-    // TODO: This is for the backward compatibility with Appium2
-    // TODO: In Appium3 the separator will be mandatory
     if (separatorPos < 0) {
-      return `${ALL_DRIVERS_MATCH}${FEATURE_NAME_SEPARATOR}${fullName}`;
+      throw new Error(errMsg);
     }
-
     const [automationName, featureName] = [
       fullName.substring(0, separatorPos),
       fullName.substring(separatorPos + 1)
     ];
     if (!automationName || !featureName) {
-      throw new Error(
-        `The full feature name must include both the destination automation name or the ` +
-        `'${ALL_DRIVERS_MATCH}' wildcard to apply the feature to all installed drivers, and ` +
-        `the feature name split by a colon, got '${fullName}' instead`
-      );
+      throw new Error(errMsg);
     }
     return fullName;
   };
@@ -501,23 +462,17 @@ export function validateFeatures(features) {
 
 /**
  * @template {Constraints} [C=BaseDriverCapConstraints]
- * @template [J=any]
  * @typedef ParsedDriverCaps
  * @property {Capabilities<C>} desiredCaps
- * @property {string} protocol
- * @property {J} [processedJsonwpCapabilities]
- * @property {W3CCapabilities<C>} [processedW3CCapabilities]
+ * @property {W3CCapabilities<C>} processedW3CCapabilities
  */
 
 /**
  * @todo protocol is more specific
  * @template {Constraints} [C=BaseDriverCapConstraints]
- * @template [J=any]
  * @typedef InvalidCaps
  * @property {Error} error
- * @property {string} protocol
  * @property {Capabilities<C>} [desiredCaps]
- * @property {J} [processedJsonwpCapabilities]
  * @property {W3CCapabilities<C>} [processedW3CCapabilities]
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "3.0.0-beta.0",
+  "version": "3.0.0-beta.1",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -55,25 +55,25 @@
     "postinstall": "node ./scripts/autoinstall-extensions.js",
     "publish:docs": "cross-env APPIUM_DOCS_PUBLISH=1 npm run build:docs",
     "test": "npm run test:unit",
-    "test:e2e": "mocha --timeout 1m --slow 30s \"./test/e2e/**/*.spec.js\"",
+    "test:e2e": "mocha --exit --timeout 1m --slow 30s \"./test/e2e/**/*.spec.js\"",
     "test:smoke": "cross-env APPIUM_HOME=./local_appium_home node ./index.js driver install uiautomator2 && cross-env APPIUM_HOME=./local_appium_home node ./index.js driver list",
     "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/base-driver": "^10.0.0-beta.0",
-    "@appium/base-plugin": "^3.0.0-beta.0",
-    "@appium/docutils": "^1.0.32",
-    "@appium/logger": "^1.6.1",
+    "@appium/base-driver": "^10.0.0-beta.2",
+    "@appium/base-plugin": "^3.0.0-beta.2",
+    "@appium/docutils": "^1.1.0",
+    "@appium/logger": "^1.7.0",
     "@appium/schema": "^0.8.1",
-    "@appium/support": "^6.0.6",
-    "@appium/types": "^0.25.1",
+    "@appium/support": "^6.1.0",
+    "@appium/types": "^0.25.3",
     "@sidvind/better-ajv-errors": "3.0.1",
     "ajv": "8.17.1",
     "ajv-formats": "3.0.1",
     "argparse": "2.0.1",
     "async-lock": "1.4.1",
     "asyncbox": "3.0.0",
-    "axios": "1.8.1",
+    "axios": "1.9.0",
     "bluebird": "3.7.2",
     "lilconfig": "3.1.3",
     "lodash": "4.17.21",
@@ -84,11 +84,11 @@
     "semver": "7.7.1",
     "source-map-support": "0.5.21",
     "teen_process": "2.3.1",
-    "type-fest": "4.36.0",
+    "type-fest": "4.40.0",
     "winston": "3.17.0",
     "wrap-ansi": "7.0.0",
     "ws": "8.18.1",
-    "yaml": "2.7.0"
+    "yaml": "2.7.1"
   },
   "engines": {
     "node": "^20.9.0 || >=22.11.0",
@@ -98,5 +98,5 @@
     "access": "public",
     "tag": "beta"
   },
-  "gitHead": "16d16dd0f3bf9829cff2ada7525156c462970932"
+  "gitHead": "dc5ef8d5f62c8a0775131305107a4037cd9ec9c9"
 }