@microsoft/teamsfx-core 1.2.0-rc.1 → 1.2.2-alpha.7b2fe9ea.0

package/build/plugins/solution/fx-solution/v2/scaffolding.js.map

@@ -1 +1 @@
-{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":";;;;AAAA,wDAYgC;AAChC,oDAAsD;AACtD,0CAKqB;AACrB,yCAA6D;AAC7D,mCAKiB;AACjB,wDAAwB;AACxB,gEAA0B;AAC1B,mCAQqB;AACrB,wEAA+D;AAC/D,mCAAmC;AACnC,sDAAkE;AAE3D,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc;;IAEd,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,0BAA0B,CAAC,EACrC,UAAU,EACV,iBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,qCAA0B,CAAC,mBAAmB,CAAW,CAAC;IAC9E,IAAI,IAAI,EAAE;QACR,GAAG,CAAC,cAAc,CAAC,mBAAmB,GAAG,IAAI,CAAC;KAC/C;IACD,MAAM,gBAAgB,GAA0B,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC9E,MAAM,SAAS,GAAG,8BAAsB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACnE,IAAI,SAAS,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,MAAM,GAAuB,OAAO;SACrC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,mEAAmE;IACnE,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,UAAU,CAAC,CAAC;IAClF,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAClE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;KACjE;IACD,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC;QACnD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;QAEvD,oEAAoE;QACpE,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;YAC5C,OAAO,gCAAgC,CAAC;SACzC;QACD,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;QACxE,IAAI,sBAAc,CAAC,gBAAgB,CAAC,EAAE;YACpC,MAAM,kBAAE,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,WAAW,mBAAmB,EAAE,8BAA0B,EAAE;gBACvF,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;YACH,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,0BAAsB,CAAC,MAAM,EAAE;gBACvE,CAAC,6BAAyB,CAAC,SAAS,CAAC,EAAE,kCAA8B;gBACrE,CAAC,6BAAyB,CAAC,OAAO,CAAC,EAAE,4BAAwB,CAAC,GAAG;gBACjE,CAAC,6BAAyB,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;gBAChF,CAAC,6BAAyB,CAAC,YAAY,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;gBACjF,CAAC,6BAAyB,CAAC,mBAAmB,CAAC,EAC7C,MAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,mBAAmB,mCAAI,EAAE;aAChD,CAAC,CAAC;SACJ;aAAM;YACL,0CAA0C;YAC1C,IAAI,UAAU,CAAC,kBAAkB,EAAE;gBACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACjE,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;oBACnB,OAAO,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;iBAC3B;aACF;SACF;QACD,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,kBAAU,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EACzD,KAAK,CACN,CAAC;QACF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AA/ED,gDA+EC;AAEM,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,OAA4B;;IAE5B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAC1C,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,qBAAqB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxF,MAAM,MAAM,GAAuB,OAAO;SACvC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC;QACnD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;QAEvD,oEAAoE;QACpE,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;QAExE,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,kBAAU,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EACzD,KAAK,CACN,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AAvCD,8CAuCC;AAEM,KAAK,UAAU,cAAc,CAClC,YAAsB,EACtB,cAAwB,EACxB,WAAmB,EACnB,aAAuB;IAEvB,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAClC,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE;QACnC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,sBAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACnF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;IAED,IAAI,aAAa,EAAE;QACjB,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,sBAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACzF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;AACH,CAAC;AAxBD,wCAwBC"}

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

@@ -1,6 +1,6 @@
-import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider, ProjectSettings } from "@microsoft/teamsfx-api";
 import { PluginsWithContext } from "../solution";
