@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.9b895e2a.0

package/build/plugins/solution/fx-solution/v3/solution.js

@@ -4,40 +4,96 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamsFxAzureSolution = void 0;
 const tslib_1 = require("tslib");
+const hooks_1 = require("@feathersjs/hooks");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const typedi_1 = require("typedi");
-const addModule_1 = require("./addModule");
-const addResource_1 = require("./addResource");
+const CommonErrorHandlerMW_1 = require("../../../../core/middleware/CommonErrorHandlerMW");
+const addFeature_1 = require("./addFeature");
 const constants_1 = require("./constants");
 const deploy_1 = require("./deploy");
-const init_1 = require("./init");
 const provision_1 = require("./provision");
-const provisionLocal_1 = require("./provisionLocal");
 const publish_1 = require("./publish");
-const scaffold_1 = require("./scaffold");
 const userTask_1 = require("./userTask");
 let TeamsFxAzureSolution = class TeamsFxAzureSolution {
     constructor() {
         this.name = constants_1.TeamsFxAzureSolutionNameV3;
-        this.getQuestionsForInit = init_1.getQuestionsForInit;
-        this.init = init_1.init;
-        this.getQuestionsForScaffold = scaffold_1.getQuestionsForScaffold;
-        this.scaffold = scaffold_1.scaffold;
-        this.getQuestionsForAddResource = addResource_1.getQuestionsForAddResource;
-        this.addResource = addResource_1.addResource;
-        this.getQuestionsForAddModule = addModule_1.getQuestionsForAddModule;
-        this.addModule = addModule_1.addModule;
+        this.getQuestionsForAddFeature = addFeature_1.getQuestionsForAddFeature;
         this.getQuestionsForProvision = provision_1.getQuestionsForProvision;
-        this.provisionResources = provision_1.provisionResources.bind(this);
-        this.getQuestionsForLocalProvision = provisionLocal_1.getQuestionsForLocalProvision;
-        this.provisionLocalResources = provisionLocal_1.provisionLocalResources;
         this.getQuestionsForDeploy = deploy_1.getQuestionsForDeploy;
-        this.deploy = deploy_1.deploy;
         this.getQuestionsForPublish = publish_1.getQuestionsForPublish;
-        this.publishApplication = publish_1.publishApplication;
         this.getQuestionsForUserTask = userTask_1.getQuestionsForUserTask;
-        this.executeUserTask = userTask_1.executeUserTask;
+    }
+    async addFeature(ctx, inputs, telemetryProps) {
+        return addFeature_1.addFeature(ctx, inputs, telemetryProps);
+    }
+    async provisionResources(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
+        return provision_1.provisionResources(ctx, inputs, envInfo, tokenProvider, telemetryProps);
+    }
+    async deploy(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
+        return deploy_1.deploy(ctx, inputs, envInfo, tokenProvider, telemetryProps);
+    }
+    async publishApplication(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
+        return publish_1.publishApplication(ctx, inputs, envInfo, tokenProvider, telemetryProps);
+    }
+    async executeUserTask(ctx, inputs, func, envInfo, tokenProvider, telemetryProps) {
+        const method = func.method;
+        if (method === "addCapability") {
+            return this.addCapability(ctx, inputs, telemetryProps);
+        }
+        if (method === "addResource") {
+            return this.addResource(ctx, inputs, telemetryProps);
+        }
+        return teamsfx_api_1.err(new teamsfx_api_1.NotImplementedError("Solution", "executeUserTask"));
+    }
+    async addCapability(ctx, inputs, telemetryProps) {
+        return userTask_1.addCapability(ctx, inputs, telemetryProps);
+    }
+    async addResource(ctx, inputs, telemetryProps) {
+        return userTask_1.addResource(ctx, inputs, telemetryProps);
     }
 };
