npm - @microsoft/teamsfx-core - Versions diffs - 1.7.0 → 1.7.1-alpha.42a29d71b.0 - Mend

@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.42a29d71b.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (448) hide show

package/build/core/middleware/consolidateLocalRemote.js CHANGED Viewed

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectConsolidateMW = void 0;
+exports.needConsolidateLocalRemote = exports.ProjectConsolidateMW = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const tools_1 = require("../../common/tools");
@@ -10,7 +10,6 @@ const environment_1 = require("../environment");
 const error_1 = require("../error");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const constants_1 = require("../../plugins/resource/appstudio/constants");
 const utils_1 = require("../../plugins/resource/appstudio/utils/utils");
 const telemetry_1 = require("../../common/telemetry");
 const globalVars_1 = require("../globalVars");
@@ -20,36 +19,30 @@ const folder_1 = require("../../folder");
 const projectSettingsLoader_1 = require("./projectSettingsLoader");
 const projectMigrator_1 = require("./projectMigrator");
 const util = tslib_1.__importStar(require("util"));
-const constants_2 = require("../../plugins/resource/spfx/utils/constants");
+const constants_1 = require("../../plugins/resource/spfx/utils/constants");
 const upgradeButton = "Upgrade";
+const LearnMore = "Learn More";
+const LearnMoreLink = "https://aka.ms/teamsfx-unify-config-guide";
 let userCancelFlag = false;
 const backupFolder = ".backup";
+const methods = new Set(["getProjectConfig", "checkPermission"]);
+const upgradeReportName = "unify-config-change-logs.md";
 const ProjectConsolidateMW = async (ctx, next) => {
     if (await projectMigrator_1.needMigrateToArmAndMultiEnv(ctx)) {
         next();
     }
     else if ((await needConsolidateLocalRemote(ctx)) && checkMethod(ctx)) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
-        const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.Message"), true, upgradeButton));
-        const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
-        if (!answer || answer != upgradeButton) {
-            telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
-                [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.Cancel,
-            });
-            ctx.result = teamsfx_api_1.err(error_1.ConsolidateCanceledError());
-            outputCancelMessage(ctx);
-            return;
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotificationStart);
+        let showModal = true;
+        if (ctx.method && methods.has(ctx.method)) {
+            showModal = false;
         }
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
-            [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.OK,
-        });
-        try {
-            await consolidateLocalRemote(ctx);
-            await next();
+        if (showModal) {
+            await upgrade(ctx, next, true);
         }
-        catch (error) {
-            telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
-            throw error;
+        else {
+            upgrade(ctx, next, false);
+            await next();
         }
     }
     else {
@@ -57,6 +50,35 @@ const ProjectConsolidateMW = async (ctx, next) => {
     }
 };
 exports.ProjectConsolidateMW = ProjectConsolidateMW;
+async function upgrade(ctx, next, showModal) {
+    let answer = undefined;
+    do {
+        const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.Message"), showModal, upgradeButton, LearnMore));
+        answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
+        if (answer === LearnMore) {
+            globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.openUrl(LearnMoreLink);
+        }
+    } while (answer === LearnMore);
+    if (!answer || answer != upgradeButton) {
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
+            [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.Cancel,
+        });
+        ctx.result = teamsfx_api_1.err(error_1.ConsolidateCanceledError());
+        outputCancelMessage(ctx);
+        return;
+    }
+    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
+        [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.OK,
+    });
+    try {
+        await consolidateLocalRemote(ctx);
+        await next();
+    }
+    catch (error) {
+        telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
+        throw error;
+    }
+}
 // check if config.local.json and manifest.template.json exist
 async function needConsolidateLocalRemote(ctx) {
     if (!tools_1.isConfigUnifyEnabled()) {
@@ -77,21 +99,23 @@ async function needConsolidateLocalRemote(ctx) {
     }
     return false;
 }
+exports.needConsolidateLocalRemote = needConsolidateLocalRemote;
 function outputCancelMessage(ctx) {
     globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade cancelled.`);
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version Teams Toolkit, please find Teams Toolkit in Extension and install the version <= ????`);
+        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version Teams Toolkit, please find Teams Toolkit in Extension and install the version <= 3.7.0`);
     }
     else {
         globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit CLI. If you want to upgrade, please trigger this command again.`);
-        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] If you are not ready to upgrade and want to continue to use the old version Teams Toolkit CLI, please install the version <= ????`);
+        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] If you are not ready to upgrade and want to continue to use the old version Teams Toolkit CLI, please install the version <= 3.7.0`);
     }
 }
 async function consolidateLocalRemote(ctx) {
     telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgradeStart);
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     const fileList = [];
+    const removeMap = new Map();
     const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs, true);
     if (loadRes.isErr()) {
         ctx.result = teamsfx_api_1.err(loadRes.error);
@@ -111,8 +135,6 @@ async function consolidateLocalRemote(ctx) {
         telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateAddLocalEnv);
         // add consolidate manifest
         let manifest;
-        const templatesFolder = folder_1.getTemplatesFolder();
-        const appDir = `${ctx.root}/${constants_1.APP_PACKAGE_FOLDER_FOR_MULTI_ENV}`;
         const remoteManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.remote.template.json");
         const remoteManifestExist = await fs_extra_1.default.pathExists(remoteManifestFile);
         if (remoteManifestExist) {
@@ -125,13 +147,13 @@ async function consolidateLocalRemote(ctx) {
                 if ((manifest === null || manifest === void 0 ? void 0 : manifest.staticTabs) && manifest.staticTabs.length > 0) {
                     manifest.staticTabs.forEach((item) => {
                         componentId = item.entityId;
-                        const contentUrl = util.format(constants_2.ManifestTemplate.REMOTE_CONTENT_URL, componentId, componentId);
+                        const contentUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONTENT_URL, componentId, componentId);
                         item.contentUrl = contentUrl;
                     });
                 }
                 if ((manifest === null || manifest === void 0 ? void 0 : manifest.configurableTabs) && manifest.configurableTabs.length > 0) {
                     manifest.configurableTabs.forEach((item) => {
-                        const configurationUrl = util.format(constants_2.ManifestTemplate.REMOTE_CONFIGURATION_URL, componentId, componentId);
+                        const configurationUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONFIGURATION_URL, componentId, componentId);
                         item.configurationUrl = configurationUrl;
                     });
                 }
@@ -146,58 +168,81 @@ async function consolidateLocalRemote(ctx) {
             }
         }
         fileList.push(path_1.default.join(inputs.projectPath, "templates", "appPackage", "template.manifest.json"));
