@microsoft/teamsfx-core 3.1.3 → 3.1.4-alpha.1df35c7d32.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/devPortalClient.d.ts +43 -0
- package/build/client/devPortalClient.d.ts.map +1 -0
- package/build/client/devPortalClient.js +626 -0
- package/build/client/devPortalClient.js.map +1 -0
- package/build/client/graphClient.d.ts +1 -0
- package/build/client/graphClient.d.ts.map +1 -1
- package/build/client/graphClient.js +17 -2
- package/build/client/graphClient.js.map +1 -1
- package/build/client/teamsDevPortalClient.d.ts +14 -21
- package/build/client/teamsDevPortalClient.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.js +65 -112
- package/build/client/teamsDevPortalClient.js.map +1 -1
- package/build/client/teamsDevPortalClientProvider.d.ts +6 -0
- package/build/client/teamsDevPortalClientProvider.d.ts.map +1 -0
- package/build/client/teamsDevPortalClientProvider.js +76 -0
- package/build/client/teamsDevPortalClientProvider.js.map +1 -0
- package/build/common/featureFlags.d.ts +7 -2
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +8 -3
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/localizeUtils.d.ts +1 -0
- package/build/common/localizeUtils.d.ts.map +1 -1
- package/build/common/localizeUtils.js +10 -0
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/templates-config.json +4 -4
- package/build/common/tools.js +2 -2
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +1 -0
- package/build/common/utils.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +87 -27
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/configManager/actionInjector.d.ts +13 -3
- package/build/component/configManager/actionInjector.d.ts.map +1 -1
- package/build/component/configManager/actionInjector.js +88 -5
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/driver/interface/commonArgs.d.ts +1 -0
- package/build/component/driver/interface/commonArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +10 -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 +12 -8
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +1 -0
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +1 -0
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +28 -26
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appUser.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appUser.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +0 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +0 -1
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +1 -18
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +3 -3
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +4 -4
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/driver/util/utils.d.ts.map +1 -1
- package/build/component/driver/util/utils.js +1 -0
- package/build/component/driver/util/utils.js.map +1 -1
- package/build/component/feature/collaboration.js +4 -4
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/openApiSpec/helper.d.ts +2 -2
- package/build/component/generator/openApiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/helper.js +65 -5
- package/build/component/generator/openApiSpec/helper.js.map +1 -1
- package/build/component/generator/openPlugin/authResolver.d.ts +2 -2
- package/build/component/generator/openPlugin/authResolver.d.ts.map +1 -1
- package/build/component/generator/openPlugin/authResolver.js +17 -7
- package/build/component/generator/openPlugin/authResolver.js.map +1 -1
- package/build/component/generator/openPlugin/errors.d.ts +4 -0
- package/build/component/generator/openPlugin/errors.d.ts.map +1 -0
- package/build/component/generator/openPlugin/errors.js +13 -0
- package/build/component/generator/openPlugin/errors.js.map +1 -0
- package/build/component/generator/openPlugin/exporter.d.ts +9 -6
- package/build/component/generator/openPlugin/exporter.d.ts.map +1 -1
- package/build/component/generator/openPlugin/exporter.js +502 -53
- package/build/component/generator/openPlugin/exporter.js.map +1 -1
- package/build/component/generator/openPlugin/fileSystem.d.ts +28 -0
- package/build/component/generator/openPlugin/fileSystem.d.ts.map +1 -0
- package/build/component/generator/openPlugin/fileSystem.js +181 -0
- package/build/component/generator/openPlugin/fileSystem.js.map +1 -0
- package/build/component/generator/openPlugin/iconStrategy.d.ts.map +1 -1
- package/build/component/generator/openPlugin/iconStrategy.js +30 -14
- package/build/component/generator/openPlugin/iconStrategy.js.map +1 -1
- package/build/component/generator/openPlugin/importer.d.ts.map +1 -1
- package/build/component/generator/openPlugin/importer.js +75 -12
- package/build/component/generator/openPlugin/importer.js.map +1 -1
- package/build/component/generator/openPlugin/mapper.d.ts +3 -2
- package/build/component/generator/openPlugin/mapper.d.ts.map +1 -1
- package/build/component/generator/openPlugin/mapper.js +188 -29
- package/build/component/generator/openPlugin/mapper.js.map +1 -1
- package/build/component/generator/openPlugin/parser.d.ts.map +1 -1
- package/build/component/generator/openPlugin/parser.js +264 -70
- package/build/component/generator/openPlugin/parser.js.map +1 -1
- package/build/component/generator/openPlugin/skillValidation.d.ts +2 -0
- package/build/component/generator/openPlugin/skillValidation.d.ts.map +1 -0
- package/build/component/generator/openPlugin/skillValidation.js +63 -0
- package/build/component/generator/openPlugin/skillValidation.js.map +1 -0
- package/build/component/generator/openPlugin/spec.d.ts +67 -0
- package/build/component/generator/openPlugin/spec.d.ts.map +1 -0
- package/build/component/generator/openPlugin/spec.js +157 -0
- package/build/component/generator/openPlugin/spec.js.map +1 -0
- package/build/component/generator/openPlugin/textUtils.d.ts +1 -1
- package/build/component/generator/openPlugin/textUtils.d.ts.map +1 -1
- package/build/component/generator/openPlugin/textUtils.js +8 -7
- package/build/component/generator/openPlugin/textUtils.js.map +1 -1
- package/build/component/generator/openPlugin/types.d.ts +76 -14
- package/build/component/generator/openPlugin/types.d.ts.map +1 -1
- package/build/component/generator/openPlugin/validation.d.ts +17 -0
- package/build/component/generator/openPlugin/validation.d.ts.map +1 -0
- package/build/component/generator/openPlugin/validation.js +563 -0
- package/build/component/generator/openPlugin/validation.js.map +1 -0
- package/build/component/generator/v4TemplateBridge.d.ts +1 -1
- package/build/component/generator/v4TemplateBridge.d.ts.map +1 -1
- package/build/component/generator/v4TemplateBridge.js +1 -4
- package/build/component/generator/v4TemplateBridge.js.map +1 -1
- package/build/component/middleware/questionMW.d.ts.map +1 -1
- package/build/component/middleware/questionMW.js +2 -0
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +4 -4
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/utils/common.d.ts +1 -9
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +7 -37
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts +3 -8
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -1
- package/build/component/utils/envFunctionUtils.js +46 -131
- package/build/component/utils/envFunctionUtils.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +7 -6
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.d.ts +6 -0
- package/build/component/utils/mcpAuthScaffolder.d.ts.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.js +17 -7
- package/build/component/utils/mcpAuthScaffolder.js.map +1 -1
- package/build/core/FxCore.d.ts +3 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.d.ts +8 -2
- package/build/core/FxCore.declarativeAgent.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.js +109 -6
- package/build/core/FxCore.declarativeAgent.js.map +1 -1
- package/build/core/FxCore.js +49 -9
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCore.openPlugin.d.ts +7 -6
- package/build/core/FxCore.openPlugin.d.ts.map +1 -1
- package/build/core/FxCore.openPlugin.js +7 -6
- package/build/core/FxCore.openPlugin.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 +40 -1
- package/build/error/common.js.map +1 -1
- package/build/index.d.ts +2 -2
- package/build/index.d.ts.map +1 -1
- package/build/index.js +6 -5
- package/build/index.js.map +1 -1
- package/build/question/generator.d.ts.map +1 -1
- package/build/question/generator.js +9 -9
- package/build/question/generator.js.map +1 -1
- package/build/question/inputs/AddAuthActionInputs.d.ts +6 -0
- package/build/question/inputs/AddAuthActionInputs.d.ts.map +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts +15 -1
- package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
- package/build/question/options/AddAuthActionOptions.d.ts.map +1 -1
- package/build/question/options/AddAuthActionOptions.js +19 -0
- package/build/question/options/AddAuthActionOptions.js.map +1 -1
- package/build/question/options/AddPluginOptions.d.ts.map +1 -1
- package/build/question/options/AddPluginOptions.js +45 -1
- package/build/question/options/AddPluginOptions.js.map +1 -1
- package/build/question/options/ExportOpenPluginOptions.js +2 -2
- package/build/question/options/ExportOpenPluginOptions.js.map +1 -1
- package/build/question/options/ImportOpenPluginOptions.js +4 -4
- package/build/question/options/ImportOpenPluginOptions.js.map +1 -1
- package/build/question/other.d.ts +2 -0
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +174 -8
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +6 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +6 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/question/scaffold/vsc/CapabilityOptions.d.ts.map +1 -1
- package/build/question/scaffold/vsc/CapabilityOptions.js +5 -2
- package/build/question/scaffold/vsc/CapabilityOptions.js.map +1 -1
- package/build/question/scaffold/vsc/rootNode.js +1 -1
- package/build/question/scaffold/vsc/rootNode.js.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +2 -0
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js +31 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
- package/build/question/share.js +2 -2
- package/build/question/share.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +1 -0
- package/build/ui/visitor.js.map +1 -1
- package/build/v4/collectInputs/collectInputs.d.ts.map +1 -1
- package/build/v4/collectInputs/collectInputs.js +91 -215
- package/build/v4/collectInputs/collectInputs.js.map +1 -1
- package/build/v4/distribution/declarativePackage.d.ts +2 -2
- package/build/v4/distribution/declarativePackage.d.ts.map +1 -1
- package/build/v4/distribution/declarativePackage.js +2 -1
- package/build/v4/distribution/declarativePackage.js.map +1 -1
- package/build/v4/distribution/descriptorLanguages.d.ts +9 -0
- package/build/v4/distribution/descriptorLanguages.d.ts.map +1 -0
- package/build/v4/distribution/descriptorLanguages.js +44 -0
- package/build/v4/distribution/descriptorLanguages.js.map +1 -0
- package/build/v4/distribution/packageDir.d.ts +6 -1
- package/build/v4/distribution/packageDir.d.ts.map +1 -1
- package/build/v4/distribution/packageDir.js +6 -1
- package/build/v4/distribution/packageDir.js.map +1 -1
- package/build/v4/engineVersion.d.ts +1 -1
- package/build/v4/engineVersion.js +1 -1
- package/build/v4/mcp/mcpAuthAction.d.ts +2 -1
- package/build/v4/mcp/mcpAuthAction.d.ts.map +1 -1
- package/build/v4/mcp/mcpAuthAction.js +32 -5
- package/build/v4/mcp/mcpAuthAction.js.map +1 -1
- package/build/v4/mcp/mcpAuthScaffold.d.ts +3 -0
- package/build/v4/mcp/mcpAuthScaffold.d.ts.map +1 -1
- package/build/v4/mcp/mcpAuthScaffold.js +63 -40
- package/build/v4/mcp/mcpAuthScaffold.js.map +1 -1
- package/build/v4/pipeline/defineStep.d.ts +10 -0
- package/build/v4/pipeline/defineStep.d.ts.map +1 -0
- package/build/v4/pipeline/defineStep.js +28 -0
- package/build/v4/pipeline/defineStep.js.map +1 -0
- package/build/v4/pipeline/runScaffoldPipeline.d.ts +2 -0
- package/build/v4/pipeline/runScaffoldPipeline.d.ts.map +1 -1
- package/build/v4/pipeline/runScaffoldPipeline.js +5 -4
- package/build/v4/pipeline/runScaffoldPipeline.js.map +1 -1
- package/build/v4/pipeline/stepParams.d.ts +4 -0
- package/build/v4/pipeline/stepParams.d.ts.map +1 -0
- package/build/v4/pipeline/stepParams.js +17 -0
- package/build/v4/pipeline/stepParams.js.map +1 -0
- package/build/v4/providers/createLanguageOptionsProvider.d.ts +13 -0
- package/build/v4/providers/createLanguageOptionsProvider.d.ts.map +1 -0
- package/build/v4/providers/createLanguageOptionsProvider.js +60 -0
- package/build/v4/providers/createLanguageOptionsProvider.js.map +1 -0
- package/build/v4/providers/createOptionsProviders.d.ts +2 -1
- package/build/v4/providers/createOptionsProviders.d.ts.map +1 -1
- package/build/v4/providers/createOptionsProviders.js +5 -1
- package/build/v4/providers/createOptionsProviders.js.map +1 -1
- package/build/v4/runtime/compatibility/index.d.ts +4 -0
- package/build/v4/runtime/compatibility/index.d.ts.map +1 -0
- package/build/v4/runtime/compatibility/index.js +11 -0
- package/build/v4/runtime/compatibility/index.js.map +1 -0
- package/build/v4/runtime/compatibility/legacyOpenApiSearch.d.ts +4 -0
- package/build/v4/runtime/compatibility/legacyOpenApiSearch.d.ts.map +1 -0
- package/build/v4/runtime/compatibility/legacyOpenApiSearch.js +26 -0
- package/build/v4/runtime/compatibility/legacyOpenApiSearch.js.map +1 -0
- package/build/v4/runtime/functions/assets/officeAddin.json +48 -0
- package/build/v4/runtime/functions/generic.d.ts +10 -0
- package/build/v4/runtime/functions/generic.d.ts.map +1 -0
- package/build/v4/runtime/functions/generic.js +25 -0
- package/build/v4/runtime/functions/generic.js.map +1 -0
- package/build/v4/runtime/functions/mcp.d.ts +8 -0
- package/build/v4/runtime/functions/mcp.d.ts.map +1 -0
- package/build/v4/runtime/functions/mcp.js +28 -0
- package/build/v4/runtime/functions/mcp.js.map +1 -0
- package/build/v4/runtime/functions/officeAddin.d.ts +27 -0
- package/build/v4/runtime/functions/officeAddin.d.ts.map +1 -0
- package/build/v4/runtime/functions/officeAddin.js +120 -0
- package/build/v4/runtime/functions/officeAddin.js.map +1 -0
- package/build/v4/runtime/packageParse.d.ts +13 -8
- package/build/v4/runtime/packageParse.d.ts.map +1 -1
- package/build/v4/runtime/packageParse.js +13 -219
- package/build/v4/runtime/packageParse.js.map +1 -1
- package/build/v4/runtime/renderFragment.d.ts +2 -0
- package/build/v4/runtime/renderFragment.d.ts.map +1 -0
- package/build/v4/runtime/renderFragment.js +11 -0
- package/build/v4/runtime/renderFragment.js.map +1 -0
- package/build/v4/runtime/scaffold.d.ts +2 -0
- package/build/v4/runtime/scaffold.d.ts.map +1 -1
- package/build/v4/runtime/scaffold.js +15 -12
- package/build/v4/runtime/scaffold.js.map +1 -1
- package/build/v4/runtime/scaffoldFromPackageDir.d.ts.map +1 -1
- package/build/v4/runtime/scaffoldFromPackageDir.js +1 -4
- package/build/v4/runtime/scaffoldFromPackageDir.js.map +1 -1
- package/build/v4/runtime/selectLanguageContent.d.ts +1 -0
- package/build/v4/runtime/selectLanguageContent.d.ts.map +1 -1
- package/build/v4/runtime/selectLanguageContent.js +5 -1
- package/build/v4/runtime/selectLanguageContent.js.map +1 -1
- package/build/v4/runtime/steps/assets/metaOs.json +197 -0
- package/build/v4/runtime/steps/assets/openApiAuth.json +33 -0
- package/build/v4/runtime/steps/assets/openApiCustomApi.json +141 -0
- package/build/v4/runtime/steps/daAction.d.ts.map +1 -1
- package/build/v4/runtime/steps/daAction.js +14 -18
- package/build/v4/runtime/steps/daAction.js.map +1 -1
- package/build/v4/runtime/steps/daSensitivity.d.ts.map +1 -1
- package/build/v4/runtime/steps/daSensitivity.js +10 -11
- package/build/v4/runtime/steps/daSensitivity.js.map +1 -1
- package/build/v4/runtime/steps/mcpAuth.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpAuth.js +40 -48
- package/build/v4/runtime/steps/mcpAuth.js.map +1 -1
- package/build/v4/runtime/steps/mcpLocal.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpLocal.js +17 -30
- package/build/v4/runtime/steps/mcpLocal.js.map +1 -1
- package/build/v4/runtime/steps/mcpStatic.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpStatic.js +31 -38
- package/build/v4/runtime/steps/mcpStatic.js.map +1 -1
- package/build/v4/runtime/steps/metaOs.d.ts.map +1 -1
- package/build/v4/runtime/steps/metaOs.js +43 -167
- package/build/v4/runtime/steps/metaOs.js.map +1 -1
- package/build/v4/runtime/steps/officeAddin.d.ts.map +1 -1
- package/build/v4/runtime/steps/officeAddin.js +14 -19
- package/build/v4/runtime/steps/officeAddin.js.map +1 -1
- package/build/v4/runtime/steps/openApi.d.ts.map +1 -1
- package/build/v4/runtime/steps/openApi.js +41 -101
- package/build/v4/runtime/steps/openApi.js.map +1 -1
- package/build/v4/runtime/steps/openApiAuth.d.ts +9 -0
- package/build/v4/runtime/steps/openApiAuth.d.ts.map +1 -0
- package/build/v4/runtime/steps/openApiAuth.js +51 -0
- package/build/v4/runtime/steps/openApiAuth.js.map +1 -0
- package/build/v4/runtime/steps/openApiCustomApi.d.ts.map +1 -1
- package/build/v4/runtime/steps/openApiCustomApi.js +9 -119
- package/build/v4/runtime/steps/openApiCustomApi.js.map +1 -1
- package/build/v4/runtime/whitelist.d.ts +4 -38
- package/build/v4/runtime/whitelist.d.ts.map +1 -1
- package/build/v4/runtime/whitelist.js +30 -190
- package/build/v4/runtime/whitelist.js.map +1 -1
- package/build/v4/surface/createFloorTail.d.ts +2 -2
- package/build/v4/surface/createFloorTail.d.ts.map +1 -1
- package/build/v4/surface/createFloorTail.js +5 -22
- package/build/v4/surface/createFloorTail.js.map +1 -1
- package/build/v4/surface/createInputs.d.ts +2 -2
- package/build/v4/surface/createInputs.d.ts.map +1 -1
- package/build/v4/surface/createInputs.js +11 -44
- package/build/v4/surface/createInputs.js.map +1 -1
- package/build/v4/surface/createSelectorWalk.d.ts.map +1 -1
- package/build/v4/surface/createSelectorWalk.js +17 -3
- package/build/v4/surface/createSelectorWalk.js.map +1 -1
- package/build/v4/surface/localizePrompt.d.ts +2 -0
- package/build/v4/surface/localizePrompt.d.ts.map +1 -1
- package/build/v4/surface/localizePrompt.js +0 -1
- package/build/v4/surface/localizePrompt.js.map +1 -1
- package/build/v4/validation/capabilityCatalog.d.ts +1 -1
- package/build/v4/validation/capabilityCatalog.d.ts.map +1 -1
- package/build/v4/validation/capabilityCatalog.js +11 -1
- package/build/v4/validation/capabilityCatalog.js.map +1 -1
- package/build/v4/validation/packageParse.d.ts +27 -0
- package/build/v4/validation/packageParse.d.ts.map +1 -0
- package/build/v4/validation/packageParse.js +247 -0
- package/build/v4/validation/packageParse.js.map +1 -0
- package/build/v4/validation/templateArchiveValidation.d.ts +2 -2
- package/build/v4/validation/templateArchiveValidation.d.ts.map +1 -1
- package/build/v4/validation/templateArchiveValidation.js +7 -2
- package/build/v4/validation/templateArchiveValidation.js.map +1 -1
- package/build/v4/validation/validateTemplatePackage.d.ts +1 -1
- package/build/v4/validation/validateTemplatePackage.d.ts.map +1 -1
- package/build/v4/validation/validateTemplatePackage.js +23 -3
- package/build/v4/validation/validateTemplatePackage.js.map +1 -1
- package/package.json +37 -37
- package/resource/package.nls.json +35 -1
- package/templates/configs/local/typescript/.gitignore +1 -0
- package/templates/configs/playground/typescript/.gitignore +4 -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.zip +0 -0
- package/templates/ui/tdpNode.json +1 -1
- package/templates/ui/wizardNode.json +1 -1
- package/templates/v4/create-selector.json +2 -2
- package/templates/v4/floor.json +1 -1
- package/templates/v4/templates-metadata.zip +0 -0
- package/templates/v4/templates.zip +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v4TemplateBridge.js","sourceRoot":"","sources":["../../../src/component/generator/v4TemplateBridge.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAiGlC,sDAsBC;AAmED,sDAeC;AA4CD,
|
|
1
|
+
{"version":3,"file":"v4TemplateBridge.js","sourceRoot":"","sources":["../../../src/component/generator/v4TemplateBridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"questionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAK9E,OAAO,EAAE,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AAG9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,aAAa,EAAE,UAAU,UAAQ,GAAG,UAAU,CAyBnF"}
|
|
@@ -14,6 +14,8 @@ function QuestionMW(key, fromAction = false) {
|
|
|
14
14
|
(0, cancellation_1.throwIfAborted)(inputs);
|
|
15
15
|
if (fromAction) {
|
|
16
16
|
inputs.outputEnvVarNames = ctx.arguments[2];
|
|
17
|
+
const driverContext = ctx.arguments[1];
|
|
18
|
+
inputs.nonInteractive = driverContext.nonInteractive;
|
|
17
19
|
}
|
|
18
20
|
const node = question_1.questionNodes[key](inputs.platform);
|
|
19
21
|
const askQuestionRes = await (0, visitor_1.traverse)(node, inputs, globalVars_1.TOOLS.ui, globalVars_1.TOOLS.telemetryReporter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"questionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAUlC,gCAyBC;AAhCD,wDAAqD;AACrD,4DAA2D;AAC3D,wDAAgD;AAEhD,6CAA8D;AAC9D,8CAA4C;AAE5C,SAAgB,UAAU,CAAC,GAAwB,EAAE,UAAU,GAAG,KAAK;IACrE,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAW,CAAC;QAC1C,IAAA,6BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,CAAC,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAkB,CAAC;YACxD,MAAM,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;QACvD,CAAC;QACD,MAAM,IAAI,GAAG,wBAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,MAAM,IAAA,kBAAQ,EAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QACvF,IAAA,6BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC;YAC3B,IAAI,UAAU,EAAE,CAAC;gBACf,GAAG,CAAC,MAAM,GAAG;oBACX,MAAM,EAAE,IAAA,iBAAG,EAAC,cAAc,CAAC,KAAK,CAAC;oBACjC,SAAS,EAAE,EAAE;iBACd,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,GAAG,IAAA,iBAAG,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -7,7 +7,7 @@ exports.createOrUpdateBotRegistration = createOrUpdateBotRegistration;
|
|
|
7
7
|
* @author Qianhao Dong <qidon@microsoft.com>
|
|
8
8
|
*/
|
|
9
9
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
10
|
-
const
|
|
10
|
+
const teamsDevPortalClientProvider_1 = require("../../../../client/teamsDevPortalClientProvider");
|
|
11
11
|
const constants_1 = require("../../../../common/constants");
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
13
|
async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration, logger) {
|
|
@@ -24,11 +24,11 @@ async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration,
|
|
|
24
24
|
}
|
|
25
25
|
const appStudioToken = appStudioTokenRes.value;
|
|
26
26
|
logger?.debug(`Input bot registration: ${JSON.stringify(botRegistration)}`);
|
|
27
|
-
const remoteBotRegistration = await
|
|
27
|
+
const remoteBotRegistration = await teamsDevPortalClientProvider_1.teamsDevPortalClient.getBotRegistration(appStudioToken, botRegistration.botId);
|
|
28
28
|
if (!remoteBotRegistration) {
|
|
29
29
|
// Not Found case.
|
|
30
30
|
logger?.verbose("Bot registration not found, create a new one.");
|
|
31
|
-
await
|
|
31
|
+
await teamsDevPortalClientProvider_1.teamsDevPortalClient.createBotRegistration(appStudioToken, botRegistration, false);
|
|
32
32
|
}
|
|
33
33
|
else {
|
|
34
34
|
// Update bot registration.
|
|
@@ -36,7 +36,7 @@ async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration,
|
|
|
36
36
|
logger?.debug(`Existing bot registration: ${JSON.stringify(remoteBotRegistration)}`);
|
|
37
37
|
const mergedBotRegistration = utils_1.Utils.mergeIBotRegistration(botRegistration, remoteBotRegistration);
|
|
38
38
|
logger?.debug(`Merged bot registration: ${JSON.stringify(mergedBotRegistration)}`);
|
|
39
|
-
await
|
|
39
|
+
await teamsDevPortalClientProvider_1.teamsDevPortalClient.updateBotRegistration(appStudioToken, mergedBotRegistration);
|
|
40
40
|
}
|
|
41
41
|
return (0, teamsfx_api_1.ok)(remoteBotRegistration !== undefined);
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAWlC,sEAsCC;AA/CD;;GAEG;AACH,wDAAkG;AAClG,
|
|
1
|
+
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAWlC,sEAsCC;AA/CD;;GAEG;AACH,wDAAkG;AAClG,kGAAuF;AACvF,4DAA+D;AAE/D,mCAAgC;AAEzB,KAAK,UAAU,6BAA6B,CACjD,iBAAoC,EACpC,eAAiC,EACjC,MAAoB;IAEpB,uCAAuC;IACvC,uDAAuD;IACvD,WAAW;IACX,2EAA2E;IAC3E,oCAAoC;IACpC,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;QAC/D,MAAM,EAAE,IAAA,2BAAe,GAAE;KAC1B,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC;QAC9B,OAAO,IAAA,iBAAG,EAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;IAC/C,MAAM,EAAE,KAAK,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,MAAM,mDAAoB,CAAC,kBAAkB,CACzE,cAAc,EACd,eAAe,CAAC,KAAM,CACvB,CAAC;IACF,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,kBAAkB;QAClB,MAAM,EAAE,OAAO,CAAC,+CAA+C,CAAC,CAAC;QACjE,MAAM,mDAAoB,CAAC,qBAAqB,CAAC,cAAc,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;IAC3F,CAAC;SAAM,CAAC;QACN,2BAA2B;QAC3B,MAAM,EAAE,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACtD,MAAM,EAAE,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,qBAAqB,GAAG,aAAK,CAAC,qBAAqB,CACvD,eAAe,EACf,qBAAqB,CACtB,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACnF,MAAM,mDAAoB,CAAC,qBAAqB,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;IAC1F,CAAC;IACD,OAAO,IAAA,gBAAE,EAAC,qBAAqB,KAAK,SAAS,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -16,15 +16,7 @@ export declare function asFactory<T>(keyValidators: KeyValidators<T>): (data: un
|
|
|
16
16
|
export declare function wrapRun(exec: () => Promise<Map<string, string>>, errorSource: string, errorHandler?: () => Promise<void>, logProvider?: LogProvider): Promise<Result<Map<string, string>, FxError>>;
|
|
17
17
|
export declare function errorHandle(error: unknown, errorSource: string, logProvider?: LogProvider, errorHandler?: () => Promise<void>): Promise<Result<Map<string, string>, FxError>>;
|
|
18
18
|
export declare function wrapSummary(exec: () => Promise<Result<Map<string, string>, FxError>>, summary: string[]): Promise<ExecutionResult>;
|
|
19
|
-
export
|
|
20
|
-
[key in string]: string;
|
|
21
|
-
}): string;
|
|
22
|
-
/**
|
|
23
|
-
* Expand environment variables in content. The format of referencing environment variable is: ${{ENV_NAME}}
|
|
24
|
-
* @return An array of environment variables
|
|
25
|
-
*/
|
|
26
|
-
export declare function getEnvironmentVariables(content: string): string[];
|
|
19
|
+
export { expandEnvironmentVariable, getEnvironmentVariables } from "@microsoft/teamsfx-api";
|
|
27
20
|
export declare function getAbsolutePath(relativeOrAbsolutePath: string, projectPath: string): string;
|
|
28
21
|
export declare function outputScaffoldingWarningMessage(warnings: Warning[]): string;
|
|
29
|
-
export {};
|
|
30
22
|
//# sourceMappingURL=common.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAGN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAGN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKjE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,CAKhF;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,IAChE,GAAG,OAAO,EAAE,KAAK,MAAM,EAAE,WAAW,MAAM,KAAG,CAAC,GAAG,SAAS,CAM5E;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAO7E;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAK3E;AAED,KAAK,aAAa,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,IACzC,MAAM,OAAO,EAAE,WAAW,MAAM,KAAG,CAAC,CAgBtD;AAED,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAClC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAM/C;AAED,wBAAsB,WAAW,CAC/B,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,EACzB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAc/C;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,EACzD,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,eAAe,CAAC,CAS1B;AAKD,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAE5F,wBAAgB,eAAe,CAAC,sBAAsB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAM3F;AAED,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAQ3E"}
|
|
@@ -2,6 +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.getEnvironmentVariables = exports.expandEnvironmentVariable = void 0;
|
|
5
6
|
exports.checkMissingArgs = checkMissingArgs;
|
|
6
7
|
exports.asOptional = asOptional;
|
|
7
8
|
exports.asBoolean = asBoolean;
|
|
@@ -10,8 +11,6 @@ exports.asFactory = asFactory;
|
|
|
10
11
|
exports.wrapRun = wrapRun;
|
|
11
12
|
exports.errorHandle = errorHandle;
|
|
12
13
|
exports.wrapSummary = wrapSummary;
|
|
13
|
-
exports.expandEnvironmentVariable = expandEnvironmentVariable;
|
|
14
|
-
exports.getEnvironmentVariables = getEnvironmentVariables;
|
|
15
14
|
exports.getAbsolutePath = getAbsolutePath;
|
|
16
15
|
exports.outputScaffoldingWarningMessage = outputScaffoldingWarningMessage;
|
|
17
16
|
const tslib_1 = require("tslib");
|
|
@@ -21,7 +20,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
|
|
|
21
20
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
22
21
|
const constant_1 = require("../configManager/constant");
|
|
23
22
|
const os_1 = require("os");
|
|
24
|
-
const placeholderRegex = /\${{ *[a-zA-Z_][a-zA-Z0-9_]* *}}/g;
|
|
25
23
|
/**
|
|
26
24
|
* check parameter, throw error if value is null or undefined
|
|
27
25
|
* @param name parameter name
|
|
@@ -103,40 +101,12 @@ async function wrapSummary(exec, summary) {
|
|
|
103
101
|
return { result, summaries };
|
|
104
102
|
}
|
|
105
103
|
}
|
|
106
|
-
//
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
const envValue = envs ? envs[envName] : process.env[envName];
|
|
113
|
-
if (envName === "APP_NAME_SUFFIX") {
|
|
114
|
-
if (envValue !== undefined && envValue !== null) {
|
|
115
|
-
content = content.replace(placeholder, envValue);
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
if (envValue) {
|
|
120
|
-
content = content.replace(placeholder, envValue);
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
return content;
|
|
126
|
-
}
|
|
127
|
-
/**
|
|
128
|
-
* Expand environment variables in content. The format of referencing environment variable is: ${{ENV_NAME}}
|
|
129
|
-
* @return An array of environment variables
|
|
130
|
-
*/
|
|
131
|
-
function getEnvironmentVariables(content) {
|
|
132
|
-
const placeholders = content.match(placeholderRegex);
|
|
133
|
-
if (placeholders) {
|
|
134
|
-
const variables = placeholders.map((placeholder) => placeholder.slice(3, -2).trim()); // removes `${{` and `}}`)
|
|
135
|
-
// remove duplicates
|
|
136
|
-
return [...new Set(variables)];
|
|
137
|
-
}
|
|
138
|
-
return [];
|
|
139
|
-
}
|
|
104
|
+
// Manifest env-variable (`${{ENV_NAME}}`) expansion lives in @microsoft/app-manifest
|
|
105
|
+
// (re-exported via @microsoft/teamsfx-api) so hosts can resolve manifests without
|
|
106
|
+
// fx-core. Re-exported here to keep the existing import path for fx-core call sites.
|
|
107
|
+
var teamsfx_api_2 = require("@microsoft/teamsfx-api");
|
|
108
|
+
Object.defineProperty(exports, "expandEnvironmentVariable", { enumerable: true, get: function () { return teamsfx_api_2.expandEnvironmentVariable; } });
|
|
109
|
+
Object.defineProperty(exports, "getEnvironmentVariables", { enumerable: true, get: function () { return teamsfx_api_2.getEnvironmentVariables; } });
|
|
140
110
|
function getAbsolutePath(relativeOrAbsolutePath, projectPath) {
|
|
141
111
|
relativeOrAbsolutePath = relativeOrAbsolutePath || "";
|
|
142
112
|
projectPath = projectPath || "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { FxError, Result, ManifestType } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DriverContext } from "../driver/interface/commonArgs";
|
|
3
|
-
export
|
|
4
|
-
TeamsManifest = "teams-manifest",
|
|
5
|
-
PluginManifest = "plugin-manifest",
|
|
6
|
-
DeclarativeCopilotManifest = "declarative-copilot-manifest",
|
|
7
|
-
ApiSpec = "api-spec",
|
|
8
|
-
EmbeddedKnowledgeFile = "embedded-knowledge-file"
|
|
9
|
-
}
|
|
3
|
+
export { ManifestType };
|
|
10
4
|
export declare function expandVariableWithFunction(content: string, ctx: DriverContext, envs: {
|
|
11
5
|
[key in string]: string;
|
|
12
6
|
} | undefined, isJson: boolean, manifestType: ManifestType, fromPath: string): Promise<Result<string, FxError>>;
|
|
7
|
+
export declare function resolveManifestWithContext(content: string, ctx: DriverContext, manifestType: ManifestType, fromPath: string): Promise<Result<string, FxError>>;
|
|
13
8
|
//# sourceMappingURL=envFunctionUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envFunctionUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAGP,MAAM,
|
|
1
|
+
{"version":3,"file":"envFunctionUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAGP,MAAM,EAGN,YAAY,EAWb,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAY/D,OAAO,EAAE,YAAY,EAAE,CAAC;AA+ExB,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE;KAAG,GAAG,IAAI,MAAM,GAAG,MAAM;CAAE,GAAG,SAAS,EAC7C,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAID,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC"}
|
|
@@ -2,15 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ManifestType = void 0;
|
|
4
4
|
exports.expandVariableWithFunction = expandVariableWithFunction;
|
|
5
|
-
|
|
5
|
+
exports.resolveManifestWithContext = resolveManifestWithContext;
|
|
6
6
|
// Copyright (c) Microsoft Corporation.
|
|
7
7
|
// Licensed under the MIT license.
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
-
|
|
10
|
-
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
11
|
-
const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
9
|
+
Object.defineProperty(exports, "ManifestType", { enumerable: true, get: function () { return teamsfx_api_1.ManifestType; } });
|
|
12
10
|
const error_1 = require("../../error");
|
|
13
|
-
const common_1 = require("./common");
|
|
14
11
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
15
12
|
const source = "ResolveManifestFunction";
|
|
16
13
|
const telemetryEvent = "manifest-with-function";
|
|
@@ -20,146 +17,64 @@ var TelemetryPropertyKey;
|
|
|
20
17
|
TelemetryPropertyKey["manifestType"] = "manifest-type";
|
|
21
18
|
TelemetryPropertyKey["functionCount"] = "function-count";
|
|
22
19
|
})(TelemetryPropertyKey || (TelemetryPropertyKey = {}));
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
ManifestType["EmbeddedKnowledgeFile"] = "embedded-knowledge-file";
|
|
30
|
-
})(ManifestType || (exports.ManifestType = ManifestType = {}));
|
|
31
|
-
async function expandVariableWithFunction(content, ctx, envs, isJson, manifestType, fromPath) {
|
|
32
|
-
const regex = /\$\[ *[a-zA-Z][a-zA-Z]*\([^\]]*\) *\]/g;
|
|
33
|
-
const matches = content.match(regex);
|
|
34
|
-
if (!matches) {
|
|
35
|
-
return (0, teamsfx_api_1.ok)(content); // no function
|
|
36
|
-
}
|
|
37
|
-
let count = 0;
|
|
38
|
-
for (const placeholder of matches) {
|
|
39
|
-
const processedRes = await processFunction(placeholder.slice(2, -1).trim(), ctx, envs, fromPath);
|
|
40
|
-
if (processedRes.isErr()) {
|
|
41
|
-
return (0, teamsfx_api_1.err)(processedRes.error);
|
|
42
|
-
}
|
|
43
|
-
let value = processedRes.value;
|
|
44
|
-
if (isJson && value) {
|
|
45
|
-
value = JSON.stringify(value).slice(1, -1);
|
|
46
|
-
}
|
|
47
|
-
if (value) {
|
|
48
|
-
count += 1;
|
|
49
|
-
content = content.replace(placeholder, value);
|
|
50
|
-
}
|
|
20
|
+
// Map a plain error thrown by @microsoft/app-manifest's resolver to the localized
|
|
21
|
+
// FxError surface fx-core drivers expect, emitting the same diagnostic logs as before.
|
|
22
|
+
function toFxError(e, ctx) {
|
|
23
|
+
if (e instanceof teamsfx_api_1.UnsupportedFileFormatError) {
|
|
24
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", e.filePath, "txt"));
|
|
25
|
+
return new UnsupportedFileFormatError(ctx.platform);
|
|
51
26
|
}
|
|
52
|
-
if (
|
|
53
|
-
ctx.
|
|
54
|
-
|
|
55
|
-
[TelemetryPropertyKey.functionCount]: count.toString(),
|
|
56
|
-
});
|
|
27
|
+
if (e instanceof teamsfx_api_1.InvalidFunctionError) {
|
|
28
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorLog", e.token, "file"));
|
|
29
|
+
return new InvalidFunctionError(ctx.platform);
|
|
57
30
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const firstTrimmedContent = content.trim();
|
|
62
|
-
if (!firstTrimmedContent.startsWith("file(") || !firstTrimmedContent.endsWith(")")) {
|
|
63
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorLog", firstTrimmedContent, "file"));
|
|
64
|
-
return (0, teamsfx_api_1.err)(new InvalidFunctionError(ctx.platform));
|
|
31
|
+
if (e instanceof teamsfx_api_1.InvalidFunctionParameterError) {
|
|
32
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorLog", e.token, "file"));
|
|
33
|
+
return new InvalidFunctionParameter(ctx.platform);
|
|
65
34
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
// static string as function parameter
|
|
70
|
-
const res = await readFileContent(trimmedParameter.substring(1, trimmedParameter.length - 1), ctx, envs, path);
|
|
71
|
-
return res;
|
|
35
|
+
if (e instanceof teamsfx_api_1.ReadFileError) {
|
|
36
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", e.filePath, e.cause?.toString()));
|
|
37
|
+
return new ReadFileError(ctx.platform, e.filePath);
|
|
72
38
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const resolvedParameter = (0, common_1.expandEnvironmentVariable)(trimmedParameter, envs);
|
|
76
|
-
const res = readFileContent(resolvedParameter, ctx, envs, path);
|
|
77
|
-
return res;
|
|
39
|
+
if (e instanceof teamsfx_api_1.FileNotFoundError) {
|
|
40
|
+
return new error_1.FileNotFoundError(source, e.filePath);
|
|
78
41
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
if (processsedRes.isErr()) {
|
|
83
|
-
return (0, teamsfx_api_1.err)(processsedRes.error);
|
|
84
|
-
}
|
|
85
|
-
const readFileRes = await readFileContent(processsedRes.value, ctx, envs, path);
|
|
86
|
-
return readFileRes;
|
|
42
|
+
if (e instanceof teamsfx_api_1.FileReferenceOutsideManifestDirectoryError) {
|
|
43
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.fileReferenceOutsideManifestDirectory.errorLog.local", e.fileReference, e.resolvedPath, e.manifestDirectory, "$[file()]"));
|
|
44
|
+
return new FileReferenceOutsideManifestDirectoryError(e.fileReference, e.resolvedPath, e.manifestDirectory);
|
|
87
45
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorLog", trimmedParameter, "file"));
|
|
91
|
-
return (0, teamsfx_api_1.err)(new InvalidFunctionParameter(ctx.platform));
|
|
46
|
+
if (e instanceof teamsfx_api_1.MissingEnvironmentVariablesError) {
|
|
47
|
+
return new error_1.MissingEnvironmentVariablesError("manifest", e.names, e.fromPath);
|
|
92
48
|
}
|
|
49
|
+
// Anything else is unexpected; wrap it so the Result<T, FxError> contract holds.
|
|
50
|
+
return (0, error_1.assembleError)(e, source);
|
|
93
51
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
if (!isPathContained(manifestDirectory, absolutePath)) {
|
|
99
|
-
return fileReferenceOutsideManifestDirectory(ctx, filePath, absolutePath, manifestDirectory);
|
|
100
|
-
}
|
|
101
|
-
if (!isSupportedFileFormat(filePath)) {
|
|
102
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", safeFileReference, "txt"));
|
|
103
|
-
return (0, teamsfx_api_1.err)(new UnsupportedFileFormatError(ctx.platform));
|
|
104
|
-
}
|
|
105
|
-
let realManifestDirectory;
|
|
106
|
-
let realFilePath;
|
|
52
|
+
// Run a resolver that yields { content, functionCount }, mapping thrown
|
|
53
|
+
// ManifestTemplateErrors to localized FxError and emitting function-count telemetry.
|
|
54
|
+
async function runManifestResolver(resolve, ctx, manifestType) {
|
|
55
|
+
let resolved;
|
|
107
56
|
try {
|
|
108
|
-
|
|
109
|
-
realFilePath = await fs_extra_1.default.realpath(absolutePath);
|
|
110
|
-
}
|
|
111
|
-
catch (error) {
|
|
112
|
-
if (isFileNotFoundError(error)) {
|
|
113
|
-
return (0, teamsfx_api_1.err)(new error_1.FileNotFoundError(source, safeFileReference));
|
|
114
|
-
}
|
|
115
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", safeFileReference, getFileSystemErrorCode(error)));
|
|
116
|
-
return (0, teamsfx_api_1.err)(new ReadFileError(ctx.platform, safeFileReference));
|
|
117
|
-
}
|
|
118
|
-
if (!isPathContained(realManifestDirectory, realFilePath)) {
|
|
119
|
-
return fileReferenceOutsideManifestDirectory(ctx, filePath, realFilePath, manifestDirectory);
|
|
57
|
+
resolved = await resolve();
|
|
120
58
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
return (0, teamsfx_api_1.err)(new UnsupportedFileFormatError(ctx.platform));
|
|
59
|
+
catch (e) {
|
|
60
|
+
return (0, teamsfx_api_1.err)(toFxError(e, ctx));
|
|
124
61
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
return (0, teamsfx_api_1.ok)(processedFileContent);
|
|
131
|
-
}
|
|
132
|
-
catch (error) {
|
|
133
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", safeFileReference, getFileSystemErrorCode(error)));
|
|
134
|
-
return (0, teamsfx_api_1.err)(new ReadFileError(ctx.platform, safeFileReference));
|
|
62
|
+
if (resolved.functionCount > 0) {
|
|
63
|
+
ctx.telemetryReporter?.sendTelemetryEvent(telemetryEvent, {
|
|
64
|
+
[TelemetryPropertyKey.manifestType]: manifestType.toString(),
|
|
65
|
+
[TelemetryPropertyKey.functionCount]: resolved.functionCount.toString(),
|
|
66
|
+
});
|
|
135
67
|
}
|
|
68
|
+
return (0, teamsfx_api_1.ok)(resolved.content);
|
|
136
69
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
return (
|
|
140
|
-
(relativePath !== ".." &&
|
|
141
|
-
!relativePath.startsWith(`..${path_1.default.sep}`) &&
|
|
142
|
-
!path_1.default.isAbsolute(relativePath)));
|
|
143
|
-
}
|
|
144
|
-
function isSupportedFileFormat(filePath) {
|
|
145
|
-
const extension = path_1.default.extname(filePath).toLowerCase();
|
|
146
|
-
return extension === ".txt" || extension === ".md";
|
|
147
|
-
}
|
|
148
|
-
function isFileNotFoundError(error) {
|
|
149
|
-
return getFileSystemErrorCode(error) === "ENOENT";
|
|
150
|
-
}
|
|
151
|
-
function getFileSystemErrorCode(error) {
|
|
152
|
-
return typeof error === "object" &&
|
|
153
|
-
error !== null &&
|
|
154
|
-
"code" in error &&
|
|
155
|
-
typeof error.code === "string"
|
|
156
|
-
? error.code
|
|
157
|
-
: "UNKNOWN";
|
|
70
|
+
// Expand only `$[file()]` macros, leaving `${{ENV}}` substitution to the caller.
|
|
71
|
+
async function expandVariableWithFunction(content, ctx, envs, isJson, manifestType, fromPath) {
|
|
72
|
+
return runManifestResolver(() => (0, teamsfx_api_1.expandFileFunctionMacros)(content, isJson, { envs, fromPath }), ctx, manifestType);
|
|
158
73
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
return (0, teamsfx_api_1.
|
|
74
|
+
// Fully resolve a manifest via @microsoft/app-manifest's resolveManifest (shared
|
|
75
|
+
// file()+env logic), adding the fx-core concerns it is agnostic to.
|
|
76
|
+
async function resolveManifestWithContext(content, ctx, manifestType, fromPath) {
|
|
77
|
+
return runManifestResolver(() => (0, teamsfx_api_1.resolveManifest)(content, { manifestType, fromPath }), ctx, manifestType);
|
|
163
78
|
}
|
|
164
79
|
class UnsupportedFileFormatError extends teamsfx_api_1.UserError {
|
|
165
80
|
constructor(platform) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envFunctionUtils.js","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"envFunctionUtils.js","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkFnC,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IASjF,QAAQ,CACN,qBAAqB,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,EACvD,oBAAoB,EAAE,YAAY;IASpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkFnC,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IASjF,QAAQ,CACN,qBAAqB,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,EACvD,oBAAoB,EAAE,YAAY;IASpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAmEhC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAc1F,UAAU,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlD,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY;IAQlD,0BAA0B,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAO/D,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAW7E;AAED,eAAO,MAAM,OAAO,SAAgB,CAAC;AAGrC,KAAK,gBAAgB,GACnB,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;CAAE,CAAC;AAC/E,UAAU,iBAAiB;IACzB,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC3B,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,cAAM,UAAU;IACd,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,iBAAiB;IA6CpD,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAmC7C;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}
|
|
@@ -146,12 +146,13 @@ class EnvUtil {
|
|
|
146
146
|
const secretEnv = {};
|
|
147
147
|
for (const key of Object.keys(envs)) {
|
|
148
148
|
let value = envs[key];
|
|
149
|
-
if (
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
149
|
+
if (key.startsWith("SECRET_")) {
|
|
150
|
+
if (value) {
|
|
151
|
+
const res = cryptoProvider.encrypt(value);
|
|
152
|
+
if (res.isErr())
|
|
153
|
+
return (0, teamsfx_api_1.err)(res.error);
|
|
154
|
+
value = res.value;
|
|
155
|
+
}
|
|
155
156
|
secretEnv[key] = value;
|
|
156
157
|
}
|
|
157
158
|
else if (key === configure_1.internalOutputNames.teamsAppUpdateTime) {
|