npm - @microsoft/teamsfx-core - Versions diffs - 2.0.0 → 2.0.1-alpha.6f92bb6f7.0 - Mend

@microsoft/teamsfx-core 2.0.0 → 2.0.1-alpha.6f92bb6f7.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 (412) hide show

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

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectSettingPathV2 = exports.getProjectSettingPathV3 = exports.getProjectSettingsPath = exports.shouldIgnored = exports.newSolutionContext = exports.loadProjectSettingsByProjectPathV2 = exports.loadProjectSettingsByProjectPath = exports.loadProjectSettings = exports.ProjectSettingsLoaderMW = void 0;
+exports.getProjectSettingPathV2 = exports.getProjectSettingPathV3 = exports.getProjectSettingsPath = exports.shouldIgnored = exports.loadProjectSettingsByProjectPathV2 = exports.loadProjectSettingsByProjectPath = exports.loadProjectSettings = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
@@ -11,49 +11,11 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const projectSettingsHelper_1 = require("../../common/projectSettingsHelper");
 const telemetry_1 = require("../../common/telemetry");
 const tools_1 = require("../../common/tools");
-const crypto_1 = require("../crypto");
-const environment_1 = require("../environment");
-const error_1 = require("../error");
-const globalVars_1 = require("../globalVars");
-const permissionRequest_1 = require("../permissionRequest");
-const migrate_1 = require("../../component/migrate");
 const versionMetadata_1 = require("../../common/versionMetadata");
+const migrate_1 = require("../../component/migrate");
 const settingsUtil_1 = require("../../component/utils/settingsUtil");