+tslib_1.__decorate([
+    hooks_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInSolutionNames.azure } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], TeamsFxAzureSolution.prototype, "addFeature", null);
+tslib_1.__decorate([
+    hooks_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInSolutionNames.azure } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], TeamsFxAzureSolution.prototype, "provisionResources", null);
+tslib_1.__decorate([
+    hooks_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInSolutionNames.azure } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], TeamsFxAzureSolution.prototype, "deploy", null);
+tslib_1.__decorate([
+    hooks_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInSolutionNames.azure } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], TeamsFxAzureSolution.prototype, "publishApplication", null);
+tslib_1.__decorate([
+    hooks_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInSolutionNames.azure } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], TeamsFxAzureSolution.prototype, "executeUserTask", null);
+tslib_1.__decorate([
+    hooks_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInSolutionNames.azure } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], TeamsFxAzureSolution.prototype, "addCapability", null);
+tslib_1.__decorate([
+    hooks_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInSolutionNames.azure } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], TeamsFxAzureSolution.prototype, "addResource", null);
 TeamsFxAzureSolution = tslib_1.__decorate([
     typedi_1.Service(constants_1.TeamsFxAzureSolutionNameV3)
 ], TeamsFxAzureSolution);

package/build/plugins/solution/fx-solution/v3/solution.js.map

