npm - @microsoft/teamsfx-core - Versions diffs - 3.0.5-alpha.00df99a59.0 → 3.0.5-alpha.2bf294cf4.0 - Mend

@microsoft/teamsfx-core 3.0.5-alpha.00df99a59.0 → 3.0.5-alpha.2bf294cf4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (152) hide show

package/build/component/feature/collaboration.js CHANGED Viewed

@@ -2,15 +2,18 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TeamsCollaboration = exports.AadCollaboration = void 0;
+exports.AgentCollaboration = exports.TeamsCollaboration = exports.AadCollaboration = void 0;
 const tslib_1 = require("tslib");
 const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const typedi_1 = require("typedi");
+const graphClient_1 = require("../../client/graphClient");
 const teamsDevPortalClient_1 = require("../../client/teamsDevPortalClient");
 const constants_1 = require("../../common/constants");
 const globalVars_1 = require("../../common/globalVars");
+const packageService_1 = require("../../component/m365/packageService");
+const serviceConstant_1 = require("../../component/m365/serviceConstant");
 const common_1 = require("../../error/common");
 const teamsApp_1 = require("../../error/teamsApp");
 const aadAppClient_1 = require("../driver/aad/utility/aadAppClient");
@@ -24,6 +27,7 @@ const EventName = {
 };
 const componentNameAad = "fx-resource-aad-app-for-teams";
 const componentNameTeams = "AppStudioPlugin";
+const componentNameAgent = "AgentPlugin";
 let AadCollaboration = class AadCollaboration {
     constructor(m365TokenProvider, logProvider) {
         this.aadAppClient = new aadAppClient_1.AadAppClient(m365TokenProvider, logProvider);
@@ -253,4 +257,83 @@ TeamsCollaboration = tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object])
 ], TeamsCollaboration);
 exports.TeamsCollaboration = TeamsCollaboration;
