@microsoft/teamsfx-core 2.0.3 → 2.0.4-alpha.06f5ef6da.0

package/build/core/middleware/concurrentLocker.js

@@ -48,6 +48,7 @@ const ConcurrentLockerMW = async (ctx, next) => {
     const lockFileDir = getLockFolder(inputs.projectPath);
     const lockfilePath = path.join(lockFileDir, `${teamsfx_api_1.ConfigFolderName}.lock`);
     await fs.ensureDir(lockFileDir);
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
     const taskName = `${ctx.method}${ctx.method === "executeUserTask" || ctx.method === "executeUserTaskOld"
         ? ` ${ctx.arguments[0].method}`
         : ""}`;
@@ -58,20 +59,22 @@ const ConcurrentLockerMW = async (ctx, next) => {
             await proper_lockfile_1.lock(configFolder, { lockfilePath: lockfilePath });
             acquired = true;
             for (const f of callback_1.CallbackRegistry.get(teamsfx_api_1.CoreCallbackEvent.lock)) {
-                f(taskName);
+                await f(taskName);
             }
             try {
                 doingTask = taskName;
                 if (retryNum > 0) {
                     // failed for some try and finally success
-                    telemetry_1.sendTelemetryErrorEvent(error_1.CoreSource, "concurrent-operation", new teamsfx_api_1.ConcurrentError(error_1.CoreSource), { retry: retryNum + "", acquired: "true", doing: doingTask, todo: taskName });
+                    telemetry_1.sendTelemetryErrorEvent(error_1.CoreSource, "concurrent-operation", new common_1.ConcurrentError(error_1.CoreSource), 
+                    // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+                    { retry: retryNum + "", acquired: "true", doing: doingTask, todo: taskName });
                 }
                 await next();
             }
             finally {
                 await proper_lockfile_1.unlock(configFolder, { lockfilePath: lockfilePath });
                 for (const f of callback_1.CallbackRegistry.get(teamsfx_api_1.CoreCallbackEvent.unlock)) {
-                    f(taskName);
+                    await f(taskName);
                 }
                 doingTask = undefined;
             }
@@ -90,13 +93,14 @@ const ConcurrentLockerMW = async (ctx, next) => {
         const log = `Failed to acquire lock for task ${taskName} on: ${configFolder}`;
         (_a = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.error(log);
         // failed for 10 times and finally failed
-        telemetry_1.sendTelemetryErrorEvent(error_1.CoreSource, "concurrent-operation", new teamsfx_api_1.ConcurrentError(error_1.CoreSource), {
+        telemetry_1.sendTelemetryErrorEvent(error_1.CoreSource, "concurrent-operation", new common_1.ConcurrentError(error_1.CoreSource), {
+            // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
             retry: retryNum + "",
             acquired: "false",
             doing: doingTask || "",
             todo: taskName,
         });
-        ctx.result = teamsfx_api_1.err(new teamsfx_api_1.ConcurrentError(error_1.CoreSource));
+        ctx.result = teamsfx_api_1.err(new common_1.ConcurrentError(error_1.CoreSource));
     }
 };
 exports.ConcurrentLockerMW = ConcurrentLockerMW;

package/build/core/middleware/concurrentLocker.js.map

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

package/build/core/middleware/errorHandler.d.ts

@@ -1,7 +1,9 @@
 import { Middleware } from "@feathersjs/hooks";
+import { SystemError, UserError } from "@microsoft/teamsfx-api";
 /**
  * in case there're some uncatched exceptions, this middleware will act as a guard
  * to catch exceptions and return specific error.
  */
 export declare const ErrorHandlerMW: Middleware;
+export declare function convertError(err: Error): UserError | SystemError | Error;
 //# sourceMappingURL=errorHandler.d.ts.map

package/build/core/middleware/errorHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6B,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI1E;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,UA6B5B,CAAC"}
+{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6B,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAe,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAI7E;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,UAc5B,CAAC;AA0BF,wBAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,GAAG,KAAK,CAoBxE"}

package/build/core/middleware/errorHandler.js

@@ -2,42 +2,29 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorHandlerMW = void 0;
+exports.convertError = exports.ErrorHandlerMW = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const globalVars_1 = require("../globalVars");
+const common_1 = require("../../error/common");
 /**
  * in case there're some uncatched exceptions, this middleware will act as a guard
  * to catch exceptions and return specific error.
  */
 const ErrorHandlerMW = async (ctx, next) => {
-    // const taskName = `${ctx.method} ${
-    //   ctx.method === "executeUserTask" ? (ctx.arguments[0] as Func).method : ""
-    // }`;
-    // if locale is set in inputs, set it globally.
+    var _a;
     const inputs = ctx.arguments[ctx.arguments.length - 1];
-    if (inputs.locale)
+    if (inputs === null || inputs === void 0 ? void 0 : inputs.locale)
         globalVars_1.setLocale(inputs.locale);
     try {
-        // let log = `FxCore start call:${taskName}`;
-        // if (inputs.loglevel && inputs.loglevel === "Debug") {
-        //   TOOLS?.logProvider?.debug(log);
-        // } else {
-        //   TOOLS?.logProvider?.info(log);
-        // }
-        // const time = new Date().getTime();
         await next();
-        // log = `FxCore finish call:${taskName}, time: ${new Date().getTime() - time} ms`;
-        // if (inputs.loglevel && inputs.loglevel === "Debug") {
-        //   TOOLS?.logProvider?.debug(log);
-        // } else {
-        //   TOOLS?.logProvider?.info(log);
-        // }
     }
     catch (e) {
-        let fxError = teamsfx_api_1.assembleError(e);
-        if (fxError instanceof teamsfx_api_1.SystemError) {
-            fxError = await tryConvertToUserError(fxError);
-        }
+        const fxError = common_1.assembleError(e);
+        ctx.result = teamsfx_api_1.err(fxError);
+    }
+    if ((_a = ctx.result) === null || _a === void 0 ? void 0 : _a.isErr()) {
+        let fxError = ctx.result.error;
+        fxError = convertError(fxError);
         ctx.result = teamsfx_api_1.err(fxError);
     }
 };
@@ -57,19 +44,24 @@ const Reg12 = /.+no space left on device.+/;
 // const Reg12 = /ENOENT: no such file or directory/;
 // const Reg13 = /EBUSY: resource busy or locked/;
 // const Reg14 = /Lock is not .+ by you/;
-// const Reg15 = /EPERM: operation not permitted/;
+const Reg15 = /EPERM: operation not permitted/;
 const Regs = [Reg1, Reg2, Reg3, Reg4, Reg5, Reg6, Reg7, Reg8, Reg9, Reg10, Reg11, Reg12];
-async function tryConvertToUserError(err) {
+function convertError(err) {
     const msg = err.message;
     if (!msg)
         return err;
+    if (Reg15.test(msg) === true) {
+        const userError = new common_1.FilePermissionError(err, err.source);
+        return userError;
+    }
     for (const reg of Regs) {
         if (reg.test(msg) === true) {
-            const userError = new teamsfx_api_1.UserError(err.source, err.name, err.message);
+            const userError = new teamsfx_api_1.UserError(err.source, err.name, err.message, err.displayMessage);
             userError.stack = err.stack;
             return userError;
         }
     }
     return err;
 }
+exports.convertError = convertError;
 //# sourceMappingURL=errorHandler.js.map

package/build/core/middleware/errorHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAA4F;AAC5F,8CAA0C;AAE1C;;;GAGG;AACI,MAAM,cAAc,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;IACvF,qCAAqC;IACrC,8EAA8E;IAC9E,MAAM;IACN,+CAA+C;IAC/C,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,MAAM,CAAC,MAAM;QAAE,sBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI;QACF,6CAA6C;QAC7C,wDAAwD;QACxD,oCAAoC;QACpC,WAAW;QACX,mCAAmC;QACnC,IAAI;QACJ,qCAAqC;QACrC,MAAM,IAAI,EAAE,CAAC;QACb,mFAAmF;QACnF,wDAAwD;QACxD,oCAAoC;QACpC,WAAW;QACX,mCAAmC;QACnC,IAAI;KACL;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,OAAO,GAAG,2BAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,OAAO,YAAY,yBAAW,EAAE;YAClC,OAAO,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;SAChD;QACD,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC;AA7BW,QAAA,cAAc,kBA6BzB;AAEF,MAAM,IAAI,GACR,mMAAmM,CAAC;AACtM,MAAM,IAAI,GAAG,6EAA6E,CAAC;AAC3F,MAAM,IAAI,GAAG,yCAAyC,CAAC;AACvD,MAAM,IAAI,GACR,yJAAyJ,CAAC;AAC5J,MAAM,IAAI,GACR,uIAAuI,CAAC;AAC1I,MAAM,IAAI,GACR,sGAAsG,CAAC;AACzG,MAAM,IAAI,GAAG,4CAA4C,CAAC;AAC1D,MAAM,IAAI,GACR,4FAA4F,CAAC;AAC/F,MAAM,IAAI,GAAG,kDAAkD,CAAC;AAChE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAC3C,MAAM,KAAK,GAAG,kCAAkC,CAAC;AACjD,MAAM,KAAK,GAAG,6BAA6B,CAAC;AAC5C,qDAAqD;AACrD,kDAAkD;AAClD,yCAAyC;AACzC,kDAAkD;AAElD,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEzF,KAAK,UAAU,qBAAqB,CAAC,GAAgB;IACnD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;IACxB,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IACrB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,SAAS,GAAG,IAAI,uBAAS,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACnE,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YAC5B,OAAO,SAAS,CAAC;SAClB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAA6E;AAC7E,8CAA0C;AAC1C,+CAAwE;AAExE;;;GAGG;AACI,MAAM,cAAc,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;IACvF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM;QAAE,sBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI;QACF,MAAM,IAAI,EAAE,CAAC;KACd;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,OAAO,GAAG,sBAAa,CAAC,CAAC,CAAC,CAAC;QACjC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;IACD,IAAI,MAAA,GAAG,CAAC,MAAM,0CAAE,KAAK,EAAE,EAAE;QACvB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAChC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC;AAdW,QAAA,cAAc,kBAczB;AAEF,MAAM,IAAI,GACR,mMAAmM,CAAC;AACtM,MAAM,IAAI,GAAG,6EAA6E,CAAC;AAC3F,MAAM,IAAI,GAAG,yCAAyC,CAAC;AACvD,MAAM,IAAI,GACR,yJAAyJ,CAAC;AAC5J,MAAM,IAAI,GACR,uIAAuI,CAAC;AAC1I,MAAM,IAAI,GACR,sGAAsG,CAAC;AACzG,MAAM,IAAI,GAAG,4CAA4C,CAAC;AAC1D,MAAM,IAAI,GACR,4FAA4F,CAAC;AAC/F,MAAM,IAAI,GAAG,kDAAkD,CAAC;AAChE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAC3C,MAAM,KAAK,GAAG,kCAAkC,CAAC;AACjD,MAAM,KAAK,GAAG,6BAA6B,CAAC;AAC5C,qDAAqD;AACrD,kDAAkD;AAClD,yCAAyC;AACzC,MAAM,KAAK,GAAG,gCAAgC,CAAC;AAE/C,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEzF,SAAgB,YAAY,CAAC,GAAU;IACrC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;IACxB,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IACrB,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QAC5B,MAAM,SAAS,GAAG,IAAI,4BAAmB,CAAC,GAAG,EAAG,GAAW,CAAC,MAAM,CAAC,CAAC;QACpE,OAAO,SAAS,CAAC;KAClB;IACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,SAAS,GAAG,IAAI,uBAAS,CAC5B,GAAW,CAAC,MAAM,EACnB,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,OAAO,EACV,GAAW,CAAC,cAAc,CAC5B,CAAC;YACF,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YAC5B,OAAO,SAAS,CAAC;SAClB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AApBD,oCAoBC"}

package/build/core/middleware/projectMigratorV3.d.ts

@@ -2,38 +2,6 @@ import { Middleware } from "@feathersjs/hooks/lib";
 import { CoreHookContext } from "../types";
 import { MigrationContext } from "./utils/migrationContext";
 import { VersionForMigration } from "./types";
-export declare const Constants: {
-    vscodeProvisionBicepPath: string;
-    launchJsonPath: string;
-    tasksJsonPath: string;
-    reportName: string;
-    envWriteOption: {
-        encoding: string;
-        flag: string;
-    };
-    envFilePrefix: string;
-};
-export declare const Parameters: {
-    skipUserConfirm: string;
-    isNonmodalMessage: string;
-    confirmOnly: string;
-};
-export declare const TelemetryPropertyKey: {
-    button: string;
-    mode: string;
-    upgradeVersion: string;
-    reason: string;
-};
-export declare const TelemetryPropertyValue: {
-    ok: string;
-    learnMore: string;
-    cancel: string;
-    modal: string;
-    nonmodal: string;
-    confirmOnly: string;
-    skipUserConfirm: string;
-    upgradeVersion: string;
-};
 export declare const learnMoreLink = "https://aka.ms/teams-toolkit-5.0-upgrade";
 export declare const errorNames: {
     manifestTemplateNotExist: string;
@@ -41,23 +9,20 @@ export declare const errorNames: {
     aadManifestTemplateNotExist: string;
 };
 export declare const moreInfoButton: string;
+declare type Migration = (context: MigrationContext) => Promise<void>;
+export declare const subMigrations: Array<Migration>;
 export declare const ProjectMigratorMWV3: Middleware;
-export declare function wrapRunMigration(context: MigrationContext, exec: (context: MigrationContext) => void): Promise<void>;
+export declare function wrapRunMigration(context: MigrationContext, exec: Migration): Promise<void>;
+export declare function buildErrorMessage(error: any, step?: string): string;
+export declare function rollbackMigration(context: MigrationContext): Promise<void>;
 export declare function migrate(context: MigrationContext): Promise<void>;
+export declare function preMigration(context: MigrationContext): Promise<void>;
 export declare function checkVersionForMigration(ctx: CoreHookContext): Promise<VersionForMigration>;
 export declare function generateAppYml(context: MigrationContext): Promise<void>;
 export declare function updateLaunchJson(context: MigrationContext): Promise<void>;
 export declare function manifestsMigration(context: MigrationContext): Promise<void>;
 export declare function azureParameterMigration(context: MigrationContext): Promise<void>;
 export declare function showNotification(ctx: CoreHookContext, versionForMigration: VersionForMigration): Promise<boolean>;
-export declare function askUserConfirm(ctx: CoreHookContext, versionForMigration: VersionForMigration): Promise<boolean>;
-export declare function showNonmodalNotification(ctx: CoreHookContext, versionForMigration: VersionForMigration): Promise<boolean>;
-export declare function showConfirmOnlyNotification(ctx: CoreHookContext): Promise<boolean>;
-export declare function popupMessageModal(versionForMigration: VersionForMigration): Promise<string | undefined>;
-export declare function popupMessageNonmodal(versionForMigration: VersionForMigration): Promise<string | undefined>;
-export declare function popupMessage(versionForMigration: VersionForMigration, isModal: boolean): Promise<string | undefined>;
-export declare function generateLocalConfig(context: MigrationContext): Promise<void>;
-export declare function ensureTrackingIdInGlobal(context: CoreHookContext): Promise<void>;
 export declare function configsMigration(context: MigrationContext): Promise<void>;
 export declare function statesMigration(context: MigrationContext): Promise<void>;
 export declare function userdataMigration(context: MigrationContext): Promise<void>;
@@ -66,4 +31,5 @@ export declare function checkapimPluginExists(pjSettings: any): boolean;
 export declare function generateApimPluginEnvContent(context: MigrationContext): Promise<void>;
 export declare function checkActiveResourcePlugins(projectPath: string): Promise<boolean>;
 export declare function updateGitignore(context: MigrationContext): Promise<void>;
+export {};
 //# sourceMappingURL=projectMigratorV3.d.ts.map

package/build/core/middleware/projectMigratorV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAgB,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAgF1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AA4C9C,eAAO,MAAM,aAAa,6CAA6C,CAAC;AAGxE,eAAO,MAAM,UAAU;;;;CAItB,CAAC;AAEF,eAAO,MAAM,cAAc,QAA6C,CAAC;AAOzE,aAAK,SAAS,GAAG,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAC9D,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,SAAS,CAY1C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UA6CjC,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBhG;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAUnE;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhF;AAWD,wBAAsB,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKtE;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWjG;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD/E;AAWD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8GjF;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BtF;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,OAAO,CAAC,CAkBlB;AAmHD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE/E;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD9E;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhF;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE7E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAQ9D;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC3F;AAED,wBAAsB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBtF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E"}