@microsoft/teamsfx-core 2.0.10-rc.0 → 2.0.10

package/build/component/generator/utils.js

@@ -2,64 +2,98 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isApiLimitError = exports.simplifyAxiosError = exports.convertToUrl = exports.convertToLangKey = exports.runWithLimitedConcurrency = exports.getSampleFileInfo = exports.downloadDirectory = exports.zipFolder = exports.getSampleInfoFromName = exports.renderTemplateFileName = exports.renderTemplateFileData = exports.unzip = exports.fetchZipFromUrl = exports.getTemplateZipUrlByVersion = exports.getTemplateLatestVersion = exports.getTemplateUrl = void 0;
+exports.isApiLimitError = exports.simplifyAxiosError = exports.convertToUrl = exports.convertToLangKey = exports.runWithLimitedConcurrency = exports.getSampleFileInfo = exports.downloadDirectory = exports.zipFolder = exports.getSampleInfoFromName = exports.renderTemplateFileName = exports.renderTemplateFileData = exports.unzip = exports.fetchZipFromUrl = exports.getTemplateZipUrlByTag = exports.getTemplateLatestTag = exports.sendRequestWithTimeout = exports.sendRequestWithRetry = void 0;
 const tslib_1 = require("tslib");
-const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
-const axios_1 = tslib_1.__importDefault(require("axios"));
-const fs = tslib_1.__importStar(require("fs-extra"));
-const lodash_1 = require("lodash");
 const mustache_1 = tslib_1.__importStar(require("mustache"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const semver_1 = tslib_1.__importDefault(require("semver"));
-const requestUtils_1 = require("../../common/requestUtils");
+const fs = tslib_1.__importStar(require("fs-extra"));
+const constant_1 = require("./constant");
 const samples_1 = require("../../common/samples");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
+const axios_1 = tslib_1.__importDefault(require("axios"));
 const templates_config_json_1 = tslib_1.__importDefault(require("../../common/templates-config.json"));
-const error_1 = require("../../error");
-const constants_1 = require("../../question/constants");
-const constant_1 = require("./constant");
-async function getTemplateUrl(name, getLatestVersion) {
-    if (process.env.TEAMSFX_TEMPLATE_PRERELEASE) {
-        return getTemplateZipUrlByVersion(name, `0.0.0-${process.env.TEAMSFX_TEMPLATE_PRERELEASE}`);
-    }
-    if (!templates_config_json_1.default.useLocalTemplate) {
-        const latestVersion = await getLatestVersion();
-        if (semver_1.default.gt(latestVersion, templates_config_json_1.default.localVersion)) {
-            // Upstream latest version is higher than the local version, return upstream templates url for downloading.
-            return getTemplateZipUrlByVersion(name, latestVersion);
-        }
-    }
-}
-exports.getTemplateUrl = getTemplateUrl;
-async function selectTemplateVersion(getTags) {
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const tools_1 = require("../../common/tools");
+const error_1 = require("../../core/error");
+const question_1 = require("../../question");
+async function selectTemplateTag(getTags) {
+    const preRelease = process.env.TEAMSFX_TEMPLATE_PRERELEASE
+        ? `0.0.0-${process.env.TEAMSFX_TEMPLATE_PRERELEASE}`
+        : "";
+    const templateVersion = templates_config_json_1.default.version;
     const templateTagPrefix = templates_config_json_1.default.tagPrefix;
-    const versionPattern = templates_config_json_1.default.version;
+    const versionPattern = preRelease || templateVersion;
     const versionList = (await getTags()).map((tag) => tag.replace(templateTagPrefix, ""));
     const selectedVersion = semver_1.default.maxSatisfying(versionList, versionPattern);
-    return selectedVersion !== null && selectedVersion !== void 0 ? selectedVersion : undefined;
+    return selectedVersion ? templateTagPrefix + selectedVersion : undefined;
 }
+async function sendRequestWithRetry(requestFn, tryLimits) {
+    var _a;
+    // !status means network error, see https://github.com/axios/axios/issues/383
+    const canTry = (status) => !status || (status >= 500 && status < 600);
+    let status;
+    let error;
+    for (let i = 0; i < tryLimits && canTry(status); i++) {
+        try {
+            const res = await requestFn();
+            if (res.status === 200 || res.status === 201) {
+                return res;
+            }
+            else {
+                error = new Error(`HTTP Request failed: ${JSON.stringify(res)}`);
+            }
+            status = res.status;
+        }
+        catch (e) {
+            error = e;
+            status = (_a = e === null || e === void 0 ? void 0 : e.response) === null || _a === void 0 ? void 0 : _a.status;
+        }
+    }
+    error !== null && error !== void 0 ? error : (error = new Error(`RequestWithRetry got bad tryLimits: ${tryLimits}`));
+    throw error;
+}
+exports.sendRequestWithRetry = sendRequestWithRetry;
+async function sendRequestWithTimeout(requestFn, timeoutInMs, tryLimits = 1) {
+    const source = axios_1.default.CancelToken.source();
+    const timeout = setTimeout(() => {
+        source.cancel();
+    }, timeoutInMs);
+    try {
+        const res = await sendRequestWithRetry(() => requestFn(source.token), tryLimits);
+        clearTimeout(timeout);
+        return res;
+    }
+    catch (err) {
+        if (axios_1.default.isCancel(err)) {
+            throw new Error("Request timeout");
+        }
+        throw err;
+    }
+}
+exports.sendRequestWithTimeout = sendRequestWithTimeout;
 async function fetchTagList(url, tryLimits, timeoutInMs) {
-    const res = await (0, requestUtils_1.sendRequestWithTimeout)(async (cancelToken) => {
+    const res = await sendRequestWithTimeout(async (cancelToken) => {
         return await axios_1.default.get(url, {
             cancelToken: cancelToken,
         });
     }, timeoutInMs, tryLimits);
     return res.data;
 }
-async function getTemplateLatestVersion(tryLimits = constant_1.defaultTryLimits, timeoutInMs = constant_1.defaultTimeoutInMs) {
+async function getTemplateLatestTag(name, tryLimits = constant_1.defaultTryLimits, timeoutInMs = constant_1.defaultTimeoutInMs) {
     const templateTagListURL = templates_config_json_1.default.tagListURL;
-    const selectedVersion = await selectTemplateVersion(async () => (await fetchTagList(templateTagListURL, tryLimits, timeoutInMs)).replace(/\r/g, "").split("\n"));
-    if (!selectedVersion) {
-        throw new Error(`Failed to find valid template`);
+    const selectedTag = await selectTemplateTag(async () => (await fetchTagList(templateTagListURL, tryLimits, timeoutInMs)).replace(/\r/g, "").split("\n"));
+    if (!selectedTag) {
+        throw new Error(`Failed to find valid template for ${name}`);
     }
-    return selectedVersion;
+    return selectedTag;
 }
-exports.getTemplateLatestVersion = getTemplateLatestVersion;
-function getTemplateZipUrlByVersion(name, version) {
-    return `${templates_config_json_1.default.templateDownloadBaseURL}/${templates_config_json_1.default.tagPrefix}${version}/${name}${templates_config_json_1.default.templateExt}`;
+exports.getTemplateLatestTag = getTemplateLatestTag;
+function getTemplateZipUrlByTag(name, selectedTag) {
+    return `${templates_config_json_1.default.templateDownloadBaseURL}/${selectedTag}/${name}.zip`;
 }
-exports.getTemplateZipUrlByVersion = getTemplateZipUrlByVersion;
+exports.getTemplateZipUrlByTag = getTemplateZipUrlByTag;
 async function fetchZipFromUrl(url, tryLimits = constant_1.defaultTryLimits, timeoutInMs = constant_1.defaultTimeoutInMs) {
-    const res = await (0, requestUtils_1.sendRequestWithRetry)(async () => {
+    const res = await sendRequestWithRetry(async () => {
         return await axios_1.default.get(url, {
             responseType: "arraybuffer",
             timeout: timeoutInMs,
@@ -108,7 +142,7 @@ function renderTemplateFileData(fileName, fileData, variables) {
 exports.renderTemplateFileData = renderTemplateFileData;
 function escapeEmptyVariable(template, view, tags = constant_1.placeholderDelimiters) {
     const parsed = mustache_1.default.parse(template, tags);
-    const tokens = (0, lodash_1.cloneDeep)(parsed); // Mustache cache the parsed result. Modify the result in place may cause unexpected issue.
+    const tokens = tools_1.deepCopy(parsed); // Mustache cache the parsed result. Modify the result in place may cause unexpected issue.
     updateTokens(tokens, view, tags, 0);
     return tokens;
 }
@@ -123,7 +157,7 @@ function updateTokens(tokens, view, tags, accShift) {
             token[1] = tags[0] + value + tags[1];
             accShift += shift;
         }
-        else if (token[0] === "#" || token[0] === "^") {
+        else if (token[0] === "#") {
             token[2] += accShift;
             token[3] += accShift;
             accShift += updateTokens(token[4], view, tags, accShift);
@@ -139,7 +173,7 @@ exports.renderTemplateFileName = renderTemplateFileName;
 async function getSampleInfoFromName(sampleName) {
     const sample = (await samples_1.sampleProvider.SampleCollection).samples.find((sample) => sample.id.toLowerCase() === sampleName.toLowerCase());
     if (!sample) {
-        throw new error_1.InputValidationError(`sample '${sampleName}'`, "not found");
+        throw error_1.InvalidInputError(`sample '${sampleName}' not found`);
     }
     return sample;
 }
@@ -159,7 +193,7 @@ exports.downloadDirectory = downloadDirectory;
 async function getSampleFileInfo(urlInfo, retryLimits) {
     var _a;
     const fileInfoUrl = `https://api.github.com/repos/${urlInfo.owner}/${urlInfo.repository}/git/trees/${urlInfo.ref}?recursive=1`;
-    const fileInfo = (await (0, requestUtils_1.sendRequestWithRetry)(async () => {
+    const fileInfo = (await sendRequestWithRetry(async () => {
         return await axios_1.default.get(fileInfoUrl);
     }, retryLimits)).data;
     const samplePaths = (_a = fileInfo === null || fileInfo === void 0 ? void 0 : fileInfo.tree) === null || _a === void 0 ? void 0 : _a.filter((node) => node.path.startsWith(`${urlInfo.dir}/`) && node.type !== "tree").map((node) => node.path);
@@ -170,7 +204,7 @@ exports.getSampleFileInfo = getSampleFileInfo;
 async function downloadSampleFiles(sampleInfo, fileUrlPrefix, samplePaths, dstPath, relativePath, retryLimits, concurrencyLimits) {
     const downloadCallback = async (samplePath) => {
         const lfsRegex = /^.*oid sha256:[0-9a-f]+\nsize \d+/gm;
-        const file = (await (0, requestUtils_1.sendRequestWithRetry)(async () => {
+        const file = (await sendRequestWithRetry(async () => {
             const content = await axios_1.default.get(fileUrlPrefix + samplePath, { responseType: "arraybuffer" });
             if (lfsRegex.test(content.data.toString())) {
                 return await axios_1.default.get(`https://media.githubusercontent.com/media/${sampleInfo.owner}/${sampleInfo.repository}/${sampleInfo.ref}/${samplePath}`, {
@@ -212,21 +246,18 @@ async function runWithLimitedConcurrency(items, callback, concurrencyLimit) {
 exports.runWithLimitedConcurrency = runWithLimitedConcurrency;
 function convertToLangKey(programmingLanguage) {
     switch (programmingLanguage) {
-        case constants_1.ProgrammingLanguage.JS: {
+        case question_1.ProgrammingLanguage.JS: {
             return "js";
         }
-        case constants_1.ProgrammingLanguage.TS: {
+        case question_1.ProgrammingLanguage.TS: {
             return "ts";
         }
-        case constants_1.ProgrammingLanguage.CSharp: {
+        case question_1.ProgrammingLanguage.CSharp: {
             return "csharp";
         }
-        case constants_1.ProgrammingLanguage.PY: {
+        case question_1.ProgrammingLanguage.PY: {
             return "python";
         }
-        case constants_1.ProgrammingLanguage.None: {
-            return "common";
-        }
     }
     return programmingLanguage;
 }

package/build/component/generator/utils.js.map

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

package/build/component/messages.js

@@ -7,17 +7,17 @@ const localizeUtils_1 = require("../common/localizeUtils");
 class ProgressTitles {
 }
 exports.ProgressTitles = ProgressTitles;
-ProgressTitles.create = (0, localizeUtils_1.getLocalizedString)("core.progress.create");
+ProgressTitles.create = localizeUtils_1.getLocalizedString("core.progress.create");
 class ProgressMessages {
 }
 exports.ProgressMessages = ProgressMessages;
-ProgressMessages.generateTemplate = (0, localizeUtils_1.getLocalizedString)("core.progress.createFromTemplate");
-ProgressMessages.generateSample = (sampleName) => (0, localizeUtils_1.getLocalizedString)("core.progress.createFromSample", sampleName);
-ProgressMessages.configureAzureStorageEnableStaticWebsite = (0, localizeUtils_1.getLocalizedString)("core.progress.configureAzureStorage");
-ProgressMessages.runCommand = (command, directory) => (0, localizeUtils_1.getLocalizedString)("core.progress.runCommand", command, directory);
-ProgressMessages.deployToAzure = (location, dist) => (0, localizeUtils_1.getLocalizedString)("core.progress.deployToAzure", location, dist);
+ProgressMessages.generateTemplate = localizeUtils_1.getLocalizedString("core.progress.createFromTemplate");
+ProgressMessages.generateSample = (sampleName) => localizeUtils_1.getLocalizedString("core.progress.createFromSample", sampleName);
+ProgressMessages.configureAzureStorageEnableStaticWebsite = localizeUtils_1.getLocalizedString("core.progress.configureAzureStorage");
+ProgressMessages.runCommand = (command, directory) => localizeUtils_1.getLocalizedString("core.progress.runCommand", command, directory);
+ProgressMessages.deployToAzure = (location, dist) => localizeUtils_1.getLocalizedString("core.progress.deployToAzure", location, dist);
 class LogMessages {
 }
 exports.LogMessages = LogMessages;
-LogMessages.getTemplateFromLocal = (0, localizeUtils_1.getLocalizedString)("plugins.function.getTemplateFromLocal");
+LogMessages.getTemplateFromLocal = localizeUtils_1.getLocalizedString("plugins.function.getTemplateFromLocal");
 //# sourceMappingURL=messages.js.map

package/build/component/messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2DAA6D;AAE7D,MAAa,cAAc;;AAA3B,wCAEC;AADiB,qBAAM,GAAG,IAAA,kCAAkB,EAAC,sBAAsB,CAAC,CAAC;AAGtE,MAAa,gBAAgB;;AAA7B,4CAWC;AAViB,iCAAgB,GAAG,IAAA,kCAAkB,EAAC,kCAAkC,CAAC,CAAC;AAC1E,+BAAc,GAAG,CAAC,UAAkB,EAAU,EAAE,CAC9D,IAAA,kCAAkB,EAAC,gCAAgC,EAAE,UAAU,CAAC,CAAC;AACnD,yDAAwC,GAAG,IAAA,kCAAkB,EAC3E,qCAAqC,CACtC,CAAC;AACc,2BAAU,GAAG,CAAC,OAAe,EAAE,SAAiB,EAAU,EAAE,CAC1E,IAAA,kCAAkB,EAAC,0BAA0B,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AACrD,8BAAa,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAU,EAAE,CACzE,IAAA,kCAAkB,EAAC,6BAA6B,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAGtE,MAAa,WAAW;;AAAxB,kCAIC;AAHwB,gCAAoB,GAAG,IAAA,kCAAkB,EAC9D,uCAAuC,CACxC,CAAC"}
+{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2DAA6D;AAE7D,MAAa,cAAc;;AAA3B,wCAEC;AADiB,qBAAM,GAAG,kCAAkB,CAAC,sBAAsB,CAAC,CAAC;AAGtE,MAAa,gBAAgB;;AAA7B,4CAWC;AAViB,iCAAgB,GAAG,kCAAkB,CAAC,kCAAkC,CAAC,CAAC;AAC1E,+BAAc,GAAG,CAAC,UAAkB,EAAU,EAAE,CAC9D,kCAAkB,CAAC,gCAAgC,EAAE,UAAU,CAAC,CAAC;AACnD,yDAAwC,GAAG,kCAAkB,CAC3E,qCAAqC,CACtC,CAAC;AACc,2BAAU,GAAG,CAAC,OAAe,EAAE,SAAiB,EAAU,EAAE,CAC1E,kCAAkB,CAAC,0BAA0B,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AACrD,8BAAa,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAU,EAAE,CACzE,kCAAkB,CAAC,6BAA6B,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAGtE,MAAa,WAAW;;AAAxB,kCAIC;AAHwB,gCAAoB,GAAG,kCAAkB,CAC9D,uCAAuC,CACxC,CAAC"}

package/build/component/middleware/actionExecutionMW.d.ts

@@ -1,5 +1,5 @@
 import { Middleware } from "@feathersjs/hooks/lib";
-import { Context, FxError, IProgressHandler, IQTreeNode, InputsWithProjectPath, MaybePromise, Result } from "@microsoft/teamsfx-api";
+import { Context, FxError, IProgressHandler, InputsWithProjectPath, MaybePromise, IQTreeNode, Result } from "@microsoft/teamsfx-api";
 interface ActionOption {
     componentName?: string;
     errorSource?: string;

package/build/component/middleware/actionExecutionMW.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actionExecutionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,qBAAqB,EACrB,YAAY,EACZ,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAUhC,UAAU,YAAY;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CACT,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,qBAAqB,KAC1B,YAAY,CAAC,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;CAC5D;AACD,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C;AACD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CA2FlE"}
+{"version":3,"file":"actionExecutionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,UAAU,EACV,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAUhC,UAAU,YAAY;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CACT,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,qBAAqB,KAC1B,YAAY,CAAC,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;CAC5D;AACD,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C;AACD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CA0FlE"}

package/build/component/middleware/actionExecutionMW.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionExecutionMW = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const lodash_1 = require("lodash");
-const globalVars_1 = require("../../common/globalVars");
-const telemetry_1 = require("../../common/telemetry");
+const globalVars_1 = require("../../core/globalVars");
 const common_1 = require("../../error/common");
 const visitor_1 = require("../../ui/visitor");
-const telemetry_2 = require("../telemetry");
+const constants_1 = require("../constants");
+const telemetry_1 = require("../telemetry");
 const settingsUtil_1 = require("../utils/settingsUtil");
 function ActionExecutionMW(action) {
     return async (ctx, next) => {
@@ -20,7 +20,7 @@ function ActionExecutionMW(action) {
         const methodName = ctx.method;
         const eventName = action.telemetryEventName || methodName;
         const telemetryProps = {
-            [telemetry_1.TelemetryProperty.Component]: telemetryComponentName,
+            [constants_1.TelemetryConstants.properties.component]: telemetryComponentName,
             env: process.env.TEAMSFX_ENV || "",
         };
         const telemetryMeasures = {};
@@ -36,10 +36,10 @@ function ActionExecutionMW(action) {
                     }
                 }
                 if (action.telemetryProps)
-                    (0, lodash_1.assign)(telemetryProps, action.telemetryProps);
+                    lodash_1.assign(telemetryProps, action.telemetryProps);
                 if (globalVars_1.globalVars.trackingId)
-                    telemetryProps[telemetry_1.TelemetryProperty.ProjectId] = globalVars_1.globalVars.trackingId; // add trackingId prop in telemetry
-                (0, telemetry_2.sendStartEvent)(eventName, telemetryProps);
+                    telemetryProps["project-id"] = globalVars_1.globalVars.trackingId; // add trackingId prop in telemetry
+                telemetry_1.sendStartEvent(eventName, telemetryProps);
             }
             // run question model
             if (action.question) {
@@ -50,7 +50,7 @@ function ActionExecutionMW(action) {
                     throw getQuestionRes.error;
                 const node = getQuestionRes.value;
                 if (node) {
-                    const askQuestionRes = await (0, visitor_1.traverse)(node, inputs, context.userInteraction, context.telemetryReporter);
+                    const askQuestionRes = await visitor_1.traverse(node, inputs, context.userInteraction, context.telemetryReporter);
                     if (askQuestionRes.isErr())
                         throw askQuestionRes.error;
                 }
@@ -74,15 +74,15 @@ function ActionExecutionMW(action) {
             if (((_c = ctx.result) === null || _c === void 0 ? void 0 : _c.isErr) && ctx.result.isErr())
                 throw ctx.result.error;
             // send end telemetry
-            (0, lodash_1.merge)(telemetryMeasures, { [telemetry_1.TelemetryProperty.TimeCost]: timeCost });
+            lodash_1.merge(telemetryMeasures, { [constants_1.TelemetryConstants.properties.timeCost]: timeCost });
             if (action.enableTelemetry) {
-                (0, telemetry_2.sendSuccessEvent)(eventName, telemetryProps, telemetryMeasures);
+                telemetry_1.sendSuccessEvent(eventName, telemetryProps, telemetryMeasures);
             }
             await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true));
         }
         catch (e) {
             await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(false));
-            const fxError = (0, common_1.assembleError)(e);
+            const fxError = common_1.assembleError(e);
             if (fxError.source === "unknown") {
                 fxError.source = errorSource || fxError.source;
                 if (fxError instanceof teamsfx_api_1.UserError) {
@@ -94,9 +94,9 @@ function ActionExecutionMW(action) {
             }
             // send error telemetry
             if (action.enableTelemetry) {
-                (0, telemetry_2.sendErrorEvent)(eventName, fxError, telemetryProps);
+                telemetry_1.sendErrorEvent(eventName, fxError, telemetryProps);
             }
-            ctx.result = (0, teamsfx_api_1.err)(fxError);
+            ctx.result = teamsfx_api_1.err(fxError);
         }
     };
 }

package/build/component/middleware/actionExecutionMW.js.map

@@ -1 +1 @@
-{"version":3,"file":"actionExecutionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAWgC;AAChC,mCAAuC;AACvC,wDAA4D;AAC5D,sDAA2D;AAC3D,+CAAmD;AACnD,8CAA4C;AAE5C,4CAAgF;AAChF,wDAAqD;AAwBrD,SAAgB,iBAAiB,CAAC,MAAoB;IACpD,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;QACpD,MAAM,aAAa,GACjB,MAAM,CAAC,aAAa,KAAI,MAAA,GAAG,CAAC,IAAI,0CAAE,aAAa,CAAA,KAAI,MAAA,GAAG,CAAC,IAAI,0CAAE,WAAW,CAAC,IAAI,CAAA,CAAC;QAChF,MAAM,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,IAAI,aAAa,CAAC;QAC9E,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,aAAa,CAAC;QACxD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAO,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,IAAI,UAAU,CAAC;QAC1D,MAAM,cAAc,GAAQ;YAC1B,CAAC,6BAAiB,CAAC,SAAS,CAAC,EAAE,sBAAsB;YACrD,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;SACnC,CAAC;QACF,MAAM,iBAAiB,GAA2B,EAAE,CAAC;QACrD,IAAI,WAAW,CAAC;QAChB,IAAI;YACF,uBAAuB;YACvB,IAAI,MAAM,CAAC,eAAe,EAAE;gBAC1B,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE;oBAC1B,wBAAwB;oBACxB,MAAM,WAAW,GAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAA6B,CAAC,WAAW,CAAC;oBAC9E,IAAI,WAAW,EAAE;wBACf,MAAM,2BAAY,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;qBACrD;iBACF;gBACD,IAAI,MAAM,CAAC,cAAc;oBAAE,IAAA,eAAM,EAAC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;gBACzE,IAAI,uBAAU,CAAC,UAAU;oBACvB,cAAc,CAAC,6BAAiB,CAAC,SAAS,CAAC,GAAG,uBAAU,CAAC,UAAU,CAAC,CAAC,mCAAmC;gBAC1G,IAAA,0BAAc,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;aAC3C;YACD,qBAAqB;YACrB,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACnB,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAY,CAAC;gBAC5C,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAA0B,CAAC;gBACzD,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC9D,IAAI,cAAc,CAAC,KAAK,EAAE;oBAAE,MAAM,cAAc,CAAC,KAAK,CAAC;gBACvD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC;gBAClC,IAAI,IAAI,EAAE;oBACR,MAAM,cAAc,GAAG,MAAM,IAAA,kBAAQ,EACnC,IAAI,EACJ,MAAM,EACN,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;oBACF,IAAI,cAAc,CAAC,KAAK,EAAE;wBAAE,MAAM,cAAc,CAAC,KAAK,CAAC;iBACxD;aACF;YACD,eAAe;YACf,IAAI,MAAM,CAAC,iBAAiB,EAAE;gBAC5B,WAAW,GAAG,kBAAK,CAAC,EAAE,CAAC,iBAAiB,CACtC,MAAM,CAAC,aAAa,IAAI,UAAU,EAClC,MAAM,CAAC,aAAa,IAAI,CAAC,CAC1B,CAAC;gBACF,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;aAC3B;YACD,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,iBAAiB,EAAE;gBACtD,MAAM,aAAa,GAAkB;oBACnC,WAAW,EAAE,WAAW;oBACxB,cAAc,EAAE,cAAc;oBAC9B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC;gBACF,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACnC;YACD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACvC,MAAM,IAAI,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;YAClD,IAAI,CAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,KAAK,KAAI,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE;gBAAE,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;YACpE,qBAAqB;YACrB,IAAA,cAAK,EAAC,iBAAiB,EAAE,EAAE,CAAC,6BAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;YACrE,IAAI,MAAM,CAAC,eAAe,EAAE;gBAC1B,IAAA,4BAAgB,EAAC,SAAS,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;aAChE;YACD,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;SAC9B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,KAAK,CAAC,CAAA,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAA,sBAAa,EAAC,CAAC,CAAC,CAAC;YACjC,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;gBAChC,OAAO,CAAC,MAAM,GAAG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;gBAC/C,IAAI,OAAO,YAAY,uBAAS,EAAE;oBAChC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC;iBAC7D;gBACD,IAAI,OAAO,YAAY,yBAAW,EAAE;oBAClC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,cAAc,CAAC;iBAChE;aACF;YACD,uBAAuB;YACvB,IAAI,MAAM,CAAC,eAAe,EAAE;gBAC1B,IAAA,0BAAc,EAAC,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;aACpD;YACD,GAAG,CAAC,MAAM,GAAG,IAAA,iBAAG,EAAC,OAAO,CAAC,CAAC;SAC3B;IACH,CAAC,CAAC;AACJ,CAAC;AA3FD,8CA2FC"}
+{"version":3,"file":"actionExecutionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":"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"}

package/build/component/middleware/envMW.js

@@ -4,10 +4,10 @@ exports.EnvWriterMW = exports.EnvLoaderMW = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const globalVars_1 = require("../../common/globalVars");
 const environmentName_1 = require("../../core/environmentName");
-const error_1 = require("../../error");
-const constants_1 = require("../../question/constants");
+const error_1 = require("../../core/error");
+const globalVars_1 = require("../../core/globalVars");
+const questionNames_1 = require("../../question/questionNames");
 const other_1 = require("../../question/other");
 const visitor_1 = require("../../ui/visitor");
 const envUtil_1 = require("../utils/envUtil");
@@ -42,7 +42,7 @@ const envLoaderMWImpl = async (withLocalEnv, ctx, next, skipLoadIfNoEnvInput = f
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     const projectPath = inputs.projectPath;
     if (!projectPath) {
-        ctx.result = (0, teamsfx_api_1.err)(new error_1.NoProjectOpenedError());
+        ctx.result = teamsfx_api_1.err(new error_1.NoProjectOpenedError());
         return;
     }
     if (inputs.ignoreEnvInfo) {
@@ -54,18 +54,18 @@ const envLoaderMWImpl = async (withLocalEnv, ctx, next, skipLoadIfNoEnvInput = f
             await next();
             return;
         }
-        const question = (0, other_1.selectTargetEnvQuestion)(constants_1.QuestionNames.Env, !withLocalEnv, true);
-        const res = await (0, visitor_1.traverse)({ data: question }, inputs, globalVars_1.TOOLS.ui);
+        const question = other_1.selectTargetEnvQuestion(questionNames_1.QuestionNames.Env, !withLocalEnv, true);
+        const res = await visitor_1.traverse({ data: question }, inputs, globalVars_1.TOOLS.ui);
         if (res.isErr()) {
             globalVars_1.TOOLS.logProvider.debug(`Failed to run question model for target environment.`);
-            ctx.result = (0, teamsfx_api_1.err)(res.error);
+            ctx.result = teamsfx_api_1.err(res.error);
             return;
         }
     }
     if (inputs.env) {
         const res = await envUtil_1.envUtil.readEnv(projectPath, inputs.env);
         if (res.isErr()) {
-            ctx.result = (0, teamsfx_api_1.err)(res.error);
+            ctx.result = teamsfx_api_1.err(res.error);
             return;
         }
         ctx.envVars = res.value;
@@ -81,7 +81,7 @@ const EnvWriterMW = async (ctx, next) => {
     if (projectPath && env && envVars) {
         const res = await envUtil_1.envUtil.writeEnv(projectPath, env, envVars);
         if (res.isErr()) {
-            ctx.result = (0, teamsfx_api_1.err)(res.error);
+            ctx.result = teamsfx_api_1.err(res.error);
             return;
         }
     }

package/build/component/middleware/envMW.js.map

@@ -1 +1 @@
-{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":";;;;AAGA,wDAAqD;AACrD,4DAAuB;AACvB,gEAAoE;AACpE,4CAAwD;AACxD,sDAA8C;AAE9C,gEAA6D;AAC7D,gDAA+D;AAC/D,8CAA4C;AAC5C,8CAA2C;AAE3C;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,YAAqB,EAAE,oBAAoB,GAAG,KAAK;IAC7E,OAAO,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;QACxD,MAAM,SAAS,GAAG,gBAAC,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI;YACF,MAAM,eAAe,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;YACrE,OAAO;SACR;gBAAS;YACR,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;gBACpB,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE;oBACrB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBACvB;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;iBAC/B;aACF;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAjBD,kCAiBC;AAED,MAAM,eAAe,GAAG,KAAK,EAC3B,YAAqB,EACrB,GAAoB,EACpB,IAAkB,EAClB,oBAAoB,GAAG,KAAK,EAC5B,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACvC,IAAI,CAAC,WAAW,EAAE;QAChB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,4BAAoB,EAAE,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,IAAI,MAAM,CAAC,aAAa,EAAE;QACxB,MAAM,CAAC,GAAG,GAAG,wCAAsB,CAAC,iBAAiB,EAAE,CAAC;KACzD;IACD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QACf,IAAI,oBAAoB,IAAI,MAAM,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE;YAC9D,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC,2GAA2G;YAC5I,MAAM,IAAI,EAAE,CAAC;YACb,OAAO;SACR;QACD,MAAM,QAAQ,GAAG,+BAAuB,CAAC,6BAAa,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACjF,MAAM,GAAG,GAAG,MAAM,kBAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,CAAC,CAAC;QACjE,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,kBAAK,CAAC,WAAW,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAChF,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;SACR;KACF;IACD,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,MAAM,GAAG,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;SACR;QACD,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC;KACzB;IACD,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAEK,MAAM,WAAW,GAAe,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACxF,MAAM,IAAI,EAAE,CAAC;IACb,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAW,CAAC;IAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACvC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC5B,IAAI,WAAW,IAAI,GAAG,IAAI,OAAO,EAAE;QACjC,MAAM,GAAG,GAAG,MAAM,iBAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAC9D,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;SACR;KACF;AACH,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB"}

package/build/component/middleware/questionMW.js

@@ -4,7 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuestionMW = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const globalVars_1 = require("../../common/globalVars");
+const globalVars_1 = require("../../core/globalVars");
 const question_1 = require("../../question");
 const visitor_1 = require("../../ui/visitor");
 function QuestionMW(key, fromAction = false) {
@@ -14,16 +14,16 @@ function QuestionMW(key, fromAction = false) {
             inputs.outputEnvVarNames = ctx.arguments[2];
         }
         const node = question_1.questionNodes[key]();
-        const askQuestionRes = await (0, visitor_1.traverse)(node, inputs, globalVars_1.TOOLS.ui, globalVars_1.TOOLS.telemetryReporter);
+        const askQuestionRes = await visitor_1.traverse(node, inputs, globalVars_1.TOOLS.ui, globalVars_1.TOOLS.telemetryReporter);
         if (askQuestionRes.isErr()) {
             if (fromAction) {
                 ctx.result = {
-                    result: (0, teamsfx_api_1.err)(askQuestionRes.error),
+                    result: teamsfx_api_1.err(askQuestionRes.error),
                     summaries: [],
                 };
             }
             else {
-                ctx.result = (0, teamsfx_api_1.err)(askQuestionRes.error);
+                ctx.result = teamsfx_api_1.err(askQuestionRes.error);
             }
             return;
         }

package/build/component/middleware/questionMW.js.map

@@ -1 +1 @@
-{"version":3,"file":"questionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAAqD;AACrD,wDAAgD;AAChD,6CAA8D;AAC9D,8CAA4C;AAE5C,SAAgB,UAAU,CAAC,GAAwB,EAAE,UAAU,GAAG,KAAK;IACrE,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAW,CAAC;QAC1C,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAC7C;QACD,MAAM,IAAI,GAAG,wBAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,cAAc,GAAG,MAAM,IAAA,kBAAQ,EAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QACvF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;YAC1B,IAAI,UAAU,EAAE;gBACd,GAAG,CAAC,MAAM,GAAG;oBACX,MAAM,EAAE,IAAA,iBAAG,EAAC,cAAc,CAAC,KAAK,CAAC;oBACjC,SAAS,EAAE,EAAE;iBACd,CAAC;aACH;iBAAM;gBACL,GAAG,CAAC,MAAM,GAAG,IAAA,iBAAG,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC;aACxC;YACD,OAAO;SACR;QACD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AArBD,gCAqBC"}
+{"version":3,"file":"questionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAAqD;AACrD,sDAA8C;AAC9C,6CAA8D;AAC9D,8CAA4C;AAE5C,SAAgB,UAAU,CAAC,GAAwB,EAAE,UAAU,GAAG,KAAK;IACrE,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAW,CAAC;QAC1C,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAC7C;QACD,MAAM,IAAI,GAAG,wBAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,cAAc,GAAG,MAAM,kBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QACvF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;YAC1B,IAAI,UAAU,EAAE;gBACd,GAAG,CAAC,MAAM,GAAG;oBACX,MAAM,EAAE,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC;oBACjC,SAAS,EAAE,EAAE;iBACd,CAAC;aACH;iBAAM;gBACL,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;aACxC;YACD,OAAO;SACR;QACD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AArBD,gCAqBC"}

package/build/component/migrate.d.ts

@@ -1,37 +1,5 @@
-export declare const ComponentNames: {
-    TeamsTab: string;
-    TeamsBot: string;
-    TeamsApi: string;
-    AppManifest: string;
-    AadApp: string;
-    AzureWebApp: string;
-    AzureStorage: string;
-    BotService: string;
-    SPFxTab: string;
-    SPFx: string;
-    Identity: string;
-    APIM: string;
-    KeyVault: string;
-    AzureSQL: string;
-    TabCode: string;
-    BotCode: string;
-    ApiCode: string;
-    Function: string;
-    SimpleAuth: string;
-    SSO: string;
-    ApiConnector: string;
-    CICD: string;
-};
 export declare const EnvStateMigrationComponentNames: string[][];
 export declare function convertProjectSettingsV2ToV3(settingsV2: any, projectPath: string): any;
-export declare function getComponent(projectSettings: any, resourceType: string): any | undefined;
-declare enum Scenarios {
-    Tab = "Tab",
-    Bot = "Bot",
-    Api = "Api"
-}
-export declare function getComponentByScenario(projectSetting: any, resourceType: string, scenario?: Scenarios): any | undefined;
 export declare function convertManifestTemplateToV3(content: string): string;
 export declare function convertManifestTemplateToV2(content: string): string;
-export {};
 //# sourceMappingURL=migrate.d.ts.map

package/build/component/migrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/component/migrate.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;CAuB1B,CAAC;AAEF,eAAO,MAAM,+BAA+B,YAY3C,CAAC;AAEF,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,GAAG,CAmLtF;AAsBD,wBAAgB,YAAY,CAAC,eAAe,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAExF;AACD,aAAK,SAAS;IACZ,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AACD,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,GAAG,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,SAAS,GACnB,GAAG,GAAG,SAAS,CAMjB;AAwBD,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQnE;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQnE"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/component/migrate.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,+BAA+B,YAY3C,CAAC;AAEF,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,GAAG,CAmLtF;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQnE;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQnE"}