+        // copy and remove old configs
+        const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfigStart);
+        const localSettingsFile = path_1.default.join(inputs.projectPath, ".fx", "configs", "localSettings.json");
+        let moveFiles = "";
+        if (await fs_extra_1.default.pathExists(localSettingsFile)) {
+            await fs_extra_1.default.copy(localSettingsFile, path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), { overwrite: true });
+            await fs_extra_1.default.remove(localSettingsFile);
+            moveFiles += "localSettings.json,";
+            removeMap.set(path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), localSettingsFile);
+        }
+        const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
+        if (await fs_extra_1.default.pathExists(localManifestFile)) {
+            await fs_extra_1.default.copy(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
+            await fs_extra_1.default.remove(localManifestFile);
+            moveFiles += "manifest.local.template.json,";
+            removeMap.set(path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), localManifestFile);
+        }
+        if (await fs_extra_1.default.pathExists(remoteManifestFile)) {
+            await fs_extra_1.default.copy(remoteManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), { overwrite: true });
+            await fs_extra_1.default.remove(remoteManifestFile);
+            moveFiles += "manifest.remote.template.json,";
+            removeMap.set(path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), remoteManifestFile);
+        }
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfig);
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgrade);
+        postConsolidate(inputs.projectPath, ctx, inputs, backupFolder, moveFiles);
     }
     catch (e) {
+        for (const item of removeMap.entries()) {
+            await fs_extra_1.default.copy(item[0], item[1]);
+        }
         for (const item of fileList) {
             await fs_extra_1.default.remove(item);
         }
+        await fs_extra_1.default.remove(path_1.default.join(inputs.projectPath, backupFolder));
         throw e;
     }
-    // move old configs
-    const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfigStart);
-    const localSettingsFile = path_1.default.join(inputs.projectPath, ".fx", "configs", "localSettings.json");
-    if (await fs_extra_1.default.pathExists(localSettingsFile)) {
-        await fs_extra_1.default.move(localSettingsFile, path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), { overwrite: true });
-    }
-    const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
-    if (await fs_extra_1.default.pathExists(localManifestFile)) {
-        await fs_extra_1.default.move(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
-    }
-    const remoteManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.remote.template.json");
-    if (await fs_extra_1.default.pathExists(remoteManifestFile)) {
-        await fs_extra_1.default.move(remoteManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), { overwrite: true });
-    }
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfig);
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgrade);
-    postConsolidate(inputs.projectPath, ctx, inputs, backupFolder);
+    generateUpgradeReport(path_1.default.join(inputs.projectPath, backupFolder));
     return true;
 }
 function checkMethod(ctx) {
-    const methods = new Set(["getProjectConfig", "checkPermission"]);
     if (ctx.method && methods.has(ctx.method) && userCancelFlag)
         return false;
     userCancelFlag = ctx.method != undefined && methods.has(ctx.method);
     return true;
 }
-async function postConsolidate(projectPath, ctx, inputs, backupFolder) {
+async function postConsolidate(projectPath, ctx, inputs, backupFolder, moveFiles) {
     telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateGuideStart);
     await updateGitIgnore(projectPath, globalVars_1.TOOLS.logProvider, backupFolder);
-    globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade success! Old localSettings.json, manifest.local.template.json and manifest.remote.template.json have been backed up to the .backup folder and you can delete it.`);
-    if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-        await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("info", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.outputMsg"), false, "OK"));
+    if (moveFiles.length > 0) {
+        moveFiles = moveFiles.substring(0, moveFiles.length - 1);
+        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade success! Old ${moveFiles} have been backed up to the .backup folder and you can delete it.`);
     }