-const common_1 = require("../../error/common");
-const ProjectSettingsLoaderMW = async (ctx, next) => {
-    const inputs = ctx.arguments[ctx.arguments.length - 1];
-    if (!shouldIgnored(ctx)) {
-        if (!inputs.projectPath) {
-            ctx.result = teamsfx_api_1.err(new error_1.NoProjectOpenedError());
-            return;
-        }
-        const projectPathExist = await fs.pathExists(inputs.projectPath);
-        if (!projectPathExist) {
-            ctx.result = teamsfx_api_1.err(new common_1.FileNotFoundError("ProjectSettingsLoaderMW", inputs.projectPath));
-            return;
-        }
-        const loadRes = await loadProjectSettings(inputs, true);
-        if (loadRes.isErr()) {
-            ctx.result = teamsfx_api_1.err(loadRes.error);
-            return;
-        }
-        const projectSettings = loadRes.value;
-        const validRes = projectSettingsHelper_1.validateProjectSettings(projectSettings);
-        if (validRes) {
-            ctx.result = teamsfx_api_1.err(new error_1.InvalidProjectSettingsFileError(validRes));
-            return;
-        }
-        ctx.projectSettings = projectSettings;
-        ctx.self.isFromSample = projectSettings.isFromSample === true;
-        ctx.self.settingsVersion = projectSettings.version;
-        ctx.self.tools.cryptoProvider = new crypto_1.LocalCrypto(projectSettings.projectId);
-        ctx.contextV2 = tools_1.createV2Context(projectSettings);
-        // set global variable once project settings is loaded
-        globalVars_1.globalVars.isVS = projectSettingsHelper_1.isVSProject(projectSettings);
-    }
-    await next();
-};
-exports.ProjectSettingsLoaderMW = ProjectSettingsLoaderMW;
+const error_1 = require("../error");
+const globalVars_1 = require("../globalVars");
 async function loadProjectSettings(inputs, isMultiEnvEnabled = false) {
     if (!inputs.projectPath) {
         return teamsfx_api_1.err(new error_1.NoProjectOpenedError());
@@ -107,22 +69,6 @@ async function loadProjectSettingsByProjectPathV2(projectPath, isMultiEnvEnabled
     return teamsfx_api_1.ok(migrate_1.convertProjectSettingsV2ToV3(projectSettings, projectPath));
 }
 exports.loadProjectSettingsByProjectPathV2 = loadProjectSettingsByProjectPathV2;
-async function newSolutionContext(tools, inputs) {
-    const projectSettings = {
-        appName: "",
-        programmingLanguage: "",
-        projectId: uuid.v4(),
-        solutionSettings: {
-            name: "fx-solution-azure",
-            version: "1.0.0",
-        },
-    };
-    const solutionContext = Object.assign(Object.assign(Object.assign({ projectSettings: projectSettings, envInfo: environment_1.newEnvInfo(), root: inputs.projectPath || "" }, tools), tools.tokenProvider), { answers: inputs, cryptoProvider: new crypto_1.LocalCrypto(projectSettings.projectId), permissionRequestProvider: inputs.projectPath
-            ? new permissionRequest_1.PermissionRequestFileProvider(inputs.projectPath)
-            : undefined });
-    return solutionContext;
-}
-exports.newSolutionContext = newSolutionContext;
 function shouldIgnored(ctx) {
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     const method = ctx.method;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,mDAA6B;~~AAG7B~~,~~wDAcgC~~;AAEhC,~~8EAA0F~~;~~AAC1F~~,sDAKgC;AAChC,~~8CAAkE~~;~~AAClE~~,~~sCAAwC~~;~~AACxC~~,~~gDAA4C;AAC5C,oCAAgG;AAChG,8CAA2C;AAC3C,4DAAqE;AAErE,~~qDAAuE;AACvE,~~kEAA0D;AAC1D,~~qEAAkE;AAClE~~,+CAAuD;AAEhD~~,MAAM,uBAAuB,GAAe,KAAK,EACtD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;QACvB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,4BAAoB,EAAE,CAAC,CAAC;YAC7C,OAAO;SACR;QACD,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjE,IAAI,CAAC,gBAAgB,EAAE;YACrB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,0BAAiB,CAAC,yBAAyB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YACvF,OAAO;SACR;QACD,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;YACnB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChC,OAAO;SACR;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;QAEtC,MAAM,QAAQ,GAAG,+CAAuB,CAAC,eAAe,CAAC,CAAC;QAC1D,IAAI,QAAQ,EAAE;YACZ,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,uCAA+~~B,CAAC,QAAQ,CAAC,CAAC,CAAC~~;~~YAChE~~,~~OAAO~~;~~SACR;QACD~~,~~GAAG,CAAC,eAAe,GAAG,eAAe,CAAC;QACrC,GAAG,CAAC,IAAY,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,~~KAAK,IAAI,CAAC;QACtE,GAAG,CAAC,IAAY,CAAC,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC;QAC3D,GAAG,CAAC,IAAY,CAAC,KAAK,CAAC,cAAc,GAAG,IAAI,oBAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACpF,GAAG,CAAC,SAAS,GAAG,uBAAe,CAAC,eAAe,CAAC,CAAC;QACjD,sDAAsD;QACtD,uBAAU,CAAC,IAAI,GAAG,mCAAW,CAAC,eAAe,CAAC,CAAC;KAChD;IAED,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAtCW,QAAA,uBAAuB,2BAsClC;AAEK,KAAK,UAAU,mBAAmB,CACvC,MAAc,EACd,iBAAiB,GAAG,KAAK;IAEzB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,OAAO,iBAAG,CAAC,IAAI,4BAAoB,EAAE,CAAC,CAAC;KACxC;IACD,OAAO,MAAM,gCAAgC,CAAC,MAAM,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AACvF,CAAC;AARD,kDAQC;AAEM,KAAK,UAAU,gCAAgC,CACpD,WAAmB,EACnB,iBAAiB,GAAG,KAAK;IAEzB,IAAI;QACF,IAAI,mBAAW,EAAE,EAAE;YACjB,MAAM,kBAAkB,GAAG,MAAM,2BAAY,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAC9E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,eAAe,GAAoB;oBACvC,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,UAAU;oBAC9C,OAAO,EAAE,kBAAkB,CAAC,KAAK,CAAC,OAAO;iBAC1C,CAAC;gBACF,OAAO,gBAAE,CAAC,eAAe,CAAC,CAAC;aAC5B;iBAAM;gBACL,OAAO,iBAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;aACtC;SACF;aAAM;YACL,OAAO,MAAM,kCAAkC,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;SACjF;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,iBAAG,CAAC,qBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;KAC9B;AACH,CAAC;AAtBD,4EAsBC;AAED,6CAA6C;AACtC,KAAK,UAAU,kCAAkC,CACtD,WAAmB,EACnB,iBAAiB,GAAG,KAAK,EACzB,MAAM,GAAG,KAAK;IAEd,IAAI,YAAY,CAAC;IACjB,IAAI,MAAM,EAAE;QACV,YAAY,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;KACrD;SAAM;QACL,YAAY,GAAG,iBAAiB;YAC9B,CAAC,CAAC,sBAAsB,CAAC,WAAW,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,8BAAgB,EAAE,EAAE,eAAe,CAAC,CAAC;KACxE;IAED,MAAM,eAAe,GAAoB,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzE,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;QAC9B,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACtC,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,aAAa,EAAE;YAC/D,CAAC,6BAAiB,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC,SAAS;SACzD,CAAC,CAAC;KACJ;IACD,uBAAU,CAAC,IAAI,GAAG,mCAAW,CAAC,eAAe,CAAC,CAAC;IAC/C,OAAO,gBAAE,CAAC,sCAA4B,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;AACxE,CAAC;AAvBD,gFAuBC;AAEM,KAAK,UAAU,kBAAkB,CAAC,KAAY,EAAE,MAAc;IACnE,MAAM,eAAe,GAAoB;QACvC,OAAO,EAAE,EAAE;QACX,mBAAmB,EAAE,EAAE;QACvB,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;QACpB,gBAAgB,EAAE;YAChB,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,OAAO;SACjB;KACF,CAAC;IACF,MAAM,eAAe,+CACnB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,wBAAU,EAAE,EACrB,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,IAC3B,KAAK,GACL,KAAK,CAAC,aAAa,KACtB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,IAAI,oBAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAC1D,yBAAyB,EAAE,MAAM,CAAC,WAAW;YAC3C,CAAC,CAAC,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC;YACvD,CAAC,CAAC,SAAS,GACd,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAvBD,gDAuBC;AAED,SAAgB,aAAa,CAAC,GAAoB;IAChD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE1B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,MAAM,KAAK,cAAc,EAAE;QAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAU,CAAC;QACvC,QAAQ,GAAG,IAAI,KAAK,mBAAK,CAAC,MAAM,CAAC;KAClC;IAED,OAAO,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,MAAM,CAAC,cAAc,CAAC;AACxF,CAAC;AAXD,sCAWC;AAED,SAAgB,sBAAsB,CAAC,WAAmB;IACxD,IAAI,mBAAW,EAAE,EAAE;QACjB,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;KAC7C;SAAM;QACL,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;KAC7C;AACH,CAAC;AAND,wDAMC;AAED,SAAgB,uBAAuB,CAAC,WAAmB;IACzD,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,4BAAU,CAAC,UAAU,CAAC,CAAC;AAC1D,CAAC;AAFD,0DAEC;AAED,SAAgB,uBAAuB,CAAC,WAAmB;IACzD,OAAO,IAAI,CAAC,OAAO,CACjB,WAAW,EACX,IAAI,8BAAgB,EAAE,EACtB,oCAAsB,EACtB,qCAAuB,CACxB,CAAC;AACJ,CAAC;AAPD,0DAOC"}
1	+ {"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"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"}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"projectVersionChecker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;~~AAqBjE~~,eAAO,MAAM,uBAAuB,EAAE,UAYrC,CAAC"}
1	+ {"version":3,"file":"projectVersionChecker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAoBjE,eAAO,MAAM,uBAAuB,EAAE,UAYrC,CAAC"}

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

@@ -11,7 +11,6 @@ const semver_1 = tslib_1.__importDefault(require("semver"));
 const tools_1 = require("../../common/tools");
 const v3MigrationUtils_1 = require("./utils/v3MigrationUtils");
 const versionMetadata_1 = require("../../common/versionMetadata");
-const projectMigrator_1 = require("./projectMigrator");
 const projectMigratorV3_1 = require("./projectMigratorV3");
 const telemetry_1 = require("../../common/telemetry");
 const error_1 = require("../error");
@@ -49,8 +48,8 @@ async function showDialog(ctx) {
     if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
         const messageKey = "core.projectVersionChecker.incompatibleProject";
         const message = localizeUtils_1.getLocalizedString(messageKey);
-        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigrator_1.learnMoreText).then((res) => {
-            if (res.isOk() && res.value === projectMigrator_1.learnMoreText) {
+        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigratorV3_1.moreInfoButton).then((res) => {
+            if (res.isOk() && res.value === projectMigratorV3_1.moreInfoButton) {
                 globalVars_1.TOOLS.ui.openUrl(versionMetadata_1.MetadataV2.updateToolkitLink);
             }
         });
@@ -64,8 +63,8 @@ async function showDialog(ctx) {
     else {
         const messageKey = "core.projectVersionChecker.vs.incompatibleProject";
         const message = localizeUtils_1.getLocalizedString(messageKey);
-        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigrator_1.learnMoreText).then((res) => {
-            if (res.isOk() && res.value === projectMigrator_1.learnMoreText) {
+        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigratorV3_1.moreInfoButton).then((res) => {
+            if (res.isOk() && res.value === projectMigratorV3_1.moreInfoButton) {
                 globalVars_1.TOOLS.ui.openUrl(projectMigratorV3_1.learnMoreLink);
             }
         });

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

	@@ -1 +1 @@
1	- {"version":3,"file":"projectVersionChecker.js","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAwE;AAGxE,8CAAsC;AACtC,8DAAgE;AAChE,4DAA4B;AAC5B,8CAAiD;AACjD,+DAA6D;AAC7D,kEAAsF;AACtF,~~uDAAkD~~;~~AAClD~~,~~2DAAoD;AACpD,~~sDAKgC;AAChC,oCAAoD;AAEpD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,OAAO,GAAgB,IAAI,GAAG,CAAC,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAEvE,MAAM,uBAAuB,GAAe,KAAK,EACtD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,MAAM,WAAW,GAAG,MAAM,oCAAiB,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM,sBAAsB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE;QACxE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;QACrC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO;KACR;IAED,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC;AAEF,KAAK,UAAU,sBAAsB,CAAC,GAAoB,EAAE,WAAwB;IAClF,IAAI,mBAAW,EAAE,EAAE;QACjB,IAAI,WAAW,CAAC,MAAM,KAAK,+BAAa,CAAC,QAAQ,IAAI,gBAAM,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;YAC7F,OAAO,IAAI,CAAC;SACb;KACF;SAAM;QACL,IAAI,WAAW,CAAC,MAAM,KAAK,+BAAa,CAAC,eAAe,EAAE;YACxD,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,EAAE;gBAClF,CAAC,6BAAiB,CAAC,cAAc,CAAC,EAAE,IAAI;aACzC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,GAAoB;IAC5C,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3F,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;QACvC,MAAM,UAAU,GAAG,gDAAgD,CAAC;QACpE,MAAM,OAAO,GAAG,kCAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,kBAAK,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE~~,+BAAa~~,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;~~YACvE~~,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,KAAK,KAAK~~,+BAAa~~,EAAE;~~gBAC7C~~,kBAAK,CAAC,EAAE,CAAC,OAAO,CAAC,4BAAU,CAAC,iBAAiB,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;QACH,OAAO,gCAAwB,CAAC,UAAU,CAAC,CAAC;KAC7C;SAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;QAC3C,MAAM,UAAU,GAAG,6CAA6C,CAAC;QACjE,kBAAK,CAAC,WAAW,CAAC,OAAO,CAAC,kCAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1D,OAAO,gCAAwB,CAAC,UAAU,CAAC,CAAC;KAC7C;SAAM;QACL,MAAM,UAAU,GAAG,mDAAmD,CAAC;QACvE,MAAM,OAAO,GAAG,kCAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,kBAAK,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE~~,+BAAa~~,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;~~YACvE~~,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,KAAK,KAAK~~,+BAAa~~,EAAE;~~gBAC7C~~,kBAAK,CAAC,EAAE,CAAC,OAAO,CAAC,iCAAa,CAAC,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,gCAAwB,CAAC,UAAU,CAAC,CAAC;KAC7C;AACH,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"}
1	+ {"version":3,"file":"projectVersionChecker.js","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAwE;AAGxE,8CAAsC;AACtC,8DAAgE;AAChE,4DAA4B;AAC5B,8CAAiD;AACjD,+DAA6D;AAC7D,kEAAsF;AACtF,2DAAoE;AACpE,sDAKgC;AAChC,oCAAoD;AAEpD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,OAAO,GAAgB,IAAI,GAAG,CAAC,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAEvE,MAAM,uBAAuB,GAAe,KAAK,EACtD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,MAAM,WAAW,GAAG,MAAM,oCAAiB,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM,sBAAsB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE;QACxE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;QACrC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO;KACR;IAED,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC;AAEF,KAAK,UAAU,sBAAsB,CAAC,GAAoB,EAAE,WAAwB;IAClF,IAAI,mBAAW,EAAE,EAAE;QACjB,IAAI,WAAW,CAAC,MAAM,KAAK,+BAAa,CAAC,QAAQ,IAAI,gBAAM,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;YAC7F,OAAO,IAAI,CAAC;SACb;KACF;SAAM;QACL,IAAI,WAAW,CAAC,MAAM,KAAK,+BAAa,CAAC,eAAe,EAAE;YACxD,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,EAAE;gBAClF,CAAC,6BAAiB,CAAC,cAAc,CAAC,EAAE,IAAI;aACzC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,GAAoB;IAC5C,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3F,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;QACvC,MAAM,UAAU,GAAG,gDAAgD,CAAC;QACpE,MAAM,OAAO,GAAG,kCAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,kBAAK,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,kCAAc,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACxE,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,KAAK,KAAK,kCAAc,EAAE;gBAC9C,kBAAK,CAAC,EAAE,CAAC,OAAO,CAAC,4BAAU,CAAC,iBAAiB,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;QACH,OAAO,gCAAwB,CAAC,UAAU,CAAC,CAAC;KAC7C;SAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;QAC3C,MAAM,UAAU,GAAG,6CAA6C,CAAC;QACjE,kBAAK,CAAC,WAAW,CAAC,OAAO,CAAC,kCAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1D,OAAO,gCAAwB,CAAC,UAAU,CAAC,CAAC;KAC7C;SAAM;QACL,MAAM,UAAU,GAAG,mDAAmD,CAAC;QACvE,MAAM,OAAO,GAAG,kCAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,kBAAK,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,kCAAc,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACxE,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,KAAK,KAAK,kCAAc,EAAE;gBAC9C,kBAAK,CAAC,EAAE,CAAC,OAAO,CAAC,iCAAa,CAAC,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,gCAAwB,CAAC,UAAU,CAAC,CAAC;KAC7C;AACH,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"}

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

@@ -4,7 +4,6 @@ import { FxError, Inputs, QTreeNode, Result } from "@microsoft/teamsfx-api";
  * This middleware will help to collect input from question flow
  */
 export declare const QuestionModelMW: Middleware;
-export declare function traverseToCollectPasswordNodes(node: QTreeNode, names: Set<string>): void;
 export declare function getQuestionsForCreateProjectV2(inputs: Inputs): Promise<Result<QTreeNode | undefined, FxError>>;
 export declare function addOfficeAddinQuestions(node: QTreeNode): void;
 //# sourceMappingURL=questionModel.d.ts.map

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~~,OAAO,EACP,MAAM,~~EAGN~~,SAAS,EACT,MAAM,~~EAEP~~,MAAM,wBAAwB,CAAC;~~AA0DhC~~;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,UA4B7B,CAAC;~~AAYF~~,~~wBAAgB,8BAA8B,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAOxF;AAuRD,~~wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAY7D"}
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,EAEL,OAAO,EACP,MAAM,EAEN,SAAS,EACT,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAoDhC;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,UA4B7B,CAAC;AA+PF,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAY7D"}

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

@@ -2,14 +2,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addOfficeAddinQuestions = exports.getQuestionsForCreateProjectV2 = exports.traverseToCollectPasswordNodes = exports.QuestionModelMW = void 0;
+exports.addOfficeAddinQuestions = exports.getQuestionsForCreateProjectV2 = exports.QuestionModelMW = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const featureFlags_1 = require("../../common/featureFlags");
-const tools_1 = require("../../common/tools");
 const utils_1 = require("../../common/utils");
 const constants_1 = require("../../component/constants");
 const developerPortalScaffoldUtils_1 = require("../../component/developerPortalScaffoldUtils");
-const spfx_1 = require("../../component/feature/spfx");
 const question_1 = require("../../component/generator/officeAddin/question");
 const question_2 = require("../../component/question");
 const utils_2 = require("../../component/resource/appManifest/utils/utils");
@@ -26,10 +24,10 @@ const QuestionModelMW = async (ctx, next) => {
     if (method === "grantPermission") {
         getQuestionRes = await collaborator_1.getQuestionsForGrantPermission(inputs);
     }
-    else if (tools_1.isV3Enabled() && (method === "listCollaborator" || method == "checkPermission")) {
+    else if (method === "listCollaborator" || method == "checkPermission") {
         getQuestionRes = await collaborator_1.getQuestionsForListCollaborator(inputs);
     }
-    else if (tools_1.isV3Enabled() && method === "deployAadManifest") {
+    else if (method === "deployAadManifest") {
         getQuestionRes = await question_3.getQuestionForDeployAadManifest(inputs);
     }
     if (getQuestionRes.isErr()) {
@@ -48,24 +46,6 @@ const QuestionModelMW = async (ctx, next) => {
     await next();
 };
 exports.QuestionModelMW = QuestionModelMW;
-// export function desensitize(node: QTreeNode, input: Inputs): Inputs {
-//   const copy = deepCopy(input);
-//   const names = new Set<string>();
-//   traverseToCollectPasswordNodes(node, names);
-//   for (const name of names) {
-//     copy[name] = "******";
-//   }
-//   return copy;
-// }
-function traverseToCollectPasswordNodes(node, names) {
-    if (node.data.type === "text" && node.data.password === true) {
-        names.add(node.data.name);
-    }
-    for (const child of node.children || []) {
-        traverseToCollectPasswordNodes(child, names);
-    }
-}
-exports.traverseToCollectPasswordNodes = traverseToCollectPasswordNodes;
 async function getQuestionsForCreateProjectWithoutDotNet(inputs) {
     var _a, _b, _c, _d;
     if (developerPortalScaffoldUtils_1.isFromDevPortal(inputs)) {
@@ -80,15 +60,8 @@ async function getQuestionsForCreateProjectWithoutDotNet(inputs) {
     node.addChild(createNew);
     createNew.condition = { equals: question_3.ScratchOptionYes().id };
     // capabilities
-    let capNode;
-    if (featureFlags_1.isPreviewFeaturesEnabled()) {
-        const capQuestion = question_3.createCapabilityQuestionPreview(inputs);
-        capNode = new teamsfx_api_1.QTreeNode(capQuestion);
-    }
-    else {
-        const capQuestion = question_3.createCapabilityQuestion();
-        capNode = new teamsfx_api_1.QTreeNode(capQuestion);
-    }
+    const capQuestion = question_3.createCapabilityQuestionPreview(inputs);
+    const capNode = new teamsfx_api_1.QTreeNode(capQuestion);
     createNew.addChild(capNode);
     const triggerNodeRes = await question_2.getNotificationTriggerQuestionNode(inputs);
     if (triggerNodeRes.isErr())
@@ -96,33 +69,14 @@ async function getQuestionsForCreateProjectWithoutDotNet(inputs) {
     if (triggerNodeRes.value) {
         capNode.addChild(triggerNodeRes.value);
     }
-    const spfxNode = await spfx_1.getSPFxScaffoldQuestion(inputs.platform);
+    const spfxNode = await question_2.getSPFxScaffoldQuestion(inputs.platform);
     if (spfxNode) {
         spfxNode.condition = { equals: constants_1.TabSPFxItem().id };
         capNode.addChild(spfxNode);
     }
     // Language
     const programmingLanguage = new teamsfx_api_1.QTreeNode(question_3.ProgrammingLanguageQuestion);
-    if (featureFlags_1.isPreviewFeaturesEnabled()) {
-        programmingLanguage.condition = {
-            notEquals: constants_1.ExistingTabOptionItem().id,
-        };
-    }
-    else {
-        programmingLanguage.condition = {
-            minItems: 1,
-            excludes: constants_1.ExistingTabOptionItem().id,
-        };
-    }
     capNode.addChild(programmingLanguage);
-    // existing tab endpoint
-    if (tools_1.isExistingTabAppEnabled()) {
-        const existingTabEndpoint = new teamsfx_api_1.QTreeNode(question_3.ExistingTabEndpointQuestion());
-        existingTabEndpoint.condition = {
-            equals: constants_1.ExistingTabOptionItem().id,
-        };
-        capNode.addChild(existingTabEndpoint);
-    }
     createNew.addChild(new teamsfx_api_1.QTreeNode(question_3.QuestionRootFolder()));
     const defaultName = !((_c = inputs.teamsAppFromTdp) === null || _c === void 0 ? void 0 : _c.appName)
         ? undefined
@@ -174,7 +128,7 @@ async function getQuestionsForCreateProjectWithDotNet(inputs) {
     if (triggerNodeRes.value) {
         dotnetCapNode.addChild(triggerNodeRes.value);
     }
-    const spfxNode = await spfx_1.getSPFxScaffoldQuestion(inputs.platform);
+    const spfxNode = await question_2.getSPFxScaffoldQuestion(inputs.platform);
     if (spfxNode) {
         spfxNode.condition = { equals: constants_1.TabSPFxItem().id };
         dotnetCapNode.addChild(spfxNode);
@@ -227,7 +181,7 @@ async function getQuestionsForCreateProjectInVSC(inputs) {
         equals: constants_1.NewProjectTypeTabOptionItem().id,
     };
     typeNode.addChild(tabTypeNode);
-    const spfxNode = await spfx_1.getSPFxScaffoldQuestion(inputs.platform);
+    const spfxNode = await question_2.getSPFxScaffoldQuestion(inputs.platform);
     if (spfxNode) {
         spfxNode.condition = { equals: constants_1.TabSPFxItem().id };
         tabTypeNode.addChild(spfxNode);

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

package/build/core/middleware/utils/MigrationUtils.d.ts CHANGED Viewed

@@ -1,14 +1,9 @@
 import { FxError, Result } from "@microsoft/teamsfx-api";
-import { CoreHookContext } from "../../types";
-import { RequiredResourceAccess } from "../../../component/resource/aadApp/interfaces/AADManifest";
 export interface Permission {
     resource: string;
     delegated: string[];
     application: string[];
 }
-export declare function permissionsToRequiredResourceAccess(permissions: Permission[]): RequiredResourceAccess[] | undefined;
-export declare function generateAadManifest(projectPath: string, projectSettingsJson: any): Promise<void>;
-export declare function needMigrateToAadManifest(ctx: CoreHookContext): Promise<boolean>;
 export declare enum FileType {
     STATE = 0,
     CONFIG = 1,

package/build/core/middleware/utils/MigrationUtils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAc,MAAM,EAAe,MAAM,wBAAwB,CAAC;~~AAGvF~~,~~OAAO,EAAE,eAAe,EAAE,~~MAAM,~~aAAa,CAAC;AAM9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AAGnG,MAAM,~~WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,UAAU,EAAE,GACxB,sBAAsB,EAAE,GAAG,SAAS,CAuBtC;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,GAAG,GACvB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CA8CrF;AAED,oBAAY,QAAQ;IAClB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;CACT;AACD,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAoBnD,CAAC;AACF,eAAO,MAAM,wBAAwB,EAAE,MAAM,EAiC5C,CAAC;AACF,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAIlD,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAWtD,CAAC;AACF,eAAO,MAAM,UAAU,UAKtB,CAAC;AAcF,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,MAAM,EACpB,WAAW,UAAQ,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAyBzB;AAsED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAapD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAsBtF"}
1	+ {"version":3,"file":"MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAc,MAAM,EAAe,MAAM,wBAAwB,CAAC;AAYvF,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,oBAAY,QAAQ;IAClB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;CACT;AACD,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAoBnD,CAAC;AACF,eAAO,MAAM,wBAAwB,EAAE,MAAM,EAiC5C,CAAC;AACF,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAIlD,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAWtD,CAAC;AACF,eAAO,MAAM,UAAU,UAKtB,CAAC;AAcF,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,MAAM,EACpB,WAAW,UAAQ,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAyBzB;AAsED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAapD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAsBtF"}

package/build/core/middleware/utils/MigrationUtils.js CHANGED Viewed

@@ -2,85 +2,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replacePlaceholdersForV3 = exports.convertPluginId = exports.namingConverterV3 = exports.secretKeys = exports.pluginIdMappingV3 = exports.nameMappingV3 = exports.provisionOutputNamingsV3 = exports.fixedNamingsV3 = exports.FileType = exports.needMigrateToAadManifest = exports.generateAadManifest = exports.permissionsToRequiredResourceAccess = void 0;
-const tslib_1 = require("tslib");
+exports.replacePlaceholdersForV3 = exports.convertPluginId = exports.namingConverterV3 = exports.secretKeys = exports.pluginIdMappingV3 = exports.nameMappingV3 = exports.provisionOutputNamingsV3 = exports.fixedNamingsV3 = exports.FileType = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const path_1 = tslib_1.__importDefault(require("path"));
-const tools_1 = require("../../../common/tools");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const localizeUtils_1 = require("../../../common/localizeUtils");
-const globalVars_1 = require("../../globalVars");
-const generateAadManifestTemplate_1 = require("../../generateAadManifestTemplate");
-const constants_1 = require("../../../component/constants");
 const error_1 = require("../../error");
-function permissionsToRequiredResourceAccess(permissions) {
-    const result = [];
-    try {
-        permissions.forEach((permission) => {
-            const res = {
-                resourceAppId: permission.resource,
-                resourceAccess: permission.application
-                    .map((item) => {
-                    return { id: item, type: "Role" };
-                })
-                    .concat(permission.delegated.map((item) => {
-                    return { id: item, type: "Scope" };
-                })),
-            };
-            result.push(res);
-        });
-    }
-    catch (err) {
-        return undefined;
-    }
-    return result;
-}
-exports.permissionsToRequiredResourceAccess = permissionsToRequiredResourceAccess;
-async function generateAadManifest(projectPath, projectSettingsJson) {
-    const permissionFilePath = path_1.default.join(projectPath, "permissions.json");
-    // add aad.template.file
-    const permissions = (await fs_extra_1.default.readJson(permissionFilePath));
-    const requiredResourceAccess = permissionsToRequiredResourceAccess(permissions);
-    if (!requiredResourceAccess) {
-        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(localizeUtils_1.getLocalizedString("core.aadManifestMigration.ParsePermissionsFailedWarning"));
-    }
-    await generateAadManifestTemplate_1.generateAadManifestTemplate(projectPath, projectSettingsJson, requiredResourceAccess, true);
-}
-exports.generateAadManifest = generateAadManifest;
-async function needMigrateToAadManifest(ctx) {
-    var _a, _b;
-    try {
-        if (!tools_1.isAadManifestEnabled()) {
-            return false;
-        }
-        const inputs = ctx.arguments[ctx.arguments.length - 1];
-        if (!inputs.projectPath) {
-            return false;
-        }
-        const fxExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, ".fx"));
-        if (!fxExist) {
-            return false;
-        }
-        const aadManifestTemplateExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, "templates", "appPackage", "aad.template.json"));
-        if (aadManifestTemplateExist) {
-            return false;
-        }
-        const permissionFileExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, "permissions.json"));
-        if (!permissionFileExist) {
-            return false;
-        }
-        const projectSettingsJson = await fs_extra_1.default.readJson(path_1.default.join(inputs.projectPath, ".fx", "configs", "projectSettings.json"));
-        const aadPluginIsActive = (_b = (_a = projectSettingsJson.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.includes(constants_1.PluginNames.AAD);
-        if (!aadPluginIsActive) {
-            return false;
-        }
-        return true;
-    }
-    catch (err) {
-        return false;
-    }
-}
-exports.needMigrateToAadManifest = needMigrateToAadManifest;
 var FileType;
 (function (FileType) {
     FileType[FileType["STATE"] = 0] = "STATE";

package/build/core/middleware/utils/MigrationUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MigrationUtils.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC~~;;;;~~AAElC,wDAAuF;~~AACvF~~,~~wDAAwB;AACxB,iDAA6D;AAE7D,gEAA0B;AAC1B,iEAAmE;AACnE,iDAAyC;AACzC,mFAAgF;AAChF,4DAA2D;AAE3D,~~uCAAyC;AAQzC,SAAgB,mCAAmC,CACjD,WAAyB;IAEzB,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,IAAI;QACF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjC,MAAM,GAAG,GAA2B;gBAClC,aAAa,EAAE,UAAU,CAAC,QAAQ;gBAClC,cAAc,EAAE,UAAU,CAAC,WAAW;qBACnC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACZ,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;gBACpC,CAAC,CAAC;qBACD,MAAM,CACL,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBAChC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;gBACrC,CAAC,CAAC,CACH;aACJ,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,kFAyBC;AAEM,KAAK,UAAU,mBAAmB,CACvC,WAAmB,EACnB,mBAAwB;IAExB,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAEtE,wBAAwB;IACxB,MAAM,WAAW,GAAG,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAiB,CAAC;IAE5E,MAAM,sBAAsB,GAAG,mCAAmC,CAAC,WAAW,CAAC,CAAC;IAChF,IAAI,CAAC,sBAAsB,EAAE;QAC3B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,OAAO,CACxB,kCAAkB,CAAC,yDAAyD,CAAC,CAC9E,CAAC;KACH;IAED,MAAM,yDAA2B,CAAC,WAAW,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,IAAI,CAAC,CAAC;AACpG,CAAC;AAjBD,kDAiBC;AAEM,KAAK,UAAU,wBAAwB,CAAC,GAAoB;;IACjE,IAAI;QACF,IAAI,CAAC,4BAAoB,EAAE,EAAE;YAC3B,OAAO,KAAK,CAAC;SACd;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,KAAK,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,KAAK,CAAC;SACd;QAED,MAAM,wBAAwB,GAAG,MAAM,kBAAE,CAAC,UAAU,CAClD,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,CAAC,CACxF,CAAC;QAEF,IAAI,wBAAwB,EAAE;YAC5B,OAAO,KAAK,CAAC;SACd;QAED,MAAM,mBAAmB,GAAG,MAAM,kBAAE,CAAC,UAAU,CAC7C,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,kBAAkB,CAAC,CAC5D,CAAC;QAEF,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,mBAAmB,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAC3C,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAqB,EAAE,KAAK,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAClF,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAA,MAAA,mBAAmB,CAAC,gBAAgB,0CAAE,qBAAqB,0CAAE,QAAQ,CAC7F,uBAAW,CAAC,GAAG,CAChB,CAAC;QAEF,IAAI,CAAC,iBAAiB,EAAE;YACtB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AA9CD,4DA8CC;AAED,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,yCAAK,CAAA;IACL,2CAAM,CAAA;IACN,+CAAQ,CAAA;AACV,CAAC,EAJW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAInB;AACY,QAAA,cAAc,GAA8B;IACvD,+BAA+B,EAAE,uBAAuB;IACxD,kCAAkC,EAAE,2BAA2B;IAC/D,mCAAmC,EAAE,iBAAiB;IACtD,sCAAsC,EAAE,qBAAqB;IAC7D,wCAAwC,EAAE,cAAc;IACxD,8CAA8C,EAAE,mBAAmB;IACnE,kDAAkD,EAAE,8BAA8B;IAClF,8CAA8C,EAAE,mBAAmB;IACnE,6DAA6D,EAC3D,sCAAsC;IACxC,8CAA8C,EAAE,mBAAmB;IACnE,+CAA+C,EAAE,8BAA8B;IAC/E,oDAAoD,EAAE,yBAAyB;IAC/E,6BAA6B,EAAE,QAAQ;IACvC,mCAAmC,EAAE,qBAAqB;IAC1D,gDAAgD,EAAE,cAAc;IAChE,+CAA+C,EAAE,cAAc;IAC/D,uCAAuC,EAAE,sBAAsB;IAC/D,sCAAsC,EAAE,qBAAqB;CAC9D,CAAC;AACW,QAAA,wBAAwB,GAAa;IAChD,8CAA8C;IAC9C,2CAA2C;IAC3C,6CAA6C;IAC7C,sDAAsD;IACtD,+CAA+C;IAC/C,2CAA2C;IAC3C,yCAAyC;IACzC,0CAA0C;IAC1C,0CAA0C;IAC1C,0CAA0C;IAC1C,6CAA6C;IAC7C,+BAA+B;IAC/B,gCAAgC;IAChC,8BAA8B;IAC9B,mCAAmC;IACnC,0CAA0C;IAC1C,kCAAkC;IAClC,6CAA6C;IAC7C,wCAAwC;IACxC,2CAA2C;IAC3C,oCAAoC;IACpC,yCAAyC;IACzC,+CAA+C;IAC/C,6CAA6C;IAC7C,gCAAgC;IAChC,oCAAoC;IACpC,mCAAmC;IACnC,+CAA+C;IAC/C,kDAAkD;IAClD,6CAA6C;IAC7C,uDAAuD;IACvD,sDAAsD;CACvD,CAAC;AACW,QAAA,aAAa,GAA8B;IACtD,iDAAiD,EAAE,oCAAoC;IACvF,sDAAsD,EACpD,6CAA6C;CAChD,CAAC;AACW,QAAA,iBAAiB,GAA8B;IAC1D,8BAA8B,EAAE,WAAW;IAC3C,sBAAsB,EAAE,WAAW;IACnC,sBAAsB,EAAE,UAAU;IAClC,iBAAiB,EAAE,WAAW;IAC9B,uBAAuB,EAAE,WAAW;IACpC,uBAAuB,EAAE,WAAW;IACpC,kBAAkB,EAAE,MAAM;IAC1B,+BAA+B,EAAE,SAAS;IAC1C,uBAAuB,EAAE,cAAc;IACvC,yBAAyB,EAAE,aAAa;CACzC,CAAC;AACW,QAAA,UAAU,GAAG;IACxB,kDAAkD;IAClD,mCAAmC;IACnC,kDAAkD;IAClD,2CAA2C;CAC5C,CAAC;AACF,MAAM,YAAY,GAAG,SAAS,CAAC;AAC/B,MAAM,YAAY,GAAG,UAAU,CAAC;AAChC,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAElD,SAAS,gCAAgC,CAAC,QAAgB;IACxD,OAAO,IAAI,MAAM,CACf,8BAA8B,GAAG,0GAA0G;QACzI,OAAO,GAAG,4HAA4H;QACtI,uBAAuB,QAAQ,IAAI,EAAE,sCAAsC;IAC7E,GAAG,CACJ,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB,CAC/B,IAAY,EACZ,IAAc,EACd,YAAoB,EACpB,WAAW,GAAG,KAAK;IAEnB,IAAI;QACF,iFAAiF;QACjF,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAE7B,2DAA2D;QAC3D,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,qBAAa,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC5D,IAAI,GAAG,qBAAa,CAAC,IAAI,CAAC,CAAC;SAC5B;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC9C,OAAO,gBAAE,CAAC,sBAAc,CAAC,IAAI,CAAC,CAAC,CAAC;SACjC;aAAM,IACL,gCAAwB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACtD,2EAA2E;YAC3E,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC;YACF,YAAY,EACZ;YACA,OAAO,gBAAE,CAAC,gCAAgC,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;SACvE;aAAM;YACL,OAAO,gBAAE,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;SAChD;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,OAAO,iBAAG,CAAC,IAAI,yBAAW,CAAC,kBAAU,EAAE,iCAAiC,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,CAAC;KAC5F;AACH,CAAC;AA9BD,8CA8BC;AAED,yCAAyC;AACzC,SAAS,uBAAuB,CAAC,IAAY,EAAE,IAAc;IAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC/D,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ,CAAC,MAAM;YAClB,OAAO,GAAG,YAAY,GAAG,GAAG,EAAE,CAAC;QACjC,KAAK,QAAQ,CAAC,QAAQ;YACpB,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;gBAC3B,OAAO,GAAG,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;;gBAClE,OAAO,GAAG,YAAY,GAAG,GAAG,EAAE,CAAC;QACtC,KAAK,QAAQ,CAAC,KAAK,CAAC;QACpB;YACE,OAAO,GAAG,CAAC;KACd;AACH,CAAC;AAED,SAAS,gCAAgC,CACvC,IAAY,EACZ,YAAoB,EACpB,IAAc;IAEd,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,yBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAEzB,IAAI,UAAU,GAAG,EAAE,CAAC;IAEpB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,WAAW,GAAG,gCAAgC,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,WAAW,KAAK,IAAI,EAAE;YACxB,gCAAgC;YAChC,IACE,uBAAuB,KAAK,WAAW,CAAC,CAAC,CAAC;gBAC1C,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC;gBAClC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EACrB;gBACA,4CAA4C;gBAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrC,GAAG;oBACD,IACE,WAAW;wBACX,WAAW,CAAC,CAAC,CAAC;wBACd,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;wBAC5B,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACvC;wBACA,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;wBAC5B,MAAM;qBACP;iBACF,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE;aAC1D;iBAAM;gBACL,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;aAC7B;YAED,IAAI,UAAU,EAAE;gBACd,MAAM;aACP;SACF;KACF;IAED,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KAC5C;IAED,OAAO,GAAG,qBAAqB,GAAG,UAAU,KAAK,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;AAC3E,CAAC;AAED,SAAgB,eAAe,CAAC,IAAY;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;QACvC,OAAO,IAAI,CAAC;KACb;IACD,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACvD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC,IAAI,CAC3D,CAAC,GAAG,EAAE,EAAE,CAAC,yBAAiB,CAAC,GAAG,CAAC,KAAK,QAAQ,CAC7C,CAAC;QACF,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAAkB,CAAC,CAAC;KACnD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAbD,0CAaC;AAED,SAAgB,wBAAwB,CAAC,OAAe,EAAE,YAAoB;IAC5E,MAAM,gBAAgB,GAAG,uCAAuC,CAAC;IACjE,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAErD,IAAI,YAAY,EAAE;QAChB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,iBAAiB,CACjC,SAAS,EACT,kBAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EACpF,YAAY,EACZ,IAAI,CACL,CAAC;YACF,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE;gBACpB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,SAAS,CAAC,KAAK,MAAM,CAAC,CAAC;aACvE;iBAAM;gBACL,MAAM,SAAS,CAAC,KAAK,CAAC;aACvB;SACF;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAtBD,4DAsBC"}
1	+ {"version":3,"file":"MigrationUtils.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":"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"}

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

@@ -1,23 +1,19 @@
 /**
  * @author Huajie Zhang <zhjay23@qq.com>
  */
-import { FolderQuestion, FuncQuestion, FxError, Inputs, MultiSelectQuestion, OptionItem, Platform, QTreeNode, Result, SingleFileQuestion, SingleSelectQuestion, TextInputQuestion } from "@microsoft/teamsfx-api";
+import { FolderQuestion, FxError, Inputs, MultiSelectQuestion, OptionItem, Platform, QTreeNode, Result, SingleFileQuestion, SingleSelectQuestion, TextInputQuestion } from "@microsoft/teamsfx-api";
 import { StaticTab } from "../component/resource/appManifest/interfaces/staticTab";
 export declare enum CoreQuestionNames {
     AppName = "app-name",
-    DefaultAppNameFunc = "default-app-name-func",
     Folder = "folder",
     ProjectPath = "projectPath",
     ProgrammingLanguage = "programming-language",
     ProjectType = "project-type",
     Capabilities = "capabilities",
     Features = "features",
-    Solution = "solution",
     CreateFromScratch = "scratch",
     Runtime = "runtime",
     Samples = "samples",
-    Stage = "stage",
-    SubStage = "substage",
     SourceEnvName = "sourceEnvName",
     TargetEnvName = "targetEnvName",
     TargetResourceGroupName = "targetResourceGroupName",
@@ -34,6 +30,7 @@ export declare enum CoreQuestionNames {
     LocalTeamsAppManifestFilePath = "local-manifest-path",
     AadAppManifestFilePath = "manifest-file-path",
     TeamsAppPackageFilePath = "app-package-file-path",
+    ValidateMethod = "validate-method",
     ConfirmManifest = "confirmManifest",
     ConfirmLocalManifest = "confirmLocalManifest",
     OutputZipPathParamName = "output-zip-path",
@@ -42,13 +39,9 @@ export declare enum CoreQuestionNames {
 }
 export declare const ProjectNamePattern = "^(?=(.*[\\da-zA-Z]){2})[a-zA-Z][^\"<>:\\?/*&|\0-\u001F]*[^\"\\s.<>:\\?/*&|\0-\u001F]$";
 export declare function createAppNameQuestion(defaultAppName?: string, validateProjectPathExistence?: boolean): TextInputQuestion;
-export declare const DefaultAppNameFunc: FuncQuestion;
 export declare function QuestionRootFolder(): FolderQuestion;
 export declare const ProgrammingLanguageQuestionForDotNet: SingleSelectQuestion;
 export declare const ProgrammingLanguageQuestion: SingleSelectQuestion;
-export declare function handleSelectionConflict<T>(sets: Set<T>[], previous: Set<T>, current: Set<T>): Set<T>;
-export declare function validateConflict<T>(sets: Set<T>[], current: Set<T>): string | undefined;
-export declare function createCapabilityQuestion(): MultiSelectQuestion;
 export declare function createCapabilityForDotNet(): SingleSelectQuestion;
 export declare function createCapabilityQuestionPreview(inputs?: Inputs): SingleSelectQuestion;
 export declare function createNewProjectQuestionWith2Layers(inputs?: Inputs): SingleSelectQuestion;
@@ -56,8 +49,6 @@ export declare function getBotProjectQuestionNode(inputs?: Inputs): SingleSelect
 export declare function getTabTypeProjectQuestionNode(inputs?: Inputs): SingleSelectQuestion;
 export declare function getMessageExtensionTypeProjectQuestionNode(inputs?: Inputs): SingleSelectQuestion;
 export declare function getOutlookAddinTypeProjectQuestionNode(inputs?: Inputs): SingleSelectQuestion;
-export declare function validateCapabilities(inputs: string[]): string | undefined;
-export declare function onChangeSelectionForCapabilities(currentSelectedIds: Set<string>, previousSelectedIds: Set<string>): Promise<Set<string>>;
 export declare function QuestionSelectTargetEnvironment(): SingleSelectQuestion;
 export declare function getQuestionNewTargetEnvironmentName(projectPath: string): TextInputQuestion;
 export declare function QuestionSelectSourceEnvironment(): SingleSelectQuestion;
@@ -74,7 +65,6 @@ export declare function ScratchOptionNo(): OptionItem;
 export declare function getRuntimeQuestion(): SingleSelectQuestion;
 export declare function getCreateNewOrFromSampleQuestion(platform: Platform): SingleSelectQuestion;
 export declare function SampleSelect(): SingleSelectQuestion;
-export declare function ExistingTabEndpointQuestion(): TextInputQuestion;
 export declare const defaultTabLocalHostUrl = "https://localhost:53000/index.html#/tab";
 export declare const tabsContentUrlQuestion: (tabs: StaticTab[]) => MultiSelectQuestion;
 export declare const tabsWebsitetUrlQuestion: (tabs: StaticTab[]) => MultiSelectQuestion;

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":"AAOA;;GAEG;AACH,OAAO,EAIL,cAAc,EACd,~~YAAY,EACZ,~~OAAO,EACP,MAAM,EAEN,mBAAmB,EAEnB,UAAU,EACV,QAAQ,EACR,SAAS,EACT,MAAM,EACN,kBAAkB,EAClB,oBAAoB,EAEpB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;~~AA2ChC~~,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAC;AAGnF,oBAAY,iBAAiB;IAC3B,OAAO,aAAa;IACpB,~~kBAAkB,0BAA0B;IAC5C,~~MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,mBAAmB,yBAAyB;IAC5C,WAAW,iBAAiB;IAC5B,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,~~QAAQ,aAAa;IACrB,~~iBAAiB,YAAY;IAC7B,OAAO,YAAY;IACnB,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;IAC7C,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,iBAAiB,sBAAsB;IACvC,cAAc,mBAAmB;IACjC,aAAa,kBAAkB;IAC/B,wBAAwB,kBAAkB;IAC1C,6BAA6B,wBAAwB;IACrD,sBAAsB,uBAAuB;IAC7C,uBAAuB,0BAA0B;IACjD,eAAe,oBAAoB;IACnC,oBAAoB,yBAAyB;IAC7C,sBAAsB,oBAAoB;IAC1C,uBAAuB,yBAAyB;IAChD,QAAQ,cAAc;CACvB;AAED,eAAO,MAAM,kBAAkB,0FACgE,CAAC;AAEhG,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,EACvB,4BAA4B,UAAO,GAClC,iBAAiB,CAqCnB;AAED,~~eAAO,MAAM,kBAAkB,EAAE,YAgBhC,CAAC;AAEF,~~wBAAgB,kBAAkB,IAAI,cAAc,CAQnD;AAED,eAAO,MAAM,oCAAoC,EAAE,oBAMlD,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,~~oBAuDzC~~,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,CAyC9D;AAED,wBAAgB,yBAAyB,IAAI,oBAAoB,CAchE;AAED,wBAAgB,+BAA+B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,~~CA+CrF~~;AAED,wBAAgB,mCAAmC,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAmBzF;AAED,wBAAgB,yBAAyB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,CA4B/E;AAED,wBAAgB,6BAA6B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAgBnF;AAED,wBAAgB,0CAA0C,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAWhG;AAED,wBAAgB,sCAAsC,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAW5F;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAqDzE;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,CAoCtB;AACD,wBAAgB,+BAA+B,IAAI,oBAAoB,CAStE;AAED,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,CA+C1F;AAED,wBAAgB,+BAA+B,IAAI,oBAAoB,CAStE;AACD,wBAAgB,2BAA2B,IAAI,oBAAoB,CASlE;AACD,wBAAgB,4BAA4B,CAC1C,0BAA0B,EAAE,MAAM,EAAE,GACnC,iBAAiB,CA+BnB;AACD,wBAAgB,4BAA4B,IAAI,iBAAiB,CAShE;AAED,wBAAgB,gCAAgC,IAAI,oBAAoB,CAOvE;AAED,wBAAgB,mBAAmB,IAAI,UAAU,CAShD;AAED,wBAAgB,kBAAkB,IAAI,UAAU,CAM/C;AAED,wBAAgB,mBAAmB,IAAI,UAAU,CAMhD;AAED,wBAAgB,mBAAmB,IAAI,UAAU,CAMhD;AACD,wBAAgB,gBAAgB,IAAI,UAAU,CAM7C;AAED,wBAAgB,eAAe,IAAI,UAAU,CAM5C;AAGD,wBAAgB,kBAAkB,IAAI,oBAAoB,CASzD;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,oBAAoB,CAsBzF;AAED,wBAAgB,YAAY,IAAI,oBAAoB,CAuBnD;AAED,~~wBAAgB,2BAA2B,IAAI,iBAAiB,CAkB/D;AAED,~~eAAO,MAAM,sBAAsB,4CAA4C,CAAC;AAEhF,eAAO,MAAM,sBAAsB,SAAU,SAAS,EAAE,KAAG,mBAU1D,CAAC;AAEF,eAAO,MAAM,uBAAuB,SAAU,SAAS,EAAE,KAAG,mBAU3D,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAS,SAAS,KAAG,UAUxD,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAS,SAAS,KAAG,UAUxD,CAAC;AAEF,eAAO,MAAM,cAAc,UAClB,MAAM,GAAG,SAAS,yBACF,MAAM,GAAG,SAAS,KACxC,mBAoBF,CAAC;AAEF,eAAO,MAAM,aAAa,uBAAwB,OAAO,SAAS,MAAM,KAAG,UAU1E,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,UAAU,CAMvD;AAED,wBAAgB,8BAA8B,IAAI,oBAAoB,CASrE;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAoBtE;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,SAAS,CAwCzF;AAED,wBAAgB,6BAA6B,IAAI,kBAAkB,CAmBlE;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,QAAQ,UAAO,GACd,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAehC;AAED,wBAAgB,mBAAmB,CACjC,uBAAuB,EAAE,MAAM,EAC/B,UAAU,UAAO,EACjB,OAAO,UAAQ,GACd,SAAS,CA8CX;AAED,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAOjD;AAmBD,wBAAsB,sCAAsC,CAC1D,KAAK,EAAE,GAAG,EACV,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B;AAED,wBAAgB,sBAAsB,IAAI,SAAS,CAQlD"}
1	+ {"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"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"}