@microsoft/teamsfx-core 1.13.0 → 1.13.1-alpha.ae549cb45.0

package/build/component/feature/api.js

@@ -6,8 +6,12 @@ exports.TeamsApi = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const lodash_1 = require("lodash");
+const path = tslib_1.__importStar(require("path"));
 require("reflect-metadata");
-const typedi_1 = require("typedi");
+const typedi_1 = tslib_1.__importStar(require("typedi"));
+const projectSettingsHelper_1 = require("../../common/projectSettingsHelper");
+const utils_1 = require("../../common/utils");
+const globalVars_1 = require("../../core/globalVars");
 const question_1 = require("../../core/question");
 const constants_1 = require("../../plugins/resource/function/constants");
 const enums_1 = require("../../plugins/resource/function/enums");
@@ -15,72 +19,123 @@ const scaffold_1 = require("../../plugins/resource/function/ops/scaffold");
 const question_2 = require("../../plugins/resource/function/question");
 const message_1 = require("../../plugins/resource/function/resources/message");
 const constants_2 = require("../constants");
+const debug_1 = require("../debug");
+const utils_2 = require("../utils");
 const workflow_1 = require("../workflow");
-const path = tslib_1.__importStar(require("path"));
-const projectSettingsHelper_1 = require("../../common/projectSettingsHelper");
-const globalVars_1 = require("../../core/globalVars");
 let TeamsApi = class TeamsApi {
     constructor() {
         this.name = constants_2.ComponentNames.TeamsApi;
     }
     add(context, inputs) {
-        return teamsfx_api_1.ok(this.addApiAction(context, inputs));
-    }
-    build() {
-        return teamsfx_api_1.ok(this.buildApiAction());
-    }
-    addApiAction(context, inputs) {
-        const actions = [];
-        this.setupConfiguration(actions, context);
-        this.setupCode(actions, context, inputs);
-        this.setupBicep(actions, context, inputs);
-        const group = {
-            type: "group",
-            name: `${this.name}.add`,
-            mode: "sequential",
-            actions: actions,
+        // return ok(this.addApiAction(context, inputs));
+        const action = {
+            name: "teams-api.add",
+            type: "function",
+            question: (context, inputs) => {
+                question_2.functionNameQuestion.validation = getFunctionNameQuestionValidation(context, inputs);
+                return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(question_2.functionNameQuestion));
+            },
+            execute: async (context, inputs) => {
+                const projectSettings = context.projectSetting;
+                const effects = [];
+                inputs[question_1.CoreQuestionNames.ProgrammingLanguage] =
+                    context.projectSetting.programmingLanguage ||
+                        inputs[question_1.CoreQuestionNames.ProgrammingLanguage] ||
+                        "javascript";
+                // 1. scaffold function
+                {
+                    inputs[enums_1.QuestionKey.functionName] =
+                        inputs[enums_1.QuestionKey.functionName] || constants_1.DefaultValues.functionName;
+                    const clonedInputs = lodash_1.cloneDeep(inputs);
+                    lodash_1.assign(clonedInputs, {
+                        folder: inputs.folder || constants_1.FunctionPluginPathInfo.solutionFolderName,
+                    });
+                    const apiCodeComponent = typedi_1.default.get(constants_2.ComponentNames.ApiCode);
+                    const res = await apiCodeComponent.generate(context, clonedInputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                    effects.push("generate api code");
+                }
+                const apiConfig = workflow_1.getComponent(projectSettings, constants_2.ComponentNames.TeamsApi);
+                if (apiConfig) {
+                    apiConfig.functionNames = apiConfig.functionNames || [];
+                    apiConfig.functionNames.push(inputs[enums_1.QuestionKey.functionName]);
+                    return teamsfx_api_1.ok(effects);
+                }
+                // 2. config teams-api
+                projectSettings.components.push({
+                    name: constants_2.ComponentNames.TeamsApi,
+                    hosting: constants_2.ComponentNames.Function,
+                    functionNames: [inputs[enums_1.QuestionKey.functionName]],
+                    deploy: true,
+                    build: true,
+                    folder: inputs.folder || constants_1.FunctionPluginPathInfo.solutionFolderName,
+                    artifactFolder: inputs.folder || constants_1.FunctionPluginPathInfo.solutionFolderName,
+                });
+                effects.push("config teams-api");
+                const biceps = [];
+                // 3.1 bicep.init
+                {
+                    const bicepComponent = typedi_1.default.get("bicep");
+                    const res = await bicepComponent.init(inputs.projectPath);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                // 3.2 azure-function.generateBicep
+                {
+                    const clonedInputs = lodash_1.cloneDeep(inputs);
+                    lodash_1.assign(clonedInputs, {
+                        componentId: constants_2.ComponentNames.TeamsApi,
+                        hosting: inputs.hosting,
+                        scenario: constants_2.Scenarios.Api,
+                    });
+                    const functionComponent = typedi_1.default.get(constants_2.ComponentNames.Function);
+                    const res = await functionComponent.generateBicep(context, clonedInputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                    res.value.forEach((b) => biceps.push(b));
+                    context.projectSetting.components.push({
+                        name: constants_2.ComponentNames.Function,
+                        scenario: constants_2.Scenarios.Api,
+                    });
+                }
+                const bicepRes = await utils_2.bicepUtils.persistBiceps(inputs.projectPath, utils_1.convertToAlphanumericOnly(context.projectSetting.appName), biceps);
+                if (bicepRes.isErr())
+                    return bicepRes;
+                // 4. generate config bicep
+                {
+                    const res = await utils_2.generateConfigBiceps(context, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                    effects.push("generate config biceps");
+                }
+                // 5. local debug settings
+                {
+                    const res = await debug_1.generateLocalDebugSettings(context, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                    effects.push("generate local debug configs");
+                }
+                globalVars_1.globalVars.isVS = projectSettingsHelper_1.isVSProject(projectSettings);
+                projectSettings.programmingLanguage || (projectSettings.programmingLanguage = inputs[question_1.CoreQuestionNames.ProgrammingLanguage]);
+                return teamsfx_api_1.ok([]);
+            },
         };
-        return group;
+        return teamsfx_api_1.ok(action);
     }
-    buildApiAction() {
+    async build(context, inputs) {
         const action = {
-            name: `${this.name}.build`,
-            type: "call",
-            targetAction: "api-code.build",
-            required: true,
+            name: "teams-api.build",
+            type: "function",
+            execute: async (context, inputs) => {
+                const apiCode = typedi_1.default.get(constants_2.ComponentNames.ApiCode);
+                const res = await apiCode.build(context, inputs);
+                if (res.isErr())
+                    return teamsfx_api_1.err(res.error);
+                return teamsfx_api_1.ok([]);
+            },
         };
-        return action;
-    }
-    hasApi(context) {
-        const api = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsApi);
-        return api != undefined; // using != to match both undefined and null
-    }
-    setupConfiguration(actions, context) {
-        if (this.hasApi(context)) {
-            actions.push(addApiTriggerAction);
-        }
-        else {
-            actions.push(configApiAction);
-        }
-        return actions;
-    }
-    setupBicep(actions, context, inputs) {
-        if (this.hasApi(context)) {
-            return actions;
-        }
-        actions.push(initBicep);
-        if (inputs.hosting) {
-            actions.push(generateBicep(inputs.hosting, { scenario: constants_2.Scenarios.Api, componentId: this.name }));
-            actions.push(generateConfigBicep(inputs.hosting, { scenario: constants_2.Scenarios.Api, componentId: this.name }));
-        }
-        return actions;
-    }
-    setupCode(actions, context, inputs) {
-        actions.push(generateApiCode);
-        if (!this.hasApi(context)) {
-            actions.push(initLocalDebug);
-        }
-        return actions;
+        return teamsfx_api_1.ok(action);
     }
 };
 TeamsApi = tslib_1.__decorate([
@@ -105,92 +160,4 @@ const getFunctionNameQuestionValidation = (context, inputs) => ({
         }
     },
 });
-const addApiTriggerAction = {
-    name: "fx.addApiTrigger",
-    type: "function",
-    plan: (context, inputs) => {
-        return teamsfx_api_1.ok([`add new function to '${constants_2.ComponentNames.TeamsApi}' in projectSettings`]);
-    },
-    question: (context, inputs) => {
-        question_2.functionNameQuestion.validation = getFunctionNameQuestionValidation(context, inputs);
-        return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(question_2.functionNameQuestion));
-    },
-    execute: async (context, inputs) => {
-        var _a, _b;
-        const functionName = (_a = inputs === null || inputs === void 0 ? void 0 : inputs[enums_1.QuestionKey.functionName]) !== null && _a !== void 0 ? _a : constants_1.DefaultValues.functionName;
-        const api = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsApi);
-        (_b = api === null || api === void 0 ? void 0 : api.functionNames) === null || _b === void 0 ? void 0 : _b.push(functionName);
-        return teamsfx_api_1.ok([`add new function to '${constants_2.ComponentNames.TeamsApi}' in projectSettings`]);
-    },
-};
-const configApiAction = {
-    name: "fx.configApi",
-    type: "function",
-    plan: (context, inputs) => {
-        return teamsfx_api_1.ok([`config '${constants_2.ComponentNames.TeamsApi}' in projectSettings`]);
-    },
-    question: (context, inputs) => {
-        question_2.functionNameQuestion.validation = getFunctionNameQuestionValidation(context, inputs);
-        return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(question_2.functionNameQuestion));
-    },
-    execute: async (context, inputs) => {
-        var _a;
-        inputs.hosting = inputs.hosting || constants_2.ComponentNames.Function;
-        const functionName = (_a = inputs === null || inputs === void 0 ? void 0 : inputs[enums_1.QuestionKey.functionName]) !== null && _a !== void 0 ? _a : constants_1.DefaultValues.functionName;
-        const projectSettings = context.projectSetting;
-        // add teams-api
-        projectSettings.components.push({
-            name: constants_2.ComponentNames.TeamsApi,
-            hosting: inputs.hosting,
-            functionNames: [functionName],
-            deploy: true,
-        });
-        // add hosting component
-        projectSettings.components.push({
-            name: inputs.hosting,
-            connections: [constants_2.ComponentNames.TeamsApi, constants_2.ComponentNames.TeamsTab, constants_2.ComponentNames.Identity],
-            scenario: constants_2.Scenarios.Api,
-        });
-        const teamsTab = workflow_1.getComponent(projectSettings, constants_2.ComponentNames.TeamsTab);
-        if (!(teamsTab === null || teamsTab === void 0 ? void 0 : teamsTab.connections))
-            lodash_1.merge(teamsTab, { connections: [constants_2.ComponentNames.TeamsApi] });
-        else
-            teamsTab.connections.push(constants_2.ComponentNames.TeamsApi);
-        projectSettings.programmingLanguage =
-            projectSettings.programmingLanguage || inputs[question_1.CoreQuestionNames.ProgrammingLanguage];
-        globalVars_1.globalVars.isVS = projectSettingsHelper_1.isVSProject(projectSettings);
-        return teamsfx_api_1.ok([`config '${constants_2.ComponentNames.TeamsApi}' in projectSettings`]);
-    },
-};
-const generateApiCode = {
-    name: "call:api-code.generate",
-    type: "call",
-    required: true,
-    targetAction: "api-code.generate",
-};
-const initBicep = {
-    type: "call",
-    targetAction: "bicep.init",
-    required: true,
-};
-const generateBicep = (hosting, inputs) => ({
-    name: `call:${hosting}.generateBicep`,
-    type: "call",
-    required: true,
-    targetAction: `${hosting}.generateBicep`,
-    inputs: inputs,
-});
-const generateConfigBicep = (hosting, inputs) => ({
-    name: `call:${hosting}-config.generateBicep`,
-    type: "call",
-    required: true,
-    targetAction: `${hosting}-config.generateBicep`,
-    inputs: inputs,
-});
-const initLocalDebug = {
-    name: "call:debug.generateLocalDebugSettings",
-    type: "call",
-    required: true,
-    targetAction: "debug.generateLocalDebugSettings",
-};
 //# sourceMappingURL=api.js.map

package/build/component/feature/api.js.map

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

package/build/component/feature/apim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apim.d.ts","sourceRoot":"","sources":["../../../src/component/feature/apim.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAEN,SAAS,EACT,OAAO,EAEP,qBAAqB,EAErB,YAAY,EAEZ,MAAM,EACP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAgB1B,qBACa,WAAW;IACtB,IAAI,SAA8B;IAClC,GAAG,CACD,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAsFpD,YAAY,CACV,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAsCrD"}
+{"version":3,"file":"apim.d.ts","sourceRoot":"","sources":["../../../src/component/feature/apim.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAEN,SAAS,EAIT,OAAO,EAEP,qBAAqB,EAErB,YAAY,EAEZ,MAAM,EACP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAmB1B,qBACa,WAAW;IACtB,IAAI,SAA8B;IAClC,GAAG,CACD,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAwEpD,YAAY,CACV,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAsCrD"}

package/build/component/feature/apim.js

@@ -6,108 +6,86 @@ exports.ApimFeature = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 require("reflect-metadata");
-const typedi_1 = require("typedi");
+const typedi_1 = tslib_1.__importStar(require("typedi"));
 const projectSettingsHelperV3_1 = require("../../common/projectSettingsHelperV3");
 const utils_1 = require("../../common/utils");
-const projectSettingsLoader_1 = require("../../core/middleware/projectSettingsLoader");
 const answer_1 = require("../../plugins/resource/apim/answer");
 const config_1 = require("../../plugins/resource/apim/config");
 const constants_1 = require("../../plugins/resource/apim/constants");
 const factory_1 = require("../../plugins/resource/apim/factory");
 const constants_2 = require("../constants");
+const messages_1 = require("../messages");
+const utils_2 = require("../utils");
 const workflow_1 = require("../workflow");
 let ApimFeature = class ApimFeature {
     constructor() {
         this.name = constants_2.ComponentNames.APIMFeature;
     }
     add(context, inputs) {
-        const component = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.APIM);
-        if (component)
-            return teamsfx_api_1.ok(undefined);
-        const hasFunc = projectSettingsHelperV3_1.hasApi(context.projectSetting);
-        const dependentActions = [];
-        if (!hasFunc) {
-            dependentActions.push({
-                name: "call:teams-api.add",
-                type: "call",
-                required: true,
-                targetAction: "teams-api.add",
-            });
-        }
-        const actions = [
-            ...dependentActions,
-            {
-                name: "apim-feature.configApim",
-                type: "function",
-                plan: (context, inputs) => {
-                    const component = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.APIM);
-                    if (component)
-                        return teamsfx_api_1.ok([]);
-                    return teamsfx_api_1.ok(["add component 'apim' in projectSettings"]);
-                },
-                execute: async (context, inputs) => {
-                    var _a, _b;
-                    const component = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.APIM);
-                    if (component)
-                        return teamsfx_api_1.ok([]);
-                    const remarks = ["add component 'apim' in projectSettings"];
-                    const apimConfig = {
-                        name: constants_2.ComponentNames.APIM,
-                        provision: true,
-                        deploy: true,
-                        connections: [],
-                    };
-                    context.projectSetting.components.push(apimConfig);
-                    const teamsTab = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsTab);
-                    if (teamsTab) {
-                        (_a = apimConfig.connections) === null || _a === void 0 ? void 0 : _a.push("teams-tab");
-                    }
-                    const teamsBot = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsBot);
-                    if (teamsBot) {
-                        (_b = apimConfig.connections) === null || _b === void 0 ? void 0 : _b.push("teams-bot");
+        const action = {
+            type: "function",
+            name: "apim-feature.add",
+            execute: async (context, inputs) => {
+                const component = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.APIM);
+                if (component)
+                    return teamsfx_api_1.ok([]);
+                const effects = [];
+                const hasFunc = projectSettingsHelperV3_1.hasApi(context.projectSetting);
+                // 1. call teams-api.add if necessary
+                if (!hasFunc) {
+                    const res = await workflow_1.runActionByName("teams-api.add", context, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                    effects.push("add teams-api");
+                }
+                // 2. scaffold
+                {
+                    const codeActionRes = await this.generateCode(context, inputs);
+                    if (codeActionRes.isOk() && codeActionRes.value) {
+                        const res = await workflow_1.runAction(codeActionRes.value, context, inputs);
+                        if (res.isErr())
+                            return teamsfx_api_1.err(res.error);
+                        effects.push("scaffold api doc");
                     }
-                    return teamsfx_api_1.ok([
-                        {
-                            type: "file",
-                            operate: "replace",
-                            filePath: projectSettingsLoader_1.getProjectSettingsPath(inputs.projectPath),
-                            remarks: remarks.join(";"),
-                        },
-                    ]);
-                },
-            },
-            {
-                type: "call",
-                name: "call:bicep.init",
-                targetAction: "bicep.init",
-                required: true,
-            },
-            {
-                name: "call:apim-feature.generateCode",
-                type: "call",
-                required: true,
-                targetAction: "apim-feature.generateCode",
-            },
-            {
-                name: "call:apim.generateBicep",
-                type: "call",
-                required: true,
-                targetAction: "apim.generateBicep",
-            },
-            {
-                name: "call:apim-config.generateBicep",
-                type: "call",
-                required: true,
-                targetAction: "apim-config.generateBicep",
+                }
+                // 3. config
+                const apimConfig = {
+                    name: constants_2.ComponentNames.APIM,
+                    provision: true,
+                    deploy: true,
+                    connections: [],
+                };
+                context.projectSetting.components.push(apimConfig);
+                effects.push(messages_1.Plans.addFeature("apim"));
+                // 4. bicep.init
+                {
+                    const bicepComponent = typedi_1.default.get("bicep");
+                    const res = await bicepComponent.init(inputs.projectPath);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                // 5. apim.generateBicep
+                {
+                    const apimResource = typedi_1.default.get(constants_2.ComponentNames.APIM);
+                    const res = await apimResource.generateBicep(context, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                    const bicepRes = await utils_2.bicepUtils.persistBiceps(inputs.projectPath, utils_1.convertToAlphanumericOnly(context.projectSetting.appName), res.value);
+                    if (bicepRes.isErr())
+                        return teamsfx_api_1.err(bicepRes.error);
+                }
+                // 6. generate config bicep
+                {
+                    const res = await utils_2.generateConfigBiceps(context, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                    effects.push("generate config biceps");
+                }
+                effects.push("generate bicep");
+                return teamsfx_api_1.ok(effects);
             },
-        ];
-        const group = {
-            type: "group",
-            name: "apim-feature.add",
-            mode: "sequential",
-            actions: actions,
         };
-        return teamsfx_api_1.ok(group);
+        return teamsfx_api_1.ok(action);
     }
     generateCode(context, inputs) {
         const action = {

package/build/component/feature/apim.js.map

@@ -1 +1 @@
-{"version":3,"file":"apim.js","sourceRoot":"","sources":["../../../src/component/feature/apim.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAWgC;AAChC,4BAA0B;AAC1B,mCAAiC;AACjC,kFAA8D;AAC9D,8CAA+D;AAC/D,uFAAqF;AACrF,+DAAiE;AACjE,+DAAsE;AACtE,qEAI+C;AAC/C,iEAA8D;AAC9D,4CAA8C;AAC9C,0CAA2C;AAG3C,IAAa,WAAW,GAAxB,MAAa,WAAW;IAAxB;QACE,SAAI,GAAG,0BAAc,CAAC,WAAW,CAAC;IAmIpC,CAAC;IAlIC,GAAG,CACD,OAAkB,EAClB,MAA6B;QAE7B,MAAM,SAAS,GAAG,uBAAY,CAAC,OAAO,CAAC,cAAc,EAAE,0BAAc,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,SAAS;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,gCAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,IAAI,CAAC,OAAO,EAAE;YACZ,gBAAgB,CAAC,IAAI,CAAC;gBACpB,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,eAAe;aAC9B,CAAC,CAAC;SACJ;QACD,MAAM,OAAO,GAAa;YACxB,GAAG,gBAAgB;YACnB;gBACE,IAAI,EAAE,yBAAyB;gBAC/B,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,CAAC,OAAkB,EAAE,MAA6B,EAAE,EAAE;oBAC1D,MAAM,SAAS,GAAG,uBAAY,CAAC,OAAO,CAAC,cAAc,EAAE,0BAAc,CAAC,IAAI,CAAC,CAAC;oBAC5E,IAAI,SAAS;wBAAE,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;oBAC7B,OAAO,gBAAE,CAAC,CAAC,yCAAyC,CAAC,CAAC,CAAC;gBACzD,CAAC;gBACD,OAAO,EAAE,KAAK,EAAE,OAAkB,EAAE,MAA6B,EAAE,EAAE;;oBACnE,MAAM,SAAS,GAAG,uBAAY,CAAC,OAAO,CAAC,cAAc,EAAE,0BAAc,CAAC,IAAI,CAAC,CAAC;oBAC5E,IAAI,SAAS;wBAAE,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;oBAC7B,MAAM,OAAO,GAAa,CAAC,yCAAyC,CAAC,CAAC;oBACtE,MAAM,UAAU,GAAc;wBAC5B,IAAI,EAAE,0BAAc,CAAC,IAAI;wBACzB,SAAS,EAAE,IAAI;wBACf,MAAM,EAAE,IAAI;wBACZ,WAAW,EAAE,EAAE;qBAChB,CAAC;oBACF,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACnD,MAAM,QAAQ,GAAG,uBAAY,CAAC,OAAO,CAAC,cAAc,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;oBAC/E,IAAI,QAAQ,EAAE;wBACZ,MAAA,UAAU,CAAC,WAAW,0CAAE,IAAI,CAAC,WAAW,CAAC,CAAC;qBAC3C;oBACD,MAAM,QAAQ,GAAG,uBAAY,CAAC,OAAO,CAAC,cAAc,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;oBAC/E,IAAI,QAAQ,EAAE;wBACZ,MAAA,UAAU,CAAC,WAAW,0CAAE,IAAI,CAAC,WAAW,CAAC,CAAC;qBAC3C;oBACD,OAAO,gBAAE,CAAC;wBACR;4BACE,IAAI,EAAE,MAAM;4BACZ,OAAO,EAAE,SAAS;4BAClB,QAAQ,EAAE,8CAAsB,CAAC,MAAM,CAAC,WAAW,CAAC;4BACpD,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;yBAC3B;qBACF,CAAC,CAAC;gBACL,CAAC;aACF;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,iBAAiB;gBACvB,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,IAAI;aACf;YACD;gBACE,IAAI,EAAE,gCAAgC;gBACtC,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,2BAA2B;aAC1C;YACD;gBACE,IAAI,EAAE,yBAAyB;gBAC/B,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,oBAAoB;aACnC;YACD;gBACE,IAAI,EAAE,gCAAgC;gBACtC,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,2BAA2B;aAC1C;SACF,CAAC;QACF,MAAM,KAAK,GAAgB;YACzB,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,OAAO;SACjB,CAAC;QACF,OAAO,gBAAE,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAED,YAAY,CACV,OAAkB,EAClB,MAA6B;QAE7B,MAAM,MAAM,GAAW;YACrB,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,MAAM;YACnB,eAAe,EAAE,IAAI;YACrB,sBAAsB,EAAE,kBAAkB;YAC1C,kBAAkB,EAAE,UAAU;YAC9B,iBAAiB,EAAE,IAAI;YACvB,aAAa,EAAE,wBAAY,CAAC,QAAQ;YACpC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,4BAAgB,CAAC,wBAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;YAC1E,IAAI,EAAE,CAAC,OAAkB,EAAE,MAA6B,EAAE,EAAE;gBAC1D,OAAO,gBAAE,CAAC,CAAC,wBAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrC,CAAC;YACD,OAAO,EAAE,KAAK,EACZ,OAAkB,EAClB,MAA6B,EAC7B,QAA2B,EAC3B,EAAE;gBACF,MAAM,OAAO,GAAa,CAAC,wBAAY,CAAC,QAAQ,CAAC,CAAC;gBAClD,MAAM,UAAU,GAAG,IAAI,yBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChD,MAAM,MAAM,GAAG,oBAAW,CAAC,MAAM,CAAC,CAAC;gBACnC,MAAM,eAAe,GAAG,MAAM,iBAAO,CAAC,oBAAoB,CACxD,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,WAAW,CACpB,CAAC;gBACF,MAAM,OAAO,GAAG,iCAAyB,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBAC1E,IAAI,MAAM,CAAC,QAAQ,EAAE;oBACnB,MAAM,MAAM,CAAC,QAAQ,CAAC,2BAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;iBACjF;gBACD,MAAM,CAAC,IAAI,CAAC,2BAAe,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBAClD,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,4BAAgB,CAAC,wBAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACjE,MAAM,eAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;gBAC5D,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;YACrB,CAAC;SACF,CAAC;QACF,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;CACF,CAAA;AApIY,WAAW;IADvB,gBAAO,CAAC,0BAAc,CAAC,WAAW,CAAC;GACvB,WAAW,CAoIvB;AApIY,kCAAW"}
+{"version":3,"file":"apim.js","sourceRoot":"","sources":["../../../src/component/feature/apim.ts"],"names":[],"mappings":"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"}

package/build/component/feature/bot.d.ts

@@ -1,21 +1,12 @@
 import { Action, ContextV3, FxError, InputsWithProjectPath, MaybePromise, Result } from "@microsoft/teamsfx-api";
 import "reflect-metadata";
-import "../code/botCode";
+import "../connection/azureWebAppConfig";
 import "../resource/appManifest/appManifest";
-import "../resource/botService";
 import "../resource/azureAppService/azureWebApp";
-import "../connection/azureWebAppConfig";
 export declare class TeamsBot {
     name: string;
-    /**
-     * 1. config bot in project settings
-     * 2. generate bot source code
-     * 3. generate bot-service and hosting bicep
-     * 3. overwrite hosting config bicep
-     * 4. persist bicep
-     * 5. add capability in teams manifest
-     */
     add(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
-    build(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
+    build(): MaybePromise<Result<Action | undefined, FxError>>;
+    buildBotAction(): Action;
 }
 //# sourceMappingURL=bot.d.ts.map

package/build/component/feature/bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../../../src/component/feature/bot.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAEN,SAAS,EACT,OAAO,EAEP,qBAAqB,EACrB,YAAY,EAEZ,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAkB1B,OAAO,iBAAiB,CAAC;AACzB,OAAO,qCAAqC,CAAC;AAC7C,OAAO,wBAAwB,CAAC;AAChC,OAAO,yCAAyC,CAAC;AACjD,OAAO,iCAAiC,CAAC;AAKzC,qBACa,QAAQ;IACnB,IAAI,SAAe;IAEnB;;;;;;;OAOG;IACH,GAAG,CACD,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAoJpD,KAAK,CACH,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CASrD"}
+{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../../../src/component/feature/bot.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,SAAS,EAIT,OAAO,EACP,qBAAqB,EACrB,YAAY,EAGZ,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,kBAAkB,CAAC;AAyB1B,OAAO,iCAAiC,CAAC;AAIzC,OAAO,qCAAqC,CAAC;AAE7C,OAAO,yCAAyC,CAAC;AAKjD,qBACa,QAAQ;IACnB,IAAI,SAAe;IACnB,GAAG,CACD,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA0KpD,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAI1D,cAAc,IAAI,MAAM;CAYzB"}