-export declare function getSelectedPlugins(azureSettings: AzureSolutionSettings): v2.ResourcePlugin[];
+export declare function getSelectedPlugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings;
 export declare function isAzureProject(azureSettings: AzureSolutionSettings): boolean;
 export declare function combineRecords<T>(records: {
@@ -8,7 +8,7 @@ export declare function combineRecords<T>(records: {
     result: T;
 }[]): Record<string, T>;
 export declare function extractSolutionInputs(record: Json): v2.SolutionInputs;
-export declare function reloadV2Plugins(solutionSettings: AzureSolutionSettings): v2.ResourcePlugin[];
+export declare function reloadV2Plugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 export declare function ensurePermissionRequest(solutionSettings: AzureSolutionSettings, permissionRequestProvider: PermissionRequestProvider): Promise<Result<Void, FxError>>;
 export declare function parseTeamsAppTenantId(appStudioToken?: Record<string, unknown>): Result<string, FxError>;
 export declare function parseUserName(appStudioToken?: Record<string, unknown>): Result<string, FxError>;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAsBhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAMnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAsBhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAMxF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAMrF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAMnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}

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

@@ -10,8 +10,9 @@ const question_1 = require("../question");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const util_1 = require("../utils/util");
 const util = tslib_1.__importStar(require("util"));
-function getSelectedPlugins(azureSettings) {
-    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSettings);
+function getSelectedPlugins(projectSettings) {
+    const azureSettings = projectSettings.solutionSettings;
+    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(projectSettings);
     azureSettings.activeResourcePlugins = plugins.map((p) => p.name);
     return plugins;
 }
@@ -45,8 +46,9 @@ function extractSolutionInputs(record) {
     };
 }
 exports.extractSolutionInputs = extractSolutionInputs;
-function reloadV2Plugins(solutionSettings) {
-    const res = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(solutionSettings);
+function reloadV2Plugins(projectSettings) {
+    const solutionSettings = projectSettings.solutionSettings;
+    const res = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(projectSettings);
     solutionSettings.activeResourcePlugins = res.map((p) => p.name);
     return res;
 }
@@ -100,7 +102,7 @@ async function checkWhetherLocalDebugM365TenantMatches(localDebugTenantId, appSt
             throw teamsfx_api_1.err(m365UserAccount.error);
         }
         if (m365TenantId.value !== localDebugTenantId) {
-            const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, localDebugTenantId, m365UserAccount.value, tools_1.isMultiEnvEnabled() ? "localSettings.json" : "default.userdata");
+            const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, localDebugTenantId, m365UserAccount.value, "localSettings.json");
             return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(errorMessage), "Solution", constants_1.SolutionError.CannotLocalDebugInDifferentTenant));
         }
     }

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,IAAI,EAAM,SAAS,EAAE,MAAM,EAAE,EAAE,EAAM,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAIjG,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,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,CAmBhC"}
+{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAKP,IAAI,EAEJ,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,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,CAiDhC"}

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

@@ -4,20 +4,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModule = exports.getQuestionsForAddModule = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const typedi_1 = require("typedi");
+const scaffolding_1 = require("../debug/scaffolding");
+const question_1 = require("../question");
+const constants_1 = require("./constants");
 const error_1 = require("./error");
 const questions_1 = require("../../utils/questions");
 async function getQuestionsForAddModule(ctx, inputs) {
     return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(questions_1.selectCapabilitiesQuestion));
 }
 exports.getQuestionsForAddModule = getQuestionsForAddModule;