@@ -1 +1 @@
-{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/solution.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,mCAAiC;AACjC,2CAAkE;AAClE,+CAAwE;AACxE,2CAAyD;AACzD,qCAAyD;AACzD,iCAAmD;AACnD,2CAA2E;AAC3E,qDAA0F;AAC1F,uCAAuE;AACvE,yCAA+D;AAC/D,yCAAsE;AAGtE,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACE,SAAI,GAAG,sCAA0B,CAAC;QAClC,wBAAmB,GAAG,0BAAmB,CAAC;QAC1C,SAAI,GAAG,WAAI,CAAC;QACZ,4BAAuB,GAAG,kCAAuB,CAAC;QAClD,aAAQ,GAAG,mBAAQ,CAAC;QACpB,+BAA0B,GAAG,wCAA0B,CAAC;QACxD,gBAAW,GAAG,yBAAW,CAAC;QAC1B,6BAAwB,GAAG,oCAAwB,CAAC;QACpD,cAAS,GAAG,qBAAS,CAAC;QACtB,6BAAwB,GAAG,oCAAwB,CAAC;QACpD,uBAAkB,GAAG,8BAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,kCAA6B,GAAG,8CAA6B,CAAC;QAC9D,4BAAuB,GAAG,wCAAuB,CAAC;QAClD,0BAAqB,GAAG,8BAAqB,CAAC;QAC9C,WAAM,GAAG,eAAM,CAAC;QAChB,2BAAsB,GAAG,gCAAsB,CAAC;QAChD,uBAAkB,GAAG,4BAAkB,CAAC;QACxC,4BAAuB,GAAG,kCAAuB,CAAC;QAClD,oBAAe,GAAG,0BAAe,CAAC;IACpC,CAAC;CAAA,CAAA;AApBY,oBAAoB;IADhC,gBAAO,CAAC,sCAA0B,CAAC;GACvB,oBAAoB,CAoBhC;AApBY,oDAAoB"}
+{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/solution.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.d.ts

@@ -0,0 +1,5 @@
+export declare class SolutionGlobalVars {
+    TeamsAppId?: string;
+}
+export declare const solutionGlobalVars: SolutionGlobalVars;
+//# sourceMappingURL=solutionGlobalVars.d.ts.map

package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solutionGlobalVars.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/solutionGlobalVars.ts"],"names":[],"mappings":"AAGA,qBAAa,kBAAkB;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}

package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.js

@@ -0,0 +1,10 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.solutionGlobalVars = exports.SolutionGlobalVars = void 0;
+class SolutionGlobalVars {
+}
+exports.SolutionGlobalVars = SolutionGlobalVars;
+exports.solutionGlobalVars = new SolutionGlobalVars();
+//# sourceMappingURL=solutionGlobalVars.js.map

package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solutionGlobalVars.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/solutionGlobalVars.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,kBAAkB;CAE9B;AAFD,gDAEC;AAEY,QAAA,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC"}

package/build/plugins/solution/fx-solution/v3/userTask.d.ts

@@ -1,4 +1,6 @@
-import { Func, FxError, Inputs, Json, QTreeNode, Result, TokenProvider, v2, v3 } from "@microsoft/teamsfx-api";
-export declare function getQuestionsForUserTask(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function executeUserTask(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v3.EnvInfoV3, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
+import { Func, FxError, Inputs, Json, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
+export declare function getQuestionsForUserTask(ctx: v2.Context, inputs: Inputs, func: Func, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getQuestionsForAddResource(ctx: v2.Context, inputs: Inputs): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function addCapability(ctx: v2.Context, inputs: Inputs, telemetryProps?: any): Promise<Result<Void, FxError>>;
+export declare function addResource(ctx: v2.Context, inputs: Inputs, telemetryProps?: Json): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=userTask.d.ts.map

package/build/plugins/solution/fx-solution/v3/userTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;AAEhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAEnC"}
+{"version":3,"file":"userTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,IAAI,EACJ,OAAO,EACP,MAAM,EAEN,IAAI,EAIJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAuBhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAgDjD;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,GAAG,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAoDhC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4ChC"}

package/build/plugins/solution/fx-solution/v3/userTask.js

@@ -2,14 +2,170 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeUserTask = exports.getQuestionsForUserTask = void 0;
+exports.addResource = exports.addCapability = exports.getQuestionsForAddResource = exports.getQuestionsForUserTask = void 0;
+const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-async function getQuestionsForUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
+const typedi_1 = require("typedi");
+const util = tslib_1.__importStar(require("util"));
+const tools_1 = require("../../../../common/tools");
+const core_1 = require("../../../../core");
+const constants_1 = require("../constants");
+const question_1 = require("../question");
+const solutionSettingsHelper_1 = require("../utils/solutionSettingsHelper");
+const executeUserTask_1 = require("../v2/executeUserTask");
+const getQuestions_1 = require("../v2/getQuestions");
+const addFeature_1 = require("./addFeature");
+const constants_2 = require("./constants");
+async function getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider) {
+    if (func.method === "addCapability") {
+        return await getQuestions_1.getQuestionsForAddCapability(ctx, inputs);
+    }
+    if (func.method === "addResource") {
+        return await getQuestionsForAddResource(ctx, inputs);
+    }
     return teamsfx_api_1.ok(undefined);
 }
 exports.getQuestionsForUserTask = getQuestionsForUserTask;
-async function executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
-    return teamsfx_api_1.err(new teamsfx_api_1.NotImplementedError("Solution", "executeUserTask"));
+async function getQuestionsForAddResource(ctx, inputs) {
+    const settings = ctx.projectSetting.solutionSettings;
+    const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
+    let addQuestion;
+    if (!isDynamicQuestion) {
+        addQuestion = question_1.createAddAzureResourceQuestion(false, false, false, false);
+    }
+    else {
+        if (!settings) {
+            return teamsfx_api_1.err(new core_1.OperationNotSupportedForExistingAppError("addResource"));
+        }
+        const alreadyHaveFunction = settings.azureResources.includes(question_1.AzureResourceFunction.id);
+        const alreadyHaveSQL = settings.azureResources.includes(question_1.AzureResourceSQL.id);
+        const alreadyHaveAPIM = settings.azureResources.includes(question_1.AzureResourceApim.id);
+        const alreadyHaveKeyVault = settings.azureResources.includes(question_1.AzureResourceKeyVault.id);
+        addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHaveKeyVault);
+        const canProceed = executeUserTask_1.canAddResource(ctx.projectSetting, ctx.telemetryReporter);
+        if (canProceed.isErr()) {
+            return teamsfx_api_1.err(canProceed.error);
+        }
+    }
+    const addAzureResourceNode = new teamsfx_api_1.QTreeNode(addQuestion);
+    //traverse plugins' getQuestionsForAddFeature
+    const pluginsWithResources = [
+        [constants_2.BuiltInFeaturePluginNames.function, question_1.AzureResourceFunction.id],
+        [constants_2.BuiltInFeaturePluginNames.sql, question_1.AzureResourceSQL.id],
+        [constants_2.BuiltInFeaturePluginNames.apim, question_1.AzureResourceApim.id],
+        [constants_2.BuiltInFeaturePluginNames.keyVault, question_1.AzureResourceKeyVault.id],
+    ];
+    for (const pair of pluginsWithResources) {
+        const pluginName = pair[0];
+        const resourceName = pair[1];
+        const plugin = typedi_1.Container.get(pluginName);
+        if (plugin.getQuestionsForAddFeature) {
+            const res = await plugin.getQuestionsForAddFeature(ctx, inputs);
+            if (res.isErr())
+                return res;
+            if (res.value) {
+                const node = res.value;
+                node.condition = { contains: resourceName };
+                if (node.data)
+                    addAzureResourceNode.addChild(node);
+            }
+        }
+    }
+    return teamsfx_api_1.ok(addAzureResourceNode);
 }
-exports.executeUserTask = executeUserTask;
+exports.getQuestionsForAddResource = getQuestionsForAddResource;
+async function addCapability(ctx, inputs, telemetryProps) {
+    if (!inputs.projectPath) {
+        return teamsfx_api_1.err(new teamsfx_api_1.InvalidInputError("solution", "inputs.projectPath is undefined"));
+    }
+    solutionSettingsHelper_1.ensureSolutionSettings(ctx.projectSetting);
+    const capabilitiesAnswer = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
+    if (telemetryProps) {
+        telemetryProps[constants_1.SolutionTelemetryProperty.Capabilities] = capabilitiesAnswer.join(";");
+    }
+    const vsProject = core_1.isVSProject(ctx.projectSetting);
+    if (vsProject) {
+        const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, feature: constants_2.BuiltInFeaturePluginNames.dotnet });
+        const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
+        if (addFeatureRes.isErr())
+            return teamsfx_api_1.err(addFeatureRes.error);
+    }
+    else {
+        for (const capability of capabilitiesAnswer) {
+            let resourcePluginName;
+            if (capability === question_1.TabOptionItem.id) {
+                resourcePluginName = constants_2.BuiltInFeaturePluginNames.frontend;
+            }
+            else if (capability === question_1.BotOptionItem.id || capability === question_1.MessageExtensionItem.id) {
+                resourcePluginName = constants_2.BuiltInFeaturePluginNames.bot;
+            }
+            if (resourcePluginName) {
+                const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, feature: resourcePluginName });
+                const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
+                if (addFeatureRes.isErr())
+                    return teamsfx_api_1.err(addFeatureRes.error);
+            }
+        }
+    }
+    if (capabilitiesAnswer.length > 0) {
+        const addNames = capabilitiesAnswer.map((c) => `'${c}'`).join(" and ");
+        const single = capabilitiesAnswer.length === 1;
+        const template = inputs.platform === teamsfx_api_1.Platform.CLI
+            ? single
+                ? tools_1.getStrings().solution.addCapability.AddCapabilityNoticeForCli
+                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNoticeForCli
+            : single
+                ? tools_1.getStrings().solution.addCapability.AddCapabilityNotice
+                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNotice;
+        const msg = util.format(template, addNames);
+        ctx.userInteraction.showMessage("info", msg, false);
+    }
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.addCapability = addCapability;
+async function addResource(ctx, inputs, telemetryProps) {
+    if (!inputs.projectPath) {
+        return teamsfx_api_1.err(new teamsfx_api_1.InvalidInputError("solution", "inputs.projectPath is undefined"));
+    }
+    solutionSettingsHelper_1.ensureSolutionSettings(ctx.projectSetting);
+    const addResourcesAnswer = inputs[question_1.AzureSolutionQuestionNames.AddResources];
+    if (telemetryProps) {
+        telemetryProps[constants_1.SolutionTelemetryProperty.Resources] = addResourcesAnswer.join(";");
+    }
+    for (const resource of addResourcesAnswer) {
+        let resourcePluginName;
+        if (resource === question_1.AzureResourceSQL.id) {
+            resourcePluginName = constants_2.BuiltInFeaturePluginNames.sql;
+        }
+        else if (resource === question_1.AzureResourceApim.id) {
+            resourcePluginName = constants_2.BuiltInFeaturePluginNames.apim;
+        }
+        else if (resource === question_1.AzureResourceFunction.id) {
+            resourcePluginName = constants_2.BuiltInFeaturePluginNames.function;
+        }
+        else if (resource === question_1.AzureResourceKeyVault.id) {
+            resourcePluginName = constants_2.BuiltInFeaturePluginNames.keyVault;
+        }
+        if (resourcePluginName) {
+            const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, feature: resourcePluginName });
+            const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
+            if (addFeatureRes.isErr())
+                return teamsfx_api_1.err(addFeatureRes.error);
+        }
+    }
+    if (addResourcesAnswer.length > 0) {
+        const addNames = addResourcesAnswer.join(" and ");
+        const single = addResourcesAnswer.length === 1;
+        const template = inputs.platform === teamsfx_api_1.Platform.CLI
+            ? single
+                ? tools_1.getStrings().solution.addResource.AddResourceNoticeForCli
+                : tools_1.getStrings().solution.addResource.AddResourcesNoticeForCli
+            : single
+                ? tools_1.getStrings().solution.addResource.AddResourceNotice
+                : tools_1.getStrings().solution.addResource.AddResourcesNotice;
+        ctx.userInteraction.showMessage("info", util.format(template, addNames), false);
+    }
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.addResource = addResource;
 //# sourceMappingURL=userTask.js.map