-    else {
+    if (inputs.platform !== teamsfx_api_1.Platform.VSCode) {
         globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.info(localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.SuccessMessage"));
     }
 }
 async function updateGitIgnore(projectPath, log, backupFolder) {
     // add config.local.json to .gitignore
-    await projectMigrator_1.addPathToGitignore(projectPath, `.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/config.local.json`, log);
+    await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/config.local.json`, log);
     // add state.local.json to .gitignore
-    await projectMigrator_1.addPathToGitignore(projectPath, `.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.StatesFolderName}/state.local.json`, log);
+    await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.StatesFolderName}/state.local.json`, log);
     if (backupFolder) {
-        await projectMigrator_1.addPathToGitignore(projectPath, backupFolder, log);
+        await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/${backupFolder}`, log);
+    }
+}
+async function generateUpgradeReport(backupFolder) {
+    try {
+        const target = path_1.default.join(backupFolder, upgradeReportName);
+        const source = path_1.default.resolve(path_1.default.join(folder_1.getResourceFolder(), upgradeReportName));
+        await fs_extra_1.default.copyFile(source, target);
+    }
+    catch (error) {
+        // do nothing
     }
 }
 //# sourceMappingURL=consolidateLocalRemote.js.map

package/build/core/middleware/consolidateLocalRemote.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAUgC;AAChC,8CAAuF;AACvF,gDAAoD;AACpD,oCAAgE;AAEhE,gEAA0B;AAC1B,wDAAwB;AACxB,wEAA+E;AAC/E,sDAOgC;AAEhC,8CAAsC;AACtC,8DAAgE;AAChE,wFAA4F;AAC5F,yCAAqE;AACrE,mEAA8D;AAC9D,uDAAoF;AACpF,mDAA6B;AAC7B,2EAA+E;AAE/E,MAAM,aAAa,GAAG,SAAS,CAAC;AAChC,MAAM,SAAS,GAAG,YAAY,CAAC;AAC/B,MAAM,aAAa,GAAG,2CAA2C,CAAC;AAClE,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,YAAY,GAAG,SAAS,CAAC;AAC/B,MAAM,OAAO,GAAgB,IAAI,GAAG,CAAC,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAC9E,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;AAEjD,MAAM,oBAAoB,GAAe,KAAK,EACnD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,IAAI,MAAM,6CAA2B,CAAC,GAAG,CAAC,EAAE;QAC1C,IAAI,EAAE,CAAC;KACR;SAAM,IAAI,CAAC,MAAM,0BAA0B,CAAC,GAAG,CAAC,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE;QACtE,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,mCAAmC,CAAC,CAAC;QACvF,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACzC,SAAS,GAAG,KAAK,CAAC;SACnB;QACD,IAAI,SAAS,EAAE;YACb,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SAChC;aAAM;YACL,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1B,MAAM,IAAI,EAAE,CAAC;SACd;KACF;SAAM;QACL,MAAM,IAAI,EAAE,CAAC;KACd;AACH,CAAC,CAAC;AArBW,QAAA,oBAAoB,wBAqB/B;AAEF,KAAK,UAAU,OAAO,CAAC,GAAoB,EAAE,IAAkB,EAAE,SAAkB;IACjF,IAAI,MAAM,GAAuB,SAAS,CAAC;IAC3C,GAAG;QACD,MAAM,GAAG,GAAG,MAAM,CAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,WAAW,CACrC,MAAM,EACN,kCAAkB,CAAC,qCAAqC,CAAC,EACzD,SAAS,EACT,aAAa,EACb,SAAS,CACV,CAAA,CAAC;QACF,MAAM,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,EAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7C,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;SAClC;KACF,QAAQ,MAAM,KAAK,SAAS,EAAE;IAC/B,IAAI,CAAC,MAAM,IAAI,MAAM,IAAI,aAAa,EAAE;QACtC,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,8BAA8B,EAAE;YAChF,CAAC,6BAAiB,CAAC,MAAM,CAAC,EAAE,iCAAqB,CAAC,MAAM;SACzD,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,gCAAwB,EAAE,CAAC,CAAC;QAC7C,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO;KACR;IACD,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,8BAA8B,EAAE;QAChF,CAAC,6BAAiB,CAAC,MAAM,CAAC,EAAE,iCAAqB,CAAC,EAAE;KACrD,CAAC,CAAC;IAEH,IAAI;QACF,MAAM,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,EAAE,CAAC;KACd;IAAC,OAAO,KAAK,EAAE;QACd,mCAAuB,CACrB,qBAAS,CAAC,IAAI,EACd,0BAAc,CAAC,uBAAuB,EACtC,2BAAa,CAAC,KAAK,EAAE,kBAAU,CAAC,CACjC,CAAC;QACF,MAAM,KAAK,CAAC;KACb;AACH,CAAC;AAED,8DAA8D;AACvD,KAAK,UAAU,0BAA0B,CAAC,GAAoB;IACnE,IAAI,CAAC,4BAAoB,EAAE,EAAE;QAC3B,OAAO,KAAK,CAAC;KACd;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,OAAO,KAAK,CAAC;KACd;IACD,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,KAAK,CAAC,CAAC,CAAC;IACpF,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;IAED,MAAM,aAAa,GAAG,MAAM,kBAAE,CAAC,UAAU,CACvC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,KAAK,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAC/E,CAAC;IACF,MAAM,wBAAwB,GAAG,MAAM,kBAAE,CAAC,UAAU,CAClD,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,WAAW,EAAE,YAAY,EAAE,wBAAwB,CAAC,CAC7F,CAAC;IACF,IAAI,CAAC,aAAa,IAAI,CAAC,wBAAwB,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAvBD,gEAuBC;AAED,SAAS,mBAAmB,CAAC,GAAoB;IAC/C,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAExD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;QACvC,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,OAAO,CACxB,sRAAsR,CACvR,CAAC;KACH;SAAM;QACL,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,OAAO,CACxB,kLAAkL,CACnL,CAAC;QACF,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,OAAO,CACxB,2IAA2I,CAC5I,CAAC;KACH;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,GAAoB;IACxD,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,8BAA8B,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,QAAQ,GAAkB,EAAE,CAAC;IACnC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,MAAM,OAAO,GAAG,MAAM,2CAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACxD,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;QACnB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;IAEtC,IAAI;QACF,wBAAwB;QACxB,MAAM,OAAO,GAAG,uBAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACzD,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,kCAAkC,CAAC,CAAC;QACtF,MAAM,YAAY,GAAG,gCAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,MAAM,gCAAkB,CAAC,cAAc,CAC5D,MAAM,CAAC,WAAY,EACnB,YAAY,EACZ,gCAAkB,CAAC,eAAe,EAAE,CACrC,CAAC;QACF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;YAC1B,MAAM,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,QAAQ,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC3F,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,6BAA6B,CAAC,CAAC;QAEjF,2BAA2B;QAC3B,IAAI,QAAsC,CAAC;QAC3C,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAClC,MAAM,CAAC,WAAqB,EAC5B,WAAW,EACX,YAAY,EACZ,+BAA+B,CAChC,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,kBAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;QACpE,IAAI,mBAAmB,EAAE;YACvB,IAAI,qBAAa,CAAC,eAAe,CAAC,EAAE;gBAClC,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,sCAAsC,CAAC,CAAC;gBAC1F,MAAM,oBAAoB,GAAG,MAAM,0CAAuB,CAAC,MAAM,CAAC,WAAqB,CAAC,CAAC;gBACzF,MAAM,cAAc,GAAG,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC1E,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBACtC,IAAI,WAAW,GAAG,EAAE,CAAC;gBACrB,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,KAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1D,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBACnC,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;wBAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAC5B,4BAAgB,CAAC,kBAAkB,EACnC,WAAW,EACX,WAAW,CACZ,CAAC;wBACF,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;oBAC/B,CAAC,CAAC,CAAC;iBACJ;gBACD,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB,KAAI,QAAQ,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtE,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBACzC,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAClC,4BAAgB,CAAC,wBAAwB,EACzC,WAAW,EACX,WAAW,CACZ,CAAC;wBACF,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;oBAC3C,CAAC,CAAC,CAAC;iBACJ;gBACD,MAAM,kBAAE,CAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC5E,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,iCAAiC,CAAC,CAAC;aACtF;iBAAM;gBACL,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,wCAAwC,CAAC,CAAC;gBAC5F,MAAM,oBAAoB,GAAG,MAAM,0CAAuB,CAAC,MAAM,CAAC,WAAqB,CAAC,CAAC;gBACzF,MAAM,kBAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;gBAC5D,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,mCAAmC,CAAC,CAAC;aACxF;SACF;QACD,QAAQ,CAAC,IAAI,CACX,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,WAAW,EAAE,YAAY,EAAE,wBAAwB,CAAC,CAC7F,CAAC;QAEF,8BAA8B;QAC9B,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,YAAY,CAAC,CAAC;QACzE,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,mCAAmC,CAAC,CAAC;QACvF,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CACjC,MAAM,CAAC,WAAqB,EAC5B,KAAK,EACL,SAAS,EACT,oBAAoB,CACrB,CAAC;QACF,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAC1C,MAAM,kBAAE,CAAC,IAAI,CACX,iBAAiB,EACjB,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,CAAC,EAC7D,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;YACF,MAAM,kBAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACnC,SAAS,IAAI,qBAAqB,CAAC;YACnC,SAAS,CAAC,GAAG,CACX,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,CAAC,EAC7D,iBAAiB,CAClB,CAAC;SACH;QACD,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CACjC,MAAM,CAAC,WAAqB,EAC5B,WAAW,EACX,YAAY,EACZ,8BAA8B,CAC/B,CAAC;QACF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAC1C,MAAM,kBAAE,CAAC,IAAI,CACX,iBAAiB,EACjB,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,8BAA8B,CAAC,EAChF,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;YACF,MAAM,kBAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACnC,SAAS,IAAI,+BAA+B,CAAC;YAC7C,SAAS,CAAC,GAAG,CACX,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,8BAA8B,CAAC,EAChF,iBAAiB,CAClB,CAAC;SACH;QACD,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;YAC3C,MAAM,kBAAE,CAAC,IAAI,CACX,kBAAkB,EAClB,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,+BAA+B,CAAC,EACjF,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;YACF,MAAM,kBAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACpC,SAAS,IAAI,gCAAgC,CAAC;YAC9C,SAAS,CAAC,GAAG,CACX,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,+BAA+B,CAAC,EACjF,kBAAkB,CACnB,CAAC;SACH;QAED,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,8BAA8B,CAAC,CAAC;QAClF,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,yBAAyB,CAAC,CAAC;QAE7E,eAAe,CAAC,MAAM,CAAC,WAAqB,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;KACrF;IAAC,OAAO,CAAC,EAAE;QACV,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;YACtC,MAAM,kBAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACjC;QACD,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;YAC3B,MAAM,kBAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACvB;QACD,MAAM,kBAAE,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,YAAY,CAAC,CAAC,CAAC;QACvE,MAAM,CAAC,CAAC;KACT;IAED,qBAAqB,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,YAAY,CAAC,CAAC,CAAC;IAC7E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,GAAoB;IACvC,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,cAAc;QAAE,OAAO,KAAK,CAAC;IAC1E,cAAc,GAAG,GAAG,CAAC,MAAM,IAAI,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,WAAmB,EACnB,GAAoB,EACpB,MAAc,EACd,YAAgC,EAChC,SAAiB;IAEjB,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,4BAA4B,CAAC,CAAC;IAChF,MAAM,eAAe,CAAC,WAAW,EAAE,kBAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAEpE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACzD,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,OAAO,CACxB,+BAA+B,SAAS,mEAAmE,CAC5G,CAAC;KACH;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;QACvC,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,IAAI,CAAC,kCAAkB,CAAC,4CAA4C,CAAC,CAAC,CAAC;KAC3F;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,WAAmB,EACnB,GAAgB,EAChB,YAAgC;IAEhC,sCAAsC;IACtC,MAAM,oCAAkB,CACtB,WAAW,EACX,GAAG,WAAW,KAAK,8BAAgB,IAAI,oCAAsB,oBAAoB,EACjF,GAAG,CACJ,CAAC;IAEF,qCAAqC;IACrC,MAAM,oCAAkB,CACtB,WAAW,EACX,GAAG,WAAW,KAAK,8BAAgB,IAAI,8BAAgB,mBAAmB,EAC1E,GAAG,CACJ,CAAC;IAEF,IAAI,YAAY,EAAE;QAChB,MAAM,oCAAkB,CAAC,WAAW,EAAE,GAAG,WAAW,IAAI,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;KAC9E;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,YAAoB;IACvD,IAAI;QACF,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,0BAAiB,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC/E,MAAM,kBAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACnC;IAAC,OAAO,KAAK,EAAE;QACd,aAAa;KACd;AACH,CAAC"}

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

	@@ -1 +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,~~UAqB5B~~,CAAC"}
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"}

package/build/core/middleware/errorHandler.js CHANGED Viewed

@@ -10,17 +10,29 @@ const globalVars_1 = require("../globalVars");
  * to catch exceptions and return specific error.
  */
 const ErrorHandlerMW = async (ctx, next) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const taskName = `${ctx.method} ${ctx.method === "executeUserTask" ? ctx.arguments[0].method : ""}`;
     // if locale is set in inputs, set it globally.
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     if (inputs.locale)
         globalVars_1.setLocale(inputs.locale);
     try {
-        (_a = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.info(`[core] start task:${taskName}, API v3: ${globalVars_1.isV3()}`);
+        let log = `[core] start task:${taskName}, API v3: ${globalVars_1.isV3()}`;
+        if (inputs.loglevel && inputs.loglevel === "Debug") {
+            (_a = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.debug(log);
+        }
+        else {
+            (_b = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _b === void 0 ? void 0 : _b.info(log);
+        }
         const time = new Date().getTime();
         await next();
-        (_b = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _b === void 0 ? void 0 : _b.info(`[core] finish task:${taskName}, time: ${new Date().getTime() - time} ms`);
+        log = `[core] finish task:${taskName}, time: ${new Date().getTime() - time} ms`;
+        if (inputs.loglevel && inputs.loglevel === "Debug") {
+            (_c = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _c === void 0 ? void 0 : _c.debug(log);
+        }
+        else {
+            (_d = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _d === void 0 ? void 0 : _d.info(log);
+        }
     }
     catch (e) {
         let fxError = teamsfx_api_1.assembleError(e);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAkG;AAClG,8CAAuD;AAEvD;;;GAGG;AACI,MAAM,cAAc,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;IACvF,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,MAAM,IAC5B,GAAG,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,CAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EACzE,EAAE,CAAC;IACH,+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,MAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,0CAAE,~~IAAI~~,CAAC,~~qBAAqB~~,~~QAAQ~~,~~aAAa~~,~~iBAAI~~,~~EAAE~~,~~EAAE~~,CAAC,CAAC;~~QAC7E~~,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,IAAI,EAAE,CAAC;QACb,MAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,0CAAE,~~IAAI~~,~~CACtB~~,~~sBAAsB~~,~~QAAQ~~,~~WAAW~~,~~IAAI~~,~~IAAI~~,~~EAAE~~,~~CAAC~~,~~OAAO~~,~~EAAE~~,~~GAAG~~,IAAI,~~KAAK~~,~~CAC1E~~,CAAC;~~KACH~~;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;~~AArBW~~,QAAA,cAAc,~~kBAqBzB~~;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"}
1	+ {"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/questionModel.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAGL,IAAI,EACJ,cAAc,EACd,OAAO,EACP,MAAM,EAGN,SAAS,EACT,MAAM,EACN,QAAQ,EACR,eAAe,EACf,KAAK,EAGL,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;~~AA8BhC~~;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,UAoJ7B,CAAC;AAEF,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQlE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAOxF;AAGD,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,QAAQ,EAAE,EAAE,CAAC,SAAS,EACtB,OAAO,EAAE,EAAE,CAAC,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAMjD;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,EAAE,CAAC,SAAS,EACtB,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAYjD;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,QAAQ,EAAE,EAAE,CAAC,SAAS,EACtB,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAWjD;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,QAAQ,EAAE,EAAE,CAAC,SAAS,EACtB,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAMjD;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,QAAQ,EAAE,EAAE,CAAC,SAAS,EACtB,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAWjD;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAkBjD;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAgDjD;~~AAoDD~~,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,~~CA0EjD~~;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,eAAe,GAAG,EAAE,CAAC,OAAO,EACjC,QAAQ,EAAE,QAAQ,GAAG,EAAE,CAAC,cAAc,EACtC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,GACrB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAwBjD;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,eAAe,GAAG,EAAE,CAAC,OAAO,EACjC,QAAQ,EAAE,QAAQ,GAAG,EAAE,CAAC,cAAc,EACtC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,GACrB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAiBjD"}
1	+ {"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/questionModel.js CHANGED Viewed

@@ -242,49 +242,8 @@ async function getQuestionsForCreateProjectV3(inputs) {
     return teamsfx_api_1.ok(node.trim());
 }
 exports.getQuestionsForCreateProjectV3 = getQuestionsForCreateProjectV3;
-async function getQuestionsForCreateM365ProjectV2(inputs) {
-    const createNode = new teamsfx_api_1.QTreeNode(question_2.M365CreateFromScratchSelectQuestion);
-    // app type
-    createNode.addChild(new teamsfx_api_1.QTreeNode(question_2.M365AppTypeSelectQuestion));
-    // capabilities
-    createNode.addChild(new teamsfx_api_1.QTreeNode(question_2.M365CapabilitiesFuncQuestion));
-    const globalSolutions = SolutionPluginContainer_1.getAllSolutionPluginsV2();
-    const context = tools_1.createV2Context(projectSettingsHelper_1.newProjectSettings());
-    for (const solutionPlugin of globalSolutions) {
-        let res = teamsfx_api_1.ok(undefined);
-        const v2plugin = solutionPlugin;
-        res = v2plugin.getQuestionsForScaffolding
-            ? await v2plugin.getQuestionsForScaffolding(context, inputs)
-            : teamsfx_api_1.ok(undefined);
-        if (res.isErr())
-            return teamsfx_api_1.err(new teamsfx_api_1.SystemError({ error: res.error, source: error_1.CoreSource, name: "QuestionModelFail" }));
-        if (res.value) {
-            const solutionNode = Array.isArray(res.value)
-                ? res.value
-                : [res.value];
-            for (const node of solutionNode) {
-                if (node.data)
-                    createNode.addChild(node);
-            }
-        }
-    }
-    // programming language
-    const programmingLanguage = new teamsfx_api_1.QTreeNode(question_2.ProgrammingLanguageQuestion);
-    programmingLanguage.condition = { minItems: 1 };
-    createNode.addChild(programmingLanguage);
-    // only CLI need folder input
-    if (teamsfx_api_1.CLIPlatforms.includes(inputs.platform)) {
-        createNode.addChild(new teamsfx_api_1.QTreeNode(question_2.QuestionRootFolder));
-    }
-    // application name
-    createNode.addChild(new teamsfx_api_1.QTreeNode(question_2.createAppNameQuestion()));
-    return teamsfx_api_1.ok(createNode.trim());
-}
 //////V2 questions
 async function getQuestionsForCreateProjectV2(inputs) {
-    if (inputs.isM365) {
-        return getQuestionsForCreateM365ProjectV2(inputs);
-    }
     const node = new teamsfx_api_1.QTreeNode(question_2.getCreateNewOrFromSampleQuestion(inputs.platform));
     // create new
     const createNew = new teamsfx_api_1.QTreeNode({ type: "group" });
@@ -294,14 +253,6 @@ async function getQuestionsForCreateProjectV2(inputs) {
     const capQuestion = question_2.createCapabilityQuestion();
     const capNode = new teamsfx_api_1.QTreeNode(capQuestion);
     createNew.addChild(capNode);
-    // create new M365
-    const createNewM365 = new teamsfx_api_1.QTreeNode({ type: "group" });
-    node.addChild(createNewM365);
-    createNewM365.condition = { equals: question_2.ScratchOptionYesM365.id };
-    // M365 app type
-    createNewM365.addChild(new teamsfx_api_1.QTreeNode(question_2.M365AppTypeSelectQuestion));
-    // M365 capabilities
-    createNewM365.addChild(new teamsfx_api_1.QTreeNode(question_2.M365CapabilitiesFuncQuestion));
     const globalSolutions = await SolutionPluginContainer_1.getAllSolutionPluginsV2();
     const context = tools_1.createV2Context(projectSettingsHelper_1.newProjectSettings());
     for (const solutionPlugin of globalSolutions) {
@@ -319,23 +270,28 @@ async function getQuestionsForCreateProjectV2(inputs) {
             for (const node of solutionNode) {
                 if (node.data) {
                     capNode.addChild(node);
-                    createNewM365.addChild(node);
                 }
             }
         }
     }
     // Language
     const programmingLanguage = new teamsfx_api_1.QTreeNode(question_2.ProgrammingLanguageQuestion);
-    programmingLanguage.condition = { minItems: 1 };
-    createNew.addChild(programmingLanguage);
-    createNewM365.addChild(programmingLanguage);
+    programmingLanguage.condition = {
+        minItems: 1,
+        excludes: question_1.ExistingTabOptionItem.id,
+    };
+    capNode.addChild(programmingLanguage);
+    // existing tab endpoint
+    const existingTabEndpoint = new teamsfx_api_1.QTreeNode(question_2.ExistingTabEndpointQuestion);
+    existingTabEndpoint.condition = {
+        contains: question_1.ExistingTabOptionItem.id,
+    };
+    capNode.addChild(existingTabEndpoint);
     // only CLI need folder input
     if (teamsfx_api_1.CLIPlatforms.includes(inputs.platform)) {
         createNew.addChild(new teamsfx_api_1.QTreeNode(question_2.QuestionRootFolder));
-        createNewM365.addChild(new teamsfx_api_1.QTreeNode(question_2.QuestionRootFolder));
     }
     createNew.addChild(new teamsfx_api_1.QTreeNode(question_2.createAppNameQuestion()));
-    createNewM365.addChild(new teamsfx_api_1.QTreeNode(question_2.createAppNameQuestion()));
     // create from sample
     const sampleNode = new teamsfx_api_1.QTreeNode(question_2.SampleSelect);
     node.addChild(sampleNode);

package/build/core/middleware/questionModel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"questionModel.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAkBgC;AAChC,mCAAmC;AACnC,8CAA+D;AAC/D,8EAAwE;AAExE,0EAA0E;AAC1E,+EAGyD;AACzD,kDAAiE;AACjE,oCAA2D;AAC3D,8CAAsC;AACtC,0CAaqB;AACrB,wEAAqE;AAGrE;;GAEG;AACI,MAAM,eAAe,GAAe,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IAC5F,MAAM,MAAM,GAAW,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAW,CAAC;IAE7B,IAAI,cAAc,GAA2C,gBAAE,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,MAAM,KAAK,iBAAiB,EAAE;QAChC,cAAc,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC;KACrE;SAAM,IAAI,MAAM,KAAK,iBAAiB,EAAE;QACvC,cAAc,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC;KACrE;SAAM,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,OAAO,EAAE;QAClD,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;KAC1D;SAAM,IACL;QACE,YAAY;QACZ,aAAa;QACb,sBAAsB;QACtB,mBAAmB;QACnB,sBAAsB;QACtB,mBAAmB;KACpB,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,EACxB;QACA,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QAClC,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,IAAI,UAAU,IAAI,SAAS,EAAE;YAC3B,IAAI,MAAM,KAAK,YAAY,IAAI,MAAM,KAAK,aAAa,EAAE;gBACvD,cAAc,GAAG,MAAM,IAAI,CAAC,0BAA0B,CACpD,MAAkC,EAClC,UAAU,EACV,SAAS,CACV,CAAC;aACH;iBAAM,IAAI,MAAM,KAAK,sBAAsB,EAAE;gBAC5C,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACnD,MAAkC,EAClC,UAAU,EACV,SAAS,EACT,GAAG,CAAC,SAA0C,CAC/C,CAAC;aACH;iBAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE;gBACzC,cAAc,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAChD,MAAkC,EAClC,UAAU,EACV,SAAS,EACT,GAAG,CAAC,SAA0C,CAC/C,CAAC;aACH;iBAAM,IAAI,MAAM,KAAK,sBAAsB,EAAE;gBAC5C,cAAc,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACjD,MAAkC,EAClC,UAAU,EACV,SAAS,EACT,GAAG,CAAC,SAA0C,CAC/C,CAAC;aACH;iBAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE;gBACzC,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAS,CAAC;gBACtC,cAAc,GAAG,MAAM,IAAI,CAAC,0BAA0B,CACpD,IAAI,EACJ,MAAM,EACN,UAAU,EACV,SAAS,EACT,GAAG,CAAC,SAA0C,CAC/C,CAAC;aACH;SACF;KACF;SAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE;QACzC,cAAc,GAAG,MAAM,6CAA8B,CAAC,MAAM,CAAC,CAAC;KAC/D;SAAM;QACL,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,SAAS,EAAE;YACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC;YAChC,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC;YAC9B,IAAI,QAAQ,IAAI,OAAO,EAAE;gBACvB,IAAI,MAAM,KAAK,oBAAoB,IAAI,MAAM,KAAK,sBAAsB,EAAE;oBACxE,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,OAAO,EACP,QAAQ,EACR,mBAAK,CAAC,SAAS,EACf,MAAM,EACN,GAAG,CAAC,SAAS,CACd,CAAC;iBACH;qBAAM,IAAI,MAAM,KAAK,YAAY,IAAI,MAAM,KAAK,cAAc,EAAE;oBAC/D,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,OAAO,EACP,QAAQ,EACR,mBAAK,CAAC,KAAK,EACX,MAAM,EACN,GAAG,CAAC,SAAS,CACd,CAAC;iBACH;qBAAM,IAAI,MAAM,KAAK,iBAAiB,IAAI,MAAM,KAAK,mBAAmB,EAAE;oBACzE,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,OAAO,EACP,QAAQ,EACR,mBAAK,CAAC,MAAM,EACZ,MAAM,EACN,GAAG,CAAC,SAAS,CACd,CAAC;iBACH;qBAAM,IAAI,MAAM,KAAK,oBAAoB,IAAI,MAAM,KAAK,sBAAsB,EAAE;oBAC/E,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,OAAO,EACP,QAAQ,EACR,mBAAK,CAAC,OAAO,EACb,MAAM,EACN,GAAG,CAAC,SAAS,CACd,CAAC;iBACH;qBAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE;oBACzC,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAS,CAAC;oBACtC,cAAc,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAClD,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,GAAG,CAAC,SAAS,CACd,CAAC;iBACH;qBAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE;oBACzC,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,OAAO,EACP,QAAQ,EACR,mBAAK,CAAC,eAAe,EACrB,MAAM,EACN,GAAG,CAAC,SAAS,CACd,CAAC;iBACH;aACF;SACF;KACF;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;QAC1B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CACtB,sCAAsC,MAAM,KAAK,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,CAChF,CAAC;QACF,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO;KACR;IAED,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CAAC,uCAAuC,MAAM,EAAE,CAAC,CAAC;IAE1E,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC;IAClC,IAAI,IAAI,EAAE;QACR,MAAM,GAAG,GAAG,MAAM,sBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5E,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CAAC,2CAA2C,MAAM,EAAE,CAAC,CAAC;YAC9E,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;SACR;QACD,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,IAAI,CACrB,4CAA4C,MAAM,aAAa,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAC9F,CAAC;KACH;IACD,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AApJW,QAAA,eAAe,mBAoJ1B;AAEF,SAAgB,WAAW,CAAC,IAAe,EAAE,KAAa;IACxD,MAAM,IAAI,GAAG,gBAAQ,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,8BAA8B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;KACvB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AARD,kCAQC;AAED,SAAgB,8BAA8B,CAAC,IAAe,EAAE,KAAkB;IAChF,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE;QAC5D,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC3B;IACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;QACvC,8BAA8B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;KAC9C;AACH,CAAC;AAPD,wEAOC;AAED,kBAAkB;AACX,KAAK,UAAU,yBAAyB,CAC7C,MAAgC,EAChC,QAAsB,EACtB,OAAmB;IAEnB,IAAI,QAAQ,CAAC,yBAAyB,EAAE;QACtC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtE,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAVD,8DAUC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,IAAU,EACV,MAAc,EACd,QAAsB,EACtB,OAAmB,EACnB,OAAsC;IAEtC,IAAI,QAAQ,CAAC,uBAAuB,EAAE;QACpC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,uBAAuB,CAChD,OAAO,EACP,MAAM,EACN,IAAI,EACJ,OAAO,EACP,kBAAK,CAAC,aAAa,CACpB,CAAC;QACF,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAlBD,8DAkBC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,MAAgC,EAChC,QAAsB,EACtB,OAAmB,EACnB,OAAsC;IAEtC,IAAI,QAAQ,CAAC,wBAAwB,EAAE;QACrC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CACjD,OAAO,EACP,MAAM,EACN,OAAO,EACP,kBAAK,CAAC,aAAa,CACpB,CAAC;QACF,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAhBD,4DAgBC;AAEM,KAAK,UAAU,qBAAqB,CACzC,MAAgC,EAChC,QAAsB,EACtB,OAAmB,EACnB,OAAsC;IAEtC,IAAI,QAAQ,CAAC,qBAAqB,EAAE;QAClC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAK,CAAC,aAAa,CAAC,CAAC;QAChG,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAXD,sDAWC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAgC,EAChC,QAAsB,EACtB,OAAmB,EACnB,OAAsC;IAEtC,IAAI,QAAQ,CAAC,sBAAsB,EAAE;QACnC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,sBAAsB,CAC/C,OAAO,EACP,MAAM,EACN,OAAO,EACP,kBAAK,CAAC,aAAa,CAAC,cAAc,CACnC,CAAC;QACF,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAhBD,wDAgBC;AAEM,KAAK,UAAU,mBAAmB,CACvC,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,2CAA2C;IAC3C,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;QACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;KAClD;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,kBAAS,CAAC,GAAG,CAAe,gCAAoB,CAAC,KAAK,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,uBAAe,CAAC,0CAAkB,EAAE,CAAC,CAAC;IACtD,IAAI,QAAQ,CAAC,mBAAmB,EAAE;QAChC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,GAAG,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,YAAY,GAAG,GAAG,CAAC,KAAkB,CAAC;YAC5C,IAAI,YAAY,CAAC,IAAI;gBAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SACpD;KACF;IACD,OAAO,gBAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AACzB,CAAC;AApBD,kDAoBC;AAEM,KAAK,UAAU,8BAA8B,CAClD,MAAc;;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,2CAAgC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9E,aAAa;IACb,MAAM,SAAS,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzB,SAAS,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,2BAAgB,CAAC,EAAE,EAAE,CAAC;IAEtD,eAAe;IACf,MAAM,WAAW,GAAG,mCAAwB,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,kBAAS,CAAC,GAAG,CAAe,gCAAoB,CAAC,KAAK,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,uBAAe,CAAC,0CAAkB,EAAE,CAAC,CAAC;IACtD,IAAI,QAAQ,CAAC,mBAAmB,EAAE;QAChC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,GAAG,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,YAAY,GAAG,GAAG,CAAC,KAAkB,CAAC;YAC5C,IAAI,YAAY,CAAC,IAAI;gBAAE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SACvD;KACF;IACD,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAe,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7E,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE;QAClB,IAAI,MAAA,OAAO,CAAC,KAAK,0CAAE,IAAI,EAAE;YACvB,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,sBAAW,CAAC,EAAE,EAAE,CAAC;YACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACjC;KACF;IACD,WAAW;IACX,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;IACvE,mBAAmB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAExC,6BAA6B;IAC7B,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;QACpC,SAAS,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;KACvD;IACD,SAAS,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,EAAE,CAAC,CAAC,CAAC;IAE3D,qBAAqB;IACrB,MAAM,UAAU,GAAG,IAAI,uBAAS,CAAC,uBAAY,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1B,UAAU,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,0BAAe,CAAC,EAAE,EAAE,CAAC;IACtD,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;QACvC,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;KACxD;IACD,OAAO,gBAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AACzB,CAAC;AAlDD,wEAkDC;AAED,KAAK,UAAU,kCAAkC,CAC/C,MAAc;IAEd,MAAM,UAAU,GAAG,IAAI,uBAAS,CAAC,8CAAmC,CAAC,CAAC;IAEtE,WAAW;IACX,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,oCAAyB,CAAC,CAAC,CAAC;IAE9D,eAAe;IACf,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,uCAA4B,CAAC,CAAC,CAAC;IAEjE,MAAM,eAAe,GAAwB,iDAAuB,EAAE,CAAC;IACvE,MAAM,OAAO,GAAG,uBAAe,CAAC,0CAAkB,EAAE,CAAC,CAAC;IACtD,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,IAAI,GAAG,GAAyD,gBAAE,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG,cAAmC,CAAC;QACrD,GAAG,GAAG,QAAQ,CAAC,0BAA0B;YACvC,CAAC,CAAC,MAAM,QAAQ,CAAC,0BAA0B,CAAC,OAAqB,EAAE,MAAM,CAAC;YAC1E,CAAC,CAAC,gBAAE,CAAC,SAAS,CAAC,CAAC;QAClB,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,kBAAU,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CACrF,CAAC;QACJ,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;gBAC3C,CAAC,CAAE,GAAG,CAAC,KAAqB;gBAC5B,CAAC,CAAC,CAAC,GAAG,CAAC,KAAkB,CAAC,CAAC;YAC7B,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;gBAC/B,IAAI,IAAI,CAAC,IAAI;oBAAE,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aAC1C;SACF;KACF;IAED,uBAAuB;IACvB,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;IACvE,mBAAmB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IAChD,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAEzC,6BAA6B;IAC7B,IAAI,0BAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QAC1C,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;KACxD;IAED,mBAAmB;IACnB,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,EAAE,CAAC,CAAC,CAAC;IAE5D,OAAO,gBAAE,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,kBAAkB;AACX,KAAK,UAAU,8BAA8B,CAClD,MAAc;IAEd,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,OAAO,kCAAkC,CAAC,MAAM,CAAC,CAAC;KACnD;IAED,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,2CAAgC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9E,aAAa;IACb,MAAM,SAAS,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzB,SAAS,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,2BAAgB,CAAC,EAAE,EAAE,CAAC;IAEtD,eAAe;IACf,MAAM,WAAW,GAAG,mCAAwB,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE5B,kBAAkB;IAClB,MAAM,aAAa,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC7B,aAAa,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,+BAAoB,CAAC,EAAE,EAAE,CAAC;IAE9D,gBAAgB;IAChB,aAAa,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,oCAAyB,CAAC,CAAC,CAAC;IAEjE,oBAAoB;IACpB,aAAa,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,uCAA4B,CAAC,CAAC,CAAC;IAEpE,MAAM,eAAe,GAAwB,MAAM,iDAAuB,EAAE,CAAC;IAC7E,MAAM,OAAO,GAAG,uBAAe,CAAC,0CAAkB,EAAE,CAAC,CAAC;IACtD,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,IAAI,GAAG,GAAyD,gBAAE,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG,cAAmC,CAAC;QACrD,GAAG,GAAG,QAAQ,CAAC,0BAA0B;YACvC,CAAC,CAAC,MAAM,QAAQ,CAAC,0BAA0B,CAAC,OAAqB,EAAE,MAAM,CAAC;YAC1E,CAAC,CAAC,gBAAE,CAAC,SAAS,CAAC,CAAC;QAClB,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC,EAAE,MAAM,EAAE,kBAAU,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CACrF,CAAC;QACJ,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;gBAC3C,CAAC,CAAE,GAAG,CAAC,KAAqB;gBAC5B,CAAC,CAAC,CAAC,GAAG,CAAC,KAAkB,CAAC,CAAC;YAC7B,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;gBAC/B,IAAI,IAAI,CAAC,IAAI,EAAE;oBACb,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACvB,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;iBAC9B;aACF;SACF;KACF;IAED,WAAW;IACX,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;IACvE,mBAAmB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACxC,aAAa,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE5C,6BAA6B;IAC7B,IAAI,0BAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QAC1C,SAAS,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;QACtD,aAAa,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;KAC3D;IACD,SAAS,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,EAAE,CAAC,CAAC,CAAC;IAC3D,aAAa,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,EAAE,CAAC,CAAC,CAAC;IAE/D,qBAAqB;IACrB,MAAM,UAAU,GAAG,IAAI,uBAAS,CAAC,uBAAY,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1B,UAAU,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,0BAAe,CAAC,EAAE,EAAE,CAAC;IACtD,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;QACvC,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;KACxD;IACD,OAAO,gBAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AACzB,CAAC;AA5ED,wEA4EC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,GAAiC,EACjC,QAAsC,EACtC,IAAoB,EACpB,MAAc,EACd,OAAsB;IAEtB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,IAAI,SAAS,IAAI,EAAE,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACrD,IAAI,GAAG,GAA2C,gBAAE,CAAC,SAAS,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,QAA6B,CAAC;QACjD,IAAI,UAAU,CAAC,uBAAuB,EAAE;YACtC,GAAG,GAAG,MAAM,UAAU,CAAC,uBAAuB,CAC5C,GAAiB,EACjB,MAAM,EACN,IAAI,EACJ,OAAQ,EACR,kBAAK,CAAC,aAAa,CACpB,CAAC;SACH;QACD,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE;YACd,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC9B,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;aACjB;SACF;QACD,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,iBAAG,CAAC,2BAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;AACxC,CAAC;AA9BD,8DA8BC;AAEM,KAAK,UAAU,cAAc,CAClC,GAAiC,EACjC,QAAsC,EACtC,KAAY,EACZ,MAAc,EACd,OAAsB;IAEtB,IAAI,KAAK,KAAK,mBAAK,CAAC,MAAM,EAAE;QAC1B,IAAI,GAAG,GAA2C,gBAAE,CAAC,SAAS,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,QAA6B,CAAC;QACjD,IAAI,UAAU,CAAC,YAAY,EAAE;YAC3B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,GAAG,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,GAAiB,EAAE,MAAM,EAAE,OAAQ,EAAE,kBAAK,CAAC,aAAa,CAAC,CAAC;SAC/F;QACD,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,GAAG,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,IAAI,GAAG,GAAG,CAAC,KAAkB,CAAC;YACpC,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,OAAO,gBAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;aACxB;SACF;KACF;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAvBD,wCAuBC"}
1	+ {"version":3,"file":"questionModel.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}

package/build/core/question.d.ts CHANGED Viewed

@@ -17,9 +17,7 @@ export declare enum CoreQuestionNames {
     NewResourceGroupName = "newResourceGroupName",
     NewResourceGroupLocation = "newResourceGroupLocation",
     NewTargetEnvName = "newTargetEnvName",
-    M365CreateFromScratch = "m365-scratch",
-    M365AppType = "app-type",
-    M365Capabilities = "m365-capabilities"
+    ExistingTabEndpoint = "existing-tab-endpoint"
 }
 export declare const ProjectNamePattern = "^[a-zA-Z][\\da-zA-Z]+$";
 export declare function createAppNameQuestion(validateProjectPathExistence?: boolean): TextInputQuestion;
@@ -38,14 +36,10 @@ export declare const QuestionSelectResourceGroup: SingleSelectQuestion;
 export declare const QuestionNewResourceGroupName: TextInputQuestion;
 export declare const QuestionNewResourceGroupLocation: SingleSelectQuestion;
 export declare const ScratchOptionYesVSC: OptionItem;
-export declare const ScratchOptionYesM365VSC: OptionItem;
 export declare const ScratchOptionNoVSC: OptionItem;
 export declare const ScratchOptionYes: OptionItem;
-export declare const ScratchOptionYesM365: OptionItem;
 export declare const ScratchOptionNo: OptionItem;
 export declare function getCreateNewOrFromSampleQuestion(platform: Platform): SingleSelectQuestion;
 export declare const SampleSelect: SingleSelectQuestion;
-export declare const M365CreateFromScratchSelectQuestion: SingleSelectQuestion;
-export declare const M365AppTypeSelectQuestion: SingleSelectQuestion;
-export declare const M365CapabilitiesFuncQuestion: FuncQuestion;
+export declare const ExistingTabEndpointQuestion: TextInputQuestion;
 //# sourceMappingURL=question.d.ts.map

package/build/core/question.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,UAAU,EACV,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EAIZ,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;~~AA0BhC~~,oBAAY,iBAAiB;IAC3B,OAAO,aAAa;IACpB,kBAAkB,0BAA0B;IAC5C,MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,mBAAmB,yBAAyB;IAC5C,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,iBAAiB,YAAY;IAC7B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,uBAAuB,4BAA4B;IACnD,oBAAoB,yBAAyB;IAC7C,wBAAwB,6BAA6B;IACrD,gBAAgB,qBAAqB;IACrC,~~qBAAqB~~,~~iBAAiB~~;~~IACtC,WAAW,aAAa~~;~~IACxB,gBAAgB,sBAAsB;CACvC;~~AAED,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAE3D,wBAAgB,qBAAqB,CAAC,4BAA4B,UAAO,GAAG,iBAAiB,CAoC5F;AAED,eAAO,MAAM,kBAAkB,EAAE,YAgBhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAIhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAiCzC,CAAC;AAwBF,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EACd,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAChB,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GACd,GAAG,CAAC,CAAC,CAAC,CAYR;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS,CAkBvF;AAED,wBAAgB,wBAAwB,IAAI,mBAAmB,~~CAkB9D~~;~~AACD~~,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,~~CAgCzE~~;AAED,wBAAsB,gCAAgC,CACpD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC/B,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,~~CA+BtB~~;AACD,eAAO,MAAM,+BAA+B,EAAE,oBAO7C,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,CA+C1F;AAED,eAAO,MAAM,+BAA+B,EAAE,oBAO7C,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAOzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,iBAmB1C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,oBAK9C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,~~uBAAuB,EAAE,UAIrC,CAAC;AAEF,eAAO,MAAM,~~kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,~~oBAAoB,EAAE,UAIlC,CAAC;AAEF,eAAO,MAAM,~~eAAe,EAAE,UAI7B,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,oBAAoB,~~CAwBzF~~;AAED,eAAO,MAAM,YAAY,EAAE,~~oBAa1B~~,CAAC;AAEF,eAAO,MAAM,~~mCAAmC~~,EAAE,~~oBAMjD~~,CAAC~~;AAEF,eAAO,MAAM,yBAAyB,EAAE,oBAMvC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAU1C,CAAC~~"}
1	+ {"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,UAAU,EACV,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EAIZ,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AA+BhC,oBAAY,iBAAiB;IAC3B,OAAO,aAAa;IACpB,kBAAkB,0BAA0B;IAC5C,MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,mBAAmB,yBAAyB;IAC5C,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,iBAAiB,YAAY;IAC7B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,uBAAuB,4BAA4B;IACnD,oBAAoB,yBAAyB;IAC7C,wBAAwB,6BAA6B;IACrD,gBAAgB,qBAAqB;IACrC,mBAAmB,0BAA0B;CAC9C;AAED,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAE3D,wBAAgB,qBAAqB,CAAC,4BAA4B,UAAO,GAAG,iBAAiB,CAoC5F;AAED,eAAO,MAAM,kBAAkB,EAAE,YAgBhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAIhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAiCzC,CAAC;AAwBF,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EACd,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAChB,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GACd,GAAG,CAAC,CAAC,CAAC,CAYR;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS,CAkBvF;AAED,wBAAgB,wBAAwB,IAAI,mBAAmB,CAiC9D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAkDzE;AAED,wBAAsB,gCAAgC,CACpD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC/B,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAkCtB;AACD,eAAO,MAAM,+BAA+B,EAAE,oBAO7C,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,CA+C1F;AAED,eAAO,MAAM,+BAA+B,EAAE,oBAO7C,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAOzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,iBAmB1C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,oBAK9C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAI7B,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,oBAAoB,CAkBzF;AAED,eAAO,MAAM,YAAY,EAAE,oBAqB1B,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,iBAgBzC,CAAC"}