-async function addModule(ctx, localSettings, inputs) {
+async function addModule(ctx, inputs, localSettings) {
     const solutionSettings = ctx.projectSetting.solutionSettings;
+    const inputCapabilities = inputs.capabilities;
+    // 1. update solution settings
     const module = {
-        capabilities: inputs.capabilities || [],
+        capabilities: inputCapabilities,
     };
     const capSet = new Set();
     solutionSettings.modules.forEach((m) => m.capabilities.forEach((c) => capSet.add(c)));
-    for (const cap of inputs.capabilities || []) {
+    for (const cap of inputCapabilities) {
         if (capSet.has(cap)) {
             return teamsfx_api_1.err(new error_1.CapabilityAlreadyAddedError(cap));
         }
@@ -27,9 +33,26 @@ async function addModule(ctx, localSettings, inputs) {
     }
     solutionSettings.capabilities = Array.from(capSet);
     solutionSettings.modules.push(module);
-    //TODO
-    //call localDebug plugin's scaffold API
-    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    // 2. scaffold local debug settings
+    const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
+    if (scaffoldLocalDebugSettingsResult.isErr()) {
+        return scaffoldLocalDebugSettingsResult;
+    }
+    // 3. call appStudio.addCapabilities() to update manifest templates
+    if (inputCapabilities.length > 0) {
+        const appStudio = typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.appStudio);
+        const manifestInputs = [];
+        if (inputCapabilities.includes(question_1.TabOptionItem.id))
+            manifestInputs.push({ name: "staticTab" });
+        if (inputCapabilities.includes(question_1.BotOptionItem.id))
+            manifestInputs.push({ name: "Bot" });
+        if (inputCapabilities.includes(question_1.MessageExtensionItem.id))
+            manifestInputs.push({ name: "MessageExtension" });
+        const addRes = await appStudio.addCapabilities(ctx, inputs, manifestInputs);
+        if (addRes.isErr())
+            return teamsfx_api_1.err(addRes.error);
+    }
+    return teamsfx_api_1.ok(scaffoldLocalDebugSettingsResult.value);
 }
 exports.addModule = addModule;
 //# sourceMappingURL=addModule.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAiG;AACjG,mCAAsD;AACtD,qDAAmE;AAE5D,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAgC;IAEhC,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,sCAA0B,CAAC,CAAC,CAAC;AACvD,CAAC;AALD,4DAKC;AACM,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,aAAmB,EACnB,MAA8D;IAE9D,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,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,OAAO,iBAAG,CAAC,IAAI,mCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;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;IACtC,MAAM;IACN,uCAAuC;IACvC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAvBD,8BAuBC"}
+{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAagC;AAChC,mCAAmC;AAEnC,sDAAkE;AAClE,0CAAiF;AACjF,2CAAyD;AACzD,mCAAsD;AACtD,qDAAmE;AAE5D,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAgC;IAEhC,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,sCAA0B,CAAC,CAAC,CAAC;AACvD,CAAC;AALD,4DAKC;AACM,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,MAAkC,EAClC,aAAoB;IAEpB,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC;IAC9C,8BAA8B;IAC9B,MAAM,MAAM,GAAc;QACxB,YAAY,EAAE,iBAAiB;KAChC,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,iBAAiB,EAAE;QACnC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,OAAO,iBAAG,CAAC,IAAI,mCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;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,mCAAmC;IACnC,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;IAED,mEAAmE;IACnE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;QACzF,MAAM,cAAc,GAQd,EAAE,CAAC;QACT,IAAI,iBAAiB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;YAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC7F,IAAI,iBAAiB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;YAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvF,IAAI,iBAAiB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC;YACrD,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,MAAM,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC9C;IACD,OAAO,gBAAE,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;AACpD,CAAC;AArDD,8BAqDC"}

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

@@ -1,37 +1,29 @@
 import { AzureAccountProvider, FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
-export declare class AzureStoragePlugin implements v3.ResourcePlugin {
-    resourceType: string;
-    description: string;
-    name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
-    provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
-    deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
-}
 export declare class AzureBotPlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
+    generateResourceTemplate(ctx: v2.Context, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare class AzureWebAppPlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
+    generateResourceTemplate(ctx: v2.Context, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare class SPFxResourcePlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare function getQuestionsForAddResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, 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=addResource.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}

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

@@ -2,9 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = exports.AzureStoragePlugin = void 0;
+exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = 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 arm_1 = tslib_1.__importDefault(require("../arm"));
 const constants_1 = require("./constants");
@@ -12,51 +13,9 @@ const error_1 = require("./error");
 const questions_1 = require("../../utils/questions");
 const utils_1 = require("./utils");
 const error_2 = require("../../utils/error");
-let AzureStoragePlugin = class AzureStoragePlugin {
-    constructor() {
-        this.resourceType = "Azure Storage";
-        this.description = "Azure Storage";
-        this.name = constants_1.BuiltInResourcePluginNames.storage;
-    }
-    async generateResourceTemplate(ctx, inputs) {
-        return teamsfx_api_1.ok({
-            kind: "bicep",
-            template: {
-                Provision: {
-                    Orchestration: "Orchestration",
-                    Reference: {
-                        endpoint: "provisionOutputs.azureStorageOutput.value.endpoint",
-                        domain: "provisionOutputs.azureStorageOutput.value.domain",
-                    },
-                    Modules: {
-                        azureStorage: "",
-                    },
-                },
-                Parameters: {
-                    azureStorageK1: "v1",
-                },
-            },
-        });
-    }
-    async provisionResource(ctx, inputs, envInfo, tokenProvider) {
-        const config = {
-            domain: "huajie1214dev35e42dtab.z19.web.core.windows.net",
-            endpoint: "https://huajie1214dev35e42dtab.z19.web.core.windows.net",
-            storageResourceId: "/subscriptions/63f43cd3-ab63-429d-80ad-950ec8359724/resourceGroups/fullcap-dev-rg/providers/Microsoft.Storage/storageAccounts/huajie1214dev35e42dtab",
-        };
-        return teamsfx_api_1.ok(config);
-    }
-    async deploy(ctx, inputs, envInfo, tokenProvider) {
-        ctx.logProvider.info(`fx-resource-azure-storage deploy success!`);
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-};
-AzureStoragePlugin = tslib_1.__decorate([
-    typedi_1.Service(constants_1.BuiltInResourcePluginNames.storage)
-], AzureStoragePlugin);
-exports.AzureStoragePlugin = AzureStoragePlugin;
 let AzureBotPlugin = class AzureBotPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Bot";
         this.description = "Azure Bot";
         this.name = constants_1.BuiltInResourcePluginNames.bot;
@@ -107,6 +66,7 @@ AzureBotPlugin = tslib_1.__decorate([
 exports.AzureBotPlugin = AzureBotPlugin;
 let AzureWebAppPlugin = class AzureWebAppPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Web App";
         this.description = "Azure Web App";
         this.name = constants_1.BuiltInResourcePluginNames.webApp;
@@ -149,6 +109,7 @@ AzureWebAppPlugin = tslib_1.__decorate([
 exports.AzureWebAppPlugin = AzureWebAppPlugin;
 let SPFxResourcePlugin = class SPFxResourcePlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "SPFx resource";
         this.description = "SPFx resource";
         this.name = constants_1.BuiltInResourcePluginNames.spfx;
@@ -163,11 +124,7 @@ SPFxResourcePlugin = tslib_1.__decorate([
 ], SPFxResourcePlugin);
 exports.SPFxResourcePlugin = SPFxResourcePlugin;
 function getAllResourcePlugins() {
-    return [
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.bot),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
-    ];
+    return [typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.storage)];
 }
 async function getQuestionsForAddResource(ctx, inputs) {
     const solutionSettings = ctx.projectSetting.solutionSettings;
@@ -194,6 +151,8 @@ async function addResource(ctx, inputs) {
         return teamsfx_api_1.err(new error_2.InvalidInputError(inputs, "inputs.resource undefined"));
     }
     const solutionSettings = ctx.projectSetting.solutionSettings;
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { existingResources: originalSettings.activeResourcePlugins });
     if (inputs.module !== undefined) {
         const module = utils_1.getModule(solutionSettings, inputs.module);
         if (module) {
@@ -215,10 +174,18 @@ async function addResource(ctx, inputs) {
     addedResourceNames.forEach((s) => allResourceNames.add(s));
     existingResourceNames.forEach((s) => allResourceNames.add(s));
     solutionSettings.activeResourcePlugins = Array.from(allResourceNames);
+    // 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);
+    }
+    const manifest = manifestRes.value;
+    const contextWithManifest = Object.assign(Object.assign({}, ctx), { appManifest: manifest });
     //call arm module to generate arm templates
     const activatedPlugins = solutionSettings.activeResourcePlugins.map((n) => typedi_1.Container.get(n));
     const addedPlugins = Array.from(addedResourceNames).map((n) => typedi_1.Container.get(n));
-    const armRes = await arm_1.default.generateArmTemplate(ctx, inputs, activatedPlugins, addedPlugins);
+    const armRes = await arm_1.default.generateArmTemplate(contextWithManifest, inputsNew, activatedPlugins, addedPlugins);
     if (armRes.isErr()) {
         return teamsfx_api_1.err(armRes.error);
     }
@@ -227,13 +194,18 @@ async function addResource(ctx, inputs) {
         const plugin = typedi_1.Container.get(pluginName);
         if (addedResourceNames.has(pluginName) && !existingResourceNames.has(pluginName)) {
             if (plugin.addResource) {
-                const res = await plugin.addResource(ctx, inputs);
+                const res = await plugin.addResource(contextWithManifest, inputsNew);
                 if (res.isErr()) {
                     return teamsfx_api_1.err(res.error);
                 }
             }
         }
     }
+    // write manifest
+    const writeRes = await appStudio.saveManifest(ctx, inputs, manifest);
+    if (writeRes.isErr()) {
+        return teamsfx_api_1.err(writeRes.error);
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.addResource = addResource;

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

@@ -1 +1 @@
-{"version":3,"file":"addResource.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addResource.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}

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

@@ -7,9 +7,11 @@ export declare const BuiltInResourcePluginNames: {
     appStudio: string;
     aad: string;
     bot: string;
+    function: string;
     webApp: string;
     storage: string;
     spfx: string;
+    simpleAuth: string;
 };
 export declare const BuiltInScaffoldPluginNames: {
     blazor: string;

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,eAAO,MAAM,oBAAoB;;;CAGhC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;;;CAOtC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;CAKtC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,eAAO,MAAM,oBAAoB;;;CAGhC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;;;;;CAStC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;CAKtC,CAAC"}

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

@@ -12,9 +12,11 @@ exports.BuiltInResourcePluginNames = {
     appStudio: "fx-resource-appstudio",
     aad: "fx-resource-aad",
     bot: "fx-resource-bot",
+    function: "fx-resource-function",
     webApp: "fx-resource-azure-web-app",
     storage: "fx-resource-azure-storage",
     spfx: "fx-resource-spfx",
+    simpleAuth: "fx-resource-simple-auth",
 };
 exports.BuiltInScaffoldPluginNames = {
     blazor: "fx-scaffold-blazor",

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAE,kCAA0B;IACjC,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,SAAS,EAAE,uBAAuB;IAClC,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,iBAAiB;IACtB,MAAM,EAAE,2BAA2B;IACnC,OAAO,EAAE,2BAA2B;IACpC,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,MAAM,EAAE,oBAAoB;IAC5B,GAAG,EAAE,uBAAuB;IAC5B,IAAI,EAAE,kBAAkB;IACxB,GAAG,EAAE,iBAAiB;CACvB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAE,kCAA0B;IACjC,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,SAAS,EAAE,uBAAuB;IAClC,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,iBAAiB;IACtB,QAAQ,EAAE,sBAAsB;IAChC,MAAM,EAAE,2BAA2B;IACnC,OAAO,EAAE,2BAA2B;IACpC,IAAI,EAAE,kBAAkB;IACxB,UAAU,EAAE,yBAAyB;CACtC,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,MAAM,EAAE,oBAAoB;IAC5B,GAAG,EAAE,uBAAuB;IAC5B,IAAI,EAAE,kBAAkB;IACxB,GAAG,EAAE,iBAAiB;CACvB,CAAC"}

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

@@ -1,6 +1,4 @@
 import { FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForDeploy(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function deploy(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    modules: string[];
-}, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+export declare function deploy(ctx: v2.Context, inputs: v3.SolutionDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=deploy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAEP,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,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,CAyBjD;AACD,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,EACxD,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6ChC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAEP,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,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,CAyBjD;AACD,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,oBAAoB,EAC/B,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6ChC"}

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAM,SAAS,EAAE,MAAM,EAAE,EAAE,EAAM,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAS9F,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAUjD;AAED,wBAAsB,IAAI,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAYhC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,MAAM,EAAM,SAAS,EAAE,MAAM,EAAE,EAAE,EAAM,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAWnG,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAUjD;AAED,wBAAsB,IAAI,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmBhC"}

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

@@ -3,9 +3,11 @@
 // 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 constants_1 = require("./constants");
 const question_1 = require("../question");
+const typedi_1 = tslib_1.__importDefault(require("typedi"));
 async function getQuestionsForInit(ctx, inputs) {
     const node = new teamsfx_api_1.QTreeNode({
         name: "set-azure-solution",
@@ -19,6 +21,7 @@ async function getQuestionsForInit(ctx, inputs) {
 }
 exports.getQuestionsForInit = getQuestionsForInit;
 async function init(ctx, inputs) {
+    // 1. init solution settings
     const solutionSettings = {
         version: "3.0.0",
         name: ctx.projectSetting.solutionSettings.name,
@@ -29,6 +32,12 @@ async function init(ctx, inputs) {
         activeResourcePlugins: [],
     };
     ctx.projectSetting.solutionSettings = solutionSettings;
+    // 2. call appStudio.init() to generate manifest templates
+    const appStudio = typedi_1.default.get(constants_1.BuiltInResourcePluginNames.appStudio);
+    const initManifestRes = await appStudio.init(ctx, inputs);
+    if (initManifestRes.isErr()) {
+        return teamsfx_api_1.err(initManifestRes.error);
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.init = init;

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8F;AAC9F,2CAAmD;AACnD,0CAKqB;AAEd,KAAK,UAAU,mBAAmB,CACvC,GAAe,EACf,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC;QACzB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE;YACvB,MAAM,CAAC,qCAA0B,CAAC,QAAQ,CAAC,GAAG,gCAAoB,CAAC,KAAK,CAAC;QAC3E,CAAC;KACF,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,GAAG,EAAE,WAAW,EAAE,CAAC,wBAAa,CAAC,EAAE,EAAE,wBAAa,CAAC,EAAE,EAAE,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC;IAChG,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAbD,kDAaC;AAEM,KAAK,UAAU,IAAI,CACxB,GAAe,EACf,MAAgC;IAEhC,MAAM,gBAAgB,GAA+B;QACnD,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI;QAC9C,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,EAAE;QACX,qBAAqB,EAAE,EAAE;KAC1B,CAAC;IACF,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACvD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAfD,oBAeC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAmG;AACnG,2CAA+E;AAC/E,0CAKqB;AACrB,4DAA+B;AAGxB,KAAK,UAAU,mBAAmB,CACvC,GAAe,EACf,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC;QACzB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE;YACvB,MAAM,CAAC,qCAA0B,CAAC,QAAQ,CAAC,GAAG,gCAAoB,CAAC,KAAK,CAAC;QAC3E,CAAC;KACF,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,GAAG,EAAE,WAAW,EAAE,CAAC,wBAAa,CAAC,EAAE,EAAE,wBAAa,CAAC,EAAE,EAAE,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC;IAChG,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAbD,kDAaC;AAEM,KAAK,UAAU,IAAI,CACxB,GAAe,EACf,MAAgC;IAEhC,4BAA4B;IAC5B,MAAM,gBAAgB,GAA+B;QACnD,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI;QAC9C,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,EAAE;QACX,qBAAqB,EAAE,EAAE;KAC1B,CAAC;IACF,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACvD,0DAA0D;IAC1D,MAAM,SAAS,GAAG,gBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;QAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;KACnC;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAtBD,oBAsBC"}

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

@@ -1,4 +1,11 @@
-import { FxError, QTreeNode, Result, TokenProvider, v2, v3 } from "@microsoft/teamsfx-api";
+import { AppStudioTokenProvider, AzureAccountProvider, FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForProvision(ctx: v2.Context, inputs: v2.InputsWithProjectPath, tokenProvider: TokenProvider, envInfo?: v2.DeepReadonly<v3.EnvInfoV3>): Promise<Result<QTreeNode | undefined, FxError>>;
 export declare function provisionResources(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, tokenProvider: TokenProvider): Promise<Result<v3.EnvInfoV3, FxError>>;
+/**
+ * make sure subscription is correct
+ *
+ */
+export declare function checkAzureSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, azureAccountProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
+export declare function askForProvisionConsent(ctx: v2.Context, azureAccountProvider: AzureAccountProvider, envInfo: v3.EnvInfoV3): Promise<Result<Void, FxError>>;
+export declare function getM365TenantId(appStudioTokenProvider: AppStudioTokenProvider): Promise<Result<string, FxError>>;
 //# sourceMappingURL=provision.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAUpG,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CA2HxC"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EAIpB,OAAO,EAEP,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAmBhC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAkKxC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4ChC;AA6JD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6BhC;AAED,wBAAsB,eAAe,CACnC,sBAAsB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0BlC"}