@microsoft/teamsfx-core 2.0.4-alpha.915247c3f.0 → 2.0.4-alpha.952007dba.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/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +2 -2
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +2 -2
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +7 -7
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/local/localCertificateManager.js +1 -1
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config-v3.json +1 -1
- package/build/common/samples.d.ts +2 -2
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +8 -18
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +32 -0
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +5 -0
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -0
- package/build/common/spec-parser/manifestUpdater.js +77 -0
- package/build/common/spec-parser/manifestUpdater.js.map +1 -0
- package/build/common/spec-parser/specFilter.d.ts +3 -0
- package/build/common/spec-parser/specFilter.d.ts.map +1 -0
- package/build/common/spec-parser/specFilter.js +47 -0
- package/build/common/spec-parser/specFilter.js.map +1 -0
- package/build/common/spec-parser/specParser.d.ts +8 -4
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +40 -21
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +6 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -0
- package/build/common/spec-parser/utils.js +70 -0
- package/build/common/spec-parser/utils.js.map +1 -0
- package/build/common/telemetry.d.ts +0 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +2 -11
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.js +2 -2
- package/build/common/tools.js.map +1 -1
- package/build/component/configManager/interface.d.ts +2 -0
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/interface.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +2 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.d.ts.map +1 -1
- package/build/component/configManager/parser.js +10 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +5 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +5 -0
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +2 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +2 -0
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/arm/validator.d.ts.map +1 -1
- package/build/component/driver/arm/validator.js +3 -3
- package/build/component/driver/arm/validator.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +2 -0
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +2 -2
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +6 -6
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +3 -13
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +0 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +1 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.js +1 -1
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +26 -0
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +2 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.js +1 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +19 -7
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/error/componentError.js +1 -1
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +25 -15
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/createAuthFiles.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +73 -22
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +9 -7
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +124 -32
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/generator.js +1 -1
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +4 -3
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +1 -1
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +6 -6
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +7 -7
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +12 -12
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +1 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +1 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/utils.js +2 -2
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/migrate.js.map +1 -1
- package/build/component/telemetry.d.ts.map +1 -1
- package/build/component/telemetry.js +3 -6
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/azureResourceOperation.js +2 -2
- package/build/component/utils/azureResourceOperation.js.map +1 -1
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +3 -2
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.d.ts.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +3 -6
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts +4 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +6 -0
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts +4 -1
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +38 -2
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +6 -0
- package/build/core/collaborator.js.map +1 -1
- package/build/core/error.d.ts +6 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +23 -1
- package/build/core/error.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +3 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +1 -2
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +5 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +3 -2
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +30 -15
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/error/common.d.ts +9 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +130 -15
- package/build/error/common.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 +100 -36
- package/build/question/create.js.map +1 -1
- package/build/question/other.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +8 -0
- package/build/ui/visitor.js.map +1 -1
- package/package.json +9 -5
- package/resource/package.nls.json +13 -2
- package/resource/yaml-schema/1.1.1/yaml.schema.json +1468 -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
- package/build/component/generator/copilotPlugin/constant.d.ts +0 -4
- package/build/component/generator/copilotPlugin/constant.d.ts.map +0 -1
- package/build/component/generator/copilotPlugin/constant.js +0 -10
- package/build/component/generator/copilotPlugin/constant.js.map +0 -1
|
@@ -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.listOperations = exports.OpenAIPluginManifestHelper = void 0;
|
|
5
|
+
exports.validateTeamsManifestLength = exports.logValidationResults = exports.listOperations = exports.OpenAIPluginManifestHelper = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
/**
|
|
8
8
|
* @author yuqzho@microsoft.com
|
|
@@ -13,20 +13,22 @@ const utils_1 = require("../utils");
|
|
|
13
13
|
const interfaces_1 = require("../../../common/spec-parser/interfaces");
|
|
14
14
|
const specParser_1 = require("../../../common/spec-parser/specParser");
|
|
15
15
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
16
|
-
const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
|
|
17
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
18
16
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
17
|
+
const os_1 = require("os");
|
|
18
|
+
const constant_1 = require("../../configManager/constant");
|
|
19
19
|
const manifestFilePath = "/.well-known/ai-plugin.json";
|
|
20
|
-
const teamsFxEnv = "${{TEAMSFX_ENV}}";
|
|
21
20
|
const componentName = "OpenAIPluginManifestHelper";
|
|
22
21
|
var OpenAIPluginManifestErrorType;
|
|
23
22
|
(function (OpenAIPluginManifestErrorType) {
|
|
24
|
-
OpenAIPluginManifestErrorType[
|
|
25
|
-
OpenAIPluginManifestErrorType[
|
|
23
|
+
OpenAIPluginManifestErrorType["AuthNotSupported"] = "openai-pliugin-auth-not-supported";
|
|
24
|
+
OpenAIPluginManifestErrorType["ApiUrlMissing"] = "openai-plugin-api-url-missing";
|
|
26
25
|
})(OpenAIPluginManifestErrorType || (OpenAIPluginManifestErrorType = {}));
|
|
27
26
|
class OpenAIPluginManifestHelper {
|
|
28
|
-
static async loadOpenAIPluginManifest(
|
|
29
|
-
|
|
27
|
+
static async loadOpenAIPluginManifest(input) {
|
|
28
|
+
let path = input + manifestFilePath;
|
|
29
|
+
if (!input.toLowerCase().startsWith("https://") && !input.toLowerCase().startsWith("http://")) {
|
|
30
|
+
path = "https://" + path;
|
|
31
|
+
}
|
|
30
32
|
try {
|
|
31
33
|
const res = await utils_1.sendRequestWithRetry(async () => {
|
|
32
34
|
return await axios_1.default.get(path);
|
|
@@ -37,56 +39,109 @@ class OpenAIPluginManifestHelper {
|
|
|
37
39
|
throw new teamsfx_api_1.UserError(componentName, "loadOpenAIPluginManifest", localizeUtils_1.getLocalizedString("error.copilotPlugin.openAiPluginManifest.CannotGetManifest", path), localizeUtils_1.getLocalizedString("error.copilotPlugin.openAiPluginManifest.CannotGetManifest", path));
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
|
-
static async updateManifest(openAiPluginManifest,
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
manifest.description.full = openAiPluginManifest.description_for_model;
|
|
50
|
-
manifest.description.short = openAiPluginManifest.description_for_human;
|
|
51
|
-
manifest.developer.websiteUrl = openAiPluginManifest.legal_info_url;
|
|
52
|
-
manifest.developer.privacyUrl = openAiPluginManifest.legal_info_url;
|
|
53
|
-
manifest.developer.termsOfUseUrl = openAiPluginManifest.legal_info_url;
|
|
54
|
-
await fs_extra_1.default.writeFile(manifestPath, JSON.stringify(manifest, null, "\t"), "utf-8");
|
|
42
|
+
static async updateManifest(openAiPluginManifest, teamsAppManifest, manifestPath) {
|
|
43
|
+
teamsAppManifest.name.full = openAiPluginManifest.name_for_model;
|
|
44
|
+
teamsAppManifest.name.short = openAiPluginManifest.name_for_human;
|
|
45
|
+
teamsAppManifest.description.full = openAiPluginManifest.description_for_model;
|
|
46
|
+
teamsAppManifest.description.short = openAiPluginManifest.description_for_human;
|
|
47
|
+
teamsAppManifest.developer.websiteUrl = openAiPluginManifest.legal_info_url;
|
|
48
|
+
teamsAppManifest.developer.privacyUrl = openAiPluginManifest.legal_info_url;
|
|
49
|
+
teamsAppManifest.developer.termsOfUseUrl = openAiPluginManifest.legal_info_url;
|
|
50
|
+
await fs_extra_1.default.writeFile(manifestPath, JSON.stringify(teamsAppManifest, null, "\t"), "utf-8");
|
|
55
51
|
return teamsfx_api_1.ok(undefined);
|
|
56
52
|
}
|
|
57
53
|
}
|
|
58
54
|
exports.OpenAIPluginManifestHelper = OpenAIPluginManifestHelper;
|
|
59
55
|
async function listOperations(context, manifest, apiSpecUrl, shouldLogWarning = true) {
|
|
60
56
|
if (manifest) {
|
|
61
|
-
apiSpecUrl = manifest.api.url;
|
|
62
57
|
const errors = validateOpenAIPluginManifest(manifest);
|
|
63
58
|
if (errors.length > 0) {
|
|
59
|
+
logValidationResults(errors, [], context, false, shouldLogWarning);
|
|
64
60
|
return teamsfx_api_1.err(errors);
|
|
65
61
|
}
|
|
62
|
+
apiSpecUrl = manifest.api.url;
|
|
66
63
|
}
|
|
67
64
|
const specParser = new specParser_1.SpecParser(apiSpecUrl);
|
|
68
65
|
const validationRes = await specParser.validate();
|
|
66
|
+
logValidationResults(validationRes.errors, validationRes.warnings, context, true, shouldLogWarning);
|
|
69
67
|
if (validationRes.status === interfaces_1.ValidationStatus.Error) {
|
|
70
68
|
return teamsfx_api_1.err(validationRes.errors);
|
|
71
69
|
}
|
|
72
|
-
if (shouldLogWarning && validationRes.warnings.length > 0) {
|
|
73
|
-
for (const warning of validationRes.warnings) {
|
|
74
|
-
context.logProvider.warning(warning.content);
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
70
|
const operations = await specParser.list();
|
|
78
|
-
|
|
71
|
+
const sortedOperations = sortOperations(operations);
|
|
72
|
+
return teamsfx_api_1.ok(sortedOperations);
|
|
79
73
|
}
|
|
80
74
|
exports.listOperations = listOperations;
|
|
75
|
+
function sortOperations(operations) {
|
|
76
|
+
const operationsWithSeparator = [];
|
|
77
|
+
for (const operation of operations) {
|
|
78
|
+
const arr = operation.toUpperCase().split(" ");
|
|
79
|
+
operationsWithSeparator.push({ id: operation, label: operation, groupName: arr[0] });
|
|
80
|
+
}
|
|
81
|
+
return operationsWithSeparator.sort((operation1, operation2) => {
|
|
82
|
+
const arr1 = operation1.id.toLowerCase().split(" ");
|
|
83
|
+
const arr2 = operation2.id.toLowerCase().split(" ");
|
|
84
|
+
return arr1[0] < arr2[0] ? -1 : arr1[0] > arr2[0] ? 1 : arr1[1].localeCompare(arr2[1]);
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
function formatTelemetryValidationProperty(result) {
|
|
88
|
+
return result.type.toString() + ": " + result.content;
|
|
89
|
+
}
|
|
90
|
+
function logValidationResults(errors, warnings, context, isApiSpec, shouldLogWarning, shouldSkipTelemetry = false) {
|
|
91
|
+
if (!shouldSkipTelemetry) {
|
|
92
|
+
context.telemetryReporter.sendTelemetryEvent(isApiSpec ? "validate-api-spec" /* validateApiSpec */ : "validate-openai-plugin-manifest" /* validateOpenAiPluginManifest */, {
|
|
93
|
+
["validation-status" /* validationStatus */]: errors.length !== 0 ? "error" : warnings.length !== 0 ? "warning" : "success",
|
|
94
|
+
["validation-errors" /* validationErrors */]: errors
|
|
95
|
+
.map((error) => formatTelemetryValidationProperty(error))
|
|
96
|
+
.join(";"),
|
|
97
|
+
["validation-warnings" /* validationWarnings */]: warnings
|
|
98
|
+
.map((warn) => formatTelemetryValidationProperty(warn))
|
|
99
|
+
.join(";"),
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
if (errors.length === 0 && (warnings.length === 0 || !shouldLogWarning)) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
// errors > 0 || (warnings > 0 && shouldLogWarning)
|
|
106
|
+
const errorMessage = errors
|
|
107
|
+
.map((error) => {
|
|
108
|
+
return `${constant_1.SummaryConstant.Failed} ${error.content}`;
|
|
109
|
+
})
|
|
110
|
+
.join(os_1.EOL);
|
|
111
|
+
const warningMessage = shouldLogWarning
|
|
112
|
+
? warnings
|
|
113
|
+
.map((warning) => {
|
|
114
|
+
return `${constant_1.SummaryConstant.NotExecuted} ${warning.content}`;
|
|
115
|
+
})
|
|
116
|
+
.join(os_1.EOL)
|
|
117
|
+
: "";
|
|
118
|
+
const failed = errors.length;
|
|
119
|
+
const warns = warnings.length;
|
|
120
|
+
const summaryStr = [];
|
|
121
|
+
if (failed > 0) {
|
|
122
|
+
summaryStr.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.validate.summary.validate.failed", failed));
|
|
123
|
+
}
|
|
124
|
+
if (warns > 0 && shouldLogWarning) {
|
|
125
|
+
summaryStr.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.validate.summary.validate.warning", warns));
|
|
126
|
+
}
|
|
127
|
+
const outputMessage = isApiSpec
|
|
128
|
+
? os_1.EOL +
|
|
129
|
+
localizeUtils_1.getLocalizedString("core.copilotPlugin.validate.apiSpec.summary", summaryStr.join(", "), errorMessage, warningMessage)
|
|
130
|
+
: os_1.EOL +
|
|
131
|
+
localizeUtils_1.getLocalizedString("core.copilotPlugin.validate.openAIPluginManifest.summary", summaryStr.join(", "), errorMessage, warningMessage);
|
|
132
|
+
void context.logProvider.info(outputMessage);
|
|
133
|
+
}
|
|
134
|
+
exports.logValidationResults = logValidationResults;
|
|
81
135
|
function validateOpenAIPluginManifest(manifest) {
|
|
136
|
+
var _a, _b;
|
|
82
137
|
const errors = [];
|
|
83
|
-
if (!manifest.api.url) {
|
|
138
|
+
if (!((_a = manifest.api) === null || _a === void 0 ? void 0 : _a.url)) {
|
|
84
139
|
errors.push({
|
|
85
140
|
type: OpenAIPluginManifestErrorType.ApiUrlMissing,
|
|
86
141
|
content: "Missing url in manifest",
|
|
87
142
|
});
|
|
88
143
|
}
|
|
89
|
-
if (manifest.auth.type !== teamsfx_api_1.OpenAIManifestAuthType.None) {
|
|
144
|
+
if (((_b = manifest.auth) === null || _b === void 0 ? void 0 : _b.type) !== teamsfx_api_1.OpenAIManifestAuthType.None) {
|
|
90
145
|
errors.push({
|
|
91
146
|
type: OpenAIPluginManifestErrorType.AuthNotSupported,
|
|
92
147
|
content: "Auth type not supported",
|
|
@@ -94,4 +149,41 @@ function validateOpenAIPluginManifest(manifest) {
|
|
|
94
149
|
}
|
|
95
150
|
return errors;
|
|
96
151
|
}
|
|
152
|
+
function validateTeamsManifestLength(teamsManifest) {
|
|
153
|
+
var _a, _b;
|
|
154
|
+
const nameShortLimit = 30;
|
|
155
|
+
const nameFullLimit = 100;
|
|
156
|
+
const descriptionShortLimit = 80;
|
|
157
|
+
const descriptionFullLimit = 4000;
|
|
158
|
+
const warnings = [];
|
|
159
|
+
// message below are copied from the validation result of Teams manifest.
|
|
160
|
+
// validate name
|
|
161
|
+
if (teamsManifest.name.short.length === 0) {
|
|
162
|
+
warnings.push("Short name of the app cannot be empty");
|
|
163
|
+
}
|
|
164
|
+
if (teamsManifest.name.short.length > nameShortLimit) {
|
|
165
|
+
warnings.push("/name/short must NOT have more than 30 characters");
|
|
166
|
+
}
|
|
167
|
+
if (!((_a = teamsManifest.name.full) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
168
|
+
warnings.push("Full name cannot be empty");
|
|
169
|
+
}
|
|
170
|
+
if (teamsManifest.name.full.length > nameFullLimit) {
|
|
171
|
+
warnings.push("/name/full must NOT have more than 100 characters");
|
|
172
|
+
}
|
|
173
|
+
// validate description
|
|
174
|
+
if (teamsManifest.description.short.length === 0) {
|
|
175
|
+
warnings.push("Short Description can not be empty");
|
|
176
|
+
}
|
|
177
|
+
if (teamsManifest.description.short.length > descriptionShortLimit) {
|
|
178
|
+
warnings.push("/description/short must NOT have more than 80 characters");
|
|
179
|
+
}
|
|
180
|
+
if (((_b = teamsManifest.description.full) === null || _b === void 0 ? void 0 : _b.length) === 0) {
|
|
181
|
+
warnings.push("Full Description can not be empty");
|
|
182
|
+
}
|
|
183
|
+
if (teamsManifest.description.full.length > descriptionFullLimit) {
|
|
184
|
+
warnings.push("/description/full must NOT have more than 4000 characters");
|
|
185
|
+
}
|
|
186
|
+
return warnings;
|
|
187
|
+
}
|
|
188
|
+
exports.validateTeamsManifestLength = validateTeamsManifestLength;
|
|
97
189
|
//# 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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"}
|
|
@@ -52,7 +52,7 @@ class Generator {
|
|
|
52
52
|
static async generateSample(ctx, destinationPath, sampleName, actionContext) {
|
|
53
53
|
var _a;
|
|
54
54
|
lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
|
|
55
|
-
[telemetry_1.TelemetryProperty.
|
|
55
|
+
[telemetry_1.TelemetryProperty.SampleAppName]: sampleName,
|
|
56
56
|
[telemetry_1.TelemetryProperty.SampleDownloadDirectory]: "true",
|
|
57
57
|
});
|
|
58
58
|
const sample = utils_2.getSampleInfoFromName(sampleName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAAsE;AACtE,gEAA0B;AAC1B,mCAA+B;AAC/B,sDAA2E;AAC3E,8CAA+D;AAC/D,4DAAkE;AAClE,0CAA4E;AAC5E,uEAAmF;AACnF,yCAKoB;AACpB,mCAOiB;AACjB,uDAM2B;AAC3B,mCAAgG;AAEhG,MAAa,SAAS;IACb,MAAM,CAAC,mBAAmB,CAC/B,OAAe,EACf,qBAA8B;QAE9B,MAAM,eAAe,GAAG,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,iCAAyB,CAAC,OAAO,CAAC,CAAC;QACpF,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,OAAO;YACpB,eAAe,EAAE,eAAe;YAChC,wBAAwB,EAAE,eAAe,CAAC,iBAAiB,EAAE;SAC9D,CAAC;IACJ,CAAC;IAYM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAClC,GAAY,EACZ,eAAuB,EACvB,QAAgB,EAChB,QAAiB,EACjB,aAA6B;;QAE7B,MAAM,UAAU,GAAG,MAAA,GAAG,CAAC,iBAAiB,mCAAI,EAAE,CAAC;QAC/C,MAAM,gBAAgB,GAAqB;YACzC,IAAI,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,6BAAkB;YACpC,YAAY,EAAE,GAAG,QAAQ,GAAG;YAC5B,WAAW,EAAE,eAAe;YAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,CACxC,8BAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC;YACxD,iBAAiB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,CACxC,8BAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC;YACxD,aAAa,EAAE,4BAA4B;SAC5C,CAAC;QACF,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,CAAC,6BAAiB,CAAC,YAAY,CAAC,EAAE,GAAG,QAAQ,IAAI,gBAAgB,CAAC,IAAI,EAAE;SACzE,CAAC,CAAC;QACH,MAAM,CAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW,0CAAE,IAAI,CAAC,2BAAgB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAA,CAAC;QACpF,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,mCAAiB,CAAC,CAAC;QACzD,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,CAAC,6BAAiB,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,wBAAwB;SACrG,CAAC,CAAC;QACH,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAaM,MAAM,CAAC,KAAK,CAAC,cAAc,CAChC,GAAY,EACZ,eAAuB,EACvB,UAAkB,EAClB,aAA6B;;QAE7B,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,CAAC,6BAAiB,CAAC,
|
|
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":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAO7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC;IAEpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,aAAa,CAAC,EAAE,CACd,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,oBAAY,mBAAmB;IAC7B,8BAA8B,yCAAyC;IACvE,uBAAuB,6BAA6B;IACpD,eAAe,oBAAoB;IACnC,yBAAyB,8BAA8B;IACvD,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;CAChB;AAGD,eAAO,MAAM,oCAAoC,EAAE,
|
|
1
|
+
{"version":3,"file":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAO7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC;IAEpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,aAAa,CAAC,EAAE,CACd,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,oBAAY,mBAAmB;IAC7B,8BAA8B,yCAAyC;IACvE,uBAAuB,6BAA6B;IACpD,eAAe,oBAAoB;IACnC,yBAAyB,8BAA8B;IACvD,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;CAChB;AAGD,eAAO,MAAM,oCAAoC,EAAE,eA2BlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAQrC,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAS3C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAYnC,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,eAc7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAczB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eAAe,EAM9C,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAAe,EAAyC,CAAC;AACvF,eAAO,MAAM,0BAA0B,EAAE,eAAe,EAA8B,CAAC"}
|
|
@@ -23,20 +23,21 @@ var GeneratorActionName;
|
|
|
23
23
|
// * This action is only for debug purpose
|
|
24
24
|
exports.fetchTemplateZipFromSourceCodeAction = {
|
|
25
25
|
name: GeneratorActionName.FetchTemplateZipFromSourceCode,
|
|
26
|
-
run:
|
|
26
|
+
run: (context) => {
|
|
27
27
|
const isDebugMode = () => {
|
|
28
28
|
const DebugTemplateFlag = process.env[constants_1.FeatureFlagName.DebugTemplate];
|
|
29
29
|
return (DebugTemplateFlag === null || DebugTemplateFlag === void 0 ? void 0 : DebugTemplateFlag.toLowerCase()) === "true" && process.env.NODE_ENV === "development";
|
|
30
30
|
};
|
|
31
31
|
if (!isDebugMode()) {
|
|
32
|
-
return;
|
|
32
|
+
return Promise.resolve();
|
|
33
33
|
}
|
|
34
34
|
if (context.zip) {
|
|
35
|
-
return;
|
|
35
|
+
return Promise.resolve();
|
|
36
36
|
}
|
|
37
37
|
//! This path only works in debug mode
|
|
38
38
|
const templateSourceCodePath = path_1.default.resolve(__dirname, "../../../../../", "templates", context.name);
|
|
39
39
|
context.zip = utils_1.zipFolder(templateSourceCodePath);
|
|
40
|
+
return Promise.resolve();
|
|
40
41
|
},
|
|
41
42
|
};
|
|
42
43
|
exports.downloadDirectoryAction = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatorAction.js","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,8DAA6B;AAC7B,wDAAwB;AACxB,mCAAoG;AACpG,gEAA0B;AAC1B,yCAAkD;AAClD,mCAAuC;AACvC,sDAAyD;AAgCzD,IAAY,mBAOX;AAPD,WAAY,mBAAmB;IAC7B,8FAAuE,CAAA;IACvE,2EAAoD,CAAA;IACpD,0DAAmC,CAAA;IACnC,8EAAuD,CAAA;IACvD,8DAAuC,CAAA;IACvC,sCAAe,CAAA;AACjB,CAAC,EAPW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAO9B;AAED,0CAA0C;AAC7B,QAAA,oCAAoC,GAAoB;IACnE,IAAI,EAAE,mBAAmB,CAAC,8BAA8B;IACxD,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"generatorAction.js","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,7 +79,7 @@ class HelperMethods {
|
|
|
79
79
|
// Read add-in manifest file
|
|
80
80
|
const addinManifest = await teamsfx_api_1.ManifestUtil.loadFromPath(addinManifestPath);
|
|
81
81
|
// Open project manifest file
|
|
82
|
-
const manifestTemplatePath =
|
|
82
|
+
const manifestTemplatePath = ManifestUtils_1.manifestUtils.getTeamsAppManifestPath(projectRoot);
|
|
83
83
|
const manifest = await teamsfx_api_1.ManifestUtil.loadFromPath(manifestTemplatePath);
|
|
84
84
|
// Update project manifest
|
|
85
85
|
manifest.extensions = addinManifest.extensions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helperMethods.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helperMethods.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,9 @@ class GeneratorChecker {
|
|
|
24
24
|
async ensureLatestDependency(ctx) {
|
|
25
25
|
telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGeneratorStart);
|
|
26
26
|
try {
|
|
27
|
-
this._logger.info(`${displayName} not found, installing...`);
|
|
27
|
+
void this._logger.info(`${displayName} not found, installing...`);
|
|
28
28
|
await this.install();
|
|
29
|
-
this._logger.info(`Successfully installed ${displayName}`);
|
|
29
|
+
void this._logger.info(`Successfully installed ${displayName}`);
|
|
30
30
|
telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGenerator);
|
|
31
31
|
}
|
|
32
32
|
catch (error) {
|
|
@@ -50,12 +50,12 @@ class GeneratorChecker {
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
async install() {
|
|
53
|
-
this._logger.info("Start installing...");
|
|
53
|
+
void this._logger.info("Start installing...");
|
|
54
54
|
await this.cleanup();
|
|
55
55
|
await this.installGenerator();
|
|
56
|
-
this._logger.info("Validating package...");
|
|
56
|
+
void this._logger.info("Validating package...");
|
|
57
57
|
if (!(await this.validate())) {
|
|
58
|
-
this._logger.debug(`Failed to validate ${name}, cleaning up...`);
|
|
58
|
+
void this._logger.debug(`Failed to validate ${name}, cleaning up...`);
|
|
59
59
|
await this.cleanup();
|
|
60
60
|
throw error_1.DependencyValidateError(name);
|
|
61
61
|
}
|
|
@@ -109,7 +109,7 @@ class GeneratorChecker {
|
|
|
109
109
|
await fs.ensureFile(this.getSentinelPath());
|
|
110
110
|
}
|
|
111
111
|
catch (error) {
|
|
112
|
-
this._logger.error(`Failed to execute npm install ${displayName}`);
|
|
112
|
+
void this._logger.error(`Failed to execute npm install ${displayName}`);
|
|
113
113
|
throw error_1.NpmInstallError(error);
|
|
114
114
|
}
|
|
115
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAUgC;AAEhC,gEAA4D;AAC5D,8DAA8E;AAC9E,oCAAoE;AACpE,0EAAuE;AACvE,kDAA+C;AAC/C,0CAAuD;AAEvD,MAAM,IAAI,GAAG,qBAAS,CAAC,oBAAoB,CAAC;AAC5C,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,qBAAS,CAAC,aAAa,EAAE,CAAC;AACzD,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,gBAAgB;IAG3B,YAAY,MAAmB;QAC7B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,GAAY;QAC9C,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,oCAAoC,CAAC,CAAC;QAE5F,IAAI;YACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,2BAA2B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare class YoChecker implements DependencyChecker {
|
|
|
6
6
|
ensureLatestDependency(ctx: Context): Promise<Result<boolean, FxError>>;
|
|
7
7
|
isLatestInstalled(): Promise<boolean>;
|
|
8
8
|
install(): Promise<void>;
|
|
9
|
-
getBinFolders():
|
|
9
|
+
getBinFolders(): string[];
|
|
10
10
|
findGloballyInstalledVersion(timeoutInSeconds?: number): Promise<string | undefined>;
|
|
11
11
|
findLatestVersion(timeoutInSeconds: number): Promise<string | undefined>;
|
|
12
12
|
private validate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yoChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAYxD,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAwBvE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAWrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"yoChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAYxD,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAwBvE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAWrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B,aAAa,IAAI,MAAM,EAAE;IAKnB,4BAA4B,CACvC,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIjB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIvE,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAcZ,OAAO;YAkCP,SAAS;CAuBxB"}
|
|
@@ -24,9 +24,9 @@ class YoChecker {
|
|
|
24
24
|
async ensureLatestDependency(ctx) {
|
|
25
25
|
telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYoStart);
|
|
26
26
|
try {
|
|
27
|
-
this._logger.info(`${displayName} not found, installing...`);
|
|
27
|
+
void this._logger.info(`${displayName} not found, installing...`);
|
|
28
28
|
await this.install();
|
|
29
|
-
this._logger.info(`Successfully installed ${displayName}`);
|
|
29
|
+
void this._logger.info(`Successfully installed ${displayName}`);
|
|
30
30
|
telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYo);
|
|
31
31
|
}
|
|
32
32
|
catch (error) {
|
|
@@ -50,17 +50,17 @@ class YoChecker {
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
async install() {
|
|
53
|
-
this._logger.info("Start installing...");
|
|
53
|
+
void this._logger.info("Start installing...");
|
|
54
54
|
await this.cleanup();
|
|
55
55
|
await this.installYo();
|
|
56
|
-
this._logger.info("Validating package...");
|
|
56
|
+
void this._logger.info("Validating package...");
|
|
57
57
|
if (!(await this.validate())) {
|
|
58
|
-
this._logger.debug("Failed to validate yo, cleaning up...");
|
|
58
|
+
void this._logger.debug("Failed to validate yo, cleaning up...");
|
|
59
59
|
await this.cleanup();
|
|
60
60
|
throw error_1.DependencyValidateError(name);
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
|
|
63
|
+
getBinFolders() {
|
|
64
64
|
const defaultPath = this.getDefaultInstallPath();
|
|
65
65
|
return [defaultPath, path.join(defaultPath, "node_modules", ".bin")];
|
|
66
66
|
}
|
|
@@ -124,7 +124,7 @@ class YoChecker {
|
|
|
124
124
|
await fs_extra_1.default.ensureFile(this.getSentinelPath());
|
|
125
125
|
}
|
|
126
126
|
catch (error) {
|
|
127
|
-
this._logger.error("Failed to execute npm install yo");
|
|
127
|
+
void this._logger.error("Failed to execute npm install yo");
|
|
128
128
|
throw error_1.NpmInstallError(error);
|
|
129
129
|
}
|
|
130
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,gEAA0B;AAC1B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAUgC;AAEhC,gEAA4D;AAC5D,8DAA8E;AAC9E,oCAAoE;AACpE,0EAAuE;AACvE,0CAAuD;AACvD,kDAA+C;AAE/C,MAAM,IAAI,GAAG,qBAAS,CAAC,iBAAiB,CAAC;AACzC,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,qBAAS,CAAC,aAAa,EAAE,CAAC;AACzD,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,SAAS;IAGpB,YAAY,MAAmB;QAC7B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,GAAY;QAC9C,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,mBAAmB,CAAC,CAAC;QAC3E,IAAI;YACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,2BAA2B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAqBtF,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;WA8GlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WAqLf,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;mBAa/D,gBAAgB;mBAehB,kBAAkB;mBAoClB,kBAAkB;
|
|
1
|
+
{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAqBtF,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;WA8GlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WAqLf,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;mBAa/D,gBAAgB;mBAehB,kBAAkB;mBAoClB,kBAAkB;CAgKxC"}
|
|
@@ -55,7 +55,7 @@ class SPFxGenerator {
|
|
|
55
55
|
static async importSPFxProject(context, inputs, destinationPath, actionContext) {
|
|
56
56
|
var _a, _b, _c, _d;
|
|
57
57
|
const importProgress = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("plugins.spfx.import.title"), 3);
|
|
58
|
-
importProgress.start();
|
|
58
|
+
await importProgress.start();
|
|
59
59
|
const importDetails = [];
|
|
60
60
|
try {
|
|
61
61
|
// Copy & paste existing SPFx solution
|
|
@@ -88,7 +88,7 @@ class SPFxGenerator {
|
|
|
88
88
|
context.templateVariables["webpartName"] =
|
|
89
89
|
webpartManifest["preconfiguredEntries"][0].title.default;
|
|
90
90
|
importDetails.push(`(.) Processing: Generating SPFx project templates with app name: ${inputs[questionNames_1.QuestionNames.AppName]}, component id: ${webpartManifest["id"]}, web part name: ${webpartManifest["preconfiguredEntries"][0].title.default}`);
|
|
91
|
-
const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, constants_2.Constants.
|
|
91
|
+
const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, constants_2.Constants.IMPORT_TEMPLATE_NAME, "ts");
|
|
92
92
|
if (templateRes.isErr()) {
|
|
93
93
|
importDetails.push(`(×) Error: Failed to generate SPFx project templates!`);
|
|
94
94
|
throw templateRes.error;
|
|
@@ -101,8 +101,8 @@ class SPFxGenerator {
|
|
|
101
101
|
catch (error) {
|
|
102
102
|
await importProgress.end(false);
|
|
103
103
|
importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
|
|
104
|
-
context.logProvider.info(importDetails.join(os_1.EOL), true);
|
|
105
|
-
context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
|
|
104
|
+
await context.logProvider.info(importDetails.join(os_1.EOL), true);
|
|
105
|
+
void context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
|
|
106
106
|
if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
|
|
107
107
|
return teamsfx_api_1.err(error);
|
|
108
108
|
}
|
|
@@ -110,9 +110,9 @@ class SPFxGenerator {
|
|
|
110
110
|
}
|
|
111
111
|
await importProgress.end(true);
|
|
112
112
|
importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
|
|
113
|
-
context.logProvider.info(importDetails.join(os_1.EOL), true);
|
|
114
|
-
context.logProvider.info(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
|
|
115
|
-
context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.import.success", destinationPath), false);
|
|
113
|
+
await context.logProvider.info(importDetails.join(os_1.EOL), true);
|
|
114
|
+
void context.logProvider.info(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
|
|
115
|
+
void context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.import.success", destinationPath), false);
|
|
116
116
|
return teamsfx_api_1.ok(undefined);
|
|
117
117
|
}
|
|
118
118
|
static async doYeomanScaffold(context, inputs, destinationPath) {
|
|
@@ -165,12 +165,12 @@ class SPFxGenerator {
|
|
|
165
165
|
const yoEnv = process.env;
|
|
166
166
|
if (yoEnv.PATH) {
|
|
167
167
|
yoEnv.PATH = shouldInstallLocally
|
|
168
|
-
? `${
|
|
168
|
+
? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`
|
|
169
169
|
: process.env.PATH;
|
|
170
170
|
}
|
|
171
171
|
else {
|
|
172
172
|
yoEnv.Path = shouldInstallLocally
|
|
173
|
-
? `${
|
|
173
|
+
? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${(_b = process.env.Path) !== null && _b !== void 0 ? _b : ""}`
|
|
174
174
|
: process.env.Path;
|
|
175
175
|
}
|
|
176
176
|
const args = [
|
|
@@ -202,7 +202,7 @@ class SPFxGenerator {
|
|
|
202
202
|
}
|
|
203
203
|
catch (yoError) {
|
|
204
204
|
if (yoError.message) {
|
|
205
|
-
context.logProvider.error(yoError.message);
|
|
205
|
+
void context.logProvider.error(yoError.message);
|
|
206
206
|
}
|
|
207
207
|
throw error_2.YoGeneratorScaffoldError();
|
|
208
208
|
}
|
|
@@ -278,7 +278,7 @@ class SPFxGenerator {
|
|
|
278
278
|
static async getWebpartManifest(spfxFolder) {
|
|
279
279
|
const webpartsDir = path.join(spfxFolder, "src", "webparts");
|
|
280
280
|
if (await fs_extra_1.default.pathExists(webpartsDir)) {
|
|
281
|
-
const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter(
|
|
281
|
+
const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter((file) => fs_extra_1.default.statSync(path.join(webpartsDir, file)).isDirectory());
|
|
282
282
|
if (webparts.length < 1) {
|
|
283
283
|
return undefined;
|
|
284
284
|
}
|
|
@@ -312,7 +312,7 @@ class SPFxGenerator {
|
|
|
312
312
|
let remoteManifest = remoteManifestRes.value;
|
|
313
313
|
importDetails.push(`(√) Done: Succeeded to load manifest.json.`);
|
|
314
314
|
const webpartsDir = path.join(spfxFolder, "src", "webparts");
|
|
315
|
-
const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter(
|
|
315
|
+
const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter((file) => fs_extra_1.default.statSync(path.join(webpartsDir, file)).isDirectory());
|
|
316
316
|
if (webparts.length > 1) {
|
|
317
317
|
importDetails.push(`(.) Processing: There're multiple web parts in the SPFx solution, exposing each of them in Teams manifest...`);
|
|
318
318
|
for (let i = 1; i < webparts.length; i++) {
|