@microsoft/teamsfx-core 1.2.0-rc.1 → 1.2.2-alpha.01e159e5.0

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

@@ -1,13 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.provisionLocalResources = exports.getQuestionsForLocalProvision = void 0;
+const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const lodash_1 = require("lodash");
+const typedi_1 = require("typedi");
+const util = tslib_1.__importStar(require("util"));
+const constants_1 = require("../../../../common/local/constants");
+const tools_1 = require("../../../../common/tools");
+const constants_2 = require("../constants");
+const provisionLocal_1 = require("../debug/provisionLocal");
+const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
+const executor_1 = require("../v2/executor");
+const provision_1 = require("./provision");
 async function getQuestionsForLocalProvision(ctx, inputs, tokenProvider, localSettings) {
     return teamsfx_api_1.ok(undefined);
 }
 exports.getQuestionsForLocalProvision = getQuestionsForLocalProvision;
 async function provisionLocalResources(ctx, inputs, localSettings, tokenProvider) {
-    return teamsfx_api_1.err(new teamsfx_api_1.NotImplementedError("Solution", "provisionLocalResources"));
+    const solutionSetting = ctx.projectSetting.solutionSettings;
+    // check M365 tenantId match
+    const localSettingsV2 = localSettings;
+    const tenantIdInConfig = localSettingsV2.teamsApp[constants_1.LocalSettingsTeamsAppKeys.TenantId];
+    const tenantIdInTokenRes = await provision_1.getM365TenantId(tokenProvider.appStudioToken);
+    if (tenantIdInTokenRes.isErr()) {
+        return teamsfx_api_1.err(tenantIdInTokenRes.error);
+    }
+    const tenantIdInToken = tenantIdInTokenRes.value;
+    if (tenantIdInConfig && tenantIdInToken && tenantIdInToken !== tenantIdInConfig) {
+        const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, tenantIdInConfig, tenantIdInToken, "localSettings.json");
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.CannotLocalDebugInDifferentTenant, errorMessage, "Solution"));
+    }
+    if (!tenantIdInConfig) {
+        localSettingsV2.teamsApp[constants_1.LocalSettingsTeamsAppKeys.TenantId] = tenantIdInToken;
+    }
+    //TODO teams app provision, return app id
+    // call appStudio.provision()
+    // localSettingsV2.teamsApp[LocalSettingsTeamsAppKeys.TeamsAppId] = "fake-local-teams-app-id";
+    // solutionGlobalVars.TeamsAppId = "fake-local-teams-app-id";
+    // provision resources for local debug
+    const plugins = solutionSetting.activeResourcePlugins.map((n) => typedi_1.Container.get(n));
+    const provisionLocalResourceThunks = plugins
+        .filter((plugin) => !lodash_1.isUndefined(plugin.provisionLocalResource))
+        .map((plugin) => {
+        return {
+            pluginName: `${plugin.name}`,
+            taskName: "provisionLocalResource",
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            thunk: () => plugin.provisionLocalResource(ctx, inputs, localSettings, tokenProvider),
+        };
+    });
+    const provisionResult = await executor_1.executeConcurrently(provisionLocalResourceThunks, ctx.logProvider);
+    if (provisionResult.kind !== "success") {
+        return teamsfx_api_1.err(provisionResult.error);
+    }
+    const debugProvisionResult = await provisionLocal_1.setupLocalDebugSettings(ctx, inputs, localSettings);
+    if (debugProvisionResult.isErr()) {
+        return teamsfx_api_1.err(debugProvisionResult.error);
+    }
+    const configureLocalResourceThunks = plugins
+        .filter((plugin) => !lodash_1.isUndefined(plugin.configureLocalResource))
+        .map((plugin) => {
+        return {
+            pluginName: `${plugin.name}`,
+            taskName: "configureLocalResource",
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            thunk: () => plugin.configureLocalResource(ctx, inputs, localSettings, tokenProvider),
+        };
+    });
+    const configureResourceResult = await executor_1.executeConcurrently(configureLocalResourceThunks, ctx.logProvider);
+    if (configureResourceResult.kind !== "success") {
+        return teamsfx_api_1.err(configureResourceResult.error);
+    }
+    const configLocalDebugSettingsRes = await provisionLocal_1.configLocalDebugSettings(ctx, inputs, localSettings);
+    if (configLocalDebugSettingsRes.isErr()) {
+        return teamsfx_api_1.err(configLocalDebugSettingsRes.error);
+    }
+    const appStuioV2 = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
+    if (appStuioV2.configureLocalResource) {
+        const res = await appStuioV2.configureLocalResource(ctx, inputs, localSettings, tokenProvider);
+        if (res.isErr()) {
+            return teamsfx_api_1.err(res.error);
+        }
+    }
+    return teamsfx_api_1.ok(localSettings);
 }
 exports.provisionLocalResources = provisionLocalResources;
 //# sourceMappingURL=provisionLocal.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provisionLocal.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAEzB,KAAK,UAAU,6BAA6B,CACjD,GAAe,EACf,MAAgC,EAChC,aAA4B,EAC5B,aAAqC;IAErC,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAPD,sEAOC;AACM,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAgC,EAChC,aAAmB,EACnB,aAA4B;IAE5B,OAAO,iBAAG,CAAC,IAAI,iCAAmB,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAC,CAAC;AAC7E,CAAC;AAPD,0DAOC"}