package/build/plugins/solution/fx-solution/v3/userTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"userTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAagC;AAEzB,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAsC,EACtC,aAA4B;IAE5B,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AATD,0DASC;AACM,KAAK,UAAU,eAAe,CACnC,GAAe,EACf,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;IAE5B,OAAO,iBAAG,CAAC,IAAI,iCAAmB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;AACrE,CAAC;AATD,0CASC"}
+{"version":3,"file":"userTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/utils.d.ts

@@ -1,3 +1,2 @@
-import { v3 } from "@microsoft/teamsfx-api";
-export declare function getModule(solutionSettings: v3.TeamsFxSolutionSettings, module?: string): v3.Module | undefined;
+export {};
 //# sourceMappingURL=utils.d.ts.map

package/build/plugins/solution/fx-solution/v3/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAG5C,wBAAgB,SAAS,CACvB,gBAAgB,EAAE,EAAE,CAAC,uBAAuB,EAC5C,MAAM,CAAC,EAAE,MAAM,GACd,EAAE,CAAC,MAAM,GAAG,SAAS,CASvB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/utils.ts"],"names":[],"mappings":""}

package/build/plugins/solution/fx-solution/v3/utils.js

@@ -1,16 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getModule = void 0;
-const lodash_1 = require("lodash");
-function getModule(solutionSettings, module) {
-    if (!lodash_1.isNumber(Number(module))) {
-        return undefined;
-    }
-    const index = Number(module);
-    if (index >= 0 && index < solutionSettings.modules.length) {
-        return solutionSettings.modules[index];
-    }
-    return undefined;
-}
-exports.getModule = getModule;
 //# sourceMappingURL=utils.js.map

package/build/plugins/solution/fx-solution/v3/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/utils.ts"],"names":[],"mappings":";;;AACA,mCAAkC;AAElC,SAAgB,SAAS,CACvB,gBAA4C,EAC5C,MAAe;IAEf,IAAI,CAAC,iBAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE;QAC7B,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE;QACzD,OAAO,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACxC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAZD,8BAYC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/utils.ts"],"names":[],"mappings":""}

package/build/plugins/solution/spfx-solution/addFeature.d.ts

@@ -0,0 +1,5 @@
+import { AppStudioTokenProvider, FxError, Inputs, QTreeNode, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
+export declare function getQuestionsForAddFeature(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function addFeature(ctx: v2.Context, inputs: v3.SolutionAddFeatureInputs): Promise<Result<Void, FxError>>;
+export declare function publishApplication(ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider): Promise<Result<Void, FxError>>;
+//# sourceMappingURL=addFeature.d.ts.map

package/build/plugins/solution/spfx-solution/addFeature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"addFeature.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAEN,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAUjD;AAED,wBAAsB,UAAU,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,wBAAwB,GAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAWhC;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}

package/build/plugins/solution/spfx-solution/addFeature.js

@@ -0,0 +1,38 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.publishApplication = exports.addFeature = exports.getQuestionsForAddFeature = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const typedi_1 = require("typedi");
+const addFeature_1 = require("../fx-solution/v3/addFeature");
+const constants_1 = require("../fx-solution/v3/constants");
+async function getQuestionsForAddFeature(ctx, inputs) {
+    const plugin = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.spfx);
+    if (plugin.getQuestionsForAddFeature) {
+        const childNode = await plugin.getQuestionsForAddFeature(ctx, inputs);
+        if (childNode.isErr())
+            return teamsfx_api_1.err(childNode.error);
+        if (childNode.value) {
+            return teamsfx_api_1.ok(childNode.value);
+        }
+    }
+    return teamsfx_api_1.ok(undefined);
+}
+exports.getQuestionsForAddFeature = getQuestionsForAddFeature;
+async function addFeature(ctx, inputs) {
+    const plugin = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.spfx);
+    if (plugin.addFeature) {
+        const contextWithManifestProvider = Object.assign(Object.assign({}, ctx), { appManifestProvider: new addFeature_1.DefaultManifestProvider() });
+        const res = await plugin.addFeature(contextWithManifestProvider, inputs);
+        if (res.isErr())
+            return teamsfx_api_1.err(res.error);
+    }
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.addFeature = addFeature;
+async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.publishApplication = publishApplication;
+//# sourceMappingURL=addFeature.js.map

package/build/plugins/solution/spfx-solution/addFeature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addFeature.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAWgC;AAChC,mCAAmC;AACnC,6DAAuE;AACvE,2DAAwE;AAEjE,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAgC;IAEhC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAmB,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,yBAAyB,EAAE;QACpC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACtE,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,KAAK,EAAE;YACnB,OAAO,gBAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC5B;KACF;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAbD,8DAaC;AAEM,KAAK,UAAU,UAAU,CAC9B,GAAe,EACf,MAAmC;IAEnC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAmB,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,MAAM,2BAA2B,mCAC5B,GAAG,KACN,mBAAmB,EAAE,IAAI,oCAAuB,EAAE,GACnD,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;QACzE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACxC;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAdD,gCAcC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;IAErC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAPD,gDAOC"}

package/build/plugins/solution/spfx-solution/solution.d.ts

@@ -1,17 +1,10 @@
 import { v3 } from "@microsoft/teamsfx-api";
-import { scaffold } from "../fx-solution/v3/scaffold";
-import { addModule } from "./addModule";
-import { getQuestionsForInit, init } from "./init";
-import { addResource, getQuestionsForScaffold, publishApplication } from "./scaffold";
+import { addFeature, getQuestionsForAddFeature, publishApplication } from "./addFeature";
 export declare class TeamsSPFxSolution implements v3.ISolution {
     name: string;
     displayName: string;
-    init: typeof init;
-    getQuestionsForInit: typeof getQuestionsForInit;
-    scaffold: typeof scaffold;
-    getQuestionsForScaffold: typeof getQuestionsForScaffold;
+    getQuestionsForAddFeature: typeof getQuestionsForAddFeature;
+    addFeature: typeof addFeature;
     publishApplication: typeof publishApplication;
-    addResource: typeof addResource;
-    addModule: typeof addModule;
 }
 //# sourceMappingURL=solution.d.ts.map

package/build/plugins/solution/spfx-solution/solution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAI5C,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEtF,qBACa,iBAAkB,YAAW,EAAE,CAAC,SAAS;IACpD,IAAI,SAA6B;IACjC,WAAW,EAAE,MAAM,CAAkC;IAErD,IAAI,cAAQ;IACZ,mBAAmB,6BAAuB;IAE1C,QAAQ,kBAAY;IACpB,uBAAuB,iCAA2B;IAElD,kBAAkB,4BAAsB;IAExC,WAAW,qBAAe;IAE1B,SAAS,mBAAa;CACvB"}
+{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAI5C,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEzF,qBACa,iBAAkB,YAAW,EAAE,CAAC,SAAS;IACpD,IAAI,SAA6B;IACjC,WAAW,EAAE,MAAM,CAAkC;IAErD,yBAAyB,mCAA6B;IACtD,UAAU,oBAAc;IAExB,kBAAkB,4BAAsB;CACzC"}

package/build/plugins/solution/spfx-solution/solution.js

@@ -7,21 +7,14 @@ const tslib_1 = require("tslib");
 const typedi_1 = require("typedi");
 const constants_1 = require("../../../common/constants");
 const constants_2 = require("../fx-solution/v3/constants");
-const scaffold_1 = require("../fx-solution/v3/scaffold");
-const addModule_1 = require("./addModule");
-const init_1 = require("./init");
-const scaffold_2 = require("./scaffold");
+const addFeature_1 = require("./addFeature");
 let TeamsSPFxSolution = class TeamsSPFxSolution {
     constructor() {
         this.name = constants_2.BuiltInSolutionNames.spfx;
         this.displayName = constants_1.PluginDisplayName.SpfxSolution;
-        this.init = init_1.init;
-        this.getQuestionsForInit = init_1.getQuestionsForInit;
-        this.scaffold = scaffold_1.scaffold;
-        this.getQuestionsForScaffold = scaffold_2.getQuestionsForScaffold;
-        this.publishApplication = scaffold_2.publishApplication;
-        this.addResource = scaffold_2.addResource;
-        this.addModule = addModule_1.addModule;
+        this.getQuestionsForAddFeature = addFeature_1.getQuestionsForAddFeature;
+        this.addFeature = addFeature_1.addFeature;
+        this.publishApplication = addFeature_1.publishApplication;
     }
 };
 TeamsSPFxSolution = tslib_1.__decorate([

package/build/plugins/solution/spfx-solution/solution.js.map

@@ -1 +1 @@
-{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,mCAAiC;AACjC,yDAA8D;AAC9D,2DAAmE;AACnE,yDAAsD;AACtD,2CAAwC;AACxC,iCAAmD;AACnD,yCAAsF;AAGtF,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACE,SAAI,GAAG,gCAAoB,CAAC,IAAI,CAAC;QACjC,gBAAW,GAAW,6BAAiB,CAAC,YAAY,CAAC;QAErD,SAAI,GAAG,WAAI,CAAC;QACZ,wBAAmB,GAAG,0BAAmB,CAAC;QAE1C,aAAQ,GAAG,mBAAQ,CAAC;QACpB,4BAAuB,GAAG,kCAAuB,CAAC;QAElD,uBAAkB,GAAG,6BAAkB,CAAC;QAExC,gBAAW,GAAG,sBAAW,CAAC;QAE1B,cAAS,GAAG,qBAAS,CAAC;IACxB,CAAC;CAAA,CAAA;AAfY,iBAAiB;IAD7B,gBAAO,CAAC,gCAAoB,CAAC,IAAI,CAAC;GACtB,iBAAiB,CAe7B;AAfY,8CAAiB"}
+{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,mCAAiC;AACjC,yDAA8D;AAC9D,2DAAmE;AACnE,6CAAyF;AAGzF,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACE,SAAI,GAAG,gCAAoB,CAAC,IAAI,CAAC;QACjC,gBAAW,GAAW,6BAAiB,CAAC,YAAY,CAAC;QAErD,8BAAyB,GAAG,sCAAyB,CAAC;QACtD,eAAU,GAAG,uBAAU,CAAC;QAExB,uBAAkB,GAAG,+BAAkB,CAAC;IAC1C,CAAC;CAAA,CAAA;AARY,iBAAiB;IAD7B,gBAAO,CAAC,gCAAoB,CAAC,IAAI,CAAC;GACtB,iBAAiB,CAQ7B;AARY,8CAAiB"}

package/build/plugins/solution/utils/questions.d.ts

@@ -1,16 +1,10 @@
-import { MultiSelectQuestion, QTreeNode, SingleSelectQuestion, v3 } from "@microsoft/teamsfx-api";
+import { MultiSelectQuestion, SingleSelectQuestion } from "@microsoft/teamsfx-api";
 export declare enum SolutionV3QuestionNames {
-    scaffoldTemplate = "template",
     capabilities = "capabilities",
-    resource = "resource",
-    module = "module",
-    modules = "modules"
+    feature = "feature",
+    plugins = "plugins"
 }
-export declare const selectSingleModuleQuestion: SingleSelectQuestion;
-export declare const selectMultiModulesQuestion: MultiSelectQuestion;
-export declare function createSelectModuleQuestionNode(modules: v3.Module[]): QTreeNode;
-export declare function createSelectModulesToDeployQuestionNode(modules: v3.Module[]): QTreeNode;
+export declare const selectSingleFeatureQuestion: SingleSelectQuestion;
+export declare const selectMultiPluginsQuestion: MultiSelectQuestion;
 export declare const selectCapabilitiesQuestion: MultiSelectQuestion;
-export declare const selectScaffoldTemplateQuestion: SingleSelectQuestion;
-export declare const selectResourceQuestion: SingleSelectQuestion;
 //# sourceMappingURL=questions.d.ts.map

package/build/plugins/solution/utils/questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/utils/questions.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,mBAAmB,EAEnB,SAAS,EACT,oBAAoB,EACpB,EAAE,EACH,MAAM,wBAAwB,CAAC;AAIhC,oBAAY,uBAAuB;IACjC,gBAAgB,aAAa;IAC7B,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,0BAA0B,EAAE,oBAKxC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,mBAKxC,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAc9E;AAED,wBAAgB,uCAAuC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAkBvF;AAED,eAAO,MAAM,0BAA0B,EAAE,mBAOxC,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,oBAM5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,oBAKpC,CAAC"}
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/utils/questions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnF,oBAAY,uBAAuB;IACjC,YAAY,iBAAiB;IAC7B,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,2BAA2B,EAAE,oBAKzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,mBAKxC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,mBAOxC,CAAC"}