@microsoft/teamsfx-core 3.0.9-beta.2025121105.0 → 3.0.9-rc.1
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.
- package/build/common/featureFlags.d.ts +5 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +2 -0
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/localizeUtils.d.ts.map +1 -1
- package/build/common/localizeUtils.js +12 -36
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/templates-config.json +3 -3
- package/build/component/constants.d.ts +0 -1
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +1 -2
- package/build/component/constants.js.map +1 -1
- package/build/component/deps-checker/constant/telemetry.d.ts +4 -0
- package/build/component/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/component/deps-checker/constant/telemetry.js +4 -0
- package/build/component/deps-checker/constant/telemetry.js.map +1 -1
- package/build/component/deps-checker/internal/testToolChecker.d.ts +11 -0
- package/build/component/deps-checker/internal/testToolChecker.d.ts.map +1 -1
- package/build/component/deps-checker/internal/testToolChecker.js +169 -30
- package/build/component/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/component/driver/script/scriptDriver.js +1 -1
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +1 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +2 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +0 -2
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +4 -79
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +0 -20
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +2 -152
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/generator/declarativeAgent/generator.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/generator.js +6 -16
- package/build/component/generator/declarativeAgent/generator.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +6 -3
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/officeAddin/metaOSHelper.d.ts.map +1 -1
- package/build/component/generator/officeAddin/metaOSHelper.js +2 -1
- package/build/component/generator/officeAddin/metaOSHelper.js.map +1 -1
- package/build/component/generator/templates/metadata/agentForTeams.d.ts +3 -0
- package/build/component/generator/templates/metadata/agentForTeams.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/agentForTeams.js +147 -0
- package/build/component/generator/templates/metadata/agentForTeams.js.map +1 -0
- package/build/component/generator/templates/metadata/bot.d.ts +3 -0
- package/build/component/generator/templates/metadata/bot.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/bot.js +142 -0
- package/build/component/generator/templates/metadata/bot.js.map +1 -0
- package/build/component/generator/templates/metadata/customEngineAgent.d.ts +3 -0
- package/build/component/generator/templates/metadata/customEngineAgent.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/customEngineAgent.js +39 -0
- package/build/component/generator/templates/metadata/customEngineAgent.js.map +1 -0
- package/build/component/generator/templates/metadata/da.d.ts +3 -0
- package/build/component/generator/templates/metadata/da.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/da.js +117 -0
- package/build/component/generator/templates/metadata/da.js.map +1 -0
- package/build/component/generator/templates/metadata/graphConnector.d.ts +3 -0
- package/build/component/generator/templates/metadata/graphConnector.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/graphConnector.js +15 -0
- package/build/component/generator/templates/metadata/graphConnector.js.map +1 -0
- package/build/component/generator/templates/metadata/index.d.ts.map +1 -1
- package/build/component/generator/templates/metadata/index.js +25 -21
- package/build/component/generator/templates/metadata/index.js.map +1 -1
- package/build/component/generator/templates/metadata/me.d.ts +3 -0
- package/build/component/generator/templates/metadata/me.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/me.js +111 -0
- package/build/component/generator/templates/metadata/me.js.map +1 -0
- package/build/component/generator/templates/metadata/special.d.ts +3 -0
- package/build/component/generator/templates/metadata/special.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/special.js +70 -0
- package/build/component/generator/templates/metadata/special.js.map +1 -0
- package/build/component/generator/templates/metadata/tab.d.ts +3 -0
- package/build/component/generator/templates/metadata/tab.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/tab.js +59 -0
- package/build/component/generator/templates/metadata/tab.js.map +1 -0
- package/build/component/generator/templates/metadata/teams.d.ts +3 -0
- package/build/component/generator/templates/metadata/teams.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/teams.js +238 -0
- package/build/component/generator/templates/metadata/teams.js.map +1 -0
- package/build/component/generator/templates/metadata/vs.d.ts +3 -0
- package/build/component/generator/templates/metadata/vs.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/vs.js +22 -0
- package/build/component/generator/templates/metadata/vs.js.map +1 -0
- package/build/component/generator/templates/metadata/wxp.d.ts +3 -0
- package/build/component/generator/templates/metadata/wxp.d.ts.map +1 -0
- package/build/component/generator/templates/metadata/wxp.js +33 -0
- package/build/component/generator/templates/metadata/wxp.js.map +1 -0
- package/build/component/generator/templates/templateNames.d.ts +0 -1
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +0 -1
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +5 -2
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/core/FxCore.d.ts +1 -4
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +19 -96
- package/build/core/FxCore.js.map +1 -1
- package/build/index.d.ts +1 -2
- package/build/index.d.ts.map +1 -1
- package/build/index.js +5 -5
- package/build/index.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +15 -1
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +56 -0
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.js +2 -2
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +0 -6
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +0 -6
- package/build/question/questionNames.js.map +1 -1
- package/build/question/scaffold/vs/createRootNode.d.ts +0 -1
- package/build/question/scaffold/vs/createRootNode.d.ts.map +1 -1
- package/build/question/scaffold/vs/createRootNode.js +16 -14
- package/build/question/scaffold/vs/createRootNode.js.map +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.js +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.js.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.d.ts +7 -0
- package/build/question/scaffold/vsc/createRootNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.js +72 -3
- package/build/question/scaffold/vsc/createRootNode.js.map +1 -1
- package/build/question/scaffold/vsc/customEngineAgentNode.d.ts +1 -1
- package/build/question/scaffold/vsc/customEngineAgentNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/customEngineAgentNode.js +24 -22
- package/build/question/scaffold/vsc/customEngineAgentNode.js.map +1 -1
- package/build/question/scaffold/vsc/daProjectTypeNode.js +3 -4
- package/build/question/scaffold/vsc/daProjectTypeNode.js.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +7 -4
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js +201 -106
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -0
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +0 -5
- package/build/ui/visitor.js.map +1 -1
- package/package.json +5 -5
- package/resource/package.nls.cs.json +69 -114
- package/resource/package.nls.de.json +67 -112
- package/resource/package.nls.es.json +69 -114
- package/resource/package.nls.fr.json +68 -113
- package/resource/package.nls.it.json +69 -114
- package/resource/package.nls.ja.json +68 -113
- package/resource/package.nls.json +23 -12
- package/resource/package.nls.ko.json +66 -111
- package/resource/package.nls.pl.json +67 -112
- package/resource/package.nls.pt-BR.json +69 -114
- package/resource/package.nls.ru.json +68 -113
- package/resource/package.nls.tr.json +67 -112
- package/resource/package.nls.zh-Hans.json +68 -113
- package/resource/package.nls.zh-Hant.json +68 -113
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/build/component/utils/odrProvider.d.ts +0 -36
- package/build/component/utils/odrProvider.d.ts.map +0 -1
- package/build/component/utils/odrProvider.js +0 -75
- package/build/component/utils/odrProvider.js.map +0 -1
- package/build/question/scaffold/commonNodes.d.ts +0 -7
- package/build/question/scaffold/commonNodes.d.ts.map +0 -1
- package/build/question/scaffold/commonNodes.js +0 -154
- package/build/question/scaffold/commonNodes.js.map +0 -1
- package/build/question/scaffold/constructNode.d.ts +0 -3
- package/build/question/scaffold/constructNode.d.ts.map +0 -1
- package/build/question/scaffold/constructNode.js +0 -50
- package/build/question/scaffold/constructNode.js.map +0 -1
- package/resource/templates/package.nls.cs.json +0 -25
- package/resource/templates/package.nls.de.json +0 -25
- package/resource/templates/package.nls.es.json +0 -25
- package/resource/templates/package.nls.fr.json +0 -25
- package/resource/templates/package.nls.it.json +0 -25
- package/resource/templates/package.nls.ja.json +0 -25
- package/resource/templates/package.nls.json +0 -33
- package/resource/templates/package.nls.ko.json +0 -25
- package/resource/templates/package.nls.pl.json +0 -25
- package/resource/templates/package.nls.pt-BR.json +0 -25
- package/resource/templates/package.nls.ru.json +0 -25
- package/resource/templates/package.nls.tr.json +0 -25
- package/resource/templates/package.nls.zh-Hans.json +0 -25
- package/resource/templates/package.nls.zh-Hant.json +0 -25
- package/resource/templates/package.nls.zh-cn.json +0 -21
- package/resource/templates/package.nls.zh-tw.json +0 -21
- package/templates/metadata/allTemplates.json +0 -429
- package/templates/metadata/defaultGeneratorTemplates.json +0 -233
- package/templates/metadata.zip +0 -0
- package/templates/ui/ceaNode.json +0 -30
- package/templates/ui/teamsNode.json +0 -124
|
@@ -19,12 +19,6 @@ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry
|
|
|
19
19
|
const wrapUtil_1 = require("../util/wrapUtil");
|
|
20
20
|
const constants_2 = require("./constants");
|
|
21
21
|
const telemetry_1 = require("./utils/telemetry");
|
|
22
|
-
const odrProvider_1 = require("../../utils/odrProvider");
|
|
23
|
-
const child_process_1 = require("child_process");
|
|
24
|
-
const util_1 = require("util");
|
|
25
|
-
const constants_3 = require("../../constants");
|
|
26
|
-
const errors_1 = require("./errors");
|
|
27
|
-
const results_1 = require("./results");
|
|
28
22
|
exports.actionName = "teamsApp/publishAppPackage";
|
|
29
23
|
const defaultOutputNames = {
|
|
30
24
|
publishedAppId: "TEAMS_APP_PUBLISHED_APP_ID",
|
|
@@ -43,7 +37,7 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
43
37
|
};
|
|
44
38
|
}
|
|
45
39
|
async publish(args, context, outputEnvVarNames) {
|
|
46
|
-
var _a, _b, _c
|
|
40
|
+
var _a, _b, _c;
|
|
47
41
|
const argsValidationResult = this.validateArgs(args);
|
|
48
42
|
if (argsValidationResult.isErr()) {
|
|
49
43
|
return (0, teamsfx_api_1.err)(argsValidationResult.error);
|
|
@@ -63,29 +57,6 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
63
57
|
}
|
|
64
58
|
const manifestString = manifestFile.getData().toString();
|
|
65
59
|
const manifest = JSON.parse(manifestString);
|
|
66
|
-
const declarativeAgents = ((_a = manifest.copilotExtensions) === null || _a === void 0 ? void 0 : _a.declarativeCopilots) || ((_b = manifest.copilotAgents) === null || _b === void 0 ? void 0 : _b.declarativeAgents);
|
|
67
|
-
if (declarativeAgents && declarativeAgents.length > 0) {
|
|
68
|
-
const declarativeAgentFile = zipEntries.find((x) => x.entryName === declarativeAgents[0].file);
|
|
69
|
-
if (declarativeAgentFile) {
|
|
70
|
-
const declarativeAgentContent = declarativeAgentFile.getData().toString();
|
|
71
|
-
const declarativeAgentManifest = JSON.parse(declarativeAgentContent);
|
|
72
|
-
if (declarativeAgentManifest.actions) {
|
|
73
|
-
for (const action of declarativeAgentManifest.actions) {
|
|
74
|
-
const actionFile = zipEntries.find((x) => x.entryName === action.file);
|
|
75
|
-
if (actionFile) {
|
|
76
|
-
const isValid = await this.verifyLocalMCPPluginCerts(actionFile);
|
|
77
|
-
if (!isValid) {
|
|
78
|
-
const message = (0, localizeUtils_1.getLocalizedString)("driver.teamsApp.error.localMcpCertVerificationFailed");
|
|
79
|
-
return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, [
|
|
80
|
-
message,
|
|
81
|
-
message,
|
|
82
|
-
]));
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
60
|
// manifest.id === externalID
|
|
90
61
|
const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
|
|
91
62
|
scopes: constants_1.AppStudioScopes,
|
|
@@ -105,12 +76,12 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
105
76
|
if (existApp.lastModifiedDateTime) {
|
|
106
77
|
description =
|
|
107
78
|
description +
|
|
108
|
-
(0, localizeUtils_1.getLocalizedString)("plugins.appstudio.lastModified", (
|
|
79
|
+
(0, localizeUtils_1.getLocalizedString)("plugins.appstudio.lastModified", (_a = existApp.lastModifiedDateTime) === null || _a === void 0 ? void 0 : _a.toLocaleString());
|
|
109
80
|
}
|
|
110
81
|
description =
|
|
111
82
|
description + (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.updatePublihsedAppConfirm");
|
|
112
83
|
const confirm = (0, localizeUtils_1.getLocalizedString)("core.option.confirm");
|
|
113
|
-
const res = await ((
|
|
84
|
+
const res = await ((_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("warn", description, true, confirm));
|
|
114
85
|
if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === confirm)
|
|
115
86
|
executePublishUpdate = true;
|
|
116
87
|
if (executePublishUpdate) {
|
|
@@ -147,7 +118,7 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
147
118
|
context.addSummary((0, localizeUtils_1.getLocalizedString)("driver.teamsApp.summary.publishTeamsAppSuccess", manifest.id));
|
|
148
119
|
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
149
120
|
const msg = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.publishSucceedNotice.cli", manifest.name.short, constants_2.Constants.TEAMS_ADMIN_PORTAL, constants_2.Constants.TEAMS_MANAGE_APP_DOC);
|
|
150
|
-
(
|
|
121
|
+
(_c = context.ui) === null || _c === void 0 ? void 0 : _c.showMessage("info", msg, false);
|
|
151
122
|
}
|
|
152
123
|
return (0, teamsfx_api_1.ok)(result);
|
|
153
124
|
}
|
|
@@ -163,52 +134,6 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
163
134
|
return (0, teamsfx_api_1.ok)(undefined);
|
|
164
135
|
}
|
|
165
136
|
}
|
|
166
|
-
async verifyLocalMCPPluginCerts(pluginFile) {
|
|
167
|
-
var _a;
|
|
168
|
-
const pluginContent = pluginFile.getData().toString();
|
|
169
|
-
const pluginManifest = JSON.parse(pluginContent);
|
|
170
|
-
if (!pluginManifest.runtimes || !Array.isArray(pluginManifest.runtimes)) {
|
|
171
|
-
return true;
|
|
172
|
-
}
|
|
173
|
-
const servers = await odrProvider_1.ODRProvider.listServers();
|
|
174
|
-
let allValidCerts = true;
|
|
175
|
-
const localPluginRuntimes = pluginManifest.runtimes.filter((runtime) => runtime.type === "LocalPlugin");
|
|
176
|
-
for (const runtime of localPluginRuntimes) {
|
|
177
|
-
const localEndpoint = (_a = runtime.spec) === null || _a === void 0 ? void 0 : _a.local_endpoint;
|
|
178
|
-
if (!localEndpoint || !localEndpoint.startsWith(constants_3.LocalMcpPrefix)) {
|
|
179
|
-
continue;
|
|
180
|
-
}
|
|
181
|
-
const mcpIdentifier = localEndpoint.substring(constants_3.LocalMcpPrefix.length);
|
|
182
|
-
const serverInfo = servers.find((x) => x.identifier === mcpIdentifier);
|
|
183
|
-
if (!serverInfo) {
|
|
184
|
-
continue;
|
|
185
|
-
}
|
|
186
|
-
const valid = await this.verifyPackageFamilyCertIsValid(serverInfo.packageFamily);
|
|
187
|
-
if (!valid) {
|
|
188
|
-
allValidCerts = false;
|
|
189
|
-
break;
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
return allValidCerts;
|
|
193
|
-
}
|
|
194
|
-
async verifyPackageFamilyCertIsValid(packageName) {
|
|
195
|
-
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
196
|
-
const command = `powershell.exe -Command "& Get-AppxPackage | where { $_.PackageFamilyName -eq '${packageName}' } | select { $_.SignatureKind }"`;
|
|
197
|
-
try {
|
|
198
|
-
const { stdout } = await execAsync(command);
|
|
199
|
-
if (!stdout) {
|
|
200
|
-
return false;
|
|
201
|
-
}
|
|
202
|
-
if (stdout.toLowerCase().includes("developer")) {
|
|
203
|
-
return false;
|
|
204
|
-
}
|
|
205
|
-
return true;
|
|
206
|
-
}
|
|
207
|
-
catch (error) {
|
|
208
|
-
console.error("Unable to get cert info for package name", error);
|
|
209
|
-
return false;
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
137
|
};
|
|
213
138
|
tslib_1.__decorate([
|
|
214
139
|
(0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/publishAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAA8F;AAC9F,8DAA6B;AAC7B,gEAA0B;AAC1B,mCAA+B;AAC/B,mCAAiC;AACjC,+EAA4E;AAC5E,yDAA4D;AAC5D,iEAAmE;AACnE,kDAAoG;AACpG,+CAAqD;AAGrD,mFAAgF;AAChF,+CAAqD;AACrD,2CAAwC;AAExC,iDAAyD;
|
|
1
|
+
{"version":3,"file":"publishAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/publishAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,26 +18,6 @@ export declare class PluginManifestUtils {
|
|
|
18
18
|
getDefaultNextAvailableApiSpecPath(apiSpecPath: string, apiSpecFolder: string, isKiotaIntegration?: boolean): Promise<string>;
|
|
19
19
|
getApiSpecFileName(openApiSpecFileNamePrefix: string, openApiSpecFileType: string, apiSpecFileNameSuffix: number, isKiotaIntegration: boolean): string;
|
|
20
20
|
getApiSpecFilePathFromPlugin(plugin: PluginManifestSchema, pluginPath: string): Promise<string[]>;
|
|
21
|
-
/**
|
|
22
|
-
* Validate LocalPlugin runtimes that use MCP servers.
|
|
23
|
-
* Validates four requirements:
|
|
24
|
-
* 1. local_endpoint must start with mcp://
|
|
25
|
-
* 2. run_for_functions entries must match tool names in MCP server
|
|
26
|
-
* 3. Function names must appear in run_for_functions
|
|
27
|
-
* 4. Functions cannot redefine parameters—must match MCP server
|
|
28
|
-
* @param manifest The plugin manifest to validate
|
|
29
|
-
* @param _context Driver context for logging
|
|
30
|
-
* @returns Array of validation error strings
|
|
31
|
-
*/
|
|
32
|
-
validateLocalMCPPluginRuntimes(manifest: PluginManifestSchema): Promise<string[]>;
|
|
33
|
-
/**
|
|
34
|
-
* Validate that function parameters match exactly between manifest and MCP tool.
|
|
35
|
-
* @param manifestFunc The function definition from the manifest
|
|
36
|
-
* @param mcpTool The tool definition from MCP server
|
|
37
|
-
* @param funcName The function name for error messages
|
|
38
|
-
* @returns Array of validation error strings
|
|
39
|
-
*/
|
|
40
|
-
private validateFunctionParameters;
|
|
41
21
|
}
|
|
42
22
|
export declare const pluginManifestUtils: PluginManifestUtils;
|
|
43
23
|
//# sourceMappingURL=PluginManifestUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,OAAO,EACP,OAAO,EAEP,QAAQ,EACR,oBAAoB,
|
|
1
|
+
{"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,OAAO,EACP,OAAO,EAEP,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAIhF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAI3D,qBAAa,mBAAmB;IACjB,sBAAsB,CACjC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAiBjD;;;;OAIG;IACU,WAAW,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAoBpC,qBAAqB,CAChC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IA6B9C,mCAAmC,CAC9C,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAiB9B,mBAAmB,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,MAAM,GAAG,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAsCxC,kCAAkC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,kBAAkB,UAAQ;IAwC5B,kBAAkB,CAChB,yBAAyB,EAAE,MAAM,EACjC,mBAAmB,EAAE,MAAM,EAC3B,qBAAqB,EAAE,MAAM,EAC7B,kBAAkB,EAAE,OAAO,GAC1B,MAAM;IAWH,4BAA4B,CAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;CAiBrB;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
|
|
@@ -19,8 +19,6 @@ const os_1 = require("os");
|
|
|
19
19
|
const envFunctionUtils_1 = require("../../../utils/envFunctionUtils");
|
|
20
20
|
const utils_2 = require("../../../../common/utils");
|
|
21
21
|
const featureFlags_1 = require("../../../../common/featureFlags");
|
|
22
|
-
const odrProvider_1 = require("../../../utils/odrProvider");
|
|
23
|
-
const constants_1 = require("../../../constants");
|
|
24
22
|
class PluginManifestUtils {
|
|
25
23
|
async readPluginManifestFile(path) {
|
|
26
24
|
if (!(await fs_extra_1.default.pathExists(path))) {
|
|
@@ -62,13 +60,11 @@ class PluginManifestUtils {
|
|
|
62
60
|
return (0, teamsfx_api_1.err)(manifestRes.error);
|
|
63
61
|
}
|
|
64
62
|
try {
|
|
65
|
-
const
|
|
66
|
-
const localMCPPluginErrors = await this.validateLocalMCPPluginRuntimes(manifestRes.value);
|
|
67
|
-
const allErrors = [...schemaErrors, ...localMCPPluginErrors];
|
|
63
|
+
const res = await teamsfx_api_1.ManifestUtil.validateManifest(manifestRes.value);
|
|
68
64
|
return (0, teamsfx_api_1.ok)({
|
|
69
65
|
id: plugin.id,
|
|
70
66
|
filePath: path,
|
|
71
|
-
validationResult:
|
|
67
|
+
validationResult: res,
|
|
72
68
|
});
|
|
73
69
|
}
|
|
74
70
|
catch (e) {
|
|
@@ -175,152 +171,6 @@ class PluginManifestUtils {
|
|
|
175
171
|
}
|
|
176
172
|
return files;
|
|
177
173
|
}
|
|
178
|
-
/**
|
|
179
|
-
* Validate LocalPlugin runtimes that use MCP servers.
|
|
180
|
-
* Validates four requirements:
|
|
181
|
-
* 1. local_endpoint must start with mcp://
|
|
182
|
-
* 2. run_for_functions entries must match tool names in MCP server
|
|
183
|
-
* 3. Function names must appear in run_for_functions
|
|
184
|
-
* 4. Functions cannot redefine parameters—must match MCP server
|
|
185
|
-
* @param manifest The plugin manifest to validate
|
|
186
|
-
* @param _context Driver context for logging
|
|
187
|
-
* @returns Array of validation error strings
|
|
188
|
-
*/
|
|
189
|
-
async validateLocalMCPPluginRuntimes(manifest) {
|
|
190
|
-
var _a, _b, _c;
|
|
191
|
-
const errors = [];
|
|
192
|
-
if (!manifest.runtimes) {
|
|
193
|
-
return errors;
|
|
194
|
-
}
|
|
195
|
-
const localPluginRuntimes = manifest.runtimes.filter((rt) => rt.type === "LocalPlugin");
|
|
196
|
-
if (localPluginRuntimes.length === 0) {
|
|
197
|
-
return errors;
|
|
198
|
-
}
|
|
199
|
-
let mcpServers = [];
|
|
200
|
-
if (process.platform === "win32") {
|
|
201
|
-
try {
|
|
202
|
-
mcpServers = await odrProvider_1.ODRProvider.listServers();
|
|
203
|
-
}
|
|
204
|
-
catch (error) {
|
|
205
|
-
return errors;
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
const mcpServerMap = new Map(mcpServers.map((s) => [s.identifier, s]));
|
|
209
|
-
for (const runtime of localPluginRuntimes) {
|
|
210
|
-
const runtimeIdx = manifest.runtimes.indexOf(runtime);
|
|
211
|
-
const localEndpoint = runtime.spec.local_endpoint;
|
|
212
|
-
// 1. Only check the ones with endpoint starting with mcp://
|
|
213
|
-
if (!localEndpoint.startsWith(constants_1.LocalMcpPrefix)) {
|
|
214
|
-
continue;
|
|
215
|
-
}
|
|
216
|
-
const mcpIdentifier = localEndpoint.replace(new RegExp(`^${constants_1.LocalMcpPrefix}`), "");
|
|
217
|
-
const mcpServer = mcpServerMap.get(mcpIdentifier);
|
|
218
|
-
if (!mcpServer) {
|
|
219
|
-
errors.push(`/runtimes/${runtimeIdx}/spec/local_endpoint: ` +
|
|
220
|
-
`MCP server "${mcpIdentifier}" not found in ODR provider.`);
|
|
221
|
-
continue;
|
|
222
|
-
}
|
|
223
|
-
const mcpToolNames = new Set(mcpServer.tools.map((t) => t.name));
|
|
224
|
-
// 2. run_for_functions entries must match tool names in MCP server
|
|
225
|
-
(_a = runtime.run_for_functions) === null || _a === void 0 ? void 0 : _a.forEach((funcName, funcIdx) => {
|
|
226
|
-
if (!mcpToolNames.has(funcName)) {
|
|
227
|
-
const availableTools = Array.from(mcpToolNames).join(", ");
|
|
228
|
-
errors.push(`/runtimes/${runtimeIdx}/run_for_functions[${funcIdx}]: ` +
|
|
229
|
-
`Tool "${funcName}" not found in MCP server "${mcpServer.display_name}". ` +
|
|
230
|
-
`Available tools: ${availableTools}`);
|
|
231
|
-
}
|
|
232
|
-
});
|
|
233
|
-
// 3. Function names must appear in run_for_functions
|
|
234
|
-
const runForFunctionsSet = new Set(runtime.run_for_functions || []);
|
|
235
|
-
(_b = manifest.functions) === null || _b === void 0 ? void 0 : _b.forEach((func, funcIdx) => {
|
|
236
|
-
if (mcpToolNames.has(func.name) && !runForFunctionsSet.has(func.name)) {
|
|
237
|
-
errors.push(`/functions[${funcIdx}]: ` +
|
|
238
|
-
`Function "${func.name}" exists in MCP server but is not listed in /runtimes/${runtimeIdx}/run_for_functions.`);
|
|
239
|
-
}
|
|
240
|
-
});
|
|
241
|
-
// 4. Functions cannot redefine parameters—must match MCP server
|
|
242
|
-
(_c = runtime.run_for_functions) === null || _c === void 0 ? void 0 : _c.forEach((funcName) => {
|
|
243
|
-
var _a;
|
|
244
|
-
const manifestFunc = (_a = manifest.functions) === null || _a === void 0 ? void 0 : _a.find((f) => f.name === funcName);
|
|
245
|
-
const mcpTool = mcpServer.tools.find((t) => t.name === funcName);
|
|
246
|
-
if (manifestFunc && mcpTool) {
|
|
247
|
-
const paramErrors = this.validateFunctionParameters(manifestFunc, mcpTool, funcName);
|
|
248
|
-
errors.push(...paramErrors);
|
|
249
|
-
}
|
|
250
|
-
});
|
|
251
|
-
}
|
|
252
|
-
return errors;
|
|
253
|
-
}
|
|
254
|
-
/**
|
|
255
|
-
* Validate that function parameters match exactly between manifest and MCP tool.
|
|
256
|
-
* @param manifestFunc The function definition from the manifest
|
|
257
|
-
* @param mcpTool The tool definition from MCP server
|
|
258
|
-
* @param funcName The function name for error messages
|
|
259
|
-
* @returns Array of validation error strings
|
|
260
|
-
*/
|
|
261
|
-
validateFunctionParameters(manifestFunc, mcpTool, funcName) {
|
|
262
|
-
var _a, _b, _c, _d;
|
|
263
|
-
const errors = [];
|
|
264
|
-
const manifestParams = ((_a = manifestFunc.parameters) === null || _a === void 0 ? void 0 : _a.properties) || {};
|
|
265
|
-
const mcpParams = ((_b = mcpTool.inputSchema) === null || _b === void 0 ? void 0 : _b.properties) || {};
|
|
266
|
-
const manifestRequired = ((_c = manifestFunc.parameters) === null || _c === void 0 ? void 0 : _c.required) || [];
|
|
267
|
-
const mcpRequired = ((_d = mcpTool.inputSchema) === null || _d === void 0 ? void 0 : _d.required) || [];
|
|
268
|
-
const manifestParamNames = new Set(Object.keys(manifestParams));
|
|
269
|
-
const mcpParamNames = new Set(Object.keys(mcpParams));
|
|
270
|
-
// Extra parameters in manifest not in MCP
|
|
271
|
-
manifestParamNames.forEach((prop) => {
|
|
272
|
-
if (!mcpParamNames.has(prop)) {
|
|
273
|
-
errors.push(`/functions["${funcName}"]/parameters/properties/${prop}: ` +
|
|
274
|
-
`Parameter not defined in MCP server. Functions cannot redefine parameters.`);
|
|
275
|
-
}
|
|
276
|
-
});
|
|
277
|
-
// Missing parameters from MCP
|
|
278
|
-
mcpParamNames.forEach((prop) => {
|
|
279
|
-
if (!manifestParamNames.has(prop)) {
|
|
280
|
-
errors.push(`/functions["${funcName}"]/parameters/properties/${prop}: ` +
|
|
281
|
-
`Missing parameter defined in MCP server. All MCP parameters must be included.`);
|
|
282
|
-
}
|
|
283
|
-
});
|
|
284
|
-
// Validate required array matches
|
|
285
|
-
const manifestRequiredSet = new Set(manifestRequired);
|
|
286
|
-
const mcpRequiredSet = new Set(mcpRequired);
|
|
287
|
-
const extraRequired = manifestRequired.filter((r) => !mcpRequiredSet.has(r));
|
|
288
|
-
const missingRequired = mcpRequired.filter((r) => !manifestRequiredSet.has(r));
|
|
289
|
-
if (extraRequired.length > 0) {
|
|
290
|
-
errors.push(`/functions["${funcName}"]/parameters/required: ` +
|
|
291
|
-
`Extra required parameters not in MCP server: ${extraRequired.join(", ")}`);
|
|
292
|
-
}
|
|
293
|
-
if (missingRequired.length > 0) {
|
|
294
|
-
errors.push(`/functions["${funcName}"]/parameters/required: ` +
|
|
295
|
-
`Missing required parameters from MCP server: ${missingRequired.join(", ")}`);
|
|
296
|
-
}
|
|
297
|
-
// Validate parameter types and properties for matching parameters
|
|
298
|
-
manifestParamNames.forEach((prop) => {
|
|
299
|
-
if (mcpParamNames.has(prop)) {
|
|
300
|
-
const manifestParam = manifestParams[prop];
|
|
301
|
-
const mcpParam = mcpParams[prop];
|
|
302
|
-
// Type check
|
|
303
|
-
if (manifestParam.type !== mcpParam.type) {
|
|
304
|
-
errors.push(`/functions["${funcName}"]/parameters/properties/${prop}/type: ` +
|
|
305
|
-
`Type mismatch. Manifest has "${String(manifestParam.type)}", ` +
|
|
306
|
-
`MCP server has "${String(mcpParam.type)}".`);
|
|
307
|
-
}
|
|
308
|
-
// Enum check
|
|
309
|
-
if (manifestParam.enum || mcpParam.enum) {
|
|
310
|
-
const manifestEnumSorted = manifestParam.enum
|
|
311
|
-
? [...manifestParam.enum].sort()
|
|
312
|
-
: undefined;
|
|
313
|
-
const mcpEnumSorted = mcpParam.enum ? [...mcpParam.enum].sort() : undefined;
|
|
314
|
-
if (JSON.stringify(manifestEnumSorted) !== JSON.stringify(mcpEnumSorted)) {
|
|
315
|
-
errors.push(`/functions["${funcName}"]/parameters/properties/${prop}/enum: ` +
|
|
316
|
-
`Enum mismatch. Manifest: ${JSON.stringify(manifestParam.enum)}, ` +
|
|
317
|
-
`MCP: ${JSON.stringify(mcpParam.enum)}.`);
|
|
318
|
-
}
|
|
319
|
-
}
|
|
320
|
-
}
|
|
321
|
-
});
|
|
322
|
-
return errors;
|
|
323
|
-
}
|
|
324
174
|
}
|
|
325
175
|
exports.PluginManifestUtils = PluginManifestUtils;
|
|
326
176
|
exports.pluginManifestUtils = new PluginManifestUtils();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAGP,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;IAY7C,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;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAEL,OAAO,EAGP,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;IAY7C,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;IAoDrB,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;CAmE7C"}
|
|
@@ -49,27 +49,17 @@ class DeclarativeAgentGenerator extends defaultGenerator_1.DefaultTemplateGenera
|
|
|
49
49
|
const language = inputs[question_1.QuestionNames.ProgrammingLanguage];
|
|
50
50
|
const safeProjectNameFromVS = language === "csharp" ? inputs[question_1.QuestionNames.SafeProjectName] : undefined;
|
|
51
51
|
const solutionNameFromVS = language === "csharp" ? inputs[question_1.QuestionNames.SolutionName] : undefined;
|
|
52
|
-
const MCPServerType = inputs[question_1.QuestionNames.MCPServerType];
|
|
53
|
-
const isLocalMCP = MCPServerType === "local";
|
|
54
52
|
const MCPForDAServerUrl = inputs[question_1.QuestionNames.MCPForDAServerUrl];
|
|
55
53
|
const replaceMap = Object.assign(Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(inputs[question_1.QuestionNames.TemplateName] === templateNames_1.TemplateNames.DeclarativeAgentWithTypeSpec
|
|
56
54
|
? (0, stringUtils_1.convertToAlphanumericOnly)(appName)
|
|
57
|
-
: appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { DeclarativeCopilot: "true", MicrosoftEntra: auth === question_1.ApiAuthOptions.microsoftEntra().id ? "true" : ""
|
|
55
|
+
: appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { DeclarativeCopilot: "true", MicrosoftEntra: auth === question_1.ApiAuthOptions.microsoftEntra().id ? "true" : "" }), (MCPForDAServerUrl
|
|
58
56
|
? {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
ServerName: inputs[question_1.QuestionNames.MCPLocalServerName],
|
|
57
|
+
MCPForDAServerUrl,
|
|
58
|
+
ServerName: new URL(MCPForDAServerUrl).host
|
|
59
|
+
.replace(/[^a-zA-Z0-9]/g, "")
|
|
60
|
+
.substring(0, 10),
|
|
64
61
|
}
|
|
65
|
-
:
|
|
66
|
-
? {
|
|
67
|
-
MCPForDAServerUrl,
|
|
68
|
-
ServerName: new URL(MCPForDAServerUrl).host
|
|
69
|
-
.replace(/[^a-zA-Z0-9]/g, "")
|
|
70
|
-
.substring(0, 10),
|
|
71
|
-
}
|
|
72
|
-
: {}));
|
|
62
|
+
: {}));
|
|
73
63
|
const templateName = inputs[question_1.QuestionNames.TemplateName];
|
|
74
64
|
(0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
|
|
75
65
|
["template-name" /* telemetryProperties.templateName */]: templateName,
|
|
@@ -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,wDAagC;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;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -5,12 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.sampleDefaultOnActionError = exports.templateDefaultOnActionError = exports.Generator = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
8
|
-
const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
|
|
9
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
10
9
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
11
10
|
const lodash_1 = require("lodash");
|
|
12
|
-
const featureFlags_1 = require("../../common/featureFlags");
|
|
13
|
-
const stringUtils_1 = require("../../common/stringUtils");
|
|
14
11
|
const telemetry_1 = require("../../common/telemetry");
|
|
15
12
|
const componentError_1 = require("../error/componentError");
|
|
16
13
|
const messages_1 = require("../messages");
|
|
@@ -19,6 +16,9 @@ const constant_1 = require("./constant");
|
|
|
19
16
|
const error_1 = require("./error");
|
|
20
17
|
const generatorAction_1 = require("./generatorAction");
|
|
21
18
|
const utils_1 = require("./utils");
|
|
19
|
+
const featureFlags_1 = require("../../common/featureFlags");
|
|
20
|
+
const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
|
|
21
|
+
const stringUtils_1 = require("../../common/stringUtils");
|
|
22
22
|
class Generator {
|
|
23
23
|
static getDefaultVariables(appName, safeProjectNameFromVS, solutionNameFromVS, targetFramework, placeProjectFileInSolutionDir, authData, llmServiceData) {
|
|
24
24
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -49,6 +49,9 @@ class Generator {
|
|
|
49
49
|
SolutionName: solutionNameFromVS !== null && solutionNameFromVS !== void 0 ? solutionNameFromVS : appName,
|
|
50
50
|
ApiKey: apiKeyActionData,
|
|
51
51
|
OAuth: oauthActionData,
|
|
52
|
+
enableTestToolByDefault: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.TestTool)
|
|
53
|
+
? "true"
|
|
54
|
+
: "",
|
|
52
55
|
enableMETestToolByDefault: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.METestTool)
|
|
53
56
|
? "true"
|
|
54
57
|
: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metaOSHelper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/metaOSHelper.ts"],"names":[],"mappings":"AA4CA,qBAAa,YAAY;IACvB,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;WAgBjC,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAI9D,MAAM,CAAC,4BAA4B,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;IAkB9F,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;WAY3E,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAmBpD,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA2BjE,cAAc,CACzB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;WA6FlC,cAAc,CACzB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;WAsCH,kBAAkB,CAC7B,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,OAAO,CAAC,IAAI,CAAC;WAmHH,iBAAiB,CAC5B,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,OAAO,CAAC,IAAI,CAAC;WA6EH,2BAA2B,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"metaOSHelper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/metaOSHelper.ts"],"names":[],"mappings":"AA4CA,qBAAa,YAAY;IACvB,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;WAgBjC,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAI9D,MAAM,CAAC,4BAA4B,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;IAkB9F,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;WAY3E,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAmBpD,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA2BjE,cAAc,CACzB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;WA6FlC,cAAc,CACzB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;WAsCH,kBAAkB,CAC7B,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,OAAO,CAAC,IAAI,CAAC;WAmHH,iBAAiB,CAC5B,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,OAAO,CAAC,IAAI,CAAC;WA6EH,2BAA2B,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAW/E"}
|
|
@@ -383,7 +383,8 @@ Office.onReady((info) => {
|
|
|
383
383
|
const pkgJsonPath = path_1.default.join(projectFolder, PKG_JSON_FILE_NAME);
|
|
384
384
|
if (fs_extra_1.default.existsSync(pkgJsonPath)) {
|
|
385
385
|
const pkgJson = await fs_extra_1.default.readJSON(pkgJsonPath);
|
|
386
|
-
pkgJson["devDependencies"]["office-addin-debugging"] = "6.0.
|
|
386
|
+
pkgJson["devDependencies"]["office-addin-debugging"] = "6.0.4";
|
|
387
|
+
pkgJson["devDependencies"]["office-addin-dev-settings"] = "3.0.4";
|
|
387
388
|
await fs_extra_1.default.writeJSON(pkgJsonPath, pkgJson, { spaces: 2 });
|
|
388
389
|
}
|
|
389
390
|
else {
|