@microsoft/teamsfx-core 3.0.9-rc.1 → 3.0.10-alpha.08ea48cc3.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/client/graphClient.d.ts +1 -0
- package/build/client/graphClient.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.d.ts +1 -0
- package/build/client/teamsDevPortalClient.d.ts.map +1 -1
- package/build/common/featureFlags.d.ts +9 -50
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +12 -42
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/localizeUtils.d.ts.map +1 -1
- package/build/common/localizeUtils.js +36 -12
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +2 -0
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +2 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +4 -4
- package/build/component/constants.d.ts +1 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +2 -1
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +0 -11
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.d.ts +5 -1
- package/build/component/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.js +16 -8
- package/build/component/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/spoClient.d.ts +1 -0
- package/build/component/driver/deploy/spfx/utility/spoClient.d.ts.map +1 -1
- package/build/component/driver/devTool/httpClient.d.ts +1 -0
- package/build/component/driver/devTool/httpClient.d.ts.map +1 -1
- package/build/component/driver/devTool/nodeInstaller.d.ts +1 -0
- package/build/component/driver/devTool/nodeInstaller.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +1 -0
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +1 -1
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/share/utils.d.ts.map +1 -1
- package/build/component/driver/share/utils.js +6 -0
- package/build/component/driver/share/utils.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +1 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +2 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts +1 -0
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +12 -1
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +2 -0
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +79 -4
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +7 -8
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +20 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +152 -2
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/generator/configFiles/configGenerator.d.ts +15 -0
- package/build/component/generator/configFiles/configGenerator.d.ts.map +1 -0
- package/build/component/generator/configFiles/configGenerator.js +167 -0
- package/build/component/generator/configFiles/configGenerator.js.map +1 -0
- package/build/component/generator/configFiles/copyPolicy.d.ts +10 -0
- package/build/component/generator/configFiles/copyPolicy.d.ts.map +1 -0
- package/build/component/generator/configFiles/copyPolicy.js +42 -0
- package/build/component/generator/configFiles/copyPolicy.js.map +1 -0
- package/build/component/generator/configFiles/jsonMerger.d.ts +11 -0
- package/build/component/generator/configFiles/jsonMerger.d.ts.map +1 -0
- package/build/component/generator/configFiles/jsonMerger.js +83 -0
- package/build/component/generator/configFiles/jsonMerger.js.map +1 -0
- package/build/component/generator/configFiles/renderTemplate.d.ts +2 -0
- package/build/component/generator/configFiles/renderTemplate.d.ts.map +1 -0
- package/build/component/generator/configFiles/renderTemplate.js +16 -0
- package/build/component/generator/configFiles/renderTemplate.js.map +1 -0
- package/build/component/generator/declarativeAgent/generator.d.ts +5 -0
- package/build/component/generator/declarativeAgent/generator.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/generator.js +78 -28
- package/build/component/generator/declarativeAgent/generator.js.map +1 -1
- package/build/component/generator/declarativeAgent/helper.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/helper.js +0 -1
- package/build/component/generator/declarativeAgent/helper.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +3 -13
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +1 -0
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +6 -4
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/metaOSHelper.d.ts.map +1 -1
- package/build/component/generator/officeAddin/metaOSHelper.js +13 -6
- package/build/component/generator/officeAddin/metaOSHelper.js.map +1 -1
- package/build/component/generator/openApiSpec/common.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/common.js +11 -22
- package/build/component/generator/openApiSpec/common.js.map +1 -1
- package/build/component/generator/openApiSpec/kiota.d.ts +0 -6
- package/build/component/generator/openApiSpec/kiota.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/kiota.js +2 -17
- package/build/component/generator/openApiSpec/kiota.js.map +1 -1
- package/build/component/generator/templates/metadata/index.d.ts.map +1 -1
- package/build/component/generator/templates/metadata/index.js +21 -25
- package/build/component/generator/templates/metadata/index.js.map +1 -1
- package/build/component/generator/templates/templateInfo.d.ts +1 -1
- package/build/component/generator/templates/templateInfo.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +1 -0
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +1 -0
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +2 -12
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.d.ts +3 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/m365/packageService.d.ts.map +1 -1
- package/build/component/m365/packageService.js +16 -20
- package/build/component/m365/packageService.js.map +1 -1
- package/build/component/middleware/envMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +7 -0
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/odrProvider.d.ts +49 -0
- package/build/component/utils/odrProvider.d.ts.map +1 -0
- package/build/component/utils/odrProvider.js +100 -0
- package/build/component/utils/odrProvider.js.map +1 -0
- package/build/component/utils/pathUtils.d.ts +2 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +19 -3
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/settingsUtil.d.ts +1 -1
- package/build/component/utils/settingsUtil.d.ts.map +1 -1
- package/build/component/utils/settingsUtil.js +20 -7
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/core/FxCore.d.ts +10 -3
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.d.ts +6 -0
- package/build/core/FxCore.declarativeAgent.d.ts.map +1 -0
- package/build/core/FxCore.declarativeAgent.js +210 -0
- package/build/core/FxCore.declarativeAgent.js.map +1 -0
- package/build/core/FxCore.js +99 -208
- package/build/core/FxCore.js.map +1 -1
- package/build/core/generateConfigFiles.d.ts +4 -0
- package/build/core/generateConfigFiles.d.ts.map +1 -0
- package/build/core/generateConfigFiles.js +61 -0
- package/build/core/generateConfigFiles.js.map +1 -0
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +8 -2
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +5 -5
- package/build/index.js.map +1 -1
- package/build/question/collaborator.d.ts.map +1 -1
- package/build/question/collaborator.js +5 -8
- package/build/question/collaborator.js.map +1 -1
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +1 -3
- package/build/question/constants.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +1 -15
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +0 -56
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +7 -8
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +3 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +3 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/question/scaffold/commonNodes.d.ts +7 -0
- package/build/question/scaffold/commonNodes.d.ts.map +1 -0
- package/build/question/scaffold/commonNodes.js +154 -0
- package/build/question/scaffold/commonNodes.js.map +1 -0
- package/build/question/scaffold/constructNode.d.ts +3 -0
- package/build/question/scaffold/constructNode.d.ts.map +1 -0
- package/build/question/scaffold/constructNode.js +50 -0
- package/build/question/scaffold/constructNode.js.map +1 -0
- package/build/question/scaffold/vs/createRootNode.d.ts +1 -0
- package/build/question/scaffold/vs/createRootNode.d.ts.map +1 -1
- package/build/question/scaffold/vs/createRootNode.js +14 -16
- package/build/question/scaffold/vs/createRootNode.js.map +1 -1
- package/build/question/scaffold/vsc/ProjectTypeOptions.d.ts +0 -1
- package/build/question/scaffold/vsc/ProjectTypeOptions.d.ts.map +1 -1
- package/build/question/scaffold/vsc/ProjectTypeOptions.js +1 -14
- package/build/question/scaffold/vsc/ProjectTypeOptions.js.map +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.js +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.js.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.d.ts +0 -7
- package/build/question/scaffold/vsc/createRootNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.js +4 -77
- package/build/question/scaffold/vsc/createRootNode.js.map +1 -1
- package/build/question/scaffold/vsc/customEngineAgentNode.d.ts +1 -1
- package/build/question/scaffold/vsc/customEngineAgentNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/customEngineAgentNode.js +22 -24
- package/build/question/scaffold/vsc/customEngineAgentNode.js.map +1 -1
- package/build/question/scaffold/vsc/daProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/daProjectTypeNode.js +4 -4
- package/build/question/scaffold/vsc/daProjectTypeNode.js.map +1 -1
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.d.ts +0 -1
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js +2 -51
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +4 -7
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js +96 -202
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +5 -0
- package/build/ui/visitor.js.map +1 -1
- package/package.json +6 -6
- package/resource/package.nls.cs.json +116 -84
- package/resource/package.nls.de.json +126 -94
- package/resource/package.nls.es.json +126 -94
- package/resource/package.nls.fr.json +114 -82
- package/resource/package.nls.it.json +127 -95
- package/resource/package.nls.ja.json +115 -83
- package/resource/package.nls.json +16 -27
- package/resource/package.nls.ko.json +123 -91
- package/resource/package.nls.pl.json +125 -93
- package/resource/package.nls.pt-BR.json +122 -90
- package/resource/package.nls.ru.json +116 -84
- package/resource/package.nls.tr.json +113 -81
- package/resource/package.nls.zh-Hans.json +114 -82
- package/resource/package.nls.zh-Hant.json +120 -88
- package/resource/templates/package.nls.cs.json +33 -0
- package/resource/templates/package.nls.de.json +33 -0
- package/resource/templates/package.nls.es.json +33 -0
- package/resource/templates/package.nls.fr.json +33 -0
- package/resource/templates/package.nls.it.json +33 -0
- package/resource/templates/package.nls.ja.json +33 -0
- package/resource/templates/package.nls.json +33 -0
- package/resource/templates/package.nls.ko.json +33 -0
- package/resource/templates/package.nls.pl.json +33 -0
- package/resource/templates/package.nls.pt-BR.json +33 -0
- package/resource/templates/package.nls.ru.json +33 -0
- package/resource/templates/package.nls.tr.json +33 -0
- package/resource/templates/package.nls.zh-Hans.json +33 -0
- package/resource/templates/package.nls.zh-Hant.json +33 -0
- package/resource/templates/package.nls.zh-cn.json +21 -0
- package/resource/templates/package.nls.zh-tw.json +21 -0
- package/templates/configs/local/python/.vscode/launch.json.tpl +93 -0
- package/templates/configs/local/python/.vscode/tasks.json.tpl +103 -0
- package/templates/configs/local/python/env/.env.local +6 -0
- package/templates/configs/local/python/m365agents.local.yml.tpl +121 -0
- package/templates/configs/local/typescript/.gitignore +1 -0
- package/templates/configs/local/typescript/.vscode/launch.json.tpl +147 -0
- package/templates/configs/local/typescript/.vscode/tasks.json.tpl +129 -0
- package/templates/configs/local/typescript/env/.env.local +6 -0
- package/templates/configs/local/typescript/m365agents.local.yml.tpl +129 -0
- package/templates/configs/local/typescript/package.json +8 -0
- package/templates/configs/playground/python/.vscode/launch.json +46 -0
- package/templates/configs/playground/python/.vscode/tasks.json +35 -0
- package/templates/configs/playground/python/env/.env.playground +7 -0
- package/templates/configs/playground/python/m365agents.playground.yml +14 -0
- package/templates/configs/playground/typescript/.gitignore +4 -0
- package/templates/configs/playground/typescript/.localConfigs.playground +0 -0
- package/templates/configs/playground/typescript/.vscode/launch.json +31 -0
- package/templates/configs/playground/typescript/.vscode/tasks.json +104 -0
- package/templates/configs/playground/typescript/env/.env.playground +7 -0
- package/templates/configs/playground/typescript/env/.env.playground.user +0 -0
- package/templates/configs/playground/typescript/m365agents.playground.yml +23 -0
- package/templates/configs/playground/typescript/package.json +9 -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/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/metadata/allTemplates.json +429 -0
- package/templates/metadata/defaultGeneratorTemplates.json +233 -0
- package/templates/metadata.zip +0 -0
- package/templates/ui/ceaNode.json +30 -0
- package/templates/ui/teamsNode.json +124 -0
- package/build/component/generator/templates/metadata/agentForTeams.d.ts +0 -3
- package/build/component/generator/templates/metadata/agentForTeams.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/agentForTeams.js +0 -147
- package/build/component/generator/templates/metadata/agentForTeams.js.map +0 -1
- package/build/component/generator/templates/metadata/bot.d.ts +0 -3
- package/build/component/generator/templates/metadata/bot.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/bot.js +0 -142
- package/build/component/generator/templates/metadata/bot.js.map +0 -1
- package/build/component/generator/templates/metadata/customEngineAgent.d.ts +0 -3
- package/build/component/generator/templates/metadata/customEngineAgent.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/customEngineAgent.js +0 -39
- package/build/component/generator/templates/metadata/customEngineAgent.js.map +0 -1
- package/build/component/generator/templates/metadata/da.d.ts +0 -3
- package/build/component/generator/templates/metadata/da.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/da.js +0 -117
- package/build/component/generator/templates/metadata/da.js.map +0 -1
- package/build/component/generator/templates/metadata/graphConnector.d.ts +0 -3
- package/build/component/generator/templates/metadata/graphConnector.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/graphConnector.js +0 -15
- package/build/component/generator/templates/metadata/graphConnector.js.map +0 -1
- package/build/component/generator/templates/metadata/me.d.ts +0 -3
- package/build/component/generator/templates/metadata/me.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/me.js +0 -111
- package/build/component/generator/templates/metadata/me.js.map +0 -1
- package/build/component/generator/templates/metadata/special.d.ts +0 -3
- package/build/component/generator/templates/metadata/special.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/special.js +0 -70
- package/build/component/generator/templates/metadata/special.js.map +0 -1
- package/build/component/generator/templates/metadata/tab.d.ts +0 -3
- package/build/component/generator/templates/metadata/tab.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/tab.js +0 -59
- package/build/component/generator/templates/metadata/tab.js.map +0 -1
- package/build/component/generator/templates/metadata/teams.d.ts +0 -3
- package/build/component/generator/templates/metadata/teams.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/teams.js +0 -238
- package/build/component/generator/templates/metadata/teams.js.map +0 -1
- package/build/component/generator/templates/metadata/vs.d.ts +0 -3
- package/build/component/generator/templates/metadata/vs.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/vs.js +0 -22
- package/build/component/generator/templates/metadata/vs.js.map +0 -1
- package/build/component/generator/templates/metadata/wxp.d.ts +0 -3
- package/build/component/generator/templates/metadata/wxp.d.ts.map +0 -1
- package/build/component/generator/templates/metadata/wxp.js +0 -33
- package/build/component/generator/templates/metadata/wxp.js.map +0 -1
- package/build/tsconfig.tsbuildinfo +0 -1
|
@@ -22,7 +22,6 @@ const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
|
|
|
22
22
|
const generator_1 = require("../generator");
|
|
23
23
|
const const_1 = require("./const");
|
|
24
24
|
const helper_1 = require("./helper");
|
|
25
|
-
const kiota_1 = require("./kiota");
|
|
26
25
|
function normalizePath(path) {
|
|
27
26
|
return "./" + path.replace(/\\/g, "/");
|
|
28
27
|
}
|
|
@@ -52,7 +51,7 @@ async function handleWarnings(context, inputs, warnings, teamsManifest, destinat
|
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
53
|
async function getTemplateInfosFromApiSpec(context, inputs, projectType, actionContext) {
|
|
55
|
-
var _a, _b, _c, _d
|
|
54
|
+
var _a, _b, _c, _d;
|
|
56
55
|
const templateName = inputs[question_1.QuestionNames.TemplateName];
|
|
57
56
|
(0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
|
|
58
57
|
["template-name" /* telemetryProperties.templateName */]: templateName,
|
|
@@ -77,16 +76,14 @@ async function getTemplateInfosFromApiSpec(context, inputs, projectType, actionC
|
|
|
77
76
|
azureOpenAIEndpoint: inputs[question_1.QuestionNames.AzureOpenAIEndpoint],
|
|
78
77
|
azureOpenAIDeploymentName: inputs[question_1.QuestionNames.AzureOpenAIDeploymentName],
|
|
79
78
|
};
|
|
80
|
-
const openapiSpecPath = (
|
|
81
|
-
|
|
82
|
-
: normalizePath(path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.DefaultApiSpecFolderName, openapiSpecFileName));
|
|
83
|
-
const authData = (_a = (await (0, kiota_1.getAuthDataFromKiota)(context, inputs))) !== null && _a !== void 0 ? _a : inputs.apiAuthData;
|
|
79
|
+
const openapiSpecPath = normalizePath(path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.DefaultApiSpecFolderName, openapiSpecFileName));
|
|
80
|
+
const authData = inputs.apiAuthData;
|
|
84
81
|
const convertedAuthData = [];
|
|
85
82
|
if (authData && authData.length > 0) {
|
|
86
83
|
for (const auth of authData) {
|
|
87
|
-
const envName = (
|
|
84
|
+
const envName = (_a = auth.registrationId) !== null && _a !== void 0 ? _a : (0, helper_1.getEnvName)((_b = auth.authName) !== null && _b !== void 0 ? _b : "");
|
|
88
85
|
convertedAuthData.push({
|
|
89
|
-
authName: (
|
|
86
|
+
authName: (_c = auth.authName) !== null && _c !== void 0 ? _c : "",
|
|
90
87
|
openapiSpecPath: openapiSpecPath,
|
|
91
88
|
registrationIdEnvName: envName,
|
|
92
89
|
authType: auth.authType,
|
|
@@ -97,7 +94,7 @@ async function getTemplateInfosFromApiSpec(context, inputs, projectType, actionC
|
|
|
97
94
|
context.telemetryReporter.sendTelemetryEvent(const_1.declarativeAgentExistingApiSpecUrlTelemetryEvent, {
|
|
98
95
|
["remote-url" /* telemetryProperties.isRemoteUrlTelemetryProperty */]: (0, stringUtils_1.isValidHttpUrl)(url).toString(),
|
|
99
96
|
["generate-type" /* telemetryProperties.generateType */]: projectType.toString(),
|
|
100
|
-
["auth-type" /* telemetryProperties.authType */]: (
|
|
97
|
+
["auth-type" /* telemetryProperties.authType */]: (_d = authData === null || authData === void 0 ? void 0 : authData.map((item) => item.authType).join(",")) !== null && _d !== void 0 ? _d : "None",
|
|
101
98
|
});
|
|
102
99
|
inputs.templateState = {
|
|
103
100
|
isYaml: isYaml,
|
|
@@ -118,14 +115,11 @@ exports.getTemplateInfosFromApiSpec = getTemplateInfosFromApiSpec;
|
|
|
118
115
|
async function generateFilesFromApiSpec(context, inputs, destinationPath, projectType, componentName) {
|
|
119
116
|
const templateState = inputs.templateState;
|
|
120
117
|
const isDeclarativeAgent = projectType === m365_spec_parser_1.ProjectType.Copilot;
|
|
121
|
-
const isKiotaIntegration = (0, kiota_1.isKiotaIntegrated)(inputs);
|
|
122
118
|
const manifestPath = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName);
|
|
123
|
-
const apiSpecFolderPath = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName,
|
|
124
|
-
const openapiSpecFileName =
|
|
125
|
-
?
|
|
126
|
-
:
|
|
127
|
-
? teamsfx_api_1.DefaultApiSpecYamlFileName
|
|
128
|
-
: teamsfx_api_1.DefaultApiSpecJsonFileName;
|
|
119
|
+
const apiSpecFolderPath = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.DefaultApiSpecFolderName);
|
|
120
|
+
const openapiSpecFileName = templateState.isYaml
|
|
121
|
+
? teamsfx_api_1.DefaultApiSpecYamlFileName
|
|
122
|
+
: teamsfx_api_1.DefaultApiSpecJsonFileName;
|
|
129
123
|
let openapiSpecPath = path_1.default.join(apiSpecFolderPath, openapiSpecFileName);
|
|
130
124
|
if (projectType === m365_spec_parser_1.ProjectType.TeamsAi) {
|
|
131
125
|
const language = inputs[question_1.QuestionNames.ProgrammingLanguage];
|
|
@@ -135,16 +129,11 @@ async function generateFilesFromApiSpec(context, inputs, destinationPath, projec
|
|
|
135
129
|
}
|
|
136
130
|
await fs_extra_1.default.ensureDir(apiSpecFolderPath);
|
|
137
131
|
const pluginManifestPath = templateState.type === m365_spec_parser_1.ProjectType.Copilot
|
|
138
|
-
? path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName,
|
|
139
|
-
? path_1.default.basename(inputs[question_1.QuestionNames.ActionManifestPath])
|
|
140
|
-
: teamsfx_api_1.DefaultPluginManifestFileName)
|
|
132
|
+
? path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.DefaultPluginManifestFileName)
|
|
141
133
|
: undefined;
|
|
142
134
|
const responseTemplateFolder = templateState.type === m365_spec_parser_1.ProjectType.SME
|
|
143
135
|
? path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName)
|
|
144
136
|
: undefined;
|
|
145
|
-
if (isKiotaIntegration) {
|
|
146
|
-
return await (0, kiota_1.kiotaPostProcess)(context, inputs, destinationPath, openapiSpecPath, pluginManifestPath || "", manifestPath, templateState.type, isDeclarativeAgent);
|
|
147
|
-
}
|
|
148
137
|
const specParser = new m365_spec_parser_1.SpecParser(templateState.url, (0, helper_1.getParserOptions)(templateState.type, isDeclarativeAgent));
|
|
149
138
|
const generateResult = await (0, helper_1.generateFromApiSpec)(specParser, manifestPath, inputs, context, componentName, templateState.type, {
|
|
150
139
|
destinationApiSpecFilePath: openapiSpecPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAEH,kEAAqF;AACrF,wDAegC;AAChC,gEAA0B;AAC1B,mCAA+B;AAC/B,2CAA6C;AAC7C,wDAAwB;AACxB,6DAA6D;AAC7D,iDAAuD;AACvD,gDAAkD;AAClD,2DAAkE;AAClE,iGAA8F;AAC9F,6EAA0E;AAE1E,4CAAyC;AAEzC,mCAKiB;AACjB,qCAMkB;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,5 @@
|
|
|
4
4
|
import { ProjectType } from "@microsoft/m365-spec-parser";
|
|
5
5
|
import { Context, FxError, GeneratorResult, Inputs } from "@microsoft/teamsfx-api";
|
|
6
6
|
import { Result } from "neverthrow";
|
|
7
|
-
export declare function isKiotaIntegrated(inputs: Inputs): boolean;
|
|
8
|
-
export declare function getAuthDataFromKiota(context: Context, inputs: Inputs): Promise<{
|
|
9
|
-
authName: string;
|
|
10
|
-
authType: "apiKey" | "oauth2";
|
|
11
|
-
registrationId: string;
|
|
12
|
-
}[] | undefined>;
|
|
13
7
|
export declare function kiotaPostProcess(context: Context, inputs: Inputs, destinationPath: string, openapiSpecPath: string, pluginManifestPath: string, manifestPath: string, templateType: ProjectType, isDeclarativeAgent: boolean): Promise<Result<GeneratorResult, FxError>>;
|
|
14
8
|
//# sourceMappingURL=kiota.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kiota.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/kiota.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EACL,OAAO,EACP,OAAO,EACP,eAAe,EACf,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAW,MAAM,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"kiota.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/kiota.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EACL,OAAO,EACP,OAAO,EACP,eAAe,EACf,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAW,MAAM,EAAE,MAAM,YAAY,CAAC;AAQ7C,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,WAAW,EACzB,kBAAkB,EAAE,OAAO,GAC1B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAuC3C"}
|
|
@@ -5,31 +5,16 @@
|
|
|
5
5
|
* @author yuqzho@microsoft.com, KennethBWSong, SLdragon, Ning Tang
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
-
exports.kiotaPostProcess =
|
|
8
|
+
exports.kiotaPostProcess = void 0;
|
|
9
9
|
const tslib_1 = require("tslib");
|
|
10
10
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
11
11
|
const neverthrow_1 = require("neverthrow");
|
|
12
12
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
13
|
-
const
|
|
13
|
+
const daSpecParser_1 = require("../../../common/daSpecParser");
|
|
14
14
|
const question_1 = require("../../../question");
|
|
15
15
|
const CopilotGptManifestUtils_1 = require("../../driver/teamsApp/utils/CopilotGptManifestUtils");
|
|
16
16
|
const const_1 = require("./const");
|
|
17
17
|
const helper_1 = require("./helper");
|
|
18
|
-
const daSpecParser_1 = require("../../../common/daSpecParser");
|
|
19
|
-
function isKiotaIntegrated(inputs) {
|
|
20
|
-
return (featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
|
|
21
|
-
inputs[question_1.QuestionNames.ActionManifestPath]);
|
|
22
|
-
}
|
|
23
|
-
exports.isKiotaIntegrated = isKiotaIntegrated;
|
|
24
|
-
async function getAuthDataFromKiota(context, inputs) {
|
|
25
|
-
// For Kiota integration, we need to get auth info here
|
|
26
|
-
if (isKiotaIntegrated(inputs)) {
|
|
27
|
-
const pluginManifestPath = inputs[question_1.QuestionNames.ActionManifestPath];
|
|
28
|
-
return await (0, daSpecParser_1.parseAndUpdatePluginManifestForKiota)(pluginManifestPath, false);
|
|
29
|
-
}
|
|
30
|
-
return undefined;
|
|
31
|
-
}
|
|
32
|
-
exports.getAuthDataFromKiota = getAuthDataFromKiota;
|
|
33
18
|
async function kiotaPostProcess(context, inputs, destinationPath, openapiSpecPath, pluginManifestPath, manifestPath, templateType, isDeclarativeAgent) {
|
|
34
19
|
// For Kiota integration scenario, we need to:
|
|
35
20
|
// 1. Copy openapi spec file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kiota.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/kiota.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAUH,gEAA0B;AAC1B,2CAA6C;AAC7C,wDAAwB;AACxB,+
|
|
1
|
+
{"version":3,"file":"kiota.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/kiota.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAUH,gEAA0B;AAC1B,2CAA6C;AAC7C,wDAAwB;AACxB,+DAAoF;AACpF,gDAAkD;AAClD,iGAA8F;AAC9F,mCAAmG;AACnG,qCAAyF;AAElF,KAAK,UAAU,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,eAAuB,EACvB,kBAA0B,EAC1B,YAAoB,EACpB,YAAyB,EACzB,kBAA2B;IAE3B,8CAA8C;IAC9C,4BAA4B;IAC5B,MAAM,kBAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,wBAAa,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC;IAEjF,+BAA+B;IAC/B,MAAM,kBAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,wBAAa,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAEhF,8CAA8C;IAC9C,MAAM,IAAA,mDAAoC,EAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAErE,+BAA+B;IAC/B,MAAM,QAAQ,GAAqB,MAAM,kBAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACnE,MAAM,qBAAqB,GAAG,cAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;IAC9E,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,IAAI,EAAE,CAAC;IACtD,QAAQ,CAAC,aAAa,CAAC,OAAO,GAAG;QAC/B;YACE,IAAI,EAAE,qBAAqB;YAC3B,EAAE,EAAE,UAAU;SACf;KACF,CAAC;IAEF,+BAA+B;IAC/B,MAAM,eAAe,GAAG,MAAM,iDAAuB,CAAC,8BAA8B,CAClF,YAAY,EACZ,+CAAuC,EACvC,uCAA+B,EAC/B,kBAAkB,CACnB,CAAC;IACF,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;QAC3B,OAAO,IAAA,gBAAG,EAAC,eAAe,CAAC,KAAK,CAAC,CAAC;KACnC;IAED,sDAAsD;IACtD,MAAM,IAAA,qDAA4C,EAAC,kBAAkB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IAEjG,wBAAwB;IACxB,MAAM,IAAA,wBAAe,EAAC,MAAM,CAAC,wBAAa,CAAC,kBAAkB,CAAC,EAAE,eAAe,CAAC,CAAC;IACjF,OAAO,IAAA,eAAE,EAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;AACrC,CAAC;AAhDD,4CAgDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/templates/metadata/index.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/templates/metadata/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAMpE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAwBvC,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAYxE;AAGD,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAY5E"}
|
|
@@ -3,34 +3,29 @@
|
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.getDefaultTemplatesOnPlatform = exports.getAllTemplatesOnPlatform = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
6
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const defaultGeneratorTemplates = [
|
|
26
|
-
...customEngineAgent_1.customEngineAgentTemplates,
|
|
27
|
-
...teams_1.teamsAgentsAndAppsTemplates,
|
|
28
|
-
...me_1.messagingExtensionTemplates,
|
|
29
|
-
...vs_1.vsOnlyTemplates,
|
|
30
|
-
...graphConnector_1.graphConnectorTemplates,
|
|
31
|
-
];
|
|
8
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
9
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
10
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
11
|
+
const templates_config_json_1 = tslib_1.__importDefault(require("../../../../common/templates-config.json"));
|
|
12
|
+
const folder_1 = require("../../../../folder");
|
|
13
|
+
function getTemplateMetadataConfig(configName) {
|
|
14
|
+
let jsonPath;
|
|
15
|
+
const cachedJsonPath = path_1.default.join(os_1.default.homedir(), `.${String(teamsfx_api_1.ConfigFolderName)}`, "metadata", configName);
|
|
16
|
+
// Check if cached JSON exists, otherwise fallback to bundled templates folder
|
|
17
|
+
if (!templates_config_json_1.default.useLocalTemplate && cachedJsonPath && fs_extra_1.default.pathExistsSync(cachedJsonPath)) {
|
|
18
|
+
jsonPath = cachedJsonPath;
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
jsonPath = path_1.default.join((0, folder_1.getTemplatesFolder)(), "metadata", configName);
|
|
22
|
+
}
|
|
23
|
+
const content = fs_extra_1.default.readFileSync(jsonPath, "utf-8");
|
|
24
|
+
return JSON.parse(content);
|
|
25
|
+
}
|
|
32
26
|
// used by programming language question options filter
|
|
33
27
|
function getAllTemplatesOnPlatform(platform) {
|
|
28
|
+
const allTemplates = getTemplateMetadataConfig("allTemplates.json");
|
|
34
29
|
switch (platform) {
|
|
35
30
|
case teamsfx_api_1.Platform.VSCode:
|
|
36
31
|
return allTemplates.filter((t) => t.language !== "csharp");
|
|
@@ -45,6 +40,7 @@ function getAllTemplatesOnPlatform(platform) {
|
|
|
45
40
|
exports.getAllTemplatesOnPlatform = getAllTemplatesOnPlatform;
|
|
46
41
|
// used by default generator
|
|
47
42
|
function getDefaultTemplatesOnPlatform(platform) {
|
|
43
|
+
const defaultGeneratorTemplates = getTemplateMetadataConfig("defaultGeneratorTemplates.json");
|
|
48
44
|
switch (platform) {
|
|
49
45
|
case teamsfx_api_1.Platform.VSCode:
|
|
50
46
|
return defaultGeneratorTemplates.filter((t) => t.language !== "csharp");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/component/generator/templates/metadata/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/component/generator/templates/metadata/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAoE;AACpE,gEAA0B;AAC1B,oDAAoB;AACpB,wDAAwB;AACxB,6GAAsE;AACtE,+CAAwD;AAGxD,SAAS,yBAAyB,CAAC,UAAkB;IACnD,IAAI,QAAgB,CAAC;IAErB,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAC9B,YAAE,CAAC,OAAO,EAAE,EACZ,IAAI,MAAM,CAAC,8BAAgB,CAAC,EAAE,EAC9B,UAAU,EACV,UAAU,CACX,CAAC;IAEF,8EAA8E;IAC9E,IAAI,CAAC,+BAAc,CAAC,gBAAgB,IAAI,cAAc,IAAI,kBAAE,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE;QAC3F,QAAQ,GAAG,cAAc,CAAC;KAC3B;SAAM;QACL,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,2BAAkB,GAAE,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KACpE;IAED,MAAM,OAAO,GAAG,kBAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAe,CAAC;AAC3C,CAAC;AAED,uDAAuD;AACvD,SAAgB,yBAAyB,CAAC,QAAkB;IAC1D,MAAM,YAAY,GAAG,yBAAyB,CAAC,mBAAmB,CAAC,CAAC;IACpE,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAQ,CAAC,MAAM;YAClB,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QAC7D,KAAK,sBAAQ,CAAC,EAAE;YACd,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QAC7D,KAAK,sBAAQ,CAAC,GAAG;YACf,OAAO,YAAY,CAAC;QACtB;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAZD,8DAYC;AAED,4BAA4B;AAC5B,SAAgB,6BAA6B,CAAC,QAAkB;IAC9D,MAAM,yBAAyB,GAAG,yBAAyB,CAAC,gCAAgC,CAAC,CAAC;IAC9F,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAQ,CAAC,MAAM;YAClB,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QAC1E,KAAK,sBAAQ,CAAC,EAAE;YACd,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QAC1E,KAAK,sBAAQ,CAAC,GAAG;YACf,OAAO,yBAAyB,CAAC;QACnC;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAZD,sEAYC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateInfo.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateInfo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"templateInfo.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateInfo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}
|
|
@@ -12,6 +12,7 @@ export declare enum TemplateNames {
|
|
|
12
12
|
DeclarativeAgentMetaOSUpgradeProject = "declarative-agent-meta-os-upgrade-project",
|
|
13
13
|
BasicCustomEngineAgent = "basic-custom-engine-agent",
|
|
14
14
|
WeatherAgent = "weather-agent",
|
|
15
|
+
TravelAgent = "travel-agent",
|
|
15
16
|
CustomCopilotBasic = "custom-copilot-basic",
|
|
16
17
|
CustomCopilotRagCustomize = "custom-copilot-rag-customize",
|
|
17
18
|
CustomCopilotRagAzureAISearch = "custom-copilot-rag-azure-ai-search",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateNames.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateNames.ts"],"names":[],"mappings":"AAKA,oBAAY,aAAa;IAEvB,qBAAqB,sBAAsB;IAC3C,qCAAqC,4BAA4B;IACjE,2CAA2C,mCAAmC;IAC9E,0CAA0C,kCAAkC;IAC5E,6CAA6C,iCAAiC;IAC9E,kCAAkC,4BAA4B;IAC9D,4BAA4B,+BAA+B;IAC3D,kCAAkC,2CAA2C;IAC7E,iCAAiC,2CAA2C;IAE5E,gCAAgC,0CAA0C;IAC1E,oCAAoC,8CAA8C;IAGlF,sBAAsB,8BAA8B;IACpD,YAAY,kBAAkB;
|
|
1
|
+
{"version":3,"file":"templateNames.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateNames.ts"],"names":[],"mappings":"AAKA,oBAAY,aAAa;IAEvB,qBAAqB,sBAAsB;IAC3C,qCAAqC,4BAA4B;IACjE,2CAA2C,mCAAmC;IAC9E,0CAA0C,kCAAkC;IAC5E,6CAA6C,iCAAiC;IAC9E,kCAAkC,4BAA4B;IAC9D,4BAA4B,+BAA+B;IAC3D,kCAAkC,2CAA2C;IAC7E,iCAAiC,2CAA2C;IAE5E,gCAAgC,0CAA0C;IAC1E,oCAAoC,8CAA8C;IAGlF,sBAAsB,8BAA8B;IACpD,YAAY,kBAAkB;IAC9B,WAAW,iBAAiB;IAG5B,kBAAkB,yBAAyB;IAC3C,yBAAyB,iCAAiC;IAC1D,6BAA6B,uCAAuC;IACpE,yBAAyB,kCAAkC;IAC3D,4BAA4B,oCAAoC;IAChE,yBAAyB,iCAAiC;IAC1D,mCAAmC,4CAA4C;IAC/E,sBAAsB,6BAA6B;IAGnD,cAAc,oBAAoB;IAGlC,GAAG,gBAAgB;IACnB,SAAS,gBAAgB;IACzB,YAAY,kBAAkB;IAC9B,MAAM,oBAAoB;IAC1B,SAAS,gBAAgB;IACzB,OAAO,aAAa;IAGpB,UAAU,gBAAgB;IAC1B,mBAAmB,yBAAyB;IAC5C,kBAAkB,wBAAwB;IAC1C,uBAAuB,8BAA8B;IACrD,wBAAwB,+BAA+B;IACvD,4BAA4B,oCAAoC;IAChE,kBAAkB,yBAAyB;IAC3C,QAAQ,aAAa;IAGrB,qCAAqC,gCAAgC;IACrE,gDAAgD,wCAAwC;IACxF,+CAA+C,8BAA8B;IAC7E,mCAAmC,gCAAgC;IACnE,oBAAoB,2BAA2B;IAC/C,sBAAsB,6BAA6B;IACnD,aAAa,mBAAmB;IAChC,uBAAuB,8BAA8B;IAGrD,eAAe,kCAAkC;IACjD,WAAW,+BAA+B;IAC1C,eAAe,kCAAkC;IACjD,iBAAiB,wBAAwB;IAGzC,KAAK,UAAU;IACf,sBAAsB,6BAA6B;CACpD"}
|
|
@@ -22,6 +22,7 @@ var TemplateNames;
|
|
|
22
22
|
// custom engine agent
|
|
23
23
|
TemplateNames["BasicCustomEngineAgent"] = "basic-custom-engine-agent";
|
|
24
24
|
TemplateNames["WeatherAgent"] = "weather-agent";
|
|
25
|
+
TemplateNames["TravelAgent"] = "travel-agent";
|
|
25
26
|
// agent for Teams
|
|
26
27
|
TemplateNames["CustomCopilotBasic"] = "custom-copilot-basic";
|
|
27
28
|
TemplateNames["CustomCopilotRagCustomize"] = "custom-copilot-rag-customize";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateNames.js","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateNames.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,8CAA8C;AAC9C,oBAAoB;AACpB,IAAY,
|
|
1
|
+
{"version":3,"file":"templateNames.js","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateNames.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,8CAA8C;AAC9C,oBAAoB;AACpB,IAAY,aAsEX;AAtED,WAAY,aAAa;IACvB,oBAAoB;IACpB,4DAA2C,CAAA;IAC3C,kFAAiE,CAAA;IACjE,+FAA8E,CAAA;IAC9E,6FAA4E,CAAA;IAC5E,+FAA8E,CAAA;IAC9E,+EAA8D,CAAA;IAC9D,4EAA2D,CAAA;IAC3D,8FAA6E,CAAA;IAC7E,6FAA4E,CAAA;IAE5E,2FAA0E,CAAA;IAC1E,mGAAkF,CAAA;IAElF,sBAAsB;IACtB,qEAAoD,CAAA;IACpD,+CAA8B,CAAA;IAC9B,6CAA4B,CAAA;IAE5B,kBAAkB;IAClB,4DAA2C,CAAA;IAC3C,2EAA0D,CAAA;IAC1D,qFAAoE,CAAA;IACpE,4EAA2D,CAAA;IAC3D,iFAAgE,CAAA;IAChE,2EAA0D,CAAA;IAC1D,gGAA+E,CAAA;IAC/E,oEAAmD,CAAA;IAEnD,oBAAoB;IACpB,mDAAkC,CAAA;IAElC,MAAM;IACN,oCAAmB,CAAA;IACnB,0CAAyB,CAAA;IACzB,+CAA8B,CAAA;IAC9B,2CAA0B,CAAA;IAC1B,0CAAyB,CAAA;IACzB,qCAAoB,CAAA;IAEpB,MAAM;IACN,2CAA0B,CAAA;IAC1B,6DAA4C,CAAA;IAC5C,2DAA0C,CAAA;IAC1C,sEAAqD,CAAA;IACrD,wEAAuD,CAAA;IACvD,iFAAgE,CAAA;IAChE,4DAA2C,CAAA;IAC3C,sCAAqB,CAAA;IAErB,sBAAsB;IACtB,sFAAqE,CAAA;IACrE,yGAAwF,CAAA;IACxF,8FAA6E,CAAA;IAC7E,oFAAmE,CAAA;IACnE,gEAA+C,CAAA;IAC/C,oEAAmD,CAAA;IACnD,iDAAgC,CAAA;IAChC,sEAAqD,CAAA;IAErD,MAAM;IACN,kEAAiD,CAAA;IACjD,2DAA0C,CAAA;IAC1C,kEAAiD,CAAA;IACjD,0DAAyC,CAAA;IAEzC,UAAU;IACV,gCAAe,CAAA;IACf,oEAAmD,CAAA;AACrD,CAAC,EAtEW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAsExB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateReplaceMap.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateReplaceMap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOhD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"templateReplaceMap.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateReplaceMap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOhD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CA4E/E"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTemplateReplaceMap = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
5
6
|
const featureFlags_1 = require("../../../common/featureFlags");
|
|
6
7
|
const stringUtils_1 = require("../../../common/stringUtils");
|
|
7
|
-
const constants_1 = require("../../../question/constants");
|
|
8
8
|
const crypto_1 = require("../../../core/crypto");
|
|
9
|
-
const
|
|
9
|
+
const constants_1 = require("../../../question/constants");
|
|
10
10
|
function getTemplateReplaceMap(inputs) {
|
|
11
11
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
12
12
|
const appName = inputs[constants_1.QuestionNames.AppName];
|
|
@@ -48,12 +48,6 @@ function getTemplateReplaceMap(inputs) {
|
|
|
48
48
|
PlaceProjectFileInSolutionDir: placeProjectFileInSolutionDir ? "true" : "",
|
|
49
49
|
SafeProjectName: safeProjectName,
|
|
50
50
|
SafeProjectNameLowerCase: safeProjectName.toLocaleLowerCase(),
|
|
51
|
-
enableTestToolByDefault: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.TestTool)
|
|
52
|
-
? "true"
|
|
53
|
-
: "",
|
|
54
|
-
enableMETestToolByDefault: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.METestTool)
|
|
55
|
-
? "true"
|
|
56
|
-
: "",
|
|
57
51
|
useOpenAI: llmService === "llm-service-openai" ? "true" : "",
|
|
58
52
|
useAzureOpenAI: llmService === "llm-service-azure-openai" ? "true" : "",
|
|
59
53
|
openAIKey: openAIKey !== null && openAIKey !== void 0 ? openAIKey : "",
|
|
@@ -69,16 +63,12 @@ function getTemplateReplaceMap(inputs) {
|
|
|
69
63
|
gcName: gcName !== null && gcName !== void 0 ? gcName : "",
|
|
70
64
|
gcConnectionId: gcConnectionId !== null && gcConnectionId !== void 0 ? gcConnectionId : "",
|
|
71
65
|
openAIEmbeddingModel: openAIEmbeddingModel !== null && openAIEmbeddingModel !== void 0 ? openAIEmbeddingModel : "",
|
|
72
|
-
isNewProjectTypeEnabled: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.NewProjectType)
|
|
73
|
-
? "true"
|
|
74
|
-
: "",
|
|
75
66
|
NewProjectTypeName: (_f = process.env.TEAMSFX_NEW_PROJECT_TYPE_NAME) !== null && _f !== void 0 ? _f : "M365Agent",
|
|
76
67
|
NewProjectTypeExt: (_g = process.env.TEAMSFX_NEW_PROJECT_TYPE_EXTENSION) !== null && _g !== void 0 ? _g : "atkproj",
|
|
77
68
|
CEAEnabled: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.CEAEnabled) ? "true" : "",
|
|
78
69
|
EmbeddedKnowledgeEnabled: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.EmbeddedKnowledgeEnabled)
|
|
79
70
|
? "true"
|
|
80
71
|
: "",
|
|
81
|
-
ShareEnabled: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.ShareEnabled) ? "true" : "",
|
|
82
72
|
SensitivityLabelEnabled: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.SensitivityLabelEnabled)
|
|
83
73
|
? "true"
|
|
84
74
|
: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateReplaceMap.js","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateReplaceMap.ts"],"names":[],"mappings":";;;;AAGA,+DAAgF;AAChF,6DAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"templateReplaceMap.js","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateReplaceMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import AdmZip from "adm-zip";
|
|
3
4
|
import { AxiosError } from "axios";
|
|
4
5
|
import { SampleConfig, SampleUrlInfo } from "../../common/samples";
|
|
@@ -9,10 +10,10 @@ export declare function getTemplateZipUrlByVersion(name: string, version: string
|
|
|
9
10
|
export declare function fetchZipFromUrl(url: string, tryLimits?: number, timeoutInMs?: number): Promise<AdmZip>;
|
|
10
11
|
export declare function unzip(zip: AdmZip, dstPath: string, nameReplaceFn?: (filePath: string, data: Buffer) => string, dataReplaceFn?: (filePath: string, data: Buffer) => Buffer | string, filterFn?: (filePath: string) => boolean): Promise<string[]>;
|
|
11
12
|
export declare function renderTemplateFileData(fileName: string, fileData: Buffer, variables?: {
|
|
12
|
-
[key: string]:
|
|
13
|
+
[key: string]: any;
|
|
13
14
|
}): string | Buffer;
|
|
14
15
|
export declare function renderTemplateFileName(fileName: string, fileData: Buffer, variables?: {
|
|
15
|
-
[key: string]:
|
|
16
|
+
[key: string]: any;
|
|
16
17
|
}): string;
|
|
17
18
|
export declare function getSampleInfoFromName(sampleName: string): Promise<SampleConfig>;
|
|
18
19
|
export declare function zipFolder(folderPath: string): AdmZip;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,8DAA6B;AAC7B,0DAAyD;AACzD,qDAA+B;AAC/B,mCAAmC;AACnC,6DAAqD;AACrD,wDAAwB;AACxB,4DAA4B;AAC5B,4DAAyF;AACzF,kDAAmF;AACnF,uGAAgE;AAChE,uCAAmD;AACnD,wDAA+D;AAC/D,yCAQoB;AACpB,wDAAkF;AAClF,8DAA8D;AAC9D,8FAA2F;AAC3F,sDAAmE;AACnE,0DAAuD;AAEhD,KAAK,UAAU,cAAc,CAClC,IAAY,EACZ,gBAAuC,EACvC,QAAmB;IAEnB,OAAO,QAAQ,KAAK,sBAAQ,CAAC,EAAE;QAC7B,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,MAAM,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;AACtD,CAAC;AARD,wCAQC;AAED,KAAK,UAAU,iBAAiB,CAC9B,IAAY,EACZ,gBAAuC;IAEvC,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE;QAC3C,OAAO,0BAA0B,CAC/B,IAAI,EACJ,SAAS,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,EAClD,+BAAc,CAAC,SAAS,CACzB,CAAC;KACH;IACD,IAAI,CAAC,+BAAc,CAAC,gBAAgB,EAAE;QACpC,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC/C,IAAI,gBAAM,CAAC,EAAE,CAAC,aAAa,EAAE,+BAAc,CAAC,YAAY,CAAC,EAAE;YACzD,2GAA2G;YAC3G,OAAO,0BAA0B,CAAC,IAAI,EAAE,aAAa,EAAE,+BAAc,CAAC,SAAS,CAAC,CAAC;SAClF;KACF;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,8EAA8E;IAC9E,IAAI,+BAAc,CAAC,gBAAgB,EAAE;QACnC,OAAO;KACR;IACD,uEAAuE;IACvE,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,KAAK,sBAAQ,CAAC,EAAE,EAAE;QAC3D,OAAO,0BAA0B,CAAC,IAAI,EAAE,UAAU,EAAE,+BAAc,CAAC,WAAW,CAAC,CAAC;KACjF;IACD,oEAAoE;IACpE,OAAO,0BAA0B,CAAC,IAAI,EAAE,+BAAc,CAAC,SAAS,EAAE,+BAAc,CAAC,WAAW,CAAC,CAAC;AAChG,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,OAAgC;IAEhC,MAAM,iBAAiB,GAAG,+BAAc,CAAC,SAAS,CAAC;IACnD,MAAM,cAAc,GAAG,+BAAc,CAAC,OAAO,CAAC;IAE9C,MAAM,WAAW,GAAG,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC;IAC/F,MAAM,eAAe,GAAG,gBAAM,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1E,OAAO,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS,CAAC;AACtC,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,GAAW,EAAE,SAAiB,EAAE,WAAmB;IAC7E,MAAM,GAAG,GAA0B,MAAM,IAAA,qCAAsB,EAC7D,KAAK,EAAE,WAAW,EAAE,EAAE;QACpB,OAAO,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAC1B,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;IACL,CAAC,EACD,WAAW,EACX,SAAS,CACV,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,SAAS,GAAG,2BAAgB,EAC5B,WAAW,GAAG,6BAAkB;IAEhC,MAAM,kBAAkB,GAAG,+BAAc,CAAC,UAAU,CAAC;IACrD,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC,KAAK,IAAI,EAAE,CAC7D,CAAC,MAAM,YAAY,CAAC,kBAAkB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAChG,CAAC;IACF,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAZD,4DAYC;AAED,SAAgB,0BAA0B,CAAC,IAAY,EAAE,OAAe,EAAE,MAAc;IACtF,OAAO,GAAG,+BAAc,CAAC,uBAAuB,IAAI,MAAM,GAAG,OAAO,IAAI,IAAI,GAAG,+BAAc,CAAC,WAAW,EAAE,CAAC;AAC9G,CAAC;AAFD,gEAEC;AAEM,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,SAAS,GAAG,2BAAgB,EAC5B,WAAW,GAAG,6BAAkB;IAEhC,MAAM,GAAG,GAAuB,MAAM,IAAA,mCAAoB,EAAC,KAAK,IAAI,EAAE;QACpE,OAAO,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAC1B,YAAY,EAAE,aAAa;YAC3B,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC,EAAE,SAAS,CAAC,CAAC;IAEd,MAAM,GAAG,GAAG,IAAI,iBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,0CAcC;AAED,kFAAkF;AAC3E,KAAK,UAAU,KAAK,CACzB,GAAW,EACX,OAAe,EACf,aAA0D,EAC1D,aAAmE,EACnE,QAAwC;IAExC,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,IAAI,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACrE,IAAI,QAAQ,EAAE;QACZ,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;KAChE;IAED,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;QAC3B,MAAM,YAAY,GAAW,KAAK,CAAC,OAAO,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAW,aAAa;YACrC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC;YAC9C,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;QACpB,MAAM,SAAS,GAAoB,aAAa;YAC9C,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC;YACzC,CAAC,CAAC,YAAY,CAAC;QACjB,MAAM,QAAQ,GAAW,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,OAAO,GAAW,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACxB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AA5BD,sBA4BC;AAED,SAAgB,sBAAsB,CACpC,QAAgB,EAChB,QAAgB,EAChB,SAAkC;IAElC,gDAAgD;IAChD,IAAI,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,0BAAe,EAAE;QAC9C,MAAM,KAAK,GAAG,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,IAAI,iBAAM,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,kBAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAClE,2FAA2F;QAC3F,6EAA6E;QAC7E,kBAAQ,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;QACnC,OAAO,kBAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,mCAAwB,CAAC,CAAC;KACzE;IACD,kIAAkI;IAClI,OAAO,QAAQ,CAAC;AAClB,CAAC;AAjBD,wDAiBC;AAED,SAAS,mBAAmB,CAC1B,QAAgB,EAChB,IAAqC,EACrC,OAAyB,gCAAqB;IAE9C,MAAM,MAAM,GAAG,kBAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAe,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAA,kBAAS,EAAC,MAAM,CAAC,CAAC,CAAC,2FAA2F;IAC7H,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACpC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,YAAY,CACnB,MAAkB,EAClB,IAAqC,EACrC,IAAsB,EACtB,QAAgB;IAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC9C,mCAAmC;IACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,EAAE;YAC9E,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,QAAQ,IAAI,KAAK,CAAC;SACnB;aAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC/C,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;YACrB,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;YAErB,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;gBACjC,QAAQ,mCAAQ,IAAI,GAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;aAC9C;iBAAM,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;gBAC7C,QAAQ,mCAAQ,IAAI,GAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;aAC3C;YAED,QAAQ,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEpE,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;SACtB;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,sBAAsB,CACpC,QAAgB,EAChB,QAAgB,EAChB,SAAkC;IAElC,yEAAyE;IACzE,kBAAQ,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IACnC,OAAO,kBAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,gCAAqB,CAAC,CAAC,OAAO,CAC5E,0BAAe,EACf,EAAE,CACH,CAAC;AACJ,CAAC;AAXD,wDAWC;AAEM,KAAK,UAAU,qBAAqB,CAAC,UAAkB;IAC5D,MAAM,MAAM,GAAG,CAAC,MAAM,wBAAc,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,IAAI,CACjE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE,CACjE,CAAC;IACF,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,4BAAoB,CAAC,WAAW,UAAU,GAAG,EAAE,WAAW,CAAC,CAAC;KACvE;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,sDAQC;AAED,SAAgB,SAAS,CAAC,UAAkB;IAC1C,MAAM,GAAG,GAAG,IAAI,iBAAM,EAAE,CAAC;IACzB,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC/B,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,8BAIC;AAEM,KAAK,UAAU,iBAAiB,CACrC,UAAyB,EACzB,OAAe,EACf,iBAAiB,GAAG,kCAAuB,EAC3C,WAAW,GAAG,mCAAwB;IAEtC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,MAAM,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACxF,MAAM,mBAAmB,CACvB,UAAU,EACV,aAAa,EACb,WAAW,EACX,OAAO,EACP,UAAU,CAAC,GAAG,EACd,WAAW,EACX,iBAAiB,CAClB,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC;AAjBD,8CAiBC;AAUM,KAAK,UAAU,iBAAiB,CAAC,OAAsB,EAAE,WAAmB;;IACjF,MAAM,WAAW,GAAG,gCAAgC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,UAAU,cAAc,OAAO,CAAC,GAAG,cAAc,CAAC;IAC/H,MAAM,QAAQ,GAAG,CACf,MAAM,IAAA,mCAAoB,EAAC,KAAK,IAAI,EAAE;QACpC,OAAO,MAAM,eAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACtC,CAAC,EAAE,WAAW,CAAC,CAChB,CAAC,IAAsB,CAAC;IAEzB,MAAM,WAAW,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAC9B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EACjF,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,aAAa,GAAG,qCAAqC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,UAAU,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,GAAG,CAAC;IACnH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;AACxC,CAAC;AAbD,8CAaC;AAED,KAAK,UAAU,mBAAmB,CAChC,UAAyB,EACzB,aAAqB,EACrB,WAAqB,EACrB,OAAe,EACf,YAAoB,EACpB,WAAmB,EACnB,iBAAyB;IAEzB,MAAM,gBAAgB,GAAG,KAAK,EAAE,UAAkB,EAAE,EAAE;QACpD,MAAM,QAAQ,GAAG,qCAAqC,CAAC;QACvD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAA,mCAAoB,EAAC,KAAK,IAAI,EAAE;YAClD,MAAM,OAAO,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,aAAa,GAAG,UAAU,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;YAC7F,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;gBAC1C,OAAO,MAAM,eAAK,CAAC,GAAG,CACpB,6CAA6C,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,GAAG,IAAI,UAAU,EAAE,EACxH;oBACE,YAAY,EAAE,aAAa;iBAC5B,CACF,CAAC;aACH;iBAAM;gBACL,OAAO,OAAO,CAAC;aAChB;QACH,CAAC,EAAE,WAAW,CAAC,CAAmB,CAAC;QACnC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAI,CAAC,QAAQ,CAAC,GAAG,YAAY,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;QACnF,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC;IACF,MAAM,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;AACpF,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,KAAU,EACV,QAAyB,EACzB,gBAAwB;IAExB,MAAM,KAAK,GAAU,EAAE,CAAC;IACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,oEAAoE;QACpE,8BAA8B;QAC9B,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC;aACrB,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;YACjB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAClC,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;YAClB,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,CAAC;QACL,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACd,4CAA4C;QAC5C,IAAI,KAAK,CAAC,MAAM,IAAI,gBAAgB,EAAE;YACpC,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC3B;KACF;IACD,2CAA2C;IAC3C,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAzBD,8DAyBC;AAED,SAAgB,gBAAgB,CAAC,mBAA2B;IAC1D,QAAQ,mBAAmB,EAAE;QAC3B,KAAK,+BAAmB,CAAC,EAAE,CAAC,CAAC;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,KAAK,+BAAmB,CAAC,EAAE,CAAC,CAAC;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,KAAK,+BAAmB,CAAC,MAAM,CAAC,CAAC;YAC/B,OAAO,QAAQ,CAAC;SACjB;QACD,KAAK,+BAAmB,CAAC,EAAE,CAAC,CAAC;YAC3B,OAAO,QAAQ,CAAC;SACjB;QACD,KAAK,+BAAmB,CAAC,IAAI,CAAC,CAAC;YAC7B,OAAO,QAAQ,CAAC;SACjB;KACF;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAnBD,4CAmBC;AAED,SAAgB,YAAY,CAAC,UAAyB;IACpD,OAAO,sBAAsB,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,UAAU,SAAS,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;AACpH,CAAC;AAFD,oCAEC;AAED,SAAgB,kBAAkB,CAAC,KAAiB;;IAClD,MAAM,eAAe,GAAG;QACtB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM;QAC9B,UAAU,EAAE,MAAA,KAAK,CAAC,QAAQ,0CAAE,UAAU;QACtC,OAAO,EAAE,MAAA,KAAK,CAAC,QAAQ,0CAAE,OAAO;QAChC,IAAI,EAAE,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI;KAC3B,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAbD,gDAaC;AAED,SAAgB,eAAe,CAAC,KAAY;;IAC1C,sHAAsH;IACtH,OAAO,CACL,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC;QACzB,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,SAAS;QACpC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC1C,CAAA,MAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,OAAO,0CAAG,uBAAuB,CAAC,MAAK,GAAG,CAC3D,CAAC;AACJ,CAAC;AARD,0CAQC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,OAAkB,EAClB,4BAAoC;;IAEpC,IAAI;QACF,MAAM,cAAc,GAAG,MAAM,CAAA,MAAA,MAAA,OAAO,CAAC,aAAa,0CAAE,iBAAiB,0CAAE,SAAS,CAAC;YAC/E,MAAM,EAAE,CAAC,qCAAyB,CAAC;SACpC,CAAC,CAAA,CAAC;QACH,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;YAC7C,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,IAAA,gCAAgB,EAAC,wCAAwC,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,CAAC,OAAO,CAAC,CAC1F,CAAC;YACF,OAAO;SACR;QACD,IAAI,cAAc,CAAC,KAAK,CAAC,MAAM,IAAI,sBAAQ,EAAE;YAC3C,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,IAAA,gCAAgB,EAAC,oCAAoC,CAAC,CAAC,CAAC;YAClF,OAAO;SACR;QACD,IAAI,cAAc,CAAC,KAAK,CAAC,KAAK,IAAI,SAAS,EAAE;YAC3C,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,IAAA,gCAAgB,EAAC,2CAA2C,CAAC,CAAC,CAAC;YACzF,OAAO;SACR;QACD,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,OAAO,CAAC,aAAc,CAAC,iBAAwB,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,wBAAwB,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,MAAM,MAAM,CAAC,KAAK,CAAC;SACpB;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC;QAElC,MAAM,2BAA2B,GAC/B,MAAM,iDAAuB,CAAC,gCAAgC,CAAC,4BAA4B,CAAC,CAAC;QAC/F,IAAI,2BAA2B,CAAC,KAAK,EAAE,EAAE;YACvC,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,IAAA,gCAAgB,EACd,2CAA2C,EAC3C,2BAA2B,CAAC,KAAK,CAClC,CACF,CAAC;YACF,OAAO;SACR;QACD,MAAM,wBAAwB,GAAG,2BAA2B,CAAC,KAAK,CAAC;QACnE,wBAAwB,CAAC,iBAAiB,GAAG;YAC3C,EAAE,EAAE,YAAY,CAAC,EAAE;SACpB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,iDAAuB,CAAC,iCAAiC,CAC9E,wBAAwB,EACxB,4BAA4B,CAC7B,CAAC;QACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;YACpB,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,IAAA,gCAAgB,EAAC,4CAA4C,EAAE,QAAQ,CAAC,KAAK,CAAC,CAC/E,CAAC;YACF,OAAO;SACR;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,IAAA,gCAAgB,EAAC,yCAAyC,EAAE,KAAK,CAAC,OAAO,CAAC,CAC3E,CAAC;KACH;AACH,CAAC;AA3DD,gEA2DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,18 +10,17 @@ const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
|
10
10
|
const form_data_1 = tslib_1.__importDefault(require("form-data"));
|
|
11
11
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
12
12
|
const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
13
|
-
const featureFlags_1 = require("../../common/featureFlags");
|
|
14
13
|
const globalVars_1 = require("../../common/globalVars");
|
|
14
|
+
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
15
15
|
const projectTypeChecker_1 = require("../../common/projectTypeChecker");
|
|
16
16
|
const telemetry_1 = require("../../common/telemetry");
|
|
17
17
|
const utils_1 = require("../../common/utils");
|
|
18
18
|
const wrappedAxiosClient_1 = require("../../common/wrappedAxiosClient");
|
|
19
19
|
const common_1 = require("../../error/common");
|
|
20
20
|
const types_1 = require("../../error/types");
|
|
21
|
+
const constants_1 = require("./constants");
|
|
21
22
|
const errors_1 = require("./errors");
|
|
22
23
|
const serviceConstant_1 = require("./serviceConstant");
|
|
23
|
-
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
24
|
-
const constants_1 = require("./constants");
|
|
25
24
|
const M365ErrorSource = "M365";
|
|
26
25
|
const M365ErrorComponent = "PackageService";
|
|
27
26
|
var AppScope;
|
|
@@ -143,8 +142,7 @@ class PackageService {
|
|
|
143
142
|
throw new Error("Invalid app package zip. manifest.json is missing");
|
|
144
143
|
}
|
|
145
144
|
const isDelcarativeAgentApp = (0, projectTypeChecker_1.IsDeclarativeAgentManifest)(manifest);
|
|
146
|
-
if (isDelcarativeAgentApp
|
|
147
|
-
featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.BuilderAPIEnabled)) {
|
|
145
|
+
if (isDelcarativeAgentApp) {
|
|
148
146
|
const res = await this.sideLoadingV2(token, packagePath, appScope);
|
|
149
147
|
let shareLink = "";
|
|
150
148
|
if (appScope.toLowerCase() === AppScope.Shared.toLowerCase()) {
|
|
@@ -373,22 +371,20 @@ class PackageService {
|
|
|
373
371
|
Authorization: `Bearer ${token}`,
|
|
374
372
|
},
|
|
375
373
|
});
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
374
|
+
try {
|
|
375
|
+
await this.axiosInstance.delete(`/builder/v1/users/titles/${titleId}`, {
|
|
376
|
+
baseURL: serviceUrl,
|
|
377
|
+
headers: {
|
|
378
|
+
Authorization: `Bearer ${token}`,
|
|
379
|
+
},
|
|
380
|
+
});
|
|
381
|
+
}
|
|
382
|
+
catch (error) {
|
|
383
|
+
if (error.response && error.response.status === 404) {
|
|
384
|
+
(_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`TitleId ${titleId} not found, skip deleting.`);
|
|
384
385
|
}
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
(_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`TitleId ${titleId} not found, skip deleting.`);
|
|
388
|
-
}
|
|
389
|
-
else {
|
|
390
|
-
throw error;
|
|
391
|
-
}
|
|
386
|
+
else {
|
|
387
|
+
throw error;
|
|
392
388
|
}
|
|
393
389
|
}
|
|
394
390
|
(_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Unacquiring done.");
|