@microsoft/teamsfx-core 2.0.4-alpha.bdda88800.0 → 2.0.4-alpha.ceeb9e1b9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/constants.d.ts +1 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts +1 -2
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +2 -2
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/depsLogger.d.ts +14 -14
- package/build/common/deps-checker/depsLogger.d.ts.map +1 -1
- package/build/common/deps-checker/depsLogger.js +7 -21
- package/build/common/deps-checker/depsLogger.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +42 -37
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +2 -2
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +8 -8
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts.map +1 -1
- package/build/common/deps-checker/util/cpUtils.js +5 -5
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -1
- package/build/common/deps-checker/util/fileHelper.js +2 -0
- package/build/common/deps-checker/util/fileHelper.js.map +1 -1
- package/build/common/deps-checker/util/progressIndicator.js +2 -2
- package/build/common/deps-checker/util/progressIndicator.js.map +1 -1
- package/build/common/featureFlags.d.ts +1 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +2 -0
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +4 -1
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -0
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/m365/launchHelper.d.ts +2 -2
- package/build/common/m365/launchHelper.d.ts.map +1 -1
- package/build/common/m365/launchHelper.js +24 -6
- package/build/common/m365/launchHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +52 -13
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +1 -0
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples.d.ts +13 -5
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +60 -38
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts +5 -0
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -0
- package/build/common/spec-parser/adaptiveCardGenerator.js +120 -0
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -0
- package/build/common/spec-parser/constants.d.ts +19 -1
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +43 -1
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +72 -14
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +21 -10
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +6 -0
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -0
- package/build/common/spec-parser/manifestUpdater.js +119 -0
- package/build/common/spec-parser/manifestUpdater.js.map +1 -0
- package/build/common/spec-parser/specFilter.d.ts +3 -0
- package/build/common/spec-parser/specFilter.d.ts.map +1 -0
- package/build/common/spec-parser/specFilter.js +40 -0
- package/build/common/spec-parser/specFilter.js.map +1 -0
- package/build/common/spec-parser/specParser.d.ts +15 -5
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +183 -34
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +28 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -0
- package/build/common/spec-parser/utils.js +242 -0
- package/build/common/spec-parser/utils.js.map +1 -0
- package/build/common/telemetry.d.ts +7 -5
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +40 -15
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.js +2 -2
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +1 -0
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +5 -1
- package/build/common/utils.js.map +1 -1
- package/build/component/configManager/constant.d.ts.map +1 -1
- package/build/component/configManager/constant.js +4 -2
- package/build/component/configManager/constant.js.map +1 -1
- package/build/component/configManager/interface.d.ts +5 -1
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/interface.js +2 -3
- package/build/component/configManager/interface.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts +1 -3
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +27 -53
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.d.ts.map +1 -1
- package/build/component/configManager/parser.js +17 -9
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts +0 -3
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +4 -12
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +10 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +10 -0
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +12 -8
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +85 -67
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.d.ts.map +1 -1
- package/build/component/coordinator/summary.js +4 -1
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +7 -7
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -0
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +2 -5
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.d.ts +3 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +14 -2
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/interface/AADApplication.js +1 -1
- package/build/component/driver/aad/interface/AADApplication.js.map +1 -1
- package/build/component/driver/aad/interface/AADManifest.js +1 -1
- package/build/component/driver/aad/interface/AADManifest.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -0
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +2 -5
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +58 -13
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +3 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +4 -1
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +10 -1
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/arm/deploy.d.ts +1 -3
- package/build/component/driver/arm/deploy.d.ts.map +1 -1
- package/build/component/driver/arm/deploy.js +1 -14
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts +2 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +15 -0
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.d.ts.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +9 -6
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/arm/validator.d.ts.map +1 -1
- package/build/component/driver/arm/validator.js +3 -3
- package/build/component/driver/arm/validator.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +1 -0
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +4 -7
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts +1 -0
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +8 -12
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts +0 -2
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +0 -10
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts +0 -2
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +0 -10
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts +0 -2
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +17 -19
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +11 -4
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +29 -16
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +18 -15
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +4 -4
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts +1 -0
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +27 -5
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +1 -0
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +33 -11
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +1 -0
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +12 -18
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts +1 -0
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +5 -11
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +2 -7
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.d.ts +1 -0
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +6 -12
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/script/baseBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +1 -0
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/baseBuildStepDriver.d.ts +0 -2
- package/build/component/driver/script/baseBuildStepDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildStepDriver.js +0 -4
- package/build/component/driver/script/baseBuildStepDriver.js.map +1 -1
- package/build/component/driver/script/dotnetBuildDriver.d.ts +0 -2
- package/build/component/driver/script/dotnetBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/dotnetBuildDriver.js +0 -9
- package/build/component/driver/script/dotnetBuildDriver.js.map +1 -1
- package/build/component/driver/script/npmBuildDriver.d.ts +0 -2
- package/build/component/driver/script/npmBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/npmBuildDriver.js +0 -9
- package/build/component/driver/script/npmBuildDriver.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.d.ts +0 -2
- package/build/component/driver/script/npxBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +0 -9
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +10 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +33 -30
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +11 -11
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +5 -5
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +31 -11
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +2 -0
- package/build/component/driver/teamsApp/clients/authSvcClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +5 -23
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +0 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +1 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts +1 -2
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js +4 -11
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +6 -11
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +3 -3
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +43 -29
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +2 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts +2 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +4 -12
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/results.d.ts.map +1 -1
- package/build/component/driver/teamsApp/results.js +2 -0
- package/build/component/driver/teamsApp/results.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +6 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +19 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +2 -3
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +21 -19
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +2 -10
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +22 -18
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/error/componentError.d.ts +2 -1
- package/build/component/error/componentError.d.ts.map +1 -1
- package/build/component/error/componentError.js +8 -4
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +53 -24
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/createAuthFiles.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +7 -2
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +133 -25
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +12 -12
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +214 -28
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +7 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +15 -3
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +31 -22
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +2 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +12 -5
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.js +2 -0
- package/build/component/generator/officeAddin/config/projectProperties.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.js +2 -0
- package/build/component/generator/officeAddin/config/projectsJsonData.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +9 -1
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +11 -5
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +12 -12
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +10 -10
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +16 -14
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +1 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +2 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +3 -3
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/utils.d.ts +12 -4
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +17 -16
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/messages.d.ts +2 -3
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +3 -4
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/actionExecutionMW.d.ts +2 -2
- package/build/component/middleware/actionExecutionMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +1 -1
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/middleware/questionMW.d.ts +2 -2
- package/build/component/middleware/questionMW.d.ts.map +1 -1
- package/build/component/middleware/questionMW.js +7 -11
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/migrate.d.ts.map +1 -1
- package/build/component/migrate.js +2 -0
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.d.ts +3 -3
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +3 -3
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +24 -2
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts +2 -2
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +6 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/telemetry.d.ts.map +1 -1
- package/build/component/telemetry.js +3 -6
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +2 -2
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +1 -4
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/azureResourceOperation.js +2 -2
- package/build/component/utils/azureResourceOperation.js.map +1 -1
- package/build/component/utils/charsetUtils.d.ts.map +1 -1
- package/build/component/utils/charsetUtils.js +5 -3
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/common.d.ts +1 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +4 -5
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts.map +1 -1
- package/build/component/utils/depsChecker/common.js +1 -1
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +9 -5
- package/build/component/utils/depsChecker/cpUtils.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +4 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.d.ts +3 -0
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +18 -4
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +2 -0
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.d.ts.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +3 -6
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts +44 -32
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +823 -63
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.d.ts +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +16 -10
- package/build/core/collaborator.js.map +1 -1
- package/build/core/error.d.ts +6 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +23 -1
- package/build/core/error.js.map +1 -1
- package/build/core/globalVars.d.ts +16 -0
- package/build/core/globalVars.d.ts.map +1 -1
- package/build/core/globalVars.js +34 -1
- package/build/core/globalVars.js.map +1 -1
- package/build/core/index.js +1 -0
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +7 -3
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/errorHandler.d.ts +2 -0
- package/build/core/middleware/errorHandler.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +16 -25
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +7 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +35 -34
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +8 -8
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +2 -1
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +3 -2
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +33 -15
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/migrationContext.d.ts +1 -0
- package/build/core/middleware/utils/migrationContext.d.ts.map +1 -1
- package/build/core/middleware/utils/migrationContext.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +6 -2
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +2 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +2 -0
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +8 -2
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +129 -22
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +2 -0
- package/build/error/deploy.js.map +1 -1
- package/build/error/index.d.ts.map +1 -1
- package/build/error/index.js +2 -0
- package/build/error/index.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +2 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +2 -0
- package/build/error/script.js.map +1 -1
- package/build/error/upgrade.d.ts.map +1 -1
- package/build/error/upgrade.js +2 -0
- package/build/error/upgrade.js.map +1 -1
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +2 -0
- package/build/error/yml.js.map +1 -1
- package/build/failpoint/index.d.ts.map +1 -1
- package/build/failpoint/index.js +2 -0
- package/build/failpoint/index.js.map +1 -1
- package/build/failpoint/marker.d.ts.map +1 -1
- package/build/failpoint/marker.js +2 -0
- package/build/failpoint/marker.js.map +1 -1
- package/build/failpoint/runtime.d.ts.map +1 -1
- package/build/failpoint/runtime.js +3 -4
- package/build/failpoint/runtime.js.map +1 -1
- package/build/index.d.ts +4 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +5 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +4 -0
- package/build/question/constants.d.ts.map +1 -0
- package/build/question/constants.js +12 -0
- package/build/question/constants.js.map +1 -0
- package/build/question/create.d.ts +14 -15
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +465 -313
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts +4 -0
- package/build/question/generator.d.ts.map +1 -0
- package/build/question/generator.js +365 -0
- package/build/question/generator.js.map +1 -0
- package/build/question/index.d.ts +18 -28
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +18 -44
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateEnvInputs.d.ts +14 -0
- package/build/question/inputs/CreateEnvInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateEnvInputs.js +5 -0
- package/build/question/inputs/CreateEnvInputs.js.map +1 -0
- package/build/question/inputs/CreateProjectInputs.d.ts +40 -0
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateProjectInputs.js +5 -0
- package/build/question/inputs/CreateProjectInputs.js.map +1 -0
- package/build/question/inputs/CreateSampleProjectInputs.d.ts +12 -0
- package/build/question/inputs/CreateSampleProjectInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateSampleProjectInputs.js +5 -0
- package/build/question/inputs/CreateSampleProjectInputs.js.map +1 -0
- package/build/question/inputs/DeployAadManifestInputs.d.ts +14 -0
- package/build/question/inputs/DeployAadManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/DeployAadManifestInputs.js +5 -0
- package/build/question/inputs/DeployAadManifestInputs.js.map +1 -0
- package/build/question/inputs/PermissionGrantInputs.d.ts +18 -0
- package/build/question/inputs/PermissionGrantInputs.d.ts.map +1 -0
- package/build/question/inputs/PermissionGrantInputs.js +5 -0
- package/build/question/inputs/PermissionGrantInputs.js.map +1 -0
- package/build/question/inputs/PermissionListInputs.d.ts +16 -0
- package/build/question/inputs/PermissionListInputs.d.ts.map +1 -0
- package/build/question/inputs/PermissionListInputs.js +5 -0
- package/build/question/inputs/PermissionListInputs.js.map +1 -0
- package/build/question/inputs/PreviewTeamsAppInputs.d.ts +14 -0
- package/build/question/inputs/PreviewTeamsAppInputs.d.ts.map +1 -0
- package/build/question/inputs/PreviewTeamsAppInputs.js +5 -0
- package/build/question/inputs/PreviewTeamsAppInputs.js.map +1 -0
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts +18 -0
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts.map +1 -0
- package/build/question/inputs/SPFxAddWebpartInputs.js +5 -0
- package/build/question/inputs/SPFxAddWebpartInputs.js.map +1 -0
- package/build/question/inputs/SelectTeamsManifestInputs.d.ts +12 -0
- package/build/question/inputs/SelectTeamsManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/SelectTeamsManifestInputs.js +5 -0
- package/build/question/inputs/SelectTeamsManifestInputs.js.map +1 -0
- package/build/question/inputs/ValidateTeamsAppInputs.d.ts +14 -0
- package/build/question/inputs/ValidateTeamsAppInputs.d.ts.map +1 -0
- package/build/question/inputs/ValidateTeamsAppInputs.js +5 -0
- package/build/question/inputs/ValidateTeamsAppInputs.js.map +1 -0
- package/build/question/inputs/index.d.ts +11 -0
- package/build/question/inputs/index.d.ts.map +1 -0
- package/build/question/inputs/index.js +16 -0
- package/build/question/inputs/index.js.map +1 -0
- package/build/question/options/CreateEnvOptions.d.ts +10 -0
- package/build/question/options/CreateEnvOptions.d.ts.map +1 -0
- package/build/question/options/CreateEnvOptions.js +24 -0
- package/build/question/options/CreateEnvOptions.js.map +1 -0
- package/build/question/options/CreateProjectOptions.d.ts +10 -0
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -0
- package/build/question/options/CreateProjectOptions.js +137 -0
- package/build/question/options/CreateProjectOptions.js.map +1 -0
- package/build/question/options/CreateSampleProjectOptions.d.ts +10 -0
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -0
- package/build/question/options/CreateSampleProjectOptions.js +52 -0
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -0
- package/build/question/options/DeployAadManifestOptions.d.ts +10 -0
- package/build/question/options/DeployAadManifestOptions.d.ts.map +1 -0
- package/build/question/options/DeployAadManifestOptions.js +21 -0
- package/build/question/options/DeployAadManifestOptions.js.map +1 -0
- package/build/question/options/PermissionGrantOptions.d.ts +10 -0
- package/build/question/options/PermissionGrantOptions.d.ts.map +1 -0
- package/build/question/options/PermissionGrantOptions.js +33 -0
- package/build/question/options/PermissionGrantOptions.js.map +1 -0
- package/build/question/options/PermissionListOptions.d.ts +10 -0
- package/build/question/options/PermissionListOptions.d.ts.map +1 -0
- package/build/question/options/PermissionListOptions.js +28 -0
- package/build/question/options/PermissionListOptions.js.map +1 -0
- package/build/question/options/PreviewTeamsAppOptions.d.ts +10 -0
- package/build/question/options/PreviewTeamsAppOptions.d.ts.map +1 -0
- package/build/question/options/PreviewTeamsAppOptions.js +26 -0
- package/build/question/options/PreviewTeamsAppOptions.js.map +1 -0
- package/build/question/options/SPFxAddWebpartOptions.d.ts +10 -0
- package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -0
- package/build/question/options/SPFxAddWebpartOptions.js +37 -0
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -0
- package/build/question/options/SelectTeamsManifestOptions.d.ts +10 -0
- package/build/question/options/SelectTeamsManifestOptions.d.ts.map +1 -0
- package/build/question/options/SelectTeamsManifestOptions.js +17 -0
- package/build/question/options/SelectTeamsManifestOptions.js.map +1 -0
- package/build/question/options/ValidateTeamsAppOptions.d.ts +10 -0
- package/build/question/options/ValidateTeamsAppOptions.d.ts.map +1 -0
- package/build/question/options/ValidateTeamsAppOptions.js +23 -0
- package/build/question/options/ValidateTeamsAppOptions.js.map +1 -0
- package/build/question/options/index.d.ts +11 -0
- package/build/question/options/index.d.ts.map +1 -0
- package/build/question/options/index.js +16 -0
- package/build/question/options/index.js.map +1 -0
- package/build/question/other.d.ts +13 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +134 -26
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +7 -2
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +11 -3
- package/build/question/questionNames.js.map +1 -1
- package/build/question/util.d.ts.map +1 -1
- package/build/question/util.js +2 -2
- package/build/question/util.js.map +1 -1
- package/build/ui/validationUtils.d.ts +31 -0
- package/build/ui/validationUtils.d.ts.map +1 -0
- package/build/ui/validationUtils.js +297 -0
- package/build/ui/validationUtils.js.map +1 -0
- package/build/ui/visitor.d.ts +13 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +264 -215
- package/build/ui/visitor.js.map +1 -1
- package/package.json +21 -14
- package/resource/package.nls.json +58 -18
- package/resource/yaml-schema/v1.2/yaml.schema.json +1474 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Tab/GetUserProfile.razor +1 -2
- package/templates/plugins/resource/aad/auth/bot/README.md +281 -263
- package/templates/plugins/resource/aad/auth/bot/js/sso/handleMessageExtensionQueryWithToken.js +13 -3
- package/templates/plugins/resource/aad/auth/bot/js/sso/profileSsoCommandHandler.js +14 -5
- package/templates/plugins/resource/aad/auth/bot/ts/sso/handleMessageExtensionQueryWithToken.ts +11 -3
- package/templates/plugins/resource/aad/auth/bot/ts/sso/profileSsoCommandHandler.ts +12 -3
- package/templates/plugins/resource/aad/auth/tab/csharp/GetUserProfile.razor +1 -2
- package/build/common/samples-config-v3.json +0 -233
- package/build/component/configManager/diagnostic.d.ts +0 -9
- package/build/component/configManager/diagnostic.d.ts.map +0 -1
- package/build/component/configManager/diagnostic.js +0 -47
- package/build/component/configManager/diagnostic.js.map +0 -1
- package/build/component/driver/middleware/updateProgress.d.ts +0 -6
- package/build/component/driver/middleware/updateProgress.d.ts.map +0 -1
- package/build/component/driver/middleware/updateProgress.js +0 -15
- package/build/component/driver/middleware/updateProgress.js.map +0 -1
- package/build/core/FxCoreImplementV3.d.ts +0 -43
- package/build/core/FxCoreImplementV3.d.ts.map +0 -1
- package/build/core/FxCoreImplementV3.js +0 -653
- package/build/core/FxCoreImplementV3.js.map +0 -1
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.ProjectMigratorGuideStatus = exports.ProjectMigratorStatus = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.TelemetryEvent = exports.TelemetryProperty =
|
|
5
|
+
exports.fillInTelemetryPropsForFxError = exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.ProjectMigratorGuideStatus = exports.ProjectMigratorStatus = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.TelemetryEvent = exports.TelemetryProperty = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
exports.TelemetryReporterInstance = TelemetryReporterInstance;
|
|
7
|
+
const constants_1 = require("../component/constants");
|
|
8
|
+
const globalVars_1 = require("../core/globalVars");
|
|
10
9
|
var TelemetryProperty;
|
|
11
10
|
(function (TelemetryProperty) {
|
|
12
11
|
TelemetryProperty["TriggerFrom"] = "trigger-from";
|
|
@@ -41,7 +40,6 @@ var TelemetryProperty;
|
|
|
41
40
|
TelemetryProperty["TemplateScenario"] = "template-scenario";
|
|
42
41
|
TelemetryProperty["TemplateFallback"] = "template-fallback";
|
|
43
42
|
TelemetryProperty["TemplateName"] = "template-name";
|
|
44
|
-
TelemetryProperty["SampleName"] = "sample-name";
|
|
45
43
|
TelemetryProperty["SampleDownloadDirectory"] = "sample-download-directory";
|
|
46
44
|
TelemetryProperty["Fallback"] = "fallback";
|
|
47
45
|
TelemetryProperty["HasSwitchedSubscription"] = "has-switched-subscription";
|
|
@@ -169,7 +167,7 @@ function sendTelemetryEvent(component, eventName, properties, measurements) {
|
|
|
169
167
|
properties = {};
|
|
170
168
|
}
|
|
171
169
|
properties[TelemetryProperty.Component] = component;
|
|
172
|
-
(_a =
|
|
170
|
+
(_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(eventName, properties, measurements);
|
|
173
171
|
}
|
|
174
172
|
exports.sendTelemetryEvent = sendTelemetryEvent;
|
|
175
173
|
function sendTelemetryErrorEvent(component, eventName, fxError, properties) {
|
|
@@ -178,16 +176,43 @@ function sendTelemetryErrorEvent(component, eventName, fxError, properties) {
|
|
|
178
176
|
properties = {};
|
|
179
177
|
}
|
|
180
178
|
properties[TelemetryProperty.Component] = component;
|
|
181
|
-
properties
|
|
182
|
-
|
|
183
|
-
|
|
179
|
+
fillInTelemetryPropsForFxError(properties, fxError);
|
|
180
|
+
(_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, {});
|
|
181
|
+
}
|
|
182
|
+
exports.sendTelemetryErrorEvent = sendTelemetryErrorEvent;
|
|
183
|
+
/**
|
|
184
|
+
* fill in telemetry properties for FxError
|
|
185
|
+
* @param error FxError
|
|
186
|
+
* @param props teletry properties
|
|
187
|
+
*/
|
|
188
|
+
function fillInTelemetryPropsForFxError(props, error) {
|
|
189
|
+
const errorCode = error.source + "." + error.name;
|
|
190
|
+
const errorType = error instanceof teamsfx_api_1.SystemError
|
|
191
|
+
? constants_1.TelemetryConstants.values.systemError
|
|
192
|
+
: constants_1.TelemetryConstants.values.userError;
|
|
193
|
+
props[constants_1.TelemetryConstants.properties.success] = constants_1.TelemetryConstants.values.no;
|
|
194
|
+
props[constants_1.TelemetryConstants.properties.errorCode] =
|
|
195
|
+
props[constants_1.TelemetryConstants.properties.errorCode] || errorCode;
|
|
196
|
+
props[constants_1.TelemetryConstants.properties.errorType] = errorType;
|
|
197
|
+
props[constants_1.TelemetryConstants.properties.errorMessage] = error.message;
|
|
198
|
+
props[constants_1.TelemetryConstants.properties.errorStack] = error.stack !== undefined ? error.stack : ""; // error stack will not append in error-message any more
|
|
199
|
+
props[constants_1.TelemetryConstants.properties.errorName] = error.name;
|
|
200
|
+
// append global context properties
|
|
201
|
+
props[constants_1.TelemetryConstants.properties.errorComponent] = globalVars_1.globalVars.component;
|
|
202
|
+
props[constants_1.TelemetryConstants.properties.errorStage] = globalVars_1.globalVars.stage;
|
|
203
|
+
props[constants_1.TelemetryConstants.properties.errorMethod] = globalVars_1.globalVars.method;
|
|
204
|
+
props[constants_1.TelemetryConstants.properties.errorSource] = globalVars_1.globalVars.source;
|
|
205
|
+
if (error.innerError && error.innerError["code"]) {
|
|
206
|
+
props[constants_1.TelemetryConstants.properties.errorInnerCode] = error.innerError["code"];
|
|
184
207
|
}
|
|
185
|
-
|
|
186
|
-
|
|
208
|
+
if (error.innerError) {
|
|
209
|
+
props[constants_1.TelemetryConstants.properties.innerError] = JSON.stringify(error.innerError, Object.getOwnPropertyNames(error.innerError));
|
|
210
|
+
}
|
|
211
|
+
if (error.categories) {
|
|
212
|
+
props[constants_1.TelemetryConstants.properties.errorCat1] = error.categories[0];
|
|
213
|
+
props[constants_1.TelemetryConstants.properties.errorCat2] = error.categories[1];
|
|
214
|
+
props[constants_1.TelemetryConstants.properties.errorCat3] = error.categories[2];
|
|
187
215
|
}
|
|
188
|
-
properties[TelemetryProperty.ErrorCode] = `${fxError.source}.${fxError.name}`;
|
|
189
|
-
properties[TelemetryProperty.ErrorMessage] = `${fxError.message}${fxError.stack ? "\nstack:\n" + fxError.stack : ""}`;
|
|
190
|
-
(_a = TelemetryReporterInstance.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, {});
|
|
191
216
|
}
|
|
192
|
-
exports.
|
|
217
|
+
exports.fillInTelemetryPropsForFxError = fillInTelemetryPropsForFxError;
|
|
193
218
|
//# sourceMappingURL=telemetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8D;AAC9D,sDAA4D;AAC5D,mDAAuD;AAEvD,IAAY,iBA0CX;AA1CD,WAAY,iBAAiB;IAC3B,iDAA4B,CAAA;IAC5B,4CAAuB,CAAA;IACvB,8CAAyB,CAAA;IACzB,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,wCAAmB,CAAA;IACnB,6CAAwB,CAAA;IACxB,6CAAwB,CAAA;IACxB,mDAA8B,CAAA;IAC9B,sDAAiC,CAAA;IACjC,6CAAwB,CAAA;IACxB,oDAA+B,CAAA;IAC/B,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,iFAA4D,CAAA;IAC5D,6CAAwB,CAAA;IACxB,sCAAiB,CAAA;IACjB,0CAAqB,CAAA;IACrB,uDAAkC,CAAA;IAClC,kDAA6B,CAAA;IAC7B,qDAAgC,CAAA;IAChC,oEAA+C,CAAA;IAC/C,yEAAoD,CAAA;IACpD,+DAA0C,CAAA;IAC1C,sDAAiC,CAAA;IACjC,gDAA2B,CAAA;IAC3B,qDAAgC,CAAA;IAChC,2DAAsC,CAAA;IACtC,2DAAsC,CAAA;IACtC,2DAAsC,CAAA;IACtC,mDAA8B,CAAA;IAC9B,0EAAqD,CAAA;IACrD,0CAAqB,CAAA;IACrB,0EAAqD,CAAA;IACrD,gEAA2C,CAAA;IAC3C,8EAAyD,CAAA;IACzD,2DAAsC,CAAA;IACtC,uDAAkC,CAAA;IAClC,yCAAoB,CAAA;IACpB,4DAAuC,CAAA;AACzC,CAAC,EA1CW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QA0C5B;AAED,IAAY,cA+DX;AA/DD,WAAY,cAAc;IACxB,uCAAqB,CAAA;IACrB,0DAAwC,CAAA;IACxC,4CAA0B,CAAA;IAC1B,qDAAmC,CAAA;IACnC,yCAAuB,CAAA;IACvB,kDAAgC,CAAA;IAChC,0CAAwB,CAAA;IACxB,mCAAiB,CAAA;IACjB,+DAA6C,CAAA;IAC7C,oDAAkC,CAAA;IAClC,0CAAwB,CAAA;IACxB,4CAA0B,CAAA;IAC1B,oDAAkC,CAAA;IAClC,+DAA6C,CAAA;IAC7C,wCAAsB,CAAA;IACtB,sDAAoC,CAAA;IACpC,wEAAsD,CAAA;IACtD,6DAA2C,CAAA;IAC3C,qEAAmD,CAAA;IACnD,0DAAwC,CAAA;IACxC,wDAAsC,CAAA;IACtC,0CAAwB,CAAA;IACxB,0FAAwE,CAAA;IACxE,0FAAwE,CAAA;IACxE,+EAA6D,CAAA;IAC7D,gFAA8D,CAAA;IAC9D,qEAAmD,CAAA;IACnD,qFAAmE,CAAA;IACnE,iEAA+C,CAAA;IAC/C,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,sFAAoE,CAAA;IACpE,2EAAyD,CAAA;IACzD,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,wGAAsF,CAAA;IACtF,6FAA2E,CAAA;IAC3E,4GAA0F,CAAA;IAC1F,iGAA+E,CAAA;IAC/E,0GAAwF,CAAA;IACxF,+FAA6E,CAAA;IAC7E,iGAA+E,CAAA;IAC/E,sFAAoE,CAAA;IACpE,kFAAgE,CAAA;IAChE,uEAAqD,CAAA;IACrD,uEAAqD,CAAA;IACrD,mGAAiF,CAAA;IACjF,uDAAqC,CAAA;IACrC,4CAA0B,CAAA;IAC1B,mDAAiC,CAAA;IACjC,8EAA4D,CAAA;IAC5D,mEAAiD,CAAA;IACjD,wDAAsC,CAAA;IACtC,oDAAkC,CAAA;IAClC,wDAAsC,CAAA;IACtC,oEAAkD,CAAA;IAClD,oDAAkC,CAAA;IAClC,sEAAoD,CAAA;IACpD,oEAAkD,CAAA;IAClD,4CAA0B,CAAA;IAC1B,0EAAwD,CAAA;IACxD,uCAAqB,CAAA;AACvB,CAAC,EA/DW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QA+DzB;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,6BAAS,CAAA;AACX,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAED,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,wCAAkB,CAAA;IAClB,4CAAsB,CAAA;AACxB,CAAC,EAHW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAG7B;AAED,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,8BAAiB,CAAA;IACjB,wBAAW,CAAA;IACX,sBAAS,CAAA;IACT,0BAAa,CAAA;IACb,kCAAqB,CAAA;AACvB,CAAC,EANW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAMpB;AAED,IAAY,0BAQX;AARD,WAAY,0BAA0B;IACpC,0DAA4B,CAAA;IAC5B,sDAAwB,CAAA;IACxB,oDAAsB,CAAA;IACtB,qFAAuD,CAAA;IACvD,2FAA6D,CAAA;IAC7D,iFAAmD,CAAA;IACnD,kEAAoC,CAAA;AACtC,CAAC,EARW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAQrC;AAED,IAAY,yBAKX;AALD,WAAY,yBAAyB;IACnC,yDAA4B,CAAA;IAC5B,qDAAwB,CAAA;IACxB,mDAAsB,CAAA;IACtB,gDAAmB,CAAA;AACrB,CAAC,EALW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAKpC;AAED,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,kCAAS,CAAA;IACT,0CAAiB,CAAA;AACnB,CAAC,EAHW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAGhC;AAED,IAAY,0BAIX;AAJD,WAAY,0BAA0B;IACpC,+CAAiB,CAAA;IACjB,sDAAwB,CAAA;IACxB,+CAAiB,CAAA;AACnB,CAAC,EAJW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAIrC;AAED,SAAgB,kBAAkB,CAChC,SAAiB,EACjB,SAAiB,EACjB,UAAoC,EACpC,YAAsC;;IAEtC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;AACnF,CAAC;AAXD,gDAWC;AAED,SAAgB,uBAAuB,CACrC,SAAiB,EACjB,SAAiB,EACjB,OAAgB,EAChB,UAAoC;;IAEpC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IAEpD,8BAA8B,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEpD,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9E,CAAC;AAdD,0DAcC;AAED;;;;GAIG;AACH,SAAgB,8BAA8B,CAC5C,KAA6B,EAC7B,KAAc;IAEd,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC;IAClD,MAAM,SAAS,GACb,KAAK,YAAY,yBAAW;QAC1B,CAAC,CAAC,8BAAkB,CAAC,MAAM,CAAC,WAAW;QACvC,CAAC,CAAC,8BAAkB,CAAC,MAAM,CAAC,SAAS,CAAC;IAC1C,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,8BAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;IAC5E,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC;QAC5C,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC;IAC9D,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IAC3D,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC;IAClE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,wDAAwD;IACxJ,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAE5D,mCAAmC;IACnC,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,uBAAU,CAAC,SAAS,CAAC;IAC3E,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,uBAAU,CAAC,KAAK,CAAC;IACnE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,uBAAU,CAAC,MAAM,CAAC;IACrE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,uBAAU,CAAC,MAAM,CAAC;IACrE,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAChD,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAChF;IAED,IAAI,KAAK,CAAC,UAAU,EAAE;QACpB,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,SAAS,CAC9D,KAAK,CAAC,UAAU,EAChB,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAC7C,CAAC;KACH;IAED,IAAI,KAAK,CAAC,UAAU,EAAE;QACpB,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KACtE;AACH,CAAC;AAtCD,wEAsCC"}
|
package/build/common/tools.js
CHANGED
|
@@ -267,9 +267,9 @@ exports.getFixedCommonProjectSettings = getFixedCommonProjectSettings;
|
|
|
267
267
|
const TunnelManagementUserAgent = { name: "Teams-Toolkit" };
|
|
268
268
|
async function listDevTunnels(token) {
|
|
269
269
|
try {
|
|
270
|
-
const tunnelManagementClientImpl = new dev_tunnels_management_1.TunnelManagementHttpClient(TunnelManagementUserAgent,
|
|
270
|
+
const tunnelManagementClientImpl = new dev_tunnels_management_1.TunnelManagementHttpClient(TunnelManagementUserAgent, () => {
|
|
271
271
|
const res = `Bearer ${token}`;
|
|
272
|
-
return res;
|
|
272
|
+
return Promise.resolve(res);
|
|
273
273
|
});
|
|
274
274
|
const options = {
|
|
275
275
|
includeAccessControl: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}
|
package/build/common/utils.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD"}
|
package/build/common/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.loadingOptionsPlaceholder = exports.convertToAlphanumericOnly = void 0;
|
|
3
|
+
exports.loadingDefaultPlaceholder = exports.loadingOptionsPlaceholder = exports.convertToAlphanumericOnly = void 0;
|
|
4
4
|
// Copyright (c) Microsoft Corporation.
|
|
5
5
|
// Licensed under the MIT license.
|
|
6
6
|
const localizeUtils_1 = require("./localizeUtils");
|
|
@@ -12,4 +12,8 @@ function loadingOptionsPlaceholder() {
|
|
|
12
12
|
return localizeUtils_1.getLocalizedString("ui.select.LoadingOptionsPlaceholder");
|
|
13
13
|
}
|
|
14
14
|
exports.loadingOptionsPlaceholder = loadingOptionsPlaceholder;
|
|
15
|
+
function loadingDefaultPlaceholder() {
|
|
16
|
+
return localizeUtils_1.getLocalizedString("ui.select.LoadingDefaultPlaceholder");
|
|
17
|
+
}
|
|
18
|
+
exports.loadingDefaultPlaceholder = loadingDefaultPlaceholder;
|
|
15
19
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mDAAqD;AAErD,SAAgB,yBAAyB,CAAC,OAAe;IACvD,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mDAAqD;AAErD,SAAgB,yBAAyB,CAAC,OAAe;IACvD,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,oBAAY,eAAe;IACzB,SAAS,mBAAc;IACvB,MAAM,oBAAe;IACrB,WAAW,iBAAiB;CAC7B;AAED,eAAO,MAAM,SAAS,kBAAkB,CAAC;AAEzC,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAE7D,oBAAY,iBAAiB;IAC3B,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,oBAAoB,aAAa;IACjC,sBAAsB,eAAe;IACrC,YAAY,kBAAkB;CAC/B"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.TelemetryProperty = exports.lifecycleExecutionEvent = exports.component = exports.SummaryConstant = void 0;
|
|
2
6
|
/**
|
|
3
7
|
* @author yefuwang@microsoft.com
|
|
4
8
|
*/
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.TelemetryProperty = exports.lifecycleExecutionEvent = exports.component = exports.SummaryConstant = void 0;
|
|
7
9
|
var SummaryConstant;
|
|
8
10
|
(function (SummaryConstant) {
|
|
9
11
|
SummaryConstant["Succeeded"] = "(\u221A) Done:";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":";AAAA;;GAEG
|
|
1
|
+
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,+CAAuB,CAAA;IACvB,6CAAqB,CAAA;IACrB,+CAA4B,CAAA;AAC9B,CAAC,EAJW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAI1B;AAEY,QAAA,SAAS,GAAG,eAAe,CAAC;AAE5B,QAAA,uBAAuB,GAAG,qBAAqB,CAAC;AAE7D,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,4CAAuB,CAAA;IACvB,wCAAmB,CAAA;IACnB,sDAAiC,CAAA;IACjC,0DAAqC,CAAA;IACrC,mDAA8B,CAAA;AAChC,CAAC,EANW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAM5B"}
|
|
@@ -4,6 +4,9 @@
|
|
|
4
4
|
import { FxError, LogProvider, Result } from "@microsoft/teamsfx-api";
|
|
5
5
|
import { DriverContext } from "../driver/interface/commonArgs";
|
|
6
6
|
import { StepDriver } from "../driver/interface/stepDriver";
|
|
7
|
+
export declare type AdditionalMetadata = {
|
|
8
|
+
[key: string]: unknown;
|
|
9
|
+
};
|
|
7
10
|
export declare type RawProjectModel = {
|
|
8
11
|
registerApp?: DriverDefinition[];
|
|
9
12
|
provision?: DriverDefinition[];
|
|
@@ -12,6 +15,7 @@ export declare type RawProjectModel = {
|
|
|
12
15
|
publish?: DriverDefinition[];
|
|
13
16
|
environmentFolderPath?: string;
|
|
14
17
|
version: string;
|
|
18
|
+
additionalMetadata?: AdditionalMetadata;
|
|
15
19
|
};
|
|
16
20
|
export declare type ProjectModel = {
|
|
17
21
|
registerApp?: ILifecycle;
|
|
@@ -21,6 +25,7 @@ export declare type ProjectModel = {
|
|
|
21
25
|
publish?: ILifecycle;
|
|
22
26
|
environmentFolderPath?: string;
|
|
23
27
|
version: string;
|
|
28
|
+
additionalMetadata?: AdditionalMetadata;
|
|
24
29
|
};
|
|
25
30
|
export declare type DriverDefinition = {
|
|
26
31
|
name?: string;
|
|
@@ -67,7 +72,6 @@ export declare type ExecutionResult = {
|
|
|
67
72
|
export interface ILifecycle {
|
|
68
73
|
name: LifecycleName;
|
|
69
74
|
driverDefs: DriverDefinition[];
|
|
70
|
-
run(ctx: DriverContext): Promise<Result<Output, FxError>>;
|
|
71
75
|
/**
|
|
72
76
|
* Resolve all placeholders in the driver's arguments based on the environment variables in-place.
|
|
73
77
|
* Unresolved placeholders will be returned. It can be used to get unresolved placeholders before actually
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/interface.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/interface.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
*/
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
5
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
5
|
exports.LifecycleNames = void 0;
|
|
7
6
|
exports.LifecycleNames = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/component/configManager/interface.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/component/configManager/interface.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AA+CrB,QAAA,cAAc,GAAmB;IAC5C,aAAa;IACb,cAAc;IACd,WAAW;IACX,QAAQ;IACR,SAAS;CACV,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { FxError, Result, LogProvider } from "@microsoft/teamsfx-api";
|
|
5
5
|
import { DriverContext } from "../driver/interface/commonArgs";
|
|
6
|
-
import { DriverDefinition, LifecycleName, ILifecycle,
|
|
6
|
+
import { DriverDefinition, LifecycleName, ILifecycle, DriverInstance, UnresolvedPlaceholders, ResolvedPlaceholders, ExecutionResult } from "./interface";
|
|
7
7
|
export declare class Lifecycle implements ILifecycle {
|
|
8
8
|
version: string;
|
|
9
9
|
name: LifecycleName;
|
|
@@ -13,8 +13,6 @@ export declare class Lifecycle implements ILifecycle {
|
|
|
13
13
|
private static stringifyOutput;
|
|
14
14
|
execute(ctx: DriverContext): Promise<ExecutionResult>;
|
|
15
15
|
executeImpl(ctx: DriverContext, resolved: ResolvedPlaceholders, unresolved: ResolvedPlaceholders): Promise<ExecutionResult>;
|
|
16
|
-
run(ctx: DriverContext): Promise<Result<Output, FxError>>;
|
|
17
|
-
private static runDrivers;
|
|
18
16
|
private stringifyDriverDef;
|
|
19
17
|
resolveDriverInstances(log: LogProvider): Result<DriverInstance[], FxError>;
|
|
20
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/lifecycle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/lifecycle.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAW,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI/E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,eAAe,EAChB,MAAM,aAAa,CAAC;AAmFrB,qBAAa,SAAU,YAAW,UAAU;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBACnB,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM;IAMhF,mBAAmB,IAAI,sBAAsB;IAK7C,OAAO,CAAC,MAAM,CAAC,eAAe;IAcxB,OAAO,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAuErD,WAAW,CACf,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,oBAAoB,EAC9B,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,eAAe,CAAC;IAuF3B,OAAO,CAAC,kBAAkB;IAOnB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC;CAanF"}
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
*/
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
5
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
5
|
exports.Lifecycle = void 0;
|
|
7
6
|
const tslib_1 = require("tslib");
|
|
7
|
+
/**
|
|
8
|
+
* @author yefuwang@microsoft.com
|
|
9
|
+
*/
|
|
8
10
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
-
const lodash_1 = tslib_1.
|
|
11
|
+
const lodash_1 = tslib_1.__importStar(require("lodash"));
|
|
10
12
|
const typedi_1 = require("typedi");
|
|
11
13
|
const yml_1 = require("../../error/yml");
|
|
12
14
|
const teamsFxTelemetryReporter_1 = require("../utils/teamsFxTelemetryReporter");
|
|
13
15
|
const constant_1 = require("./constant");
|
|
16
|
+
const error_1 = require("../../error");
|
|
17
|
+
const globalVars_1 = require("../../core/globalVars");
|
|
14
18
|
function resolveDriverDef(def, resolved, unresolved) {
|
|
15
19
|
const args = def.with;
|
|
16
20
|
for (const k in args) {
|
|
@@ -123,19 +127,19 @@ class Lifecycle {
|
|
|
123
127
|
else {
|
|
124
128
|
if (result.error.kind === "Failure") {
|
|
125
129
|
e = result.error.error;
|
|
126
|
-
ctx.logProvider.
|
|
130
|
+
ctx.logProvider.error(`Failed to Execute lifecycle ${this.name}. ${e.name}:${e.message}`);
|
|
127
131
|
}
|
|
128
132
|
else if (result.error.kind === "PartialSuccess") {
|
|
129
133
|
failedAction = this.stringifyDriverDef(result.error.reason.failedDriver);
|
|
130
134
|
const output = Lifecycle.stringifyOutput(result.error.env);
|
|
131
135
|
if (result.error.reason.kind === "DriverError") {
|
|
132
136
|
e = result.error.reason.error;
|
|
133
|
-
ctx.logProvider.
|
|
137
|
+
ctx.logProvider.error(`Failed to Execute lifecycle ${this.name} due to failed action: ${failedAction}. ${e.name}:${e.message}. Env output: ${output}`);
|
|
134
138
|
}
|
|
135
139
|
else if (result.error.reason.kind === "UnresolvedPlaceholders") {
|
|
136
140
|
// This error is just for telemetry because sendEndEvent() needs an error as parameter.
|
|
137
|
-
e = new
|
|
138
|
-
ctx.logProvider.
|
|
141
|
+
e = new error_1.MissingEnvironmentVariablesError(constant_1.component, result.error.reason.unresolvedPlaceHolders.join(","));
|
|
142
|
+
ctx.logProvider.error(`Failed to Execute lifecycle ${this.name} because there are unresolved placeholders ${JSON.stringify(unresolved)} for action: ${failedAction}. Env output: ${output}`);
|
|
139
143
|
}
|
|
140
144
|
}
|
|
141
145
|
}
|
|
@@ -152,6 +156,7 @@ class Lifecycle {
|
|
|
152
156
|
return { result, summaries };
|
|
153
157
|
}
|
|
154
158
|
async executeImpl(ctx, resolved, unresolved) {
|
|
159
|
+
var _a;
|
|
155
160
|
const maybeDrivers = this.resolveDriverInstances(ctx.logProvider);
|
|
156
161
|
if (maybeDrivers.isErr()) {
|
|
157
162
|
return { result: teamsfx_api_1.err({ kind: "Failure", error: maybeDrivers.error }), summaries: [] };
|
|
@@ -160,10 +165,13 @@ class Lifecycle {
|
|
|
160
165
|
const envOutput = new Map();
|
|
161
166
|
const summaries = [];
|
|
162
167
|
for (const driver of drivers) {
|
|
163
|
-
ctx.logProvider.
|
|
168
|
+
ctx.logProvider.verbose(`Executing action ${this.stringifyDriverDef(driver)} in lifecycle ${this.name}`);
|
|
169
|
+
if (driver.instance.progressTitle) {
|
|
170
|
+
await ((_a = ctx.progressBar) === null || _a === void 0 ? void 0 : _a.next(driver.instance.progressTitle));
|
|
171
|
+
}
|
|
164
172
|
resolveDriverDef(driver, resolved, unresolved);
|
|
165
173
|
if (unresolved.length > 0) {
|
|
166
|
-
ctx.logProvider.
|
|
174
|
+
ctx.logProvider.warning(`Unresolved placeholders(${unresolved.join(",")}) found for Action ${this.stringifyDriverDef(driver)} in lifecycle ${this.name}`);
|
|
167
175
|
summaries.push([
|
|
168
176
|
`${constant_1.SummaryConstant.Failed} Unresolved placeholders: ${unresolved.join(",")}`,
|
|
169
177
|
]);
|
|
@@ -185,20 +193,12 @@ class Lifecycle {
|
|
|
185
193
|
process.env[envVar] = value;
|
|
186
194
|
}
|
|
187
195
|
}
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
result = r.result;
|
|
195
|
-
summary = r.summaries.map((s) => `${constant_1.SummaryConstant.Succeeded} ${s}`);
|
|
196
|
-
}
|
|
197
|
-
else {
|
|
198
|
-
result = await driver.instance.run(driver.with, ctx);
|
|
199
|
-
// if execute is not implemented, treat it as if no summaries was returned.
|
|
200
|
-
summary = [];
|
|
201
|
-
}
|
|
196
|
+
globalVars_1.setErrorContext({ component: lodash_1.camelCase(driver.uses), method: "execute" }); // set driver name as component name for telemetry
|
|
197
|
+
const r = await driver.instance.execute(driver.with, ctx, driver.writeToEnvironmentFile
|
|
198
|
+
? new Map(Object.entries(driver.writeToEnvironmentFile))
|
|
199
|
+
: undefined, this.version);
|
|
200
|
+
const result = r.result;
|
|
201
|
+
const summary = r.summaries.map((s) => `${constant_1.SummaryConstant.Succeeded} ${s}`);
|
|
202
202
|
summaries.push(summary);
|
|
203
203
|
if (result.isErr()) {
|
|
204
204
|
summary.push(`${constant_1.SummaryConstant.Failed} ${result.error.message}`);
|
|
@@ -219,36 +219,10 @@ class Lifecycle {
|
|
|
219
219
|
envOutput.set(envVar, value);
|
|
220
220
|
process.env[envVar] = value;
|
|
221
221
|
}
|
|
222
|
-
ctx.logProvider.
|
|
222
|
+
ctx.logProvider.verbose(`Action ${this.stringifyDriverDef(driver)} in lifecycle ${this.name} succeeded with output ${Lifecycle.stringifyOutput(result.value)}`);
|
|
223
223
|
}
|
|
224
224
|
return { result: teamsfx_api_1.ok(envOutput), summaries };
|
|
225
225
|
}
|
|
226
|
-
async run(ctx) {
|
|
227
|
-
const maybeDrivers = this.resolveDriverInstances(ctx.logProvider);
|
|
228
|
-
if (maybeDrivers.isErr()) {
|
|
229
|
-
return teamsfx_api_1.err(maybeDrivers.error);
|
|
230
|
-
}
|
|
231
|
-
const drivers = maybeDrivers.value;
|
|
232
|
-
return Lifecycle.runDrivers(drivers, ctx);
|
|
233
|
-
}
|
|
234
|
-
static async runDrivers(drivers, ctx) {
|
|
235
|
-
const envOutput = new Map();
|
|
236
|
-
const unresolvedPlaceHolders = resolvePlaceHolders(drivers)[1];
|
|
237
|
-
if (unresolvedPlaceHolders.length > 0) {
|
|
238
|
-
return teamsfx_api_1.ok({ env: envOutput, unresolvedPlaceHolders });
|
|
239
|
-
}
|
|
240
|
-
for (const driver of drivers) {
|
|
241
|
-
const result = await driver.instance.run(driver.with, ctx);
|
|
242
|
-
if (result.isErr()) {
|
|
243
|
-
return teamsfx_api_1.err(result.error);
|
|
244
|
-
}
|
|
245
|
-
for (const [envVar, value] of result.value) {
|
|
246
|
-
envOutput.set(envVar, value);
|
|
247
|
-
process.env[envVar] = value;
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
return teamsfx_api_1.ok({ env: envOutput, unresolvedPlaceHolders });
|
|
251
|
-
}
|
|
252
226
|
stringifyDriverDef(def) {
|
|
253
227
|
if (def.name) {
|
|
254
228
|
return JSON.stringify({ name: def.name, uses: def.uses });
|
|
@@ -256,7 +230,7 @@ class Lifecycle {
|
|
|
256
230
|
return def.uses;
|
|
257
231
|
}
|
|
258
232
|
resolveDriverInstances(log) {
|
|
259
|
-
log.debug(`Trying to resolve actions for lifecycle ${this.name}`);
|
|
233
|
+
void log.debug(`Trying to resolve actions for lifecycle ${this.name}`);
|
|
260
234
|
const drivers = [];
|
|
261
235
|
for (const def of this.driverDefs) {
|
|
262
236
|
if (!typedi_1.Container.has(def.uses)) {
|
|
@@ -264,7 +238,7 @@ class Lifecycle {
|
|
|
264
238
|
}
|
|
265
239
|
const driver = typedi_1.Container.get(def.uses);
|
|
266
240
|
drivers.push(Object.assign({ instance: driver }, def));
|
|
267
|
-
log.debug(`Action ${this.stringifyDriverDef(def)} found for lifecycle ${this.name}`);
|
|
241
|
+
void log.debug(`Action ${this.stringifyDriverDef(def)} found for lifecycle ${this.name}`);
|
|
268
242
|
}
|
|
269
243
|
return teamsfx_api_1.ok(drivers);
|
|
270
244
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/component/configManager/lifecycle.ts"],"names":[],"mappings":";AAAA;;GAEG
|
|
1
|
+
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/component/configManager/lifecycle.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDAA+E;AAC/E,yDAAsC;AACtC,mCAAmC;AACnC,yCAA4D;AAG5D,gFAA6E;AAC7E,yCAAoG;AAUpG,uCAA+D;AAC/D,sDAAwD;AAExD,SAAS,gBAAgB,CACvB,GAAqB,EACrB,QAA8B,EAC9B,UAAkC;IAElC,MAAM,IAAI,GAAG,GAAG,CAAC,IAA+B,CAAC;IACjD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;KAC9C;IACD,IAAI,GAAG,CAAC,GAAG,EAAE;QACX,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE;YACvB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACvB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SACvD;KACF;AACH,CAAC;AAED,uEAAuE;AACvE,mDAAmD;AACnD,SAAS,mBAAmB,CAC1B,IAAwB;IAExB,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;KACrD;IACD,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,OAAO,CACd,KAAc,EACd,QAA8B,EAC9B,UAAkC;IAElC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;QACzC,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,OAAO,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;KACnD;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC/B,MAAM,QAAQ,GAAc,EAAE,CAAC;QAC/B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;YACrB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;SACjD;QACD,OAAO,QAAQ,CAAC;KACjB;SAAM,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACtD,MAAM,MAAM,GAAG,gBAAC,CAAC,SAAS,CAAC,KAAK,CAA4B,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAClC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;KACf;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,aAAa,CACpB,GAAW,EACX,QAA8B,EAC9B,UAAkC;IAElC,MAAM,cAAc,GAAG,uCAAuC,CAAC;IAC/D,IAAI,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,OAAO,OAAO,IAAI,IAAI,EAAE;QACtB,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,EAAE;YACX,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACzB;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;SAC7C;QACD,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACpC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAa,SAAS;IAIpB,YAAY,IAAmB,EAAE,UAA8B,EAAE,OAAe;QAC9E,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,mBAAmB;QACjB,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,MAA2B;QACxD,MAAM,GAAG,GAA2B,EAAE,CAAC;QAEvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,EAAE;YAC3B,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBAC3B,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;aACnB;iBAAM;gBACL,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACZ;SACF;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAkB;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3F,MAAM,iBAAiB,GAAG,IAAI,mDAAwB,CAAC,GAAG,CAAC,iBAAiB,EAAE;YAC5E,aAAa,EAAE,oBAAS;SACzB,CAAC,CAAC;QACH,iBAAiB,CAAC,cAAc,CAAC;YAC/B,SAAS,EAAE,kCAAuB;YAClC,UAAU,EAAE;gBACV,CAAC,4BAAiB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI;gBACxC,CAAC,4BAAiB,CAAC,OAAO,CAAC,EAAE,OAAO;aACrC;SACF,CAAC,CAAC;QACH,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAyB,EAAE,CAAC;QAC1C,MAAM,UAAU,GAA2B,EAAE,CAAC;QAC9C,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChF,IAAI,CAAsB,CAAC;QAC3B,IAAI,YAAgC,CAAC;QAErC,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;YACjB,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,gCAAgC,IAAI,CAAC,IAAI,aAAa,SAAS,CAAC,eAAe,CAC7E,MAAM,CAAC,KAAK,CACb,EAAE,CACJ,CAAC;SACH;aAAM;YACL,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;gBACnC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;gBACvB,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aAC3F;iBAAM,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBACjD,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACzE,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3D,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE;oBAC9C,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;oBAC9B,GAAG,CAAC,WAAW,CAAC,KAAK,CACnB,+BAA+B,IAAI,CAAC,IAAI,0BAA0B,YAAY,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,iBAAiB,MAAM,EAAE,CAChI,CAAC;iBACH;qBAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,wBAAwB,EAAE;oBAChE,uFAAuF;oBACvF,CAAC,GAAG,IAAI,wCAAgC,CACtC,oBAAS,EACT,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CACrD,CAAC;oBACF,GAAG,CAAC,WAAW,CAAC,KAAK,CACnB,+BACE,IAAI,CAAC,IACP,8CAA8C,IAAI,CAAC,SAAS,CAC1D,UAAU,CACX,gBAAgB,YAAY,iBAAiB,MAAM,EAAE,CACvD,CAAC;iBACH;aACF;SACF;QAED,iBAAiB,CAAC,YAAY,CAC5B;YACE,SAAS,EAAE,kCAAuB;YAClC,UAAU,EAAE;gBACV,CAAC,4BAAiB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI;gBACxC,CAAC,4BAAiB,CAAC,OAAO,CAAC,EAAE,OAAO;gBACpC,CAAC,4BAAiB,CAAC,oBAAoB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBAClE,CAAC,4BAAiB,CAAC,sBAAsB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;gBACtE,CAAC,4BAAiB,CAAC,YAAY,CAAC,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;aACrD;SACF,EACD,CAAC,CACF,CAAC;QAEF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,WAAW,CACf,GAAkB,EAClB,QAA8B,EAC9B,UAAgC;;QAEhC,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE;YACxB,OAAO,EAAE,MAAM,EAAE,iBAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;SACvF;QACD,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC;QACnC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,GAAG,CAAC,WAAW,CAAC,OAAO,CACrB,oBAAoB,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,iBAAiB,IAAI,CAAC,IAAI,EAAE,CAChF,CAAC;YACF,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE;gBACjC,MAAM,CAAA,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA,CAAC;aAC5D;YACD,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC/C,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,GAAG,CAAC,WAAW,CAAC,OAAO,CACrB,2BAA2B,UAAU,CAAC,IAAI,CACxC,GAAG,CACJ,sBAAsB,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,iBAAiB,IAAI,CAAC,IAAI,EAAE,CACnF,CAAC;gBACF,SAAS,CAAC,IAAI,CAAC;oBACb,GAAG,0BAAe,CAAC,MAAM,6BAA6B,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;iBAC7E,CAAC,CAAC;gBACH,OAAO;oBACL,MAAM,EAAE,iBAAG,CAAC;wBACV,IAAI,EAAE,gBAAgB;wBACtB,GAAG,EAAE,SAAS;wBACd,MAAM,EAAE;4BACN,IAAI,EAAE,wBAAwB;4BAC9B,YAAY,EAAE,MAAM;4BACpB,sBAAsB,EAAE,UAAU;yBACnC;qBACF,CAAC;oBACF,SAAS;iBACV,CAAC;aACH;YAED,IAAI,MAAM,CAAC,GAAG,EAAE;gBACd,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;oBACxD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;iBAC7B;aACF;YAED,4BAAe,CAAC,EAAE,SAAS,EAAE,kBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,kDAAkD;YAC7H,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CACrC,MAAM,CAAC,IAAI,EACX,GAAG,EACH,MAAM,CAAC,sBAAsB;gBAC3B,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;gBACxD,CAAC,CAAC,SAAS,EACb,IAAI,CAAC,OAAO,CACb,CAAC;YACF,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;YACxB,MAAM,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,0BAAe,CAAC,SAAS,IAAI,CAAC,EAAE,CAAC,CAAC;YAC5E,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxB,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,CAAC,IAAI,CAAC,GAAG,0BAAe,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAClE,OAAO;oBACL,MAAM,EAAE,iBAAG,CAAC;wBACV,IAAI,EAAE,gBAAgB;wBACtB,GAAG,EAAE,SAAS;wBACd,MAAM,EAAE;4BACN,IAAI,EAAE,aAAa;4BACnB,YAAY,EAAE,MAAM;4BACpB,KAAK,EAAE,MAAM,CAAC,KAAK;yBACpB;qBACF,CAAC;oBACF,SAAS;iBACV,CAAC;aACH;YAED,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC1C,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;aAC7B;YACD,GAAG,CAAC,WAAW,CAAC,OAAO,CACrB,UAAU,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,iBACvC,IAAI,CAAC,IACP,0BAA0B,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACpE,CAAC;SACH;QAED,OAAO,EAAE,MAAM,EAAE,gBAAE,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC;IAC9C,CAAC;IAEO,kBAAkB,CAAC,GAAqB;QAC9C,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IAEM,sBAAsB,CAAC,GAAgB;QAC5C,KAAK,GAAG,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE;YACjC,IAAI,CAAC,kBAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC5B,OAAO,iBAAG,CAAC,IAAI,+BAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;aACrD;YACD,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAa,GAAG,CAAC,IAAI,CAAC,CAAC;YACnD,OAAO,CAAC,IAAI,iBAAG,QAAQ,EAAE,MAAM,IAAK,GAAG,EAAG,CAAC;YAC3C,KAAK,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,wBAAwB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SAC3F;QACD,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;CACF;AAnND,8BAmNC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/parser.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAKlE,OAAO,EACL,WAAW,EACX,YAAY,EAIb,MAAM,aAAa,CAAC;AAuFrB,qBAAa,UAAW,YAAW,WAAW;IACtC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YA0B7E,QAAQ;CAqCvB;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
*/
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
5
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
5
|
exports.yamlParser = exports.YamlParser = void 0;
|
|
7
6
|
const tslib_1 = require("tslib");
|
|
7
|
+
/**
|
|
8
|
+
* @author yefuwang@microsoft.com
|
|
9
|
+
*/
|
|
8
10
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
11
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
10
12
|
const js_yaml_1 = require("js-yaml");
|
|
@@ -21,7 +23,7 @@ const versionNotSupportedKey = "error.yaml.VersionNotSupported";
|
|
|
21
23
|
function parseRawProjectModel(obj) {
|
|
22
24
|
const result = { version: "" };
|
|
23
25
|
if (environmentFolderPath in obj) {
|
|
24
|
-
if (typeof obj[
|
|
26
|
+
if (typeof obj[environmentFolderPath] !== "string") {
|
|
25
27
|
return teamsfx_api_1.err(new yml_1.YamlFieldTypeError("environmentFolderPath", "string"));
|
|
26
28
|
}
|
|
27
29
|
result.environmentFolderPath = obj[environmentFolderPath];
|
|
@@ -35,6 +37,11 @@ function parseRawProjectModel(obj) {
|
|
|
35
37
|
else {
|
|
36
38
|
return teamsfx_api_1.err(new yml_1.YamlFieldMissingError("version"));
|
|
37
39
|
}
|
|
40
|
+
if ("additionalMetadata" in obj) {
|
|
41
|
+
// No validation for additionalMetadata by design. This property is for telemetry related purpose only
|
|
42
|
+
// and should not affect user-observable behavior of TTK.
|
|
43
|
+
result.additionalMetadata = obj["additionalMetadata"];
|
|
44
|
+
}
|
|
38
45
|
for (const name of interface_1.LifecycleNames) {
|
|
39
46
|
if (name in obj) {
|
|
40
47
|
const value = obj[name];
|
|
@@ -99,20 +106,21 @@ class YamlParser {
|
|
|
99
106
|
if (raw.value.environmentFolderPath) {
|
|
100
107
|
result.environmentFolderPath = raw.value.environmentFolderPath;
|
|
101
108
|
}
|
|
109
|
+
if (raw.value.additionalMetadata) {
|
|
110
|
+
result.additionalMetadata = raw.value.additionalMetadata;
|
|
111
|
+
}
|
|
102
112
|
return teamsfx_api_1.ok(result);
|
|
103
113
|
}
|
|
104
114
|
async parseRaw(path, validateSchema) {
|
|
105
|
-
let diagnostic = undefined;
|
|
106
115
|
try {
|
|
107
116
|
globalVars_1.globalVars.ymlFilePath = path;
|
|
108
117
|
const str = await fs_extra_1.default.readFile(path, "utf8");
|
|
109
118
|
const content = js_yaml_1.load(str);
|
|
110
119
|
const value = content;
|
|
111
120
|
const version = typeof value["version"] === "string" ? value["version"] : undefined;
|
|
112
|
-
diagnostic = await validator.generateDiagnosticMessage(path, str, version);
|
|
113
121
|
// note: typeof null === "object" typeof undefined === "undefined" in js
|
|
114
122
|
if (typeof content !== "object" || Array.isArray(content) || content === null) {
|
|
115
|
-
return teamsfx_api_1.err(new yml_1.InvalidYamlSchemaError(path
|
|
123
|
+
return teamsfx_api_1.err(new yml_1.InvalidYamlSchemaError(path));
|
|
116
124
|
}
|
|
117
125
|
if (validateSchema) {
|
|
118
126
|
if (!validator.isVersionSupported(version !== null && version !== void 0 ? version : "undefined")) {
|
|
@@ -120,13 +128,13 @@ class YamlParser {
|
|
|
120
128
|
}
|
|
121
129
|
const valid = validator.validate(value, version);
|
|
122
130
|
if (!valid) {
|
|
123
|
-
return teamsfx_api_1.err(new yml_1.InvalidYamlSchemaError(path
|
|
131
|
+
return teamsfx_api_1.err(new yml_1.InvalidYamlSchemaError(path));
|
|
124
132
|
}
|
|
125
133
|
}
|
|
126
134
|
return parseRawProjectModel(value);
|
|
127
135
|
}
|
|
128
136
|
catch (error) {
|
|
129
|
-
return teamsfx_api_1.err(new yml_1.InvalidYamlSchemaError(path
|
|
137
|
+
return teamsfx_api_1.err(new yml_1.InvalidYamlSchemaError(path));
|
|
130
138
|
}
|
|
131
139
|
}
|
|
132
140
|
}
|