+{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provisionLocal.ts"],"names":[],"mappings":"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"}

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

@@ -1,27 +1,22 @@
-import { FxError, Inputs, Json, OptionItem, QTreeNode, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
-export declare class ReactTabScaffoldPlugin implements v3.ScaffoldPlugin {
-    getTemplates(ctx: v2.Context, inputs: Inputs): Promise<Result<v3.ScaffoldTemplate[], FxError>>;
-    scaffold(ctx: v2.Context, inputs: v3.PluginScaffoldInputs): Promise<Result<Json | undefined, FxError>>;
-    name: string;
-}
+import { FxError, Inputs, Json, QTreeNode, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare class BotScaffoldPlugin implements v3.ScaffoldPlugin {
+    type: "scaffold";
     getTemplates(ctx: v2.Context, inputs: Inputs): Promise<Result<v3.ScaffoldTemplate[], FxError>>;
-    scaffold(ctx: v2.Context, inputs: v3.PluginScaffoldInputs): Promise<Result<Json | undefined, FxError>>;
+    scaffold(ctx: v3.ContextWithManifest, inputs: v3.PluginScaffoldInputs): Promise<Result<Json | undefined, FxError>>;
     name: string;
 }
 export declare class BlazorScaffoldPlugin implements v3.ScaffoldPlugin {
+    type: "scaffold";
     getTemplates(ctx: v2.Context, inputs: Inputs): Promise<Result<v3.ScaffoldTemplate[], FxError>>;
-    scaffold(ctx: v2.Context, inputs: v3.PluginScaffoldInputs): Promise<Result<Json | undefined, FxError>>;
+    scaffold(ctx: v3.ContextWithManifest, inputs: v3.PluginScaffoldInputs): Promise<Result<Json | undefined, FxError>>;
     name: string;
 }
 export declare class SPFxScaffoldPlugin implements v3.ScaffoldPlugin {
+    type: "scaffold";
     getTemplates(ctx: v2.Context, inputs: Inputs): Promise<Result<v3.ScaffoldTemplate[], FxError>>;
-    scaffold(ctx: v2.Context, inputs: v3.PluginScaffoldInputs): Promise<Result<Json | undefined, FxError>>;
+    scaffold(ctx: v3.ContextWithManifest, inputs: v3.PluginScaffoldInputs): Promise<Result<Json | undefined, FxError>>;
     name: string;
 }
 export declare function getQuestionsForScaffold(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function scaffold(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    module?: string;
-    template?: OptionItem;
-}): Promise<Result<Void, FxError>>;
+export declare function scaffold(ctx: v2.Context, inputs: v3.SolutionScaffoldInputs, localSettings?: Json): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=scaffold.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/scaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,IAAI,EAEJ,UAAU,EACV,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAWhC,qBACa,sBAAuB,YAAW,EAAE,CAAC,cAAc;IACxD,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAc5C,QAAQ,CACZ,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAW7C,IAAI,SAAkC;CACvC;AAED,qBACa,iBAAkB,YAAW,EAAE,CAAC,cAAc;IACnD,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAe5C,QAAQ,CACZ,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAW7C,IAAI,SAAkC;CACvC;AAED,qBACa,oBAAqB,YAAW,EAAE,CAAC,cAAc;IACtD,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAoB5C,QAAQ,CACZ,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAW7C,IAAI,SAAqC;CAC1C;AAED,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IACpD,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAU5C,QAAQ,CACZ,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAW7C,IAAI,SAAmC;CACxC;AAUD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA+CjD;AACD,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,UAAU,CAAA;CAAE,GAC5E,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA8BhC"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/scaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAchC,qBACa,iBAAkB,YAAW,EAAE,CAAC,cAAc;IACzD,IAAI,EAAE,UAAU,CAAc;IACxB,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAe5C,QAAQ,CACZ,GAAG,EAAE,EAAE,CAAC,mBAAmB,EAC3B,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAW7C,IAAI,SAAkC;CACvC;AAED,qBACa,oBAAqB,YAAW,EAAE,CAAC,cAAc;IAC5D,IAAI,EAAE,UAAU,CAAc;IACxB,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAoB5C,QAAQ,CACZ,GAAG,EAAE,EAAE,CAAC,mBAAmB,EAC3B,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAW7C,IAAI,SAAqC;CAC1C;AAED,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IAC1D,IAAI,EAAE,UAAU,CAAc;IACxB,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAU5C,QAAQ,CACZ,GAAG,EAAE,EAAE,CAAC,mBAAmB,EAC3B,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAW7C,IAAI,SAAmC;CACxC;AAUD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA+CjD;AACD,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,sBAAsB,EACjC,aAAa,CAAC,EAAE,IAAI,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmDhC"}

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

@@ -2,53 +2,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scaffold = exports.getQuestionsForScaffold = exports.SPFxScaffoldPlugin = exports.BlazorScaffoldPlugin = exports.BotScaffoldPlugin = exports.ReactTabScaffoldPlugin = void 0;
+exports.scaffold = exports.getQuestionsForScaffold = exports.SPFxScaffoldPlugin = exports.BlazorScaffoldPlugin = exports.BotScaffoldPlugin = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
-const constants_1 = require("./constants");
+const error_1 = require("../../utils/error");
 const questions_1 = require("../../utils/questions");
+const scaffolding_1 = require("../debug/scaffolding");
+const constants_1 = require("./constants");
 const utils_1 = require("./utils");
-const error_1 = require("../../utils/error");
-let ReactTabScaffoldPlugin = class ReactTabScaffoldPlugin {
-    constructor() {
-        this.name = constants_1.BuiltInScaffoldPluginNames.tab;
-    }
-    async getTemplates(ctx, inputs) {
-        return teamsfx_api_1.ok([
-            {
-                name: "ReactTab_JS",
-                language: "javascript",
-                description: "ReactTab Javascript",
-            },
-            {
-                name: "ReactTab_TS",
-                language: "typescript",
-                description: "ReactTab Typescript",
-            },
-        ]);
-    }
-    async scaffold(ctx, inputs) {
-        ctx.logProvider.info("fx-scaffold-react-tab:scaffold");
-        if (!inputs.test)
-            await fs_extra_1.default.ensureDir(path.join(inputs.projectPath, "tabs"));
-        const solutionSettings = ctx.projectSetting.solutionSettings;
-        const module = utils_1.getModule(solutionSettings, inputs.module);
-        if (module) {
-            module.dir = "tabs";
-            module.deployType = "folder";
-        }
-        return teamsfx_api_1.ok(undefined);
-    }
-};
-ReactTabScaffoldPlugin = tslib_1.__decorate([
-    typedi_1.Service(constants_1.BuiltInScaffoldPluginNames.tab)
-], ReactTabScaffoldPlugin);
-exports.ReactTabScaffoldPlugin = ReactTabScaffoldPlugin;
 let BotScaffoldPlugin = class BotScaffoldPlugin {
     constructor() {
+        this.type = "scaffold";
         this.name = constants_1.BuiltInScaffoldPluginNames.bot;
     }
     async getTemplates(ctx, inputs) {
@@ -84,6 +51,7 @@ BotScaffoldPlugin = tslib_1.__decorate([
 exports.BotScaffoldPlugin = BotScaffoldPlugin;
 let BlazorScaffoldPlugin = class BlazorScaffoldPlugin {
     constructor() {
+        this.type = "scaffold";
         this.name = constants_1.BuiltInScaffoldPluginNames.blazor;
     }
     async getTemplates(ctx, inputs) {
@@ -124,6 +92,7 @@ BlazorScaffoldPlugin = tslib_1.__decorate([
 exports.BlazorScaffoldPlugin = BlazorScaffoldPlugin;
 let SPFxScaffoldPlugin = class SPFxScaffoldPlugin {
     constructor() {
+        this.type = "scaffold";
         this.name = constants_1.BuiltInScaffoldPluginNames.spfx;
     }
     async getTemplates(ctx, inputs) {
@@ -209,7 +178,7 @@ async function getQuestionsForScaffold(ctx, inputs) {
     return teamsfx_api_1.ok(node);
 }
 exports.getQuestionsForScaffold = getQuestionsForScaffold;
-async function scaffold(ctx, inputs) {
+async function scaffold(ctx, inputs, localSettings) {
     if (!inputs.template) {
         return teamsfx_api_1.err(new error_1.InvalidInputError(inputs));
     }
@@ -222,19 +191,28 @@ async function scaffold(ctx, inputs) {
     const templateName = data.templateName;
     const plugin = typedi_1.Container.get(pluginName);
     const pluginInputs = Object.assign(Object.assign({}, inputs), { template: templateName });
-    const res = await plugin.scaffold(ctx, pluginInputs);
-    if (res.isErr()) {
-        return teamsfx_api_1.err(res.error);
-    }
-    const manifest = [];
-    if (res.value) {
-        manifest.push(res.value);
-    }
-    inputs.manifest = manifest;
-    //TODO
-    // //call appstudio.scaffold() API
-    // const appstudioPlugin = Container.get<v3.ScaffoldPlugin>(BuiltInResourcePluginNames.AppStudio);
-    // await appstudioPlugin.scaffold(ctx, pluginInputs);
+    // read manifest
+    const appStudio = typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.appStudio);
+    const manifestRes = await appStudio.loadManifest(ctx, inputs);
+    if (manifestRes.isErr()) {
+        return teamsfx_api_1.err(manifestRes.error);
+    }
+    // scaffold
+    const manifest = manifestRes.value;
+    const contextWithManifest = Object.assign(Object.assign({}, ctx), { appManifest: manifest });
+    const scaffoldRes = await plugin.scaffold(contextWithManifest, pluginInputs);
+    if (scaffoldRes.isErr()) {
+        return teamsfx_api_1.err(scaffoldRes.error);
+    }
+    // write manifest
+    const writeRes = await appStudio.saveManifest(ctx, inputs, manifest);
+    if (writeRes.isErr()) {
+        return teamsfx_api_1.err(writeRes.error);
+    }
+    const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
+    if (scaffoldLocalDebugSettingsResult.isErr()) {
+        return scaffoldLocalDebugSettingsResult;
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.scaffold = scaffold;

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

@@ -1 +1 @@
-{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/scaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAYgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,mCAA4C;AAC5C,2CAAyD;AACzD,qDAG+B;AAC/B,mCAAoC;AACpC,6CAAsD;AAEtD,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QAgCE,SAAI,GAAG,sCAA0B,CAAC,GAAG,CAAC;IACxC,CAAC;IAhCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,qBAAqB;aACnC;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,qBAAqB;aACnC;SACF,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;YACpB,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC;SAC9B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAjCY,sBAAsB;IADlC,gBAAO,CAAC,sCAA0B,CAAC,GAAG,CAAC;GAC3B,sBAAsB,CAiClC;AAjCY,wDAAsB;AAoCnC,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QAiCE,SAAI,GAAG,sCAA0B,CAAC,GAAG,CAAC;IACxC,CAAC;IAjCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,cAAc;aAC5B;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,cAAc;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC;YACnB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAlCY,iBAAiB;IAD7B,gBAAO,CAAC,sCAA0B,CAAC,GAAG,CAAC;GAC3B,iBAAiB,CAkC7B;AAlCY,8CAAiB;AAqC9B,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QAsCE,SAAI,GAAG,sCAA0B,CAAC,MAAM,CAAC;IAC3C,CAAC;IAtCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,gBAAgB;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC;YACtB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAvCY,oBAAoB;IADhC,gBAAO,CAAC,sCAA0B,CAAC,MAAM,CAAC;GAC9B,oBAAoB,CAuChC;AAvCY,oDAAoB;AA0CjC,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QA4BE,SAAI,GAAG,sCAA0B,CAAC,IAAI,CAAC;IACzC,CAAC;IA5BC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,UAAU;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;YACpB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AA7BY,kBAAkB;IAD9B,gBAAO,CAAC,sCAA0B,CAAC,IAAI,CAAC;GAC5B,kBAAkB,CA6B9B;AA7BY,gDAAkB;AA+B/B,SAAS,qBAAqB;IAC5B,OAAO;QACL,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,MAAM,CAAC;QACnE,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,GAAG,CAAC;QAChE,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,GAAG,CAAC;KACjE,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAgC;IAEhC,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,MAAM,UAAU,GAAG,0CAA8B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;KAC3B;IACD,MAAM,YAAY,GAAG,IAAI,uBAAS,CAAC,0CAA8B,CAAC,CAAC;IACnE,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QACpC,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACnC;QACD,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE;YAC5C,aAAa,CAAC,IAAI,CAAC;gBACjB,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACrC,KAAK,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,GAAG;gBAC/C,MAAM,EAAE,QAAQ,CAAC,WAAW;gBAC5B,IAAI,EAAE;oBACJ,UAAU,EAAE,MAAM,CAAC,IAAI;oBACvB,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC5B;aACF,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,IAAI,UAAU,EAAE;oBACd,UAAU,CAAC,SAAS,GAAG;wBACrB,SAAS,EAAE,KAAK,EAAE,KAAiB,EAAE,MAAe,EAA+B,EAAE;4BACnF,IAAI,KAAK,CAAC,IAAI,EAAE;gCACd,IAAK,KAAK,CAAC,IAAY,CAAC,UAAU,KAAK,MAAM,CAAC,IAAI;oCAAE,OAAO,SAAS,CAAC;6BACtE;4BACD,OAAO,EAAE,CAAC;wBACZ,CAAC;qBACF,CAAC;oBACF,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBACnC;aACF;SACF;KACF;IACD,0CAA8B,CAAC,aAAa,GAAG,aAAa,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC5B,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAlDD,0DAkDC;AACM,KAAK,UAAU,QAAQ,CAC5B,GAAe,EACf,MAA6E;IAE7E,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,OAAO,iBAAG,CAAC,IAAI,yBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;KAC3C;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,iBAAG,CAAC,IAAI,yBAAiB,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC,CAAC;KACzE;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAoD,CAAC;IAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IACvC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAoB,UAAU,CAAC,CAAC;IAC5D,MAAM,YAAY,mCACb,MAAM,KACT,QAAQ,EAAE,YAAY,GACvB,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACrD,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;QACf,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACvB;IACD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,MAAM;IACN,kCAAkC;IAClC,kGAAkG;IAClG,qDAAqD;IACrD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAjCD,4BAiCC"}
+{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/scaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAYgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,mCAA4C;AAE5C,6CAAsD;AACtD,qDAG+B;AAC/B,sDAAkE;AAClE,2CAAqF;AACrF,mCAAoC;AAGpC,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACE,SAAI,GAAe,UAAU,CAAC;QAiC9B,SAAI,GAAG,sCAA0B,CAAC,GAAG,CAAC;IACxC,CAAC;IAjCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,cAAc;aAC5B;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,cAAc;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAA2B,EAC3B,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC;YACnB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAnCY,iBAAiB;IAD7B,gBAAO,CAAC,sCAA0B,CAAC,GAAG,CAAC;GAC3B,iBAAiB,CAmC7B;AAnCY,8CAAiB;AAsC9B,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACE,SAAI,GAAe,UAAU,CAAC;QAsC9B,SAAI,GAAG,sCAA0B,CAAC,MAAM,CAAC;IAC3C,CAAC;IAtCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,gBAAgB;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAA2B,EAC3B,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC;YACtB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAxCY,oBAAoB;IADhC,gBAAO,CAAC,sCAA0B,CAAC,MAAM,CAAC;GAC9B,oBAAoB,CAwChC;AAxCY,oDAAoB;AA2CjC,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAe,UAAU,CAAC;QA4B9B,SAAI,GAAG,sCAA0B,CAAC,IAAI,CAAC;IACzC,CAAC;IA5BC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,UAAU;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAA2B,EAC3B,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;YACpB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AA9BY,kBAAkB;IAD9B,gBAAO,CAAC,sCAA0B,CAAC,IAAI,CAAC;GAC5B,kBAAkB,CA8B9B;AA9BY,gDAAkB;AAgC/B,SAAS,qBAAqB;IAC5B,OAAO;QACL,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,MAAM,CAAC;QACnE,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,GAAG,CAAC;QAChE,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,GAAG,CAAC;KACjE,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAgC;IAEhC,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,MAAM,UAAU,GAAG,0CAA8B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;KAC3B;IACD,MAAM,YAAY,GAAG,IAAI,uBAAS,CAAC,0CAA8B,CAAC,CAAC;IACnE,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QACpC,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACnC;QACD,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE;YAC5C,aAAa,CAAC,IAAI,CAAC;gBACjB,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACrC,KAAK,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,GAAG;gBAC/C,MAAM,EAAE,QAAQ,CAAC,WAAW;gBAC5B,IAAI,EAAE;oBACJ,UAAU,EAAE,MAAM,CAAC,IAAI;oBACvB,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC5B;aACF,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,IAAI,UAAU,EAAE;oBACd,UAAU,CAAC,SAAS,GAAG;wBACrB,SAAS,EAAE,KAAK,EAAE,KAAiB,EAAE,MAAe,EAA+B,EAAE;4BACnF,IAAI,KAAK,CAAC,IAAI,EAAE;gCACd,IAAK,KAAK,CAAC,IAAY,CAAC,UAAU,KAAK,MAAM,CAAC,IAAI;oCAAE,OAAO,SAAS,CAAC;6BACtE;4BACD,OAAO,EAAE,CAAC;wBACZ,CAAC;qBACF,CAAC;oBACF,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBACnC;aACF;SACF;KACF;IACD,0CAA8B,CAAC,aAAa,GAAG,aAAa,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC5B,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAlDD,0DAkDC;AACM,KAAK,UAAU,QAAQ,CAC5B,GAAe,EACf,MAAiC,EACjC,aAAoB;IAEpB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,OAAO,iBAAG,CAAC,IAAI,yBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;KAC3C;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,iBAAG,CAAC,IAAI,yBAAiB,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC,CAAC;KACzE;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAoD,CAAC;IAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IACvC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAoB,UAAU,CAAC,CAAC;IAC5D,MAAM,YAAY,mCACb,MAAM,KACT,QAAQ,EAAE,YAAY,GACvB,CAAC;IAEF,gBAAgB;IAChB,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC9D,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;QACvB,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAC/B;IAED,WAAW;IACX,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC;IACnC,MAAM,mBAAmB,mCACpB,GAAG,KACN,WAAW,EAAE,QAAQ,GACtB,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;IAC7E,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;QACvB,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAC/B;IAED,iBAAiB;IACjB,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACrE,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;QACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC5B;IAED,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CACvE,GAAG,EACH,MAAM,EACN,aAAa,CACd,CAAC;IACF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;QAC5C,OAAO,gCAAgC,CAAC;KACzC;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAvDD,4BAuDC"}

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/spfx-solution/addModule.d.ts

@@ -1,5 +1,3 @@
-import { FxError, Json, Result, v2, Void } from "@microsoft/teamsfx-api";
-export declare function addModule(ctx: v2.Context, localSettings: Json, inputs: v2.InputsWithProjectPath & {
-    capabilities?: string[];
-}): Promise<Result<Void, FxError>>;
+import { FxError, Json, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
+export declare function addModule(ctx: v2.Context, inputs: v3.SolutionAddModuleInputs, localSettings?: Json): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=addModule.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAM,MAAM,EAAE,EAAE,EAAM,IAAI,EAAO,MAAM,wBAAwB,CAAC;AAGtF,wBAAsB,SAAS,CAC7B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,aAAa,EAAE,IAAI,EACnB,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC7D,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAuBhC"}
+{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAM,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAO,MAAM,wBAAwB,CAAC;AAGtF,wBAAsB,SAAS,CAC7B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,uBAAuB,EAClC,aAAa,CAAC,EAAE,IAAI,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAuBhC"}

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModule = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const error_1 = require("./error");
-async function addModule(ctx, localSettings, inputs) {
+async function addModule(ctx, inputs, localSettings) {
     const solutionSettings = ctx.projectSetting.solutionSettings;
     const module = {
         capabilities: inputs.capabilities || [],

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

@@ -1 +1 @@
-{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAsF;AACtF,mCAAqD;AAE9C,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,aAAmB,EACnB,MAA8D;IAE9D,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAgD,CAAC;IAC7F,MAAM,MAAM,GAAc;QACxB,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;KACxC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE;QAC3C,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,+CAA+C,EAC/C,KAAK,CACN,CAAC;YACF,OAAO,iBAAG,CAAC,IAAI,kCAA0B,EAAE,CAAC,CAAC;SAC9C;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;KACF;IACD,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEtC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,8BA2BC"}
+{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAsF;AACtF,mCAAqD;AAE9C,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,MAAkC,EAClC,aAAoB;IAEpB,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAgD,CAAC;IAC7F,MAAM,MAAM,GAAc;QACxB,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;KACxC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE;QAC3C,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,+CAA+C,EAC/C,KAAK,CACN,CAAC;YACF,OAAO,iBAAG,CAAC,IAAI,kCAA0B,EAAE,CAAC,CAAC;SAC9C;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;KACF;IACD,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEtC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,8BA2BC"}

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

@@ -3,9 +3,8 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = exports.getQuestionsForInit = void 0;
-const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const typedi_1 = tslib_1.__importDefault(require("typedi"));
+const typedi_1 = require("typedi");
 const question_1 = require("../fx-solution/question");
 const constants_1 = require("../fx-solution/v3/constants");
 const questions_1 = require("./questions");
@@ -36,7 +35,7 @@ exports.getQuestionsForInit = getQuestionsForInit;
 async function init(ctx, inputs) {
     const solutionSettings = {
         version: "3.0.0",
-        name: ctx.projectSetting.solutionSettings.name,
+        name: constants_1.BuiltInSolutionNames.spfx,
         capabilities: ["tab"],
         hostType: question_1.HostTypeOptionSPFx.id,
         modules: [],
@@ -47,6 +46,6 @@ async function init(ctx, inputs) {
 }
 exports.init = init;
 function getAllScaffoldPlugins() {
-    return [typedi_1.default.get(constants_1.BuiltInScaffoldPluginNames.spfx)];
+    return [typedi_1.Container.get(constants_1.BuiltInScaffoldPluginNames.spfx)];
 }
 //# sourceMappingURL=init.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/init.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA8F;AAC9F,4DAA+B;AAC/B,sDAA0E;AAC1E,2DAA+F;AAC/F,2CAAyD;AAElD,KAAK,UAAU,mBAAmB,CACvC,GAAe,EACf,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC;QACzB,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE;YACvB,MAAM,CAAC,sCAA0B,CAAC,QAAQ,CAAC,GAAG,gCAAoB,CAAC,IAAI,CAAC;QAC1E,CAAC;KACF,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,sBAAW,CAAC,EAAE,EAAE,CAAC;IAE9C,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;IACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,IAAI,UAAU,EAAE;oBACd,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBAC3B;aACF;SACF;KACF;IAED,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,kDA2BC;AAEM,KAAK,UAAU,IAAI,CACxB,GAAe,EACf,MAAgC;IAEhC,MAAM,gBAAgB,GAAiC;QACrD,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI;QAC9C,YAAY,EAAE,CAAC,KAAK,CAAC;QACrB,QAAQ,EAAE,6BAAkB,CAAC,EAAE;QAC/B,OAAO,EAAE,EAAE;QACX,qBAAqB,EAAE,EAAE;KAC1B,CAAC;IAEF,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACvD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAfD,oBAeC;AAED,SAAS,qBAAqB;IAC5B,OAAO,CAAC,gBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7E,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/init.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8F;AAC9F,mCAAmC;AACnC,sDAA0E;AAC1E,2DAA+F;AAC/F,2CAAyD;AAElD,KAAK,UAAU,mBAAmB,CACvC,GAAe,EACf,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC;QACzB,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE;YACvB,MAAM,CAAC,sCAA0B,CAAC,QAAQ,CAAC,GAAG,gCAAoB,CAAC,IAAI,CAAC;QAC1E,CAAC;KACF,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,sBAAW,CAAC,EAAE,EAAE,CAAC;IAE9C,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;IACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,IAAI,UAAU,EAAE;oBACd,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBAC3B;aACF;SACF;KACF;IAED,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,kDA2BC;AAEM,KAAK,UAAU,IAAI,CACxB,GAAe,EACf,MAAgC;IAEhC,MAAM,gBAAgB,GAAiC;QACrD,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,gCAAoB,CAAC,IAAI;QAC/B,YAAY,EAAE,CAAC,KAAK,CAAC;QACrB,QAAQ,EAAE,6BAAkB,CAAC,EAAE;QAC/B,OAAO,EAAE,EAAE;QACX,qBAAqB,EAAE,EAAE;KAC1B,CAAC;IAEF,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACvD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAfD,oBAeC;AAED,SAAS,qBAAqB;IAC5B,OAAO,CAAC,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7E,CAAC"}

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

@@ -1,13 +1,5 @@
-import { FxError, Inputs, Json, Result, v2, AppStudioTokenProvider, Void, OptionItem, QTreeNode } from "@microsoft/teamsfx-api";
+import { AppStudioTokenProvider, FxError, Inputs, QTreeNode, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForScaffold(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function scaffold(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    module?: string;
-    template?: OptionItem;
-}): Promise<Result<Void, FxError>>;
-export declare function generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<Json, FxError>>;
 export declare function publishApplication(ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider): Promise<Result<Void, FxError>>;
-export declare function addResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    module?: string;
-    resource?: string;
-}): Promise<Result<Void, FxError>>;
+export declare function addResource(ctx: v2.Context, inputs: v3.SolutionAddResourceInputs): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=scaffold.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,MAAM,EACN,EAAE,EAEF,sBAAsB,EACtB,IAAI,EAGJ,UAAU,EACV,SAAS,EACV,MAAM,wBAAwB,CAAC;AAOhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmDjD;AAED,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,UAAU,CAAA;CAAE,GAC5E,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC;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;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GACxE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAGN,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmDjD;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;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,yBAAyB,GACnC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}

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

@@ -2,12 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResource = exports.publishApplication = exports.generateResourceTemplate = exports.scaffold = exports.getQuestionsForScaffold = void 0;
-const tslib_1 = require("tslib");
+exports.addResource = exports.publishApplication = exports.getQuestionsForScaffold = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const typedi_1 = tslib_1.__importDefault(require("typedi"));
+const typedi_1 = require("typedi");
 const constants_1 = require("../fx-solution/v3/constants");
-const error_1 = require("../utils/error");
 const questions_1 = require("../utils/questions");
 async function getQuestionsForScaffold(ctx, inputs) {
     const node = new teamsfx_api_1.QTreeNode({ type: "group" });
@@ -18,7 +16,7 @@ async function getQuestionsForScaffold(ctx, inputs) {
     }
     const templateNode = new teamsfx_api_1.QTreeNode(questions_1.selectScaffoldTemplateQuestion);
     const staticOptions = [];
-    const spfxPlugin = typedi_1.default.get(constants_1.BuiltInScaffoldPluginNames.spfx);
+    const spfxPlugin = typedi_1.Container.get(constants_1.BuiltInScaffoldPluginNames.spfx);
     const scaffoldPlugins = [spfxPlugin];
     for (const plugin of scaffoldPlugins) {
         const getTemplatesRes = await plugin.getTemplates(ctx, inputs);
@@ -60,40 +58,6 @@ async function getQuestionsForScaffold(ctx, inputs) {
     return teamsfx_api_1.ok(node);
 }
 exports.getQuestionsForScaffold = getQuestionsForScaffold;
-async function scaffold(ctx, inputs) {
-    if (!inputs.template) {
-        return teamsfx_api_1.err(new error_1.InvalidInputError(inputs));
-    }
-    const template = inputs.template;
-    if (!template.data) {
-        return teamsfx_api_1.err(new error_1.InvalidInputError(inputs, "template.data is undefined"));
-    }
-    const data = template.data;
-    const pluginName = data.pluginName;
-    const templateName = data.templateName;
-    const plugin = typedi_1.default.get(pluginName);
-    const pluginInputs = Object.assign(Object.assign({}, inputs), { template: templateName });
-    const res = await plugin.scaffold(ctx, pluginInputs);
-    if (res.isErr()) {
-        return teamsfx_api_1.err(res.error);
-    }
-    const manifest = [];
-    if (res.value) {
-        manifest.push(res.value);
-    }
-    inputs.manifest = manifest;
-    pluginInputs.manifest = manifest;
-    //TODO
-    // //call appstudio.scaffold() API
-    // const appstudioPlugin = Container.get<v3.ScaffoldPlugin>(BuiltInResourcePluginNames.AppStudio);
-    // await appstudioPlugin.scaffold(ctx, pluginInputs);
-    return teamsfx_api_1.ok(teamsfx_api_1.Void);
-}
-exports.scaffold = scaffold;
-async function generateResourceTemplate(ctx, inputs) {
-    return teamsfx_api_1.ok({});
-}
-exports.generateResourceTemplate = generateResourceTemplate;
 async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAYgC;AAChC,mCAAmC;AACnC,2DAAyE;AACzE,kDAAoG;AAE7F,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAgC;IAEhC,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAgD,CAAC;IAC7F,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,MAAM,UAAU,GAAG,0CAA8B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;KAC3B;IACD,MAAM,YAAY,GAAG,IAAI,uBAAS,CAAC,0CAA8B,CAAC,CAAC;IACnE,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAsB,kBAAS,CAAC,GAAG,CACjD,sCAA0B,CAAC,IAAI,CAChC,CAAC;IACF,MAAM,eAAe,GAAG,CAAC,UAAU,CAAC,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QACpC,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACnC;QACD,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE;YAC5C,aAAa,CAAC,IAAI,CAAC;gBACjB,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACrC,KAAK,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,GAAG;gBAC/C,MAAM,EAAE,QAAQ,CAAC,WAAW;gBAC5B,IAAI,EAAE;oBACJ,UAAU,EAAE,MAAM,CAAC,IAAI;oBACvB,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC5B;aACF,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,IAAI,UAAU,EAAE;oBACd,UAAU,CAAC,SAAS,GAAG;wBACrB,SAAS,EAAE,KAAK,EAAE,KAAiB,EAAE,MAAe,EAA+B,EAAE;4BACnF,IAAI,KAAK,CAAC,IAAI,EAAE;gCACd,IAAK,KAAK,CAAC,IAAY,CAAC,UAAU,KAAK,MAAM,CAAC,IAAI;oCAAE,OAAO,SAAS,CAAC;6BACtE;4BACD,OAAO,EAAE,CAAC;wBACZ,CAAC;qBACF,CAAC;oBACF,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBACnC;aACF;SACF;KACF;IACD,0CAA8B,CAAC,aAAa,GAAG,aAAa,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAE5B,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAtDD,0DAsDC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;IAErC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAPD,gDAOC;AAEM,KAAK,UAAU,WAAW,CAC/B,GAAe,EACf,MAAoC;IAEpC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AALD,kCAKC"}

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

@@ -1,22 +1,17 @@
-import { FxError, Inputs, Json, Result, v2, v3, AppStudioTokenProvider, Void, QTreeNode, OptionItem } from "@microsoft/teamsfx-api";
+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";
 export declare class TeamsSPFxSolution implements v3.ISolution {
     name: string;
     displayName: string;
-    init: (ctx: v2.Context, inputs: v2.InputsWithProjectPath) => Promise<Result<Void, FxError>>;
-    getQuestionsForInit?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<QTreeNode | undefined, FxError>>;
-    scaffold: (ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-        module?: string;
-        template?: OptionItem;
-    }) => Promise<Result<Void, FxError>>;
-    getQuestionsForScaffold?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath) => Promise<Result<QTreeNode | undefined, FxError>>;
-    generateResourceTemplate: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Json, FxError>>;
-    publishApplication: (ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider) => Promise<Result<Void, FxError>>;
-    addResource: (ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-        module?: string;
-        resource?: string;
-    }) => Promise<Result<Void, FxError>>;
-    addModule: (ctx: v2.Context, localSettings: Json, inputs: v2.InputsWithProjectPath & {
-        capabilities?: string[];
-    }) => Promise<Result<Void, FxError>>;
+    init: typeof init;
+    getQuestionsForInit: typeof getQuestionsForInit;
+    scaffold: typeof scaffold;
+    getQuestionsForScaffold: typeof getQuestionsForScaffold;
+    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,EAEL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,MAAM,EACN,EAAE,EACF,EAAE,EACF,sBAAsB,EACtB,IAAI,EACJ,SAAS,EACT,UAAU,EACX,MAAM,wBAAwB,CAAC;AAehC,qBACa,iBAAkB,YAAW,EAAE,CAAC,SAAS;IACpD,IAAI,SAA6B;IACjC,WAAW,EAAE,MAAM,CAAkC;IAErD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,qBAAqB,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CACpF;IACP,mBAAmB,CAAC,EAAE,CACpB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAuB;IAE3E,QAAQ,EAAE,CACR,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,UAAU,CAAA;KAAE,KAC1E,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAY;IAC/C,uBAAuB,CAAC,EAAE,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,KAC7B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA2B;IAE/E,wBAAwB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IAE3B,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,KAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAsB;IAEzD,WAAW,EAAE,CACX,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAe;IAElD,SAAS,EAAE,CACT,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,aAAa,EAAE,IAAI,EACnB,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,KAC3D,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAa;CACjD"}
+{"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"}

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

@@ -4,12 +4,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamsSPFxSolution = void 0;
 const tslib_1 = require("tslib");
-const constants_1 = require("../../../common/constants");
-const scaffold_1 = require("./scaffold");
-const init_1 = require("./init");
 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");
 let TeamsSPFxSolution = class TeamsSPFxSolution {
     constructor() {
         this.name = constants_2.BuiltInSolutionNames.spfx;
@@ -17,10 +18,9 @@ let TeamsSPFxSolution = class TeamsSPFxSolution {
         this.init = init_1.init;
         this.getQuestionsForInit = init_1.getQuestionsForInit;
         this.scaffold = scaffold_1.scaffold;
-        this.getQuestionsForScaffold = scaffold_1.getQuestionsForScaffold;
-        this.generateResourceTemplate = scaffold_1.generateResourceTemplate;
-        this.publishApplication = scaffold_1.publishApplication;
-        this.addResource = scaffold_1.addResource;
+        this.getQuestionsForScaffold = scaffold_2.getQuestionsForScaffold;
+        this.publishApplication = scaffold_2.publishApplication;
+        this.addResource = scaffold_2.addResource;
         this.addModule = addModule_1.addModule;
     }
 };

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;;;;AAelC,yDAA8D;AAE9D,yCAMoB;AACpB,iCAAmD;AACnD,mCAAiC;AACjC,2DAAmE;AACnE,2CAAwC;AAGxC,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACE,SAAI,GAAG,gCAAoB,CAAC,IAAI,CAAC;QACjC,gBAAW,GAAW,6BAAiB,CAAC,YAAY,CAAC;QAErD,SAAI,GACF,WAAI,CAAC;QACP,wBAAmB,GAGoC,0BAAmB,CAAC;QAE3E,aAAQ,GAG8B,mBAAQ,CAAC;QAC/C,4BAAuB,GAGgC,kCAAuB,CAAC;QAE/E,6BAAwB,GACtB,mCAAwB,CAAC;QAE3B,uBAAkB,GAKoB,6BAAkB,CAAC;QAEzD,gBAAW,GAG2B,sBAAW,CAAC;QAElD,cAAS,GAI6B,qBAAS,CAAC;IAClD,CAAC;CAAA,CAAA;AAxCY,iBAAiB;IAD7B,gBAAO,CAAC,gCAAoB,CAAC,IAAI,CAAC;GACtB,iBAAiB,CAwC7B;AAxCY,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,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"}