@microsoft/teamsfx-core 2.0.4-alpha.5925cbfed.0 → 2.0.4-alpha.6afadb512.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/samples-config-v3.json +22 -1
- package/build/common/spec-parser/interfaces.d.ts +0 -5
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +1 -5
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/component/configManager/interface.d.ts +5 -2
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/interface.js.map +1 -1
- package/build/component/configManager/parser.d.ts.map +1 -1
- package/build/component/configManager/parser.js +6 -7
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +1 -2
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/coordinator/index.d.ts +5 -4
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +5 -3
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +8 -1
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +2 -0
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +55 -23
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +8 -0
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/utils/metadataUtil.d.ts +3 -0
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +16 -3
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/core/FxCore.d.ts +25 -24
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +3 -3
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts +23 -21
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +22 -18
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/collaborator.js +2 -2
- package/build/core/collaborator.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +4 -0
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +34 -32
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/utils/migrationContext.d.ts +1 -0
- package/build/core/middleware/utils/migrationContext.d.ts.map +1 -1
- package/build/core/middleware/utils/migrationContext.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +4 -0
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/question/create.d.ts +1 -0
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +37 -27
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts +2 -1
- package/build/question/generator.d.ts.map +1 -1
- package/build/question/generator.js +147 -46
- package/build/question/generator.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +5 -1
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateSampleProjectInputs.d.ts +1 -1
- package/build/question/inputs/CreateSampleProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +10 -2
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +2 -0
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +17 -9
- package/build/question/other.js.map +1 -1
- package/build/ui/validationUtils.js +2 -2
- package/build/ui/validationUtils.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.json +11 -6
- package/resource/yaml-schema/{1.1.1 → v1.2}/yaml.schema.json +11 -5
- 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
|
@@ -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.generateScaffoldingSummary = exports.logValidationResults = exports.listOperations = exports.OpenAIPluginManifestHelper = void 0;
|
|
5
|
+
exports.convertSpecParserErrorToFxError = exports.generateScaffoldingSummary = exports.logValidationResults = exports.listOperations = exports.OpenAIPluginManifestHelper = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
/**
|
|
8
8
|
* @author yuqzho@microsoft.com
|
|
@@ -19,6 +19,7 @@ const os_1 = require("os");
|
|
|
19
19
|
const constant_1 = require("../../configManager/constant");
|
|
20
20
|
const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
|
|
21
21
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
22
|
+
const specParserError_1 = require("../../../common/spec-parser/specParserError");
|
|
22
23
|
const manifestFilePath = "/.well-known/ai-plugin.json";
|
|
23
24
|
const componentName = "OpenAIPluginManifestHelper";
|
|
24
25
|
var OpenAIPluginManifestErrorType;
|
|
@@ -43,9 +44,7 @@ class OpenAIPluginManifestHelper {
|
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
static async updateManifest(openAiPluginManifest, teamsAppManifest, manifestPath) {
|
|
46
|
-
teamsAppManifest.
|
|
47
|
-
teamsAppManifest.name.short = openAiPluginManifest.name_for_human;
|
|
48
|
-
teamsAppManifest.description.full = openAiPluginManifest.description_for_model;
|
|
47
|
+
teamsAppManifest.description.full = openAiPluginManifest.description_for_human;
|
|
49
48
|
teamsAppManifest.description.short = openAiPluginManifest.description_for_human;
|
|
50
49
|
teamsAppManifest.developer.websiteUrl = openAiPluginManifest.legal_info_url;
|
|
51
50
|
teamsAppManifest.developer.privacyUrl = openAiPluginManifest.legal_info_url;
|
|
@@ -64,29 +63,39 @@ async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath,
|
|
|
64
63
|
}
|
|
65
64
|
apiSpecUrl = manifest.api.url;
|
|
66
65
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
let operations = await specParser.list();
|
|
74
|
-
// Filter out exsiting APIs
|
|
75
|
-
if (!includeExistingAPIs) {
|
|
76
|
-
if (!teamsManifestPath) {
|
|
77
|
-
throw new error_1.MissingRequiredInputError("teamsManifestPath", "inputs");
|
|
66
|
+
try {
|
|
67
|
+
const specParser = new specParser_1.SpecParser(apiSpecUrl);
|
|
68
|
+
const validationRes = await specParser.validate();
|
|
69
|
+
logValidationResults(validationRes.errors, validationRes.warnings, context, true, shouldLogWarning);
|
|
70
|
+
if (validationRes.status === interfaces_1.ValidationStatus.Error) {
|
|
71
|
+
return teamsfx_api_1.err(validationRes.errors);
|
|
78
72
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
73
|
+
let operations = await specParser.list();
|
|
74
|
+
// Filter out exsiting APIs
|
|
75
|
+
if (!includeExistingAPIs) {
|
|
76
|
+
if (!teamsManifestPath) {
|
|
77
|
+
throw new error_1.MissingRequiredInputError("teamsManifestPath", "inputs");
|
|
78
|
+
}
|
|
79
|
+
const manifest = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
|
|
80
|
+
if (manifest.isOk()) {
|
|
81
|
+
const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifest.value);
|
|
82
|
+
operations = operations.filter((operation) => !existingOperationIds.includes(operation));
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
throw manifest.error;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
const sortedOperations = sortOperations(operations);
|
|
89
|
+
return teamsfx_api_1.ok(sortedOperations);
|
|
90
|
+
}
|
|
91
|
+
catch (e) {
|
|
92
|
+
if (e instanceof specParserError_1.SpecParserError) {
|
|
93
|
+
throw convertSpecParserErrorToFxError(e);
|
|
83
94
|
}
|
|
84
95
|
else {
|
|
85
|
-
throw
|
|
96
|
+
throw e;
|
|
86
97
|
}
|
|
87
98
|
}
|
|
88
|
-
const sortedOperations = sortOperations(operations);
|
|
89
|
-
return teamsfx_api_1.ok(sortedOperations);
|
|
90
99
|
}
|
|
91
100
|
exports.listOperations = listOperations;
|
|
92
101
|
function sortOperations(operations) {
|
|
@@ -196,7 +205,7 @@ function formatApiSpecValidationWarningMessage(specWarnings) {
|
|
|
196
205
|
: "";
|
|
197
206
|
}
|
|
198
207
|
function validateTeamsManifestLength(teamsManifest) {
|
|
199
|
-
var _a, _b;
|
|
208
|
+
var _a, _b, _c;
|
|
200
209
|
const nameShortLimit = 30;
|
|
201
210
|
const nameFullLimit = 100;
|
|
202
211
|
const descriptionShortLimit = 80;
|
|
@@ -220,10 +229,33 @@ function validateTeamsManifestLength(teamsManifest) {
|
|
|
220
229
|
if (teamsManifest.description.full.length > descriptionFullLimit) {
|
|
221
230
|
warnings.push(formatLengthExceedingErrorMessage("/description/full", descriptionFullLimit));
|
|
222
231
|
}
|
|
232
|
+
// validate card
|
|
233
|
+
if (teamsfx_api_1.ManifestUtil.parseCommonProperties(teamsManifest).isCopilotPlugin) {
|
|
234
|
+
const commands = ((_c = teamsManifest.composeExtensions) === null || _c === void 0 ? void 0 : _c[0]).commands;
|
|
235
|
+
for (const command of commands) {
|
|
236
|
+
if (command.type === "query") {
|
|
237
|
+
if (!command.apiResponseRenderingTemplate) {
|
|
238
|
+
warnings.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCardTemlate", "apiResponseRenderingTemplateFile", command.id) +
|
|
239
|
+
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)));
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
const cardPath = path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName, command.apiResponseRenderingTemplate);
|
|
243
|
+
if (!fs_extra_1.default.existsSync(cardPath)) {
|
|
244
|
+
warnings.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsAppPackagePackage.cannotFindCard", command.apiResponseRenderingTemplate, teamsfx_api_1.AppPackageFolderName) +
|
|
245
|
+
localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsAppPackagePackage.cannotFindCard.mitigation", command.apiResponseRenderingTemplate, teamsfx_api_1.AppPackageFolderName));
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
223
251
|
return warnings;
|
|
224
252
|
}
|
|
225
253
|
function formatLengthExceedingErrorMessage(field, limit) {
|
|
226
254
|
return (localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.lengthExceeding", field, limit.toString()) +
|
|
227
255
|
localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.mitigation", field, path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName)));
|
|
228
256
|
}
|
|
257
|
+
function convertSpecParserErrorToFxError(error) {
|
|
258
|
+
return new teamsfx_api_1.SystemError("SpecParser", error.errorType.toString(), error.message, error.message);
|
|
259
|
+
}
|
|
260
|
+
exports.convertSpecParserErrorToFxError = convertSpecParserErrorToFxError;
|
|
229
261
|
//# sourceMappingURL=helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,OAAO,EACR,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAqBhC,qBAAa,oBAAoB;WASlB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAoBlB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;;WAIhC,aAAa,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAyEvC"}
|
|
@@ -22,6 +22,7 @@ const generator_1 = require("../generator");
|
|
|
22
22
|
const office_addin_project_1 = require("office-addin-project");
|
|
23
23
|
const questionNames_1 = require("../../../question/questionNames");
|
|
24
24
|
const create_1 = require("../../../question/create");
|
|
25
|
+
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
25
26
|
const componentName = "office-addin";
|
|
26
27
|
const telemetryEvent = "generate";
|
|
27
28
|
const templateName = "office-addin";
|
|
@@ -49,6 +50,7 @@ class OfficeAddinGenerator {
|
|
|
49
50
|
const language = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
|
|
50
51
|
const host = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
|
|
51
52
|
const workingDir = process.cwd();
|
|
53
|
+
const importProgress = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.title"), 3);
|
|
52
54
|
process.chdir(addinRoot);
|
|
53
55
|
try {
|
|
54
56
|
if (!fromFolder) {
|
|
@@ -68,23 +70,29 @@ class OfficeAddinGenerator {
|
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
72
|
else {
|
|
73
|
+
await importProgress.start();
|
|
71
74
|
// from existing project
|
|
75
|
+
await importProgress.next(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.copyFiles"));
|
|
72
76
|
helperMethods_1.HelperMethods.copyAddinFiles(fromFolder, addinRoot);
|
|
73
77
|
const sourceManifestFile = inputs[questionNames_1.QuestionNames.OfficeAddinManifest];
|
|
74
78
|
let manifestFile = sourceManifestFile.replace(fromFolder, addinRoot);
|
|
79
|
+
await importProgress.next(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.convertProject"));
|
|
75
80
|
if (manifestFile.endsWith(".xml")) {
|
|
76
81
|
// Need to convert to json project first
|
|
77
82
|
await office_addin_project_1.convertProject(manifestFile);
|
|
78
83
|
manifestFile = manifestFile.replace(/\.xml$/, ".json");
|
|
79
84
|
}
|
|
80
85
|
inputs[questionNames_1.QuestionNames.OfficeAddinHost] = await getHost(manifestFile);
|
|
86
|
+
await importProgress.next(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.updateManifest"));
|
|
81
87
|
helperMethods_1.HelperMethods.updateManifest(destinationPath, manifestFile);
|
|
82
88
|
}
|
|
83
89
|
process.chdir(workingDir);
|
|
90
|
+
importProgress.end(true, true);
|
|
84
91
|
return teamsfx_api_1.ok(undefined);
|
|
85
92
|
}
|
|
86
93
|
catch (e) {
|
|
87
94
|
process.chdir(workingDir);
|
|
95
|
+
importProgress.end(false, true);
|
|
88
96
|
return teamsfx_api_1.err(error_1.CopyFileError(e));
|
|
89
97
|
}
|
|
90
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDASgC;AAChC,+BAA4B;AAC5B,mDAAgD;AAChD,iEAA4D;AAC5D,yFAAyD;AACzD,oEAA8C;AAC9C,+BAAiC;AACjC,+CAAoD;AACpD,4DAAuB;AACvB,+CAA8C;AAC9C,0EAAuE;AACvE,4CAAyC;AACzC,+DAAsD;AACtD,mEAAgE;AAChE,qDAAuD;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,9 @@ import { FxError, Result, TeamsAppManifest, devPreview } from "@microsoft/teamsf
|
|
|
2
2
|
import { ProjectModel } from "../configManager/interface";
|
|
3
3
|
declare class MetadataUtil {
|
|
4
4
|
parse(path: string, env: string | undefined): Promise<Result<ProjectModel, FxError>>;
|
|
5
|
+
static parseSampleTag(additionalMetadata: {
|
|
6
|
+
[key: string]: unknown;
|
|
7
|
+
} | undefined): string;
|
|
5
8
|
parseManifest(manifest: TeamsAppManifest | devPreview.DevPreviewSchema): void;
|
|
6
9
|
}
|
|
7
10
|
export declare const metadataUtil: MetadataUtil;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIvF,OAAO,EAAkB,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1E,cAAM,YAAY;IACV,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"metadataUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIvF,OAAO,EAAkB,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1E,cAAM,YAAY;IACV,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IA4B1F,MAAM,CAAC,cAAc,CAAC,kBAAkB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,GAAG,SAAS,GAAG,MAAM;IAczF,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,GAAG,IAAI;CA6B9E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}
|
|
@@ -11,7 +11,7 @@ const parser_1 = require("../configManager/parser");
|
|
|
11
11
|
const crypto_1 = require("crypto");
|
|
12
12
|
class MetadataUtil {
|
|
13
13
|
async parse(path, env) {
|
|
14
|
-
var _a, _b
|
|
14
|
+
var _a, _b;
|
|
15
15
|
const res = await parser_1.yamlParser.parse(path, true);
|
|
16
16
|
const props = {};
|
|
17
17
|
props[telemetry_1.TelemetryProperty.YmlName] = (env === "local" ? versionMetadata_1.MetadataV3.localConfigFile : versionMetadata_1.MetadataV3.configFile)
|
|
@@ -23,11 +23,24 @@ class MetadataUtil {
|
|
|
23
23
|
props[name + ".actions"] = str !== null && str !== void 0 ? str : "";
|
|
24
24
|
}
|
|
25
25
|
props[telemetry_1.TelemetryProperty.YmlSchemaVersion] = res.value.version;
|
|
26
|
-
props[telemetry_1.TelemetryProperty.SampleAppName] = (
|
|
27
|
-
(
|
|
26
|
+
props[telemetry_1.TelemetryProperty.SampleAppName] = MetadataUtil.parseSampleTag(res.value.additionalMetadata);
|
|
27
|
+
(_b = globalVars_1.TOOLS.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(telemetry_1.TelemetryEvent.MetaData, props);
|
|
28
28
|
}
|
|
29
29
|
return res;
|
|
30
30
|
}
|
|
31
|
+
static parseSampleTag(additionalMetadata) {
|
|
32
|
+
if (additionalMetadata === undefined) {
|
|
33
|
+
return "";
|
|
34
|
+
}
|
|
35
|
+
const sampleTag = additionalMetadata["sampleTag"];
|
|
36
|
+
if (typeof sampleTag === "string") {
|
|
37
|
+
// replace characters that could make the tag be mistaken as a file path or an email address
|
|
38
|
+
return sampleTag.replace(/[@\/\\\.]/g, "_");
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
return "";
|
|
42
|
+
}
|
|
43
|
+
}
|
|
31
44
|
parseManifest(manifest) {
|
|
32
45
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
33
46
|
const props = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataUtil.js","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,sDAA2E;AAC3E,kEAA0D;AAC1D,sDAA8C;AAC9C,0DAA0E;AAC1E,oDAAqD;AACrD,mCAAoC;AAEpC,MAAM,YAAY;IAChB,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,GAAuB;;QAC/C,MAAM,GAAG,GAAG,MAAM,mBAAU,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,KAAK,GAA8B,EAAE,CAAC;QAC5C,KAAK,CAAC,6BAAiB,CAAC,OAAO,CAAC,GAAG,CACjC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,4BAAU,CAAC,eAAe,CAAC,CAAC,CAAC,4BAAU,CAAC,UAAU,CACrE;aACE,KAAK,CAAC,GAAG,CAAC;aACV,IAAI,CAAC,EAAE,CAAC,CAAC;QACZ,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE;YACd,KAAK,MAAM,IAAI,IAAI,0BAAc,EAAE;gBACjC,MAAM,GAAG,GAAG,MAAA,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,0CAAE,UAAU,CACpC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EACrB,QAAQ,GACR,KAAK,CAAC,GAAG,EACT,IAAI,CAAC,EAAE,CAAC,CAAC;gBACZ,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,EAAE,CAAC;aACtC;YACD,KAAK,CAAC,6BAAiB,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;YAC9D,KAAK,CAAC,6BAAiB,CAAC,aAAa,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"metadataUtil.js","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":"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"}
|
package/build/core/FxCore.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiOperation, CoreCallbackEvent, CreateProjectResult, CryptoProvider, Func, FxError, Inputs, InputsWithProjectPath, OpenAIPluginManifest, QTreeNode, Result, Stage, Tools
|
|
1
|
+
import { ApiOperation, CoreCallbackEvent, CreateProjectResult, CryptoProvider, Func, FxError, Inputs, InputsWithProjectPath, OpenAIPluginManifest, QTreeNode, Result, Stage, Tools } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DotenvParseOutput } from "dotenv";
|
|
3
3
|
import "reflect-metadata";
|
|
4
4
|
import { ILifecycle } from "../component/configManager/interface";
|
|
@@ -8,7 +8,8 @@ import "../component/driver/script/scriptDriver";
|
|
|
8
8
|
import { ErrorResult } from "../component/generator/copilotPlugin/helper";
|
|
9
9
|
import { FxCoreV3Implement } from "./FxCoreImplementV3";
|
|
10
10
|
import { PreProvisionResForVS, VersionCheckRes } from "./types";
|
|
11
|
-
|
|
11
|
+
import { ListCollaboratorResult, PermissionsResult } from "../common/permissionInterface";
|
|
12
|
+
export declare type CoreCallbackFunc = (name: string, err?: FxError, data?: any) => void | Promise<void>;
|
|
12
13
|
export declare class FxCore {
|
|
13
14
|
tools: Tools;
|
|
14
15
|
isFromSample?: boolean;
|
|
@@ -31,24 +32,24 @@ export declare class FxCore {
|
|
|
31
32
|
/**
|
|
32
33
|
* lifecycle commands: provision
|
|
33
34
|
*/
|
|
34
|
-
provisionResources(inputs: Inputs): Promise<Result<
|
|
35
|
+
provisionResources(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
35
36
|
/**
|
|
36
37
|
* lifecycle commands: deploy
|
|
37
38
|
*/
|
|
38
|
-
deployArtifacts(inputs: Inputs): Promise<Result<
|
|
39
|
-
localDebug(inputs: Inputs): Promise<Result<
|
|
39
|
+
deployArtifacts(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
40
|
+
localDebug(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
40
41
|
/**
|
|
41
42
|
* none lifecycle command, v3 only
|
|
42
43
|
*/
|
|
43
|
-
deployAadManifest(inputs: Inputs): Promise<Result<
|
|
44
|
+
deployAadManifest(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
44
45
|
/**
|
|
45
46
|
* none lifecycle command, v3 only
|
|
46
47
|
*/
|
|
47
|
-
addWebpart(inputs: Inputs): Promise<Result<
|
|
48
|
+
addWebpart(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
48
49
|
/**
|
|
49
50
|
* lifecycle command: publish
|
|
50
51
|
*/
|
|
51
|
-
publishApplication(inputs: Inputs): Promise<Result<
|
|
52
|
+
publishApplication(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
52
53
|
/**
|
|
53
54
|
* most commands will be deprecated in V3
|
|
54
55
|
*/
|
|
@@ -56,27 +57,27 @@ export declare class FxCore {
|
|
|
56
57
|
/**
|
|
57
58
|
* v3 only none lifecycle command
|
|
58
59
|
*/
|
|
59
|
-
buildAadManifest(inputs: Inputs): Promise<Result<
|
|
60
|
+
buildAadManifest(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
60
61
|
/**
|
|
61
62
|
* v3 only none lifecycle command
|
|
62
63
|
*/
|
|
63
|
-
deployTeamsManifest(inputs: Inputs): Promise<Result<
|
|
64
|
+
deployTeamsManifest(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
64
65
|
/**
|
|
65
66
|
* v3 only none lifecycle command
|
|
66
67
|
*/
|
|
67
|
-
validateApplication(inputs: Inputs): Promise<Result<
|
|
68
|
+
validateApplication(inputs: Inputs): Promise<Result<any, FxError>>;
|
|
68
69
|
/**
|
|
69
70
|
* v3 only none lifecycle command
|
|
70
71
|
*/
|
|
71
|
-
validateManifest(inputs: Inputs): Promise<Result<
|
|
72
|
+
validateManifest(inputs: Inputs): Promise<Result<any, FxError>>;
|
|
72
73
|
/**
|
|
73
74
|
* v3 only none lifecycle command
|
|
74
75
|
*/
|
|
75
|
-
validateAppPackage(inputs: Inputs): Promise<Result<
|
|
76
|
+
validateAppPackage(inputs: Inputs): Promise<Result<any, FxError>>;
|
|
76
77
|
/**
|
|
77
78
|
* v3 only none lifecycle command
|
|
78
79
|
*/
|
|
79
|
-
createAppPackage(inputs: Inputs): Promise<Result<
|
|
80
|
+
createAppPackage(inputs: Inputs): Promise<Result<any, FxError>>;
|
|
80
81
|
/**
|
|
81
82
|
* get url to preview the app, may prompt to select env, hub and Teams manifest
|
|
82
83
|
* v3 only none lifecycle command
|
|
@@ -115,15 +116,15 @@ export declare class FxCore {
|
|
|
115
116
|
teamsAppName: string;
|
|
116
117
|
m365TenantId: string;
|
|
117
118
|
}, FxError>>;
|
|
118
|
-
grantPermission(inputs: Inputs): Promise<Result<
|
|
119
|
+
grantPermission(inputs: Inputs): Promise<Result<PermissionsResult, FxError>>;
|
|
119
120
|
/**
|
|
120
121
|
* none lifecycle command
|
|
121
122
|
*/
|
|
122
|
-
checkPermission(inputs: Inputs): Promise<Result<
|
|
123
|
+
checkPermission(inputs: Inputs): Promise<Result<PermissionsResult, FxError>>;
|
|
123
124
|
/**
|
|
124
125
|
* none lifecycle command
|
|
125
126
|
*/
|
|
126
|
-
listCollaborator(inputs: Inputs): Promise<Result<
|
|
127
|
+
listCollaborator(inputs: Inputs): Promise<Result<ListCollaboratorResult, FxError>>;
|
|
127
128
|
getSelectedEnv(inputs: Inputs): Promise<Result<string | undefined, FxError>>;
|
|
128
129
|
createLocalCrypto(projectPath: string): Promise<Result<CryptoProvider, FxError>>;
|
|
129
130
|
/**
|
|
@@ -134,15 +135,15 @@ export declare class FxCore {
|
|
|
134
135
|
* only for vs code extension
|
|
135
136
|
*/
|
|
136
137
|
decrypt(ciphertext: string, inputs: Inputs): Promise<Result<string, FxError>>;
|
|
137
|
-
createEnv(inputs: Inputs): Promise<Result<
|
|
138
|
-
phantomMigrationV3(inputs: Inputs): Promise<Result<
|
|
138
|
+
createEnv(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
139
|
+
phantomMigrationV3(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
139
140
|
projectVersionCheck(inputs: Inputs): Promise<Result<VersionCheckRes, FxError>>;
|
|
140
|
-
apply(inputs: Inputs, templatePath: string, lifecycleName: string): Promise<Result<
|
|
141
|
-
runLifecycle(lifecycle: ILifecycle, driverContext: DriverContext, env: string): Promise<Result<
|
|
141
|
+
apply(inputs: Inputs, templatePath: string, lifecycleName: string): Promise<Result<undefined, FxError>>;
|
|
142
|
+
runLifecycle(lifecycle: ILifecycle, driverContext: DriverContext, env: string): Promise<Result<undefined, FxError>>;
|
|
142
143
|
preProvisionForVS(inputs: Inputs): Promise<Result<PreProvisionResForVS, FxError>>;
|
|
143
|
-
preCheckYmlAndEnvForVS(inputs: Inputs): Promise<Result<
|
|
144
|
-
publishInDeveloperPortal(inputs: Inputs): Promise<Result<
|
|
145
|
-
copilotPluginAddAPI(inputs: Inputs): Promise<Result<
|
|
144
|
+
preCheckYmlAndEnvForVS(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
145
|
+
publishInDeveloperPortal(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
146
|
+
copilotPluginAddAPI(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
146
147
|
copilotPluginLoadOpenAIManifest(inputs: Inputs): Promise<Result<OpenAIPluginManifest, FxError>>;
|
|
147
148
|
copilotPluginListOperations(inputs: Inputs): Promise<Result<ApiOperation[], ErrorResult[]>>;
|
|
148
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EAEd,IAAI,EACJ,OAAO,EACP,MAAM,EACN,qBAAqB,EAErB,oBAAoB,EACpB,SAAS,EACT,MAAM,EACN,KAAK,EACL,KAAK,
|
|
1
|
+
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
|
package/build/core/FxCore.js
CHANGED
|
@@ -338,7 +338,7 @@ class FxCore {
|
|
|
338
338
|
}
|
|
339
339
|
else {
|
|
340
340
|
await driverContext.logProvider.warning(`No definition found for ${lifecycleName}`);
|
|
341
|
-
return teamsfx_api_1.ok(
|
|
341
|
+
return teamsfx_api_1.ok(undefined);
|
|
342
342
|
}
|
|
343
343
|
}
|
|
344
344
|
async runLifecycle(lifecycle, driverContext, env) {
|
|
@@ -347,7 +347,7 @@ class FxCore {
|
|
|
347
347
|
if (runResult.isOk()) {
|
|
348
348
|
await driverContext.logProvider.info(`Lifecycle ${lifecycle.name} succeeded`);
|
|
349
349
|
const writeResult = await envUtil_1.envUtil.writeEnv(driverContext.projectPath, env, envUtil_1.envUtil.map2object(runResult.value));
|
|
350
|
-
return writeResult.map(() =>
|
|
350
|
+
return writeResult.map(() => undefined);
|
|
351
351
|
}
|
|
352
352
|
else {
|
|
353
353
|
const error = runResult.error;
|
|
@@ -361,7 +361,7 @@ class FxCore {
|
|
|
361
361
|
if (error.reason.kind === "UnresolvedPlaceholders") {
|
|
362
362
|
const unresolved = error.reason.unresolvedPlaceHolders;
|
|
363
363
|
await driverContext.logProvider.warning(`Unresolved placeholders: ${unresolved.join(",")} for driver ${failedDriver.uses}`);
|
|
364
|
-
return teamsfx_api_1.ok(
|
|
364
|
+
return teamsfx_api_1.ok(undefined);
|
|
365
365
|
}
|
|
366
366
|
else {
|
|
367
367
|
await driverContext.logProvider.error(`Failed to run ${lifecycle.name} due to ${error.reason.error.name}: ${error.reason.error.message}. Failed driver: ${failedDriver.uses}`);
|
package/build/core/FxCore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FxCore.js","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FxCore.js","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
|