+let AgentCollaboration = class AgentCollaboration {
+    constructor(m365TokenProvider) {
+        this.tokenProvider = m365TokenProvider;
+    }
+    async grantPermission(ctx, titleId, userInfo) {
+        const mosTokenRes = await this.tokenProvider.getAccessToken({
+            scopes: [serviceConstant_1.MosServiceScope],
+        });
+        if (mosTokenRes.isErr()) {
+            return (0, teamsfx_api_1.err)(mosTokenRes.error);
+        }
+        const mosToken = mosTokenRes.value;
+        // grant owner permission
+        const res = await packageService_1.PackageService.GetSharedInstance().addOwner(mosToken, titleId, userInfo);
+        if (res.isErr()) {
+            return (0, teamsfx_api_1.err)(res.error);
+        }
+        const result = [
+            {
+                name: packageService_1.AgentPermission.name,
+                roles: [packageService_1.AgentPermission.owner],
+                type: packageService_1.AgentPermission.type,
+                resourceId: titleId,
+            },
+        ];
+        return (0, teamsfx_api_1.ok)(result);
+    }
+    async listCollaborator(ctx, titleId) {
+        const mosTokenRes = await this.tokenProvider.getAccessToken({
+            scopes: [serviceConstant_1.MosServiceScope],
+        });
+        if (mosTokenRes.isErr()) {
+            return (0, teamsfx_api_1.err)(mosTokenRes.error);
+        }
+        const mosToken = mosTokenRes.value;
+        const res = await packageService_1.PackageService.GetSharedInstance().previewApp(mosToken, titleId);
+        if (res.isErr()) {
+            return (0, teamsfx_api_1.err)(res.error);
+        }
+        const owners = res.value.owners;
+        const agentOwners = [];
+        const graphClient = new graphClient_1.GraphClient(this.tokenProvider);
+        for (const owner of owners) {
+            const userInfo = await graphClient.getUserInfoFromId(owner.entityId);
+            if (userInfo) {
+                agentOwners.push({
+                    userObjectId: owner.entityId,
+                    displayName: userInfo.displayName,
+                    userPrincipalName: userInfo.userPrincipalName,
+                    resourceId: titleId,
+                });
+            }
+        }
+        return (0, teamsfx_api_1.ok)(agentOwners);
+    }
+};
+tslib_1.__decorate([
+    (0, lib_1.hooks)([
+        (0, globalVars_1.ErrorContextMW)({ source: "M365", component: "AgentCollaboration" }),
+        (0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(EventName.grantPermission, componentNameAgent),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, String, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AgentCollaboration.prototype, "grantPermission", null);
+tslib_1.__decorate([
+    (0, lib_1.hooks)([
+        (0, globalVars_1.ErrorContextMW)({ source: "M365", component: "AgentCollaboration" }),
+        (0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(EventName.listCollaborator, componentNameAgent),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, String]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AgentCollaboration.prototype, "listCollaborator", null);
+AgentCollaboration = tslib_1.__decorate([
+    (0, typedi_1.Service)("agent-collaboration"),
+    tslib_1.__metadata("design:paramtypes", [Object])
+], AgentCollaboration);
+exports.AgentCollaboration = AgentCollaboration;
 //# sourceMappingURL=collaboration.js.map

package/build/component/feature/collaboration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAQgC;AAChC,0DAA0B;AAC1B,mCAAiC;AACjC,4EAAyE;AACzE,sDAAyD;AACzD,wDAAyD;~~AAEzD~~,+CAAqF;AACrF,mDAAqD;AACrD,qEAAkE;AAClE,+DAAkE;AAClE,0FAAuF;AACvF,4DAAyD;AAGzD,MAAM,SAAS,GAAG;IAChB,eAAe,EAAE,kBAAkB;IACnC,gBAAgB,EAAE,mBAAmB;IACrC,eAAe,EAAE,kBAAkB;CACpC,CAAC;AACF,MAAM,gBAAgB,GAAG,+BAA+B,CAAC;AACzD,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;~~AAG7C~~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"}
1	+ {"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"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"}

package/build/component/generator/combinedProject/generator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/combinedProject/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAEL,OAAO,EACP,OAAO,EACP,eAAe,EACf,MAAM,EAEN,MAAM,EACP,MAAM,wBAAwB,CAAC;AAShC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAWzD;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE,aAAa,SAAgC;IAE7C,mBAAmB,SAAgB;IACnB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAM7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;~~IA2D3C~~,IAAI,CACF,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAS7C"}
1	+ {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/combinedProject/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAEL,OAAO,EACP,OAAO,EACP,eAAe,EACf,MAAM,EAEN,MAAM,EACP,MAAM,wBAAwB,CAAC;AAShC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAWzD;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE,aAAa,SAAgC;IAE7C,mBAAmB,SAAgB;IACnB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAM7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IA8D3C,IAAI,CACF,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAS7C"}

package/build/component/generator/combinedProject/generator.js CHANGED Viewed

@@ -32,7 +32,8 @@ class CombinedProjectGenerator extends defaultGenerator_1.DefaultTemplateGenerat
         const appName = inputs[question_1.QuestionNames.AppName];
         const language = inputs[question_1.QuestionNames.ProgrammingLanguage];
         const safeProjectNameFromVS = language === "csharp" ? inputs[question_1.QuestionNames.SafeProjectName] : undefined;
-        const replaceMap = Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { DeclarativeCopilot: "true", CopilotConnector: "true", MicrosoftEntra: auth === question_1.ApiAuthOptions.microsoftEntra().id ? "true" : "" });
+        const solutionNameFromVS = language === "csharp" ? inputs[question_1.QuestionNames.SolutionName] : undefined;
+        const replaceMap = Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { DeclarativeCopilot: "true", CopilotConnector: "true", MicrosoftEntra: auth === question_1.ApiAuthOptions.microsoftEntra().id ? "true" : "" });
         const templateName = inputs[question_1.QuestionNames.TemplateName];
         (0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
             ["template-name" /* telemetryProperties.templateName */]: templateName,

package/build/component/generator/combinedProject/generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/combinedProject/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDAQgC;AAChC,mCAA+B;AAC/B,wDAAwB;AACxB,gDAK2B;AAE3B,0DAA+D;AAC/D,4CAAyC;AAEzC,8DAA2D;AAC3D,gEAA0B;AAS1B;;GAEG;AACH,MAAa,wBAAyB,SAAQ,2CAAwB;IAAtE;;QACE,kBAAa,GAAG,4BAA4B,CAAC;QAE7C,wBAAmB,GAAG,YAAY,CAAC;~~IAqFrC~~,CAAC;~~IApFiB~~,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,OAAO,CAAC,6BAAa,CAAC,kCAAkC,CAAC,CAAC,QAAQ,CAChE,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CACnC,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,IAAI,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,wBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,MAAM,qBAAqB,GACzB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;~~QAE5E~~,MAAM,UAAU,mCACX,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAC1E,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC;QAExD,IAAA,cAAK,EAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,wDAAkC,EAAE,YAAY;YAChD,iEAAsC,EACpC,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAC3D,qFAA+C,EAC7C,MAAM,CAAC,wBAAa,CAAC,UAAU,CAAC,KAAK,6BAAkB,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE;SACzF,CAAC,CAAC;QAEH,wFAAwF;QACxF,IAAI,YAAY,KAAK,6BAAa,CAAC,kCAAkC,EAAE;YACrE,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;gBACD;oBACE,YAAY,EAAE,6BAAa,CAAC,cAAc;oBAC1C,QAAQ,EAAE,8BAAmB,CAAC,EAAE;oBAChC,UAAU;iBACX;gBACD;oBACE,YAAY,EAAE,6BAAa,CAAC,qBAAqB;oBACjD,QAAQ,EAAE,8BAAmB,CAAC,MAAM;oBACpC,UAAU;oBACV,SAAS,EAAE,IAAI,CAAC,mBAAmB;iBACpC;aACF,CAAC,CACH,CAAC;SACH;QAED,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,UAAU;aACX;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAED,+DAA+D;IAC/D,IAAI,CACF,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,mBAAmB,EAAE,kCAAoB,CAAC,CAAC;QAC7F,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,kCAAoB,CAAC,CAAC;QACtE,cAAc;QACd,kBAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,gBAAgB;QAChB,kBAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACpE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;CACF;~~AAxFD~~,~~4DAwFC~~"}
1	+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/combinedProject/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDAQgC;AAChC,mCAA+B;AAC/B,wDAAwB;AACxB,gDAK2B;AAE3B,0DAA+D;AAC/D,4CAAyC;AAEzC,8DAA2D;AAC3D,gEAA0B;AAS1B;;GAEG;AACH,MAAa,wBAAyB,SAAQ,2CAAwB;IAAtE;;QACE,kBAAa,GAAG,4BAA4B,CAAC;QAE7C,wBAAmB,GAAG,YAAY,CAAC;IAwFrC,CAAC;IAvFiB,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,OAAO,CAAC,6BAAa,CAAC,kCAAkC,CAAC,CAAC,QAAQ,CAChE,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CACnC,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,IAAI,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,wBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,MAAM,qBAAqB,GACzB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,kBAAkB,GACtB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEzE,MAAM,UAAU,mCACX,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAC1E,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC;QAExD,IAAA,cAAK,EAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,wDAAkC,EAAE,YAAY;YAChD,iEAAsC,EACpC,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAC3D,qFAA+C,EAC7C,MAAM,CAAC,wBAAa,CAAC,UAAU,CAAC,KAAK,6BAAkB,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE;SACzF,CAAC,CAAC;QAEH,wFAAwF;QACxF,IAAI,YAAY,KAAK,6BAAa,CAAC,kCAAkC,EAAE;YACrE,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;gBACD;oBACE,YAAY,EAAE,6BAAa,CAAC,cAAc;oBAC1C,QAAQ,EAAE,8BAAmB,CAAC,EAAE;oBAChC,UAAU;iBACX;gBACD;oBACE,YAAY,EAAE,6BAAa,CAAC,qBAAqB;oBACjD,QAAQ,EAAE,8BAAmB,CAAC,MAAM;oBACpC,UAAU;oBACV,SAAS,EAAE,IAAI,CAAC,mBAAmB;iBACpC;aACF,CAAC,CACH,CAAC;SACH;QAED,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,UAAU;aACX;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAED,+DAA+D;IAC/D,IAAI,CACF,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,mBAAmB,EAAE,kCAAoB,CAAC,CAAC;QAC7F,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,kCAAoB,CAAC,CAAC;QACtE,cAAc;QACd,kBAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,gBAAgB;QAChB,kBAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACpE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;CACF;AA3FD,4DA2FC"}

package/build/component/generator/declarativeAgent/generator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAIN,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAmBzD;;;;GAIG;AACH,qBAAa,yBAA0B,SAAQ,wBAAwB;IACrE,aAAa,SAA8C;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAW7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;~~IAwCrB~~,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CA2D7C"}
1	+ {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAIN,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAmBzD;;;;GAIG;AACH,qBAAa,yBAA0B,SAAQ,wBAAwB;IACrE,aAAa,SAA8C;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAW7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IA2CrB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CA2D7C"}

package/build/component/generator/declarativeAgent/generator.js CHANGED Viewed

@@ -47,9 +47,10 @@ class DeclarativeAgentGenerator extends defaultGenerator_1.DefaultTemplateGenera
         const appName = inputs[question_1.QuestionNames.AppName];
         const language = inputs[question_1.QuestionNames.ProgrammingLanguage];
         const safeProjectNameFromVS = language === "csharp" ? inputs[question_1.QuestionNames.SafeProjectName] : undefined;
+        const solutionNameFromVS = language === "csharp" ? inputs[question_1.QuestionNames.SolutionName] : undefined;
         const replaceMap = Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(inputs[question_1.QuestionNames.TemplateName] === templateNames_1.TemplateNames.DeclarativeAgentWithTypeSpec
             ? (0, stringUtils_1.convertToAlphanumericOnly)(appName)
-            : appName, safeProjectNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { DeclarativeCopilot: "true", MicrosoftEntra: auth === question_1.ApiAuthOptions.microsoftEntra().id ? "true" : "" });
+            : appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { DeclarativeCopilot: "true", MicrosoftEntra: auth === question_1.ApiAuthOptions.microsoftEntra().id ? "true" : "" });
         const templateName = inputs[question_1.QuestionNames.TemplateName];
         (0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
             ["template-name" /* telemetryProperties.templateName */]: templateName,

package/build/component/generator/declarativeAgent/generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDAYgC;AAChC,mCAA+B;AAC/B,wDAAwB;AACxB,gDAK2B;AAC3B,iGAA8F;AAE9F,+CAAqE;AACrE,0DAA+D;AAC/D,4CAAyC;AAEzC,8DAA2D;AAC3D,qCAA6C;AAE7C,+DAAsF;AACtF,gEAA0B;AAC1B,+DAAgF;AAChF,6DAAwE;AACxE,oCAAsD;AAWtD;;;;GAIG;AACH,MAAa,yBAA0B,SAAQ,2CAAwB;IAAvE;;QACE,kBAAa,GAAG,0CAA0C,CAAC;~~IAyH7D~~,CAAC;~~IAxHiB~~,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,OAAO;YACL,6BAAa,CAAC,qBAAqB;YACnC,6BAAa,CAAC,qCAAqC;YACnD,6BAAa,CAAC,2CAA2C;YACzD,6BAAa,CAAC,0CAA0C;YACxD,6BAAa,CAAC,kCAAkC;YAChD,6BAAa,CAAC,4BAA4B;SAC3C,CAAC,QAAQ,CAAC,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC,CAAC;IACjD,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,IAAI,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,wBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,MAAM,qBAAqB,GACzB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;~~QAE5E~~,MAAM,UAAU,mCACX,qBAAS,CAAC,mBAAmB,CAC9B,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,KAAK,6BAAa,CAAC,4BAA4B;YAC/E,CAAC,CAAC,IAAA,uCAAyB,EAAC,OAAO,CAAC;YACpC,CAAC,CAAC,OAAO,EACX,qBAAqB,EACrB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAC1E,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC;QAExD,IAAA,cAAK,EAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,wDAAkC,EAAE,YAAY;YAChD,iEAAsC,EACpC,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAC3D,qFAA+C,EAC7C,MAAM,CAAC,wBAAa,CAAC,UAAU,CAAC,KAAK,6BAAkB,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE;SACzF,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,UAAU;aACX;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CACjC,eAAe,EACf,kCAAoB,EACpB,sCAAwB,CACzB,CAAC;QACF,MAAM,iCAAiC,GAAG,MAAM,iDAAuB,CAAC,eAAe,CACrF,iBAAiB,CAClB,CAAC;QACF,IAAI,iCAAiC,CAAC,KAAK,EAAE,EAAE;YAC7C,+CAA+C;YAC/C,IAAI,6BAAa,CAAC,kCAAkC,KAAK,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,EAAE;gBAC3F,OAAO,IAAA,iBAAG,EAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;aACrD;YACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;SACf;QAED,IAAI,iCAAkB,CAAC,eAAe,CAAC,2BAAY,CAAC,uBAAuB,CAAC,EAAE;YAC5E,cAAc;YACd,MAAM,IAAA,kCAA0B,EAAC,OAAO,EAAE,iCAAiC,CAAC,KAAK,CAAC,CAAC;SACpF;QAED,IACE,iCAAkB,CAAC,eAAe,CAAC,2BAAY,CAAC,wBAAwB,CAAC;YACzE,CAAC,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,CAAC,EACzE;YACA,yCAAyC;YACzC,MAAM,2BAA2B,GAAG,cAAI,CAAC,IAAI,CAC3C,eAAe,EACf,kCAAoB,EACpB,+CAAmC,CACpC,CAAC;YACF,MAAM,kBAAE,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;SACjD;QACD,IAAI,6BAAa,CAAC,kCAAkC,KAAK,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,EAAE;YAC3F,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAiB,EAC1C,iCAAiC,CAAC,KAAK,EACvC,MAAM,CAAC,wBAAa,CAAC,sBAAsB,CAAC,EAC5C,MAAM,CAAC,wBAAa,CAAC,yBAAyB,CAAC,EAC/C,UAAU,EACV,OAAO,EACP,IAAI,CAAC,aAAa,CACnB,CAAC;YAEF,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE;gBACxB,OAAO,IAAA,iBAAG,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;aAChC;iBAAM;gBACL,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,EAAE,EAAE;oBACvE,MAAM,cAAc,GAAG,IAAA,wCAA+B,EAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oBACpF,IAAI,cAAc,EAAE;wBAClB,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;qBAC1C;iBACF;gBACD,OAAO,IAAA,gBAAE,EAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;aACtD;SACF;aAAM;YACL,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;SACf;IACH,CAAC;CACF;~~AA1HD~~,~~8DA0HC~~"}
1	+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":"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"}

package/build/component/generator/generator.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { Context, FxError, Result } from "@microsoft/teamsfx-api";
 import { ActionContext } from "../middleware/actionExecutionMW";
 import { GeneratorAction, GeneratorContext } from "./generatorAction";
 export declare class Generator {
-    static getDefaultVariables(appName: string, safeProjectNameFromVS?: string, targetFramework?: string, placeProjectFileInSolutionDir?: boolean, authData?: {
+    static getDefaultVariables(appName: string, safeProjectNameFromVS?: string, solutionNameFromVS?: string, targetFramework?: string, placeProjectFileInSolutionDir?: boolean, authData?: {
         authName: string;
         openapiSpecPath: string;
         registrationIdEnvName: string;

package/build/component/generator/generator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAM,MAAM,wBAAwB,CAAC;AAMtE,OAAO,EAAE,aAAa,EAAqB,MAAM,iCAAiC,CAAC;AAanF,OAAO,EAEL,eAAe,EAEf,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,SAAS;WACN,mBAAmB,CAC/B,OAAO,EAAE,MAAM,EACf,qBAAqB,CAAC,EAAE,MAAM,EAC9B,eAAe,CAAC,EAAE,MAAM,EACxB,6BAA6B,CAAC,EAAE,OAAO,EACvC,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,EAAE,MAAM,CAAC;QACxB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,EAAE,EACH,cAAc,CAAC,EAAE;QACf,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,yBAAyB,CAAC,EAAE,MAAM,CAAC;KACpC,GACA;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;~~WA0EL~~,gBAAgB,CAClC,GAAG,EAAE,OAAO,EACZ,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WA2ClB,cAAc,CAChC,GAAG,EAAE,OAAO,EACZ,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAqBlB,QAAQ,CAC1B,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,eAAe,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC;CAWjB;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC,CAmBf"}
1	+ {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAM,MAAM,wBAAwB,CAAC;AAMtE,OAAO,EAAE,aAAa,EAAqB,MAAM,iCAAiC,CAAC;AAanF,OAAO,EAEL,eAAe,EAEf,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,SAAS;WACN,mBAAmB,CAC/B,OAAO,EAAE,MAAM,EACf,qBAAqB,CAAC,EAAE,MAAM,EAC9B,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,6BAA6B,CAAC,EAAE,OAAO,EACvC,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,EAAE,MAAM,CAAC;QACxB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,EAAE,EACH,cAAc,CAAC,EAAE;QACf,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,yBAAyB,CAAC,EAAE,MAAM,CAAC;KACpC,GACA;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;WA2EL,gBAAgB,CAClC,GAAG,EAAE,OAAO,EACZ,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WA2ClB,cAAc,CAChC,GAAG,EAAE,OAAO,EACZ,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAqBlB,QAAQ,CAC1B,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,eAAe,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC;CAWjB;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC,CAmBf"}

package/build/component/generator/generator.js CHANGED Viewed

@@ -20,7 +20,7 @@ const featureFlags_1 = require("../../common/featureFlags");
 const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
 const stringUtils_1 = require("../../common/stringUtils");
 class Generator {
-    static getDefaultVariables(appName, safeProjectNameFromVS, targetFramework, placeProjectFileInSolutionDir, authData, llmServiceData) {
+    static getDefaultVariables(appName, safeProjectNameFromVS, solutionNameFromVS, targetFramework, placeProjectFileInSolutionDir, authData, llmServiceData) {
         var _a, _b, _c, _d, _e, _f;
         const safeProjectName = safeProjectNameFromVS !== null && safeProjectNameFromVS !== void 0 ? safeProjectNameFromVS : (0, stringUtils_1.convertToAlphanumericOnly)(appName);
         const apiKeyActionData = [];
@@ -46,6 +46,7 @@ class Generator {
             PlaceProjectFileInSolutionDir: placeProjectFileInSolutionDir ? "true" : "",
             SafeProjectName: safeProjectName,
             SafeProjectNameLowerCase: safeProjectName.toLocaleLowerCase(),
+            SolutionName: solutionNameFromVS !== null && solutionNameFromVS !== void 0 ? solutionNameFromVS : appName,
             ApiKey: apiKeyActionData,
             OAuth: oauthActionData,
             enableTestToolByDefault: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.TestTool)

package/build/component/generator/generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"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~~AAtKH~~,~~8BAsLC~~;AAED,SAAgB,4BAA4B,CAC1C,MAAuB,EACvB,OAAyB,EACzB,KAAY;IAEZ,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,qCAAmB,CAAC,sBAAsB;YAC7C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;YACxB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,sBAAW,CAAC,oBAAoB,CAAC,CAAC;YAC3D,MAAM;QACR,KAAK,qCAAmB,CAAC,qBAAqB;YAC5C,IAAI,KAAK,YAAY,wCAAuB,EAAE;gBAC5C,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;aAC1C;iBAAM;gBACL,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACzC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,kCAA0B,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;aAC1E;QACH;YACE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;KACnD;IACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC;AAtBD,oEAsBC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,MAAuB,EACvB,OAAyB,EACzB,KAAY;IAEZ,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,KAAK,YAAY,wCAAuB;QAAE,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;IACtE,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC5C,MAAM,kBAAE,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACtC;IACD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,qCAAmB,CAAC,eAAe;YACtC,MAAM,IAAI,4BAAoB,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;QACpD,KAAK,qCAAmB,CAAC,iBAAiB;YACxC,MAAM,GAAG,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,UAAW,CAAC,CAAC;YAC9C,IAAI,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE;gBAC1B,MAAM,IAAI,mCAA2B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;aAC/D;iBAAM;gBACL,MAAM,IAAI,kCAA0B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;aAC9D;QACH;YACE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAClC;AACH,CAAC;AAvBD,gEAuBC"}
1	+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"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"}

package/build/component/generator/openApiSpec/common.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/common.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAA6B,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAEL,OAAO,EAKP,OAAO,EACP,eAAe,EACf,MAAM,EAMP,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAW,MAAM,EAAE,MAAM,YAAY,CAAC;AAQ7C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AA8DzD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC,~~CA+E1C~~;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAgI3C"}
1	+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/common.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAA6B,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAEL,OAAO,EAKP,OAAO,EACP,eAAe,EACf,MAAM,EAMP,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAW,MAAM,EAAE,MAAM,YAAY,CAAC;AAQ7C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AA8DzD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC,CAkF1C;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAgI3C"}

package/build/component/generator/openApiSpec/common.js CHANGED Viewed

@@ -66,6 +66,7 @@ async function getTemplateInfosFromApiSpec(context, inputs, projectType, actionC
                 : constants_1.ProgrammingLanguage.None;
     }
     const safeProjectNameFromVS = language === constants_1.ProgrammingLanguage.CSharp ? inputs[question_1.QuestionNames.SafeProjectName] : undefined;
+    const solutionNameFromVS = language === constants_1.ProgrammingLanguage.CSharp ? inputs[question_1.QuestionNames.SolutionName] : undefined;
     const url = inputs[question_1.QuestionNames.ApiSpecLocation].trim();
     const isYaml = !(await (0, utils_1.isJsonSpecFile)(url));
     const openapiSpecFileName = isYaml ? teamsfx_api_1.DefaultApiSpecYamlFileName : teamsfx_api_1.DefaultApiSpecJsonFileName;
@@ -92,7 +93,7 @@ async function getTemplateInfosFromApiSpec(context, inputs, projectType, actionC
             });
         }
     }
-    context.templateVariables = generator_1.Generator.getDefaultVariables(inputs[question_1.QuestionNames.AppName], safeProjectNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true", convertedAuthData !== null && convertedAuthData !== void 0 ? convertedAuthData : [], llmServiceData);
+    context.templateVariables = generator_1.Generator.getDefaultVariables(inputs[question_1.QuestionNames.AppName], safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true", convertedAuthData !== null && convertedAuthData !== void 0 ? convertedAuthData : [], llmServiceData);
     context.telemetryReporter.sendTelemetryEvent(const_1.declarativeAgentExistingApiSpecUrlTelemetryEvent, {
         ["remote-url" /* telemetryProperties.isRemoteUrlTelemetryProperty */]: (0, stringUtils_1.isValidHttpUrl)(url).toString(),
         ["generate-type" /* telemetryProperties.generateType */]: projectType.toString(),

package/build/component/generator/openApiSpec/common.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/common.ts"],"names":[],"mappings":"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~~AApFD~~,~~kEAoFC~~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"}
1	+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/common.ts"],"names":[],"mappings":"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"}

package/build/component/generator/other/ssrTabGenerator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ssrTabGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/other/ssrTabGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAM,MAAM,wBAAwB,CAAC;AAE9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,qBAAa,eAAgB,SAAQ,wBAAwB;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAI7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;~~CAyB5C~~"}
1	+ {"version":3,"file":"ssrTabGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/other/ssrTabGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAM,MAAM,wBAAwB,CAAC;AAE9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,qBAAa,eAAgB,SAAQ,wBAAwB;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAI7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;CA2B5C"}

package/build/component/generator/other/ssrTabGenerator.js CHANGED Viewed

@@ -18,8 +18,9 @@ class SsrTabGenerator extends defaultGenerator_1.DefaultTemplateGenerator {
         const templateName = inputs[constants_1.QuestionNames.TemplateName];
         const appName = inputs[constants_1.QuestionNames.AppName];
         const safeProjectNameFromVS = inputs[constants_1.QuestionNames.SafeProjectName];
+        const solutionNameFromVS = inputs[constants_1.QuestionNames.SolutionName];
         const isNet8 = !inputs.targetFramework || inputs.targetFramework === "net8.0";
-        const replaceMap = Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { IsNet8Framework: isNet8 ? "true" : "" });
+        const replaceMap = Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { IsNet8Framework: isNet8 ? "true" : "" });
         return Promise.resolve((0, teamsfx_api_1.ok)([
             {
                 templateName: templateName,

package/build/component/generator/other/ssrTabGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ssrTabGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/other/ssrTabGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8E;AAC9E,2DAAiF;AACjF,0DAA+D;AAC/D,4CAAyC;AAEzC,8DAA2D;AAE3D,4CAA4C;AAC5C,MAAa,eAAgB,SAAQ,2CAAwB;IAC3C,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,OAAO,CAAC,6BAAa,CAAC,SAAS,EAAE,6BAAa,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChF,CAAC;IACe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC;QAC9E,MAAM,UAAU,mCACX,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GACtC,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,+BAAmB,CAAC,MAAM;gBACpC,UAAU;aACX;SACF,CAAC,CACH,CAAC;IACJ,CAAC;CACF;~~AAlCD~~,~~0CAkCC~~"}
1	+ {"version":3,"file":"ssrTabGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/other/ssrTabGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8E;AAC9E,2DAAiF;AACjF,0DAA+D;AAC/D,4CAAyC;AAEzC,8DAA2D;AAE3D,4CAA4C;AAC5C,MAAa,eAAgB,SAAQ,2CAAwB;IAC3C,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,OAAO,CAAC,6BAAa,CAAC,SAAS,EAAE,6BAAa,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChF,CAAC;IACe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,CAAC;QACpE,MAAM,kBAAkB,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC;QAC9E,MAAM,UAAU,mCACX,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GACtC,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,+BAAmB,CAAC,MAAM;gBACpC,UAAU;aACX;SACF,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AApCD,0CAoCC"}

package/build/component/generator/other/tdpGenerator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tdpGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/other/tdpGenerator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAO,OAAO,EAAE,eAAe,EAAE,MAAM,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIpG,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;GAEG;AACH,qBAAa,YAAa,SAAQ,wBAAwB;IACxD,aAAa,SAAmB;IAGhB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAK7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;~~IA8BrB~~,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAW7C"}
1	+ {"version":3,"file":"tdpGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/other/tdpGenerator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAO,OAAO,EAAE,eAAe,EAAE,MAAM,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIpG,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;GAEG;AACH,qBAAa,YAAa,SAAQ,wBAAwB;IACxD,aAAa,SAAmB;IAGhB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAK7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IAgCrB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAW7C"}

package/build/component/generator/other/tdpGenerator.js CHANGED Viewed

@@ -32,13 +32,14 @@ class TdpGenerator extends defaultGenerator_1.DefaultTemplateGenerator {
         }
         const appName = inputs[constants_1.QuestionNames.AppName];
         const safeProjectNameFromVS = inputs[constants_1.QuestionNames.SafeProjectName];
+        const solutionNameFromVS = inputs[constants_1.QuestionNames.SolutionName];
         const isNet8 = !inputs.targetFramework || inputs.targetFramework === "net8.0"; // used by SSR Tab
         const language = inputs[constants_1.QuestionNames.ProgrammingLanguage];
         return Promise.resolve((0, teamsfx_api_1.ok)([
             {
                 templateName: templateName,
                 language: language,
-                replaceMap: Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { IsNet8Framework: isNet8 ? "true" : "" }),
+                replaceMap: Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { IsNet8Framework: isNet8 ? "true" : "" }),
             },
         ]));
     }

package/build/component/generator/other/tdpGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tdpGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/other/tdpGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,wDAAoG;AACpG,0CAAsD;AACtD,2DAAiF;AACjF,qFAAkF;AAElF,0DAA+D;AAC/D,4CAAyC;AAGzC;;GAEG;AACH,MAAa,YAAa,SAAQ,2CAAwB;IAA1D;;QACE,kBAAa,GAAG,eAAe,CAAC;~~IA2DlC~~,CAAC;~~IAzDC~~,uBAAuB;IACP,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,6DAA6D;QAC7D,OAAO,MAAM,CAAC,eAAe,KAAK,SAAS,CAAC;IAC9C,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,IAAA,iBAAG,EACR,IAAI,4BAAoB,CAAC,iBAAiB,EAAE,wBAAwB,EAAE,cAAc,CAAC,CACtF,CAAC;SACH;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,kBAAkB;QACjG,MAAM,QAAQ,GAAG,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,QAAQ;gBAClB,UAAU,kCACL,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GACtC;aACF;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,2DAA4B,CAAC,iBAAiB,CAC9D,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CACP,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvB;QACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;IAChB,CAAC;CACF;~~AA5DD~~,~~oCA4DC~~"}
1	+ {"version":3,"file":"tdpGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/other/tdpGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,wDAAoG;AACpG,0CAAsD;AACtD,2DAAiF;AACjF,qFAAkF;AAElF,0DAA+D;AAC/D,4CAAyC;AAGzC;;GAEG;AACH,MAAa,YAAa,SAAQ,2CAAwB;IAA1D;;QACE,kBAAa,GAAG,eAAe,CAAC;IA6DlC,CAAC;IA3DC,uBAAuB;IACP,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,6DAA6D;QAC7D,OAAO,MAAM,CAAC,eAAe,KAAK,SAAS,CAAC;IAC9C,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,IAAA,iBAAG,EACR,IAAI,4BAAoB,CAAC,iBAAiB,EAAE,wBAAwB,EAAE,cAAc,CAAC,CACtF,CAAC;SACH;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,CAAC;QACpE,MAAM,kBAAkB,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,kBAAkB;QACjG,MAAM,QAAQ,GAAG,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,QAAQ;gBAClB,UAAU,kCACL,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GACtC;aACF;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,2DAA4B,CAAC,iBAAiB,CAC9D,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CACP,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvB;QACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;IAChB,CAAC;CACF;AA9DD,oCA8DC"}

package/build/component/generator/spfx/spfxGenerator.d.ts CHANGED Viewed

@@ -12,7 +12,7 @@ export declare class SPFxGenerator {
     static shouldAddWebPartWithLocalDependencies(solutionVersion: string, globalVersion: string | undefined, localVersion: string | undefined, context: Context): Promise<boolean>;
     static copySPFxSolution(src: string, dest: string): Promise<void>;
     static getWebpartManifest(spfxFolder: string): Promise<any | undefined>;
-    static updateSPFxTemplate(spfxFolder: string, destinationPath: string, importDetails: string[]): Promise<void>;
+    static updateSPFxTemplate(spfxFolder: string, destinationPath: string, importDetails: string[], useNewDevUrl: boolean): Promise<void>;
     static getNodeVersion(solutionPath: string, context: Context): Promise<string>;
 }
 export declare class SPFxGeneratorNew extends DefaultTemplateGenerator {

package/build/component/generator/spfx/spfxGenerator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAkBhC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAEtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAqBzD,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;~~WAoHlB~~,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WA6Mf,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;mBAYtD,uBAAuB;WAsExB,qCAAqC,CACvD,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC;WAqHC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;WAe1C,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;WAqChE,kBAAkB,CACpC,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EAAE;~~WAsKL~~,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAyC5F;AAED,qBAAa,gBAAiB,SAAQ,wBAAwB;IAC5D,aAAa,SAAwB;IACrB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAK7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;CAe5C;AAED,qBAAa,mBAAoB,SAAQ,wBAAwB;IAC/D,aAAa,SAA2B;IACxC,aAAa,EAAE,MAAM,EAAE,CAAM;IACb,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAM7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IA6ErB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;~~CA+B7C~~"}
1	+ {"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAkBhC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAEtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAqBzD,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;WAyHlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WA6Mf,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;mBAYtD,uBAAuB;WAsExB,qCAAqC,CACvD,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC;WAqHC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;WAe1C,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;WAqChE,kBAAkB,CACpC,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EAAE,EACvB,YAAY,EAAE,OAAO;WA2KH,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAyC5F;AAED,qBAAa,gBAAiB,SAAQ,wBAAwB;IAC5D,aAAa,SAAwB;IACrB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAK7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;CAe5C;AAED,qBAAa,mBAAoB,SAAQ,wBAAwB;IAC/D,aAAa,SAA2B;IACxC,aAAa,EAAE,MAAM,EAAE,CAAM;IACb,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAM7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IA6ErB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAqC7C"}

package/build/component/generator/spfx/spfxGenerator.js CHANGED Viewed

@@ -103,7 +103,7 @@ class SPFxGenerator {
             importDetails.push(`(√) Done: Succeeded to generate SPFx project templates.`);
             // Update manifest and related files
             await importProgress.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.updateTemplates"));
-            await this.updateSPFxTemplate(spfxFolder, destinationPath, importDetails);
+            await this.updateSPFxTemplate(spfxFolder, destinationPath, importDetails, semver_1.default.gte(SPFxVersion, "1.21.0"));
         }
         catch (error) {
             await importProgress.end(false);
@@ -429,7 +429,7 @@ class SPFxGenerator {
         }
         return undefined;
     }
-    static async updateSPFxTemplate(spfxFolder, destinationPath, importDetails) {
+    static async updateSPFxTemplate(spfxFolder, destinationPath, importDetails, useNewDevUrl) {
         var _a, _b;
         try {
             importDetails.push(`(.) Processing: Loading manifest.local.json...`);
@@ -473,7 +473,9 @@ class SPFxGenerator {
                     const localStaticSnippet = {
                         entityId: componentId,
                         name: webpartName,
-                        contentUrl: util.format(constants_2.ManifestTemplate.LOCAL_CONTENT_URL, componentId),
+                        contentUrl: util.format(useNewDevUrl
+                            ? constants_2.ManifestTemplate.LOCAL_CONTENT_URL_NEW
+                            : constants_2.ManifestTemplate.LOCAL_CONTENT_URL, componentId),
                         websiteUrl: constants_2.ManifestTemplate.WEBSITE_URL,
                         scopes: ["personal"],
                     };
@@ -667,20 +669,21 @@ class SPFxGeneratorImport extends defaultGenerator_1.DefaultTemplateGenerator {
         }
     }
     async post(context, inputs, destinationPath, actionContext) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         try {
             const spfxFolder = inputs[constants_1.QuestionNames.SPFxFolder];
-            await SPFxGenerator.updateSPFxTemplate(spfxFolder, destinationPath, this.importDetails);
-            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
+            const useNewDevUrl = (_a = context.templateVariables) === null || _a === void 0 ? void 0 : _a["useNewDevUrl"];
+            await SPFxGenerator.updateSPFxTemplate(spfxFolder, destinationPath, this.importDetails, useNewDevUrl == "true");
+            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
             await context.logProvider.logInFile(teamsfx_api_1.LogLevel.Info, this.importDetails.join(os_1.EOL));
-            void context.logProvider.info((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
+            void context.logProvider.info((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
             void context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.success", destinationPath), false);
             return (0, teamsfx_api_1.ok)({});
         }
         catch (error) {
-            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
+            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
             await context.logProvider.logInFile(teamsfx_api_1.LogLevel.Info, this.importDetails.join(os_1.EOL));
-            void context.logProvider.error((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
+            void context.logProvider.error((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.getLogFilePath()));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
                 return (0, teamsfx_api_1.err)(error);
             }