@microsoft/teamsfx-core 2.0.4-alpha.a80a9a6b9.0 → 2.0.4-alpha.aa5ceceb5.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.
- package/build/common/constants.d.ts +2 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +2 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/constant/message.d.ts +2 -0
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +2 -0
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +9 -1
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +8 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/depsChecker.d.ts +7 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +1 -0
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts +24 -0
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/testToolChecker.js +238 -0
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -0
- package/build/common/deps-checker/util/fileHelper.d.ts +1 -0
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -1
- package/build/common/deps-checker/util/fileHelper.js +9 -1
- package/build/common/deps-checker/util/fileHelper.js.map +1 -1
- package/build/common/featureFlags.d.ts +2 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +10 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +1 -5
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/samples.d.ts +3 -0
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts +3 -0
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts.map +1 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js +21 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js.map +1 -0
- package/build/common/spec-parser/constants.d.ts +8 -6
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +8 -8
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +16 -22
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +2 -1
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +5 -4
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +18 -15
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +1 -0
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +14 -12
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +1 -1
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +11 -6
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/versionMetadata.d.ts +1 -0
- package/build/common/versionMetadata.d.ts.map +1 -1
- package/build/common/versionMetadata.js +1 -0
- package/build/common/versionMetadata.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +4 -3
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/coordinator/index.d.ts +1 -0
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +5 -6
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +4 -0
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts +5 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts.map +1 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js +21 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js.map +1 -0
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +4 -0
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +4 -0
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +10 -2
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/devTool/constant.d.ts +2 -0
- package/build/component/driver/devTool/constant.d.ts.map +1 -1
- package/build/component/driver/devTool/constant.js +4 -0
- package/build/component/driver/devTool/constant.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts +5 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts.map +1 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +24 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.map +1 -0
- package/build/component/driver/devTool/installDriver.d.ts +1 -0
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +47 -2
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +8 -0
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +1 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +9 -9
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +6 -0
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +22 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +4 -0
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +7 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +15 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +2 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +3 -0
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +21 -0
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +3 -0
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +53 -17
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/middleware/envMW.js +2 -2
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +10 -5
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +4 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +9 -4
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +17 -5
- package/build/core/FxCore.js.map +1 -1
- package/build/core/environment.d.ts +2 -9
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +17 -13
- package/build/core/environment.js.map +1 -1
- package/build/core/environmentName.d.ts +18 -0
- package/build/core/environmentName.d.ts.map +1 -0
- package/build/core/environmentName.js +35 -0
- package/build/core/environmentName.js.map +1 -0
- package/build/core/telemetry.d.ts +1 -0
- package/build/core/telemetry.d.ts.map +1 -1
- package/build/core/telemetry.js +3 -3
- package/build/core/telemetry.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +10 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts +5 -5
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +21 -5
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +1 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +41 -19
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +21 -2
- package/build/error/deploy.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +4 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +7 -2
- package/build/error/script.js.map +1 -1
- package/build/error/types.d.ts +6 -0
- package/build/error/types.d.ts.map +1 -0
- package/build/error/types.js +12 -0
- package/build/error/types.js.map +1 -0
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +6 -0
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +4 -2
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +9 -3
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +13 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +63 -63
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +1 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +1 -0
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +2 -4
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +6 -9
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +5 -5
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +0 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +0 -1
- package/build/question/questionNames.js.map +1 -1
- package/package.json +5 -3
- package/resource/package.nls.cs.json +83 -23
- package/resource/package.nls.de.json +81 -21
- package/resource/package.nls.es.json +83 -23
- package/resource/package.nls.fr.json +82 -22
- package/resource/package.nls.it.json +82 -22
- package/resource/package.nls.ja.json +83 -23
- package/resource/package.nls.json +23 -8
- package/resource/package.nls.ko.json +82 -22
- package/resource/package.nls.pl.json +83 -23
- package/resource/package.nls.pt-BR.json +84 -24
- package/resource/package.nls.ru.json +84 -24
- package/resource/package.nls.tr.json +82 -22
- package/resource/package.nls.zh-Hans.json +82 -22
- package/resource/package.nls.zh-Hant.json +82 -22
- package/resource/package.nls.zh-cn.json +82 -22
- package/resource/package.nls.zh-tw.json +82 -22
- package/resource/yaml-schema/v1.3/yaml.schema.json +1500 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -22,6 +22,8 @@ const constants_2 = require("../constants");
|
|
|
22
22
|
const errors_1 = require("../errors");
|
|
23
23
|
const results_1 = require("../results");
|
|
24
24
|
const telemetry_1 = require("./telemetry");
|
|
25
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
26
|
+
const globalVars_1 = require("../../../../core/globalVars");
|
|
25
27
|
class ManifestUtils {
|
|
26
28
|
async readAppManifest(projectPath) {
|
|
27
29
|
const filePath = this.getTeamsAppManifestPath(projectPath);
|
|
@@ -36,8 +38,13 @@ class ManifestUtils {
|
|
|
36
38
|
let content = await fs_extra_1.default.readFile(manifestTemplatePath, { encoding: "utf-8" });
|
|
37
39
|
content = strip_bom_1.default(content);
|
|
38
40
|
const contentV3 = migrate_1.convertManifestTemplateToV3(content);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
try {
|
|
42
|
+
const manifest = JSON.parse(contentV3);
|
|
43
|
+
return teamsfx_api_1.ok(manifest);
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
return teamsfx_api_1.err(new common_1.JSONSyntaxError(manifestTemplatePath, e, "ManifestUtils"));
|
|
47
|
+
}
|
|
41
48
|
}
|
|
42
49
|
async _writeAppManifest(appManifest, manifestTemplatePath) {
|
|
43
50
|
const content = JSON.stringify(appManifest, undefined, 4);
|
|
@@ -278,6 +285,12 @@ class ManifestUtils {
|
|
|
278
285
|
return teamsfx_api_1.ok(manifest);
|
|
279
286
|
}
|
|
280
287
|
}
|
|
288
|
+
tslib_1.__decorate([
|
|
289
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "ManifestUtils" })]),
|
|
290
|
+
tslib_1.__metadata("design:type", Function),
|
|
291
|
+
tslib_1.__metadata("design:paramtypes", [String]),
|
|
292
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
293
|
+
], ManifestUtils.prototype, "_readAppManifest", null);
|
|
281
294
|
exports.ManifestUtils = ManifestUtils;
|
|
282
295
|
exports.manifestUtils = new ManifestUtils();
|
|
283
296
|
//# sourceMappingURL=ManifestUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAUgC;AAChC,8DAA6B;AAC7B,gEAA0B;AAC1B,mCAAmC;AACnC,mDAA6B;AAC7B,4BAA0B;AAC1B,kEAAiC;AACjC,+BAA0B;AAC1B,0EAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,9 +84,10 @@ function needBotCode(appDefinition) {
|
|
|
84
84
|
}
|
|
85
85
|
exports.needBotCode = needBotCode;
|
|
86
86
|
function isApiBasedMessageExtension(appDefinition) {
|
|
87
|
+
var _a;
|
|
87
88
|
return (!!appDefinition.messagingExtensions &&
|
|
88
89
|
appDefinition.messagingExtensions.length > 0 &&
|
|
89
|
-
appDefinition.messagingExtensions[0].messagingExtensionServiceType === "
|
|
90
|
+
((_a = appDefinition.messagingExtensions[0].messagingExtensionServiceType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "apibased");
|
|
90
91
|
}
|
|
91
92
|
function containsUnsupportedFeature(appDefinition) {
|
|
92
93
|
var _a, _b, _c, _d, _e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mCAAkC;AAClC,gEAAgC;AAKhC,SAAgB,iBAAiB,CAAC,MAAc,EAAE,QAAa;IAC7D,IAAI,IAAI,GAAa,EAAE,CAAC;IACxB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,IAAI,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACxB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;wBACxB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,MAAM,IAAI,GAAG,IAAI,KAAK,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;oBAC5E,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;iBAClE;aACF;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;gBAC7E,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;aAC/B;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,8CAmBC;AAED,SAAgB,cAAc,CAAC,cAAsB,EAAE,IAAS;IAC9D,iBAAiB;IACjB,kBAAQ,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IACnC,cAAc,GAAG,kBAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACvD,OAAO,cAAc,CAAC;AACxB,CAAC;AALD,wCAKC;AAED,SAAgB,aAAa,CAAC,aAA4B;IACxD,MAAM,mBAAmB,GAAkB;QACzC,eAAe;QACf,QAAQ;QACR,OAAO;QACP,SAAS;QACT,MAAM;KACP,CAAC;IACF,IAAI,CAAC,CAAC,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACrE,OAAO,CACL,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;YAC5F,CAAC,CACF,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,sCAgBC;AAED,SAAgB,UAAU,CAAC,aAA4B;IACrD,OAAO,CACL,CAAC,CAAC,aAAa,CAAC,gBAAgB;QAChC,aAAa,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;QACzC,kBAAkB,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;AACJ,CAAC;AAND,gCAMC;AAED,SAAgB,iBAAiB,CAAC,aAA4B;IAC5D,OAAO,WAAW,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,aAAa,CAAC,CAAC;AAClE,CAAC;AAFD,8CAEC;AAED,SAAgB,WAAW,CAAC,aAA4B;IACtD,OAAO,aAAa,CAAC,aAAa,CAAC,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC;AACnE,CAAC;AAFD,kCAEC;AAED,SAAgB,KAAK,CAAC,aAA4B;IAChD,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;AAC/D,CAAC;AAFD,sBAEC;AAED,SAAgB,0BAA0B,CAAC,aAA4B;IACrE,OAAO,CACL,CAAC,CAAC,aAAa,CAAC,mBAAmB;QACnC,aAAa,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7C,CAAC;AACJ,CAAC;AAND,gEAMC;AAED,SAAgB,gCAAgC,CAAC,aAA4B;IAC3E,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,0BAA0B,CAAC,aAAa,CAAC,CAAC;AAC3E,CAAC;AAFD,4EAEC;AAED,SAAgB,WAAW,CAAC,aAA4B;IACtD,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,0BAA0B,CAAC,aAAa,CAAC,CAAC;AAC3E,CAAC;AAFD,kCAEC;AAED,SAAS,0BAA0B,CAAC,aAA4B
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,MAAM,EACN,OAAO,
|
|
1
|
+
{"version":3,"file":"validateAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,MAAM,EACN,OAAO,EAQR,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAgB7E,qBACa,wBAAyB,YAAW,UAAU;IACzD,WAAW,SAAoE;IAC/E,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAuOhD,OAAO,CAAC,YAAY;CAYrB"}
|
|
@@ -62,6 +62,9 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
|
62
62
|
const manifestContent = manifestFile.getData().toString();
|
|
63
63
|
const manifest = JSON.parse(manifestContent);
|
|
64
64
|
metadataUtil_1.metadataUtil.parseManifest(manifest);
|
|
65
|
+
// Add common properties like isCopilotPlugin: boolean
|
|
66
|
+
const manifestTelemetries = teamsfx_api_1.ManifestUtil.parseCommonTelemetryProperties(manifest);
|
|
67
|
+
lodash_1.merge(context.telemetryProperties, manifestTelemetries);
|
|
65
68
|
}
|
|
66
69
|
const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
|
|
67
70
|
scopes: tools_1.AppStudioScopes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,
|
|
1
|
+
{"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAIN,OAAO,EACR,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAIN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAwChC,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,qBAAa,sBAAsB;WASb,mBAAmB,CACrC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;WAkBrC,wBAAwB,CAC1C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;mBAUpC,aAAa;CAwKnC"}
|
|
@@ -26,6 +26,7 @@ const utils_1 = require("../../../common/spec-parser/utils");
|
|
|
26
26
|
const constants_1 = require("../../../common/spec-parser/constants");
|
|
27
27
|
const util = tslib_1.__importStar(require("util"));
|
|
28
28
|
const specParserError_1 = require("../../../common/spec-parser/specParserError");
|
|
29
|
+
const util_1 = require("../../../question/util");
|
|
29
30
|
const fromApiSpeccomponentName = "copilot-plugin-existing-api";
|
|
30
31
|
const fromApiSpecTemplateName = "copilot-plugin-existing-api";
|
|
31
32
|
const fromOpenAIPlugincomponentName = "copilot-plugin-from-oai-plugin";
|
|
@@ -34,6 +35,8 @@ const apiSpecFolderName = "apiSpecificationFiles";
|
|
|
34
35
|
const apiSpecYamlFileName = "openapi.yaml";
|
|
35
36
|
const apiSpecJsonFileName = "openapi.json";
|
|
36
37
|
const invalidApiSpecErrorName = "invalid-api-spec";
|
|
38
|
+
const copilotPluginExistingApiSpecUrlTelemetryEvent = "copilot-plugin-existing-api-spec-url";
|
|
39
|
+
const isRemoteUrlTelemetryProperty = "remote-url";
|
|
37
40
|
class CopilotPluginGenerator {
|
|
38
41
|
static async generateFromApiSpec(context, inputs, destinationPath) {
|
|
39
42
|
return await this.generateForME(context, inputs, destinationPath, fromApiSpecTemplateName, fromApiSpeccomponentName);
|
|
@@ -54,6 +57,9 @@ class CopilotPluginGenerator {
|
|
|
54
57
|
if (templateRes.isErr())
|
|
55
58
|
return teamsfx_api_1.err(templateRes.error);
|
|
56
59
|
const url = (_a = inputs[questionNames_1.QuestionNames.ApiSpecLocation]) !== null && _a !== void 0 ? _a : (_b = inputs.openAIPluginManifest) === null || _b === void 0 ? void 0 : _b.api.url;
|
|
60
|
+
context.telemetryReporter.sendTelemetryEvent(copilotPluginExistingApiSpecUrlTelemetryEvent, {
|
|
61
|
+
[isRemoteUrlTelemetryProperty]: util_1.isValidHttpUrl(url).toString(),
|
|
62
|
+
});
|
|
57
63
|
// validate API spec
|
|
58
64
|
const specParser = new specParser_1.SpecParser(url);
|
|
59
65
|
const validationRes = await specParser.validate();
|
|
@@ -69,6 +75,10 @@ class CopilotPluginGenerator {
|
|
|
69
75
|
warnings.splice(warnings.indexOf(operationIdWarning), 1);
|
|
70
76
|
}
|
|
71
77
|
}
|
|
78
|
+
const specVersionWarning = warnings.find((w) => w.type === interfaces_1.WarningType.ConvertSwaggerToOpenAPI);
|
|
79
|
+
if (specVersionWarning) {
|
|
80
|
+
specVersionWarning.content = ""; // We don't care content of this warning
|
|
81
|
+
}
|
|
72
82
|
if (validationRes.status === interfaces_1.ValidationStatus.Error) {
|
|
73
83
|
helper_1.logValidationResults(validationRes.errors, warnings, context, true, false, true);
|
|
74
84
|
const errorMessage = inputs.platform === teamsfx_api_1.Platform.VSCode
|
|
@@ -90,7 +100,18 @@ class CopilotPluginGenerator {
|
|
|
90
100
|
const openapiSpecPath = path_1.default.join(apiSpecFolderPath, isYaml ? apiSpecYamlFileName : apiSpecJsonFileName);
|
|
91
101
|
const adaptiveCardFolder = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.AdaptiveFolderName);
|
|
92
102
|
const generateResult = await specParser.generate(manifestPath, filters, openapiSpecPath, adaptiveCardFolder);
|
|
103
|
+
context.telemetryReporter.sendTelemetryEvent(helper_1.specParserGenerateResultTelemetryEvent, {
|
|
104
|
+
[helper_1.specParserGenerateResultAllSuccessTelemetryProperty]: generateResult.allSuccess.toString(),
|
|
105
|
+
[helper_1.specParserGenerateResultWarningsTelemetryProperty]: generateResult.warnings
|
|
106
|
+
.map((w) => w.type.toString() + ": " + w.content)
|
|
107
|
+
.join(";"),
|
|
108
|
+
});
|
|
93
109
|
if (generateResult.warnings.length > 0) {
|
|
110
|
+
generateResult.warnings.find((o) => {
|
|
111
|
+
if (o.type === interfaces_1.WarningType.OperationOnlyContainsOptionalParam) {
|
|
112
|
+
o.content = ""; // We don't care content of this warning
|
|
113
|
+
}
|
|
114
|
+
});
|
|
94
115
|
warnings.push(...generateResult.warnings);
|
|
95
116
|
}
|
|
96
117
|
// update manifest based on openAI plugin manifest
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,+CAA8C;AAC9C,wDAagC;AAChC,4CAAyC;AACzC,wDAAwB;AACxB,0EAAuE;AACvE,mEAAgE;AAChE,uEAAoE;AACpE,mEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,9 @@ declare enum OpenAIPluginManifestErrorType {
|
|
|
8
8
|
AuthNotSupported = "openai-pliugin-auth-not-supported",
|
|
9
9
|
ApiUrlMissing = "openai-plugin-api-url-missing"
|
|
10
10
|
}
|
|
11
|
+
export declare const specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
|
|
12
|
+
export declare const specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
|
|
13
|
+
export declare const specParserGenerateResultWarningsTelemetryProperty = "warnings";
|
|
11
14
|
export interface ErrorResult {
|
|
12
15
|
/**
|
|
13
16
|
* The type of error.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,OAAO,EAEP,oBAAoB,EACpB,MAAM,EAIN,gBAAgB,EAChB,YAAY,EAEZ,OAAO,EAKR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EACL,SAAS,IAAI,gBAAgB,EAE7B,aAAa,EAEd,MAAM,wCAAwC,CAAC;AAShD,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAgB9E,aAAK,6BAA6B;IAChC,gBAAgB,sCAAsC;IACtD,aAAa,kCAAkC;CAChD;AAED,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,gBAAgB,GAAG,6BAA6B,CAAC;IAEvD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,0BAA0B;WACxB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;WAuBtE,cAAc,CACzB,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAUvC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,oBAAoB,GAAG,SAAS,EAC1C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,mBAAmB,UAAO,EAC1B,gBAAgB,UAAO,GACtB,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,OAAO,EAEP,oBAAoB,EACpB,MAAM,EAIN,gBAAgB,EAChB,YAAY,EAEZ,OAAO,EAKR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EACL,SAAS,IAAI,gBAAgB,EAE7B,aAAa,EAEd,MAAM,wCAAwC,CAAC;AAShD,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAgB9E,aAAK,6BAA6B;IAChC,gBAAgB,sCAAsC;IACtD,aAAa,kCAAkC;CAChD;AAED,eAAO,MAAM,sCAAsC,gCAAgC,CAAC;AACpF,eAAO,MAAM,mDAAmD,gBAAgB,CAAC;AACjF,eAAO,MAAM,iDAAiD,aAAa,CAAC;AAE5E,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,gBAAgB,GAAG,6BAA6B,CAAC;IAEvD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,0BAA0B;WACxB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;WAuBtE,cAAc,CACzB,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAUvC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,oBAAoB,GAAG,SAAS,EAC1C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,mBAAmB,UAAO,EAC1B,gBAAgB,UAAO,GACtB,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAiEhD;AAoBD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,EAAE,EACrB,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,OAAO,EAClB,gBAAgB,EAAE,OAAO,EACzB,mBAAmB,UAAQ,GAC1B,IAAI,CAmEN;AA0BD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,gBAAgB,EAC/B,WAAW,EAAE,MAAM,GAClB,MAAM,CA6BR;AAyJD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAE/E"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.convertSpecParserErrorToFxError = exports.generateScaffoldingSummary = exports.logValidationResults = exports.listOperations = exports.OpenAIPluginManifestHelper = void 0;
|
|
5
|
+
exports.convertSpecParserErrorToFxError = exports.generateScaffoldingSummary = exports.logValidationResults = exports.listOperations = exports.OpenAIPluginManifestHelper = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
/**
|
|
8
8
|
* @author yuqzho@microsoft.com
|
|
@@ -27,6 +27,9 @@ var OpenAIPluginManifestErrorType;
|
|
|
27
27
|
OpenAIPluginManifestErrorType["AuthNotSupported"] = "openai-pliugin-auth-not-supported";
|
|
28
28
|
OpenAIPluginManifestErrorType["ApiUrlMissing"] = "openai-plugin-api-url-missing";
|
|
29
29
|
})(OpenAIPluginManifestErrorType || (OpenAIPluginManifestErrorType = {}));
|
|
30
|
+
exports.specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
|
|
31
|
+
exports.specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
|
|
32
|
+
exports.specParserGenerateResultWarningsTelemetryProperty = "warnings";
|
|
30
33
|
class OpenAIPluginManifestHelper {
|
|
31
34
|
static async loadOpenAIPluginManifest(input) {
|
|
32
35
|
let path = (input.endsWith("/") ? input.substring(0, input.length - 1) : input) + manifestFilePath;
|
|
@@ -82,6 +85,17 @@ async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath,
|
|
|
82
85
|
const operationMaps = await specParser.listOperationMap();
|
|
83
86
|
const existingOperations = existingOperationIds.map((key) => operationMaps.get(key));
|
|
84
87
|
operations = operations.filter((operation) => !existingOperations.includes(operation));
|
|
88
|
+
// No extra API can be added
|
|
89
|
+
if (operations.length == 0) {
|
|
90
|
+
const errors = [
|
|
91
|
+
{
|
|
92
|
+
type: interfaces_1.ErrorType.NoExtraAPICanBeAdded,
|
|
93
|
+
content: localizeUtils_1.getLocalizedString("error.copilotPlugin.noExtraAPICanBeAdded"),
|
|
94
|
+
},
|
|
95
|
+
];
|
|
96
|
+
logValidationResults(errors, [], context, true, false);
|
|
97
|
+
return teamsfx_api_1.err(errors);
|
|
98
|
+
}
|
|
85
99
|
}
|
|
86
100
|
else {
|
|
87
101
|
throw manifest.error;
|
|
@@ -178,15 +192,20 @@ function validateOpenAIPluginManifest(manifest) {
|
|
|
178
192
|
return errors;
|
|
179
193
|
}
|
|
180
194
|
function generateScaffoldingSummary(warnings, teamsManifest, projectPath) {
|
|
181
|
-
|
|
195
|
+
var _a;
|
|
196
|
+
const apiSpecFileName = ((_a = teamsManifest.composeExtensions) === null || _a === void 0 ? void 0 : _a.length) &&
|
|
197
|
+
teamsManifest.composeExtensions[0].apiSpecificationFile
|
|
198
|
+
? teamsManifest.composeExtensions[0].apiSpecificationFile
|
|
199
|
+
: "";
|
|
200
|
+
const apiSpecWarningMessage = formatApiSpecValidationWarningMessage(warnings, path_1.default.join(teamsfx_api_1.AppPackageFolderName, apiSpecFileName));
|
|
182
201
|
const manifestWarningResult = validateTeamsManifestLength(teamsManifest, projectPath, warnings);
|
|
183
202
|
const manifestWarningMessage = manifestWarningResult.map((warn) => {
|
|
184
203
|
return `${constant_1.SummaryConstant.NotExecuted} ${warn}`;
|
|
185
204
|
});
|
|
186
|
-
if (apiSpecWarningMessage || manifestWarningMessage.length) {
|
|
205
|
+
if (apiSpecWarningMessage.length || manifestWarningMessage.length) {
|
|
187
206
|
let details = "";
|
|
188
|
-
if (apiSpecWarningMessage) {
|
|
189
|
-
details += os_1.EOL + apiSpecWarningMessage;
|
|
207
|
+
if (apiSpecWarningMessage.length) {
|
|
208
|
+
details += os_1.EOL + apiSpecWarningMessage.join(os_1.EOL);
|
|
190
209
|
}
|
|
191
210
|
if (manifestWarningMessage.length) {
|
|
192
211
|
details += os_1.EOL + manifestWarningMessage.join(os_1.EOL);
|
|
@@ -198,23 +217,33 @@ function generateScaffoldingSummary(warnings, teamsManifest, projectPath) {
|
|
|
198
217
|
}
|
|
199
218
|
}
|
|
200
219
|
exports.generateScaffoldingSummary = generateScaffoldingSummary;
|
|
201
|
-
function formatApiSpecValidationWarningMessage(specWarnings) {
|
|
202
|
-
const
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
220
|
+
function formatApiSpecValidationWarningMessage(specWarnings, apiSpecFileName) {
|
|
221
|
+
const resultWarnings = [];
|
|
222
|
+
const operationIdWarning = specWarnings.find((w) => w.type === interfaces_1.WarningType.OperationIdMissing);
|
|
223
|
+
if (operationIdWarning) {
|
|
224
|
+
resultWarnings.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.operationId", `${constant_1.SummaryConstant.NotExecuted} ${operationIdWarning.content}`, teamsfx_api_1.ManifestTemplateFileName));
|
|
225
|
+
}
|
|
226
|
+
const swaggerWarning = specWarnings.find((w) => w.type === interfaces_1.WarningType.ConvertSwaggerToOpenAPI);
|
|
227
|
+
if (swaggerWarning) {
|
|
228
|
+
resultWarnings.push(`${constant_1.SummaryConstant.NotExecuted} ` +
|
|
229
|
+
localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.swaggerVersion", apiSpecFileName));
|
|
230
|
+
}
|
|
231
|
+
return resultWarnings;
|
|
208
232
|
}
|
|
209
233
|
function validateTeamsManifestLength(teamsManifest, projectPath, warnings) {
|
|
210
|
-
var _a, _b, _c, _d;
|
|
234
|
+
var _a, _b, _c, _d, _e;
|
|
211
235
|
const nameShortLimit = 30;
|
|
212
236
|
const nameFullLimit = 100;
|
|
213
237
|
const descriptionShortLimit = 80;
|
|
214
238
|
const descriptionFullLimit = 4000;
|
|
239
|
+
const envPlaceholder = "${{TEAMSFX_ENV}}";
|
|
240
|
+
const devEnv = "dev";
|
|
215
241
|
const resultWarnings = [];
|
|
216
242
|
// validate name
|
|
217
|
-
|
|
243
|
+
const shortNameLength = teamsManifest.name.short.includes(envPlaceholder)
|
|
244
|
+
? teamsManifest.name.short.length - envPlaceholder.length + devEnv.length
|
|
245
|
+
: teamsManifest.name.short.length;
|
|
246
|
+
if (shortNameLength > nameShortLimit) {
|
|
218
247
|
resultWarnings.push(formatLengthExceedingErrorMessage("/name/short", nameShortLimit));
|
|
219
248
|
}
|
|
220
249
|
if (!!teamsManifest.name.full && ((_a = teamsManifest.name.full) === null || _a === void 0 ? void 0 : _a.length) > nameFullLimit) {
|
|
@@ -231,13 +260,20 @@ function validateTeamsManifestLength(teamsManifest, projectPath, warnings) {
|
|
|
231
260
|
if (teamsManifest.description.full.length > descriptionFullLimit) {
|
|
232
261
|
resultWarnings.push(formatLengthExceedingErrorMessage("/description/full", descriptionFullLimit));
|
|
233
262
|
}
|
|
234
|
-
// validate
|
|
263
|
+
// validate command
|
|
235
264
|
if (teamsfx_api_1.ManifestUtil.parseCommonProperties(teamsManifest).isCopilotPlugin) {
|
|
236
|
-
const
|
|
265
|
+
const optionalParamsOnlyWarnings = warnings.filter((o) => o.type === interfaces_1.WarningType.OperationOnlyContainsOptionalParam);
|
|
266
|
+
if (optionalParamsOnlyWarnings) {
|
|
267
|
+
for (const optionalParamsOnlyWarning of optionalParamsOnlyWarnings) {
|
|
268
|
+
resultWarnings.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCommandParameters", optionalParamsOnlyWarning.data) +
|
|
269
|
+
localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCommandParameters.mitigation", optionalParamsOnlyWarning.data, path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName), path_1.default.join(teamsfx_api_1.AppPackageFolderName, (_c = teamsManifest.composeExtensions[0].apiSpecificationFile) !== null && _c !== void 0 ? _c : "")));
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
const commands = ((_d = teamsManifest.composeExtensions) === null || _d === void 0 ? void 0 : _d[0]).commands;
|
|
237
273
|
for (const command of commands) {
|
|
238
274
|
if (command.type === "query") {
|
|
239
275
|
if (!command.apiResponseRenderingTemplateFile) {
|
|
240
|
-
const errorDetail = (
|
|
276
|
+
const errorDetail = (_e = warnings.find((w) => w.type === interfaces_1.WarningType.GenerateCardFailed && w.data === command.id)) === null || _e === void 0 ? void 0 : _e.content;
|
|
241
277
|
resultWarnings.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCardTemlate", "apiResponseRenderingTemplateFile", command.id) +
|
|
242
278
|
localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCardTemlate.mitigation", teamsfx_api_1.AppPackageFolderName, `composeExtensions/commands/${command.id}/apiResponseRenderingTemplateFile`, path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName)) +
|
|
243
279
|
(errorDetail ? os_1.EOL + errorDetail : ""));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.EnvWriterMW = exports.EnvLoaderMW = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
6
6
|
const lodash_1 = tslib_1.__importDefault(require("lodash"));
|
|
7
|
-
const
|
|
7
|
+
const environmentName_1 = require("../../core/environmentName");
|
|
8
8
|
const error_1 = require("../../core/error");
|
|
9
9
|
const globalVars_1 = require("../../core/globalVars");
|
|
10
10
|
const questionNames_1 = require("../../question/questionNames");
|
|
@@ -46,7 +46,7 @@ const envLoaderMWImpl = async (withLocalEnv, ctx, next, skipLoadIfNoEnvInput = f
|
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
if (inputs.ignoreEnvInfo) {
|
|
49
|
-
inputs.env =
|
|
49
|
+
inputs.env = environmentName_1.environmentNameManager.getDefaultEnvName();
|
|
50
50
|
}
|
|
51
51
|
if (!inputs.env) {
|
|
52
52
|
if (skipLoadIfNoEnvInput) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":";;;;AAGA,wDAAqD;AACrD,4DAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceGroupHelper.d.ts","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,oBAAoB,EAEpB,OAAO,
|
|
1
|
+
{"version":3,"file":"ResourceGroupHelper.d.ts","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,qBAAqB,EAGrB,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAmBhC,oBAAY,iBAAiB,GAAG;IAC9B,sBAAsB,EAAE,OAAO,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAKF,cAAM,mBAAmB;IACjB,sBAAsB,CAC1B,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqC7B,2BAA2B,CAC/B,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAiB9B,oBAAoB,CACxB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,iBAAiB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAuBpD,kBAAkB,CACtB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAkBzC,YAAY,CAChB,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAwCrC;;OAEG;IACG,sBAAsB,CAC1B,MAAM,EAAE,qBAAqB,EAC7B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,EAClC,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAuCxC,cAAc,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM;CASxF;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
|
|
@@ -37,7 +37,8 @@ class ResourceGroupHelper {
|
|
|
37
37
|
return teamsfx_api_1.ok(response.name);
|
|
38
38
|
}
|
|
39
39
|
catch (e) {
|
|
40
|
-
|
|
40
|
+
delete e["request"];
|
|
41
|
+
return teamsfx_api_1.err(new azure_1.CreateResourceGroupError(resourceGroupName, subscriptionId, e.message || JSON.stringify(e), e));
|
|
41
42
|
}
|
|
42
43
|
}
|
|
43
44
|
async checkResourceGroupExistence(resourceGroupName, rmClient) {
|
|
@@ -46,7 +47,8 @@ class ResourceGroupHelper {
|
|
|
46
47
|
return teamsfx_api_1.ok(!!checkRes.body);
|
|
47
48
|
}
|
|
48
49
|
catch (e) {
|
|
49
|
-
|
|
50
|
+
delete e["request"];
|
|
51
|
+
return teamsfx_api_1.err(new azure_1.CheckResourceGroupExistenceError(resourceGroupName, rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
async getResourceGroupInfo(resourceGroupName, rmClient) {
|
|
@@ -63,7 +65,8 @@ class ResourceGroupHelper {
|
|
|
63
65
|
return teamsfx_api_1.ok(undefined);
|
|
64
66
|
}
|
|
65
67
|
catch (e) {
|
|
66
|
-
|
|
68
|
+
delete e["request"];
|
|
69
|
+
return teamsfx_api_1.err(new azure_1.GetResourceGroupError(resourceGroupName, rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
67
70
|
}
|
|
68
71
|
}
|
|
69
72
|
async listResourceGroups(rmClient) {
|
|
@@ -80,7 +83,8 @@ class ResourceGroupHelper {
|
|
|
80
83
|
return teamsfx_api_1.ok(results);
|
|
81
84
|
}
|
|
82
85
|
catch (e) {
|
|
83
|
-
|
|
86
|
+
delete e["request"];
|
|
87
|
+
return teamsfx_api_1.err(new azure_1.ListResourceGroupsError(rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
84
88
|
}
|
|
85
89
|
}
|
|
86
90
|
async getLocations(azureAccountProvider, rmClient) {
|
|
@@ -109,7 +113,8 @@ class ResourceGroupHelper {
|
|
|
109
113
|
return teamsfx_api_1.ok(rgLocations);
|
|
110
114
|
}
|
|
111
115
|
catch (e) {
|
|
112
|
-
|
|
116
|
+
delete e["request"];
|
|
117
|
+
return teamsfx_api_1.err(new azure_1.ListResourceGroupLocationsError(rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
113
118
|
}
|
|
114
119
|
}
|
|
115
120
|
/**
|