@microsoft/teamsfx-core 2.0.4-alpha.0237b70e3.0 → 2.0.4-alpha.06f5ef6da.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 +3 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +3 -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/constant/message.d.ts +2 -0
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +2 -0
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +12 -1
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +11 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/depsChecker.d.ts +7 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +1 -0
- package/build/common/deps-checker/depsChecker.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/testToolChecker.d.ts +45 -0
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/testToolChecker.js +359 -0
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -0
- 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 +4 -4
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/deps-checker/util/fileHelper.d.ts +1 -0
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -1
- package/build/common/deps-checker/util/fileHelper.js +9 -1
- 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 +3 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +14 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +1 -5
- 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 +66 -19
- 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 +17 -5
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +76 -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/adaptiveCardWrapper.d.ts +3 -0
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts.map +1 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js +21 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js.map +1 -0
- package/build/common/spec-parser/constants.d.ts +23 -7
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +45 -7
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +77 -13
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +24 -13
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +7 -0
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -0
- package/build/common/spec-parser/manifestUpdater.js +155 -0
- package/build/common/spec-parser/manifestUpdater.js.map +1 -0
- package/build/common/spec-parser/specFilter.d.ts +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +25 -34
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +10 -4
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +172 -93
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +29 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -0
- package/build/common/spec-parser/utils.js +314 -0
- package/build/common/spec-parser/utils.js.map +1 -0
- package/build/common/telemetry.d.ts +7 -4
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +43 -8
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +7 -2
- package/build/common/tools.js.map +1 -1
- package/build/common/versionMetadata.d.ts +1 -0
- package/build/common/versionMetadata.d.ts.map +1 -1
- package/build/common/versionMetadata.js +1 -0
- package/build/common/versionMetadata.js.map +1 -1
- package/build/component/configManager/interface.d.ts +5 -3
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/interface.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts +1 -3
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +23 -51
- 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 +7 -8
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +6 -6
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +6 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +7 -1
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +13 -8
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +84 -68
- 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 +2 -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 -2
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +8 -11
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts +5 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts.map +1 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js +21 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js.map +1 -0
- 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 +13 -1
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -2
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +4 -11
- 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/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 +19 -0
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +7 -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/botAadApp/create.d.ts +2 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +11 -10
- 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 +27 -16
- 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/constant.d.ts +2 -0
- package/build/component/driver/devTool/constant.d.ts.map +1 -1
- package/build/component/driver/devTool/constant.js +4 -0
- package/build/component/driver/devTool/constant.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts +5 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts.map +1 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +24 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.map +1 -0
- package/build/component/driver/devTool/installDriver.d.ts +2 -0
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +84 -13
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +8 -0
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.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 +30 -29
- 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 +11 -5
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +53 -12
- 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 +4 -3
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +53 -43
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +4 -0
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +9 -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/utils/ManifestUtils.d.ts +3 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +24 -6
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +2 -2
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +22 -10
- 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 +17 -12
- 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 +6 -11
- 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 +13 -6
- 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 +55 -26
- 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 +154 -28
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +14 -7
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +241 -39
- 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 +30 -21
- 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/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 +9 -5
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +10 -8
- 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 +11 -11
- package/build/component/generator/spfx/spfxGenerator.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 +3 -3
- 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.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.js +2 -2
- 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 +11 -9
- 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.js +3 -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/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +8 -4
- 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 +6 -4
- 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 +16 -3
- 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 +9 -4
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +2 -2
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts +42 -34
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +831 -68
- 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/environment.d.ts +2 -9
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +17 -13
- package/build/core/environment.js.map +1 -1
- package/build/core/environmentName.d.ts +18 -0
- package/build/core/environmentName.d.ts.map +1 -0
- package/build/core/environmentName.js +35 -0
- package/build/core/environmentName.js.map +1 -0
- 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/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/projectMigratorV3.d.ts +4 -0
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +34 -32
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/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/core/telemetry.d.ts +1 -0
- package/build/core/telemetry.d.ts.map +1 -1
- package/build/core/telemetry.js +3 -3
- package/build/core/telemetry.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +10 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts +5 -5
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +21 -5
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +8 -11
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +67 -53
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +21 -2
- package/build/error/deploy.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +4 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +7 -2
- package/build/error/script.js.map +1 -1
- package/build/error/types.d.ts +6 -0
- package/build/error/types.d.ts.map +1 -0
- package/build/error/types.js +12 -0
- package/build/error/types.js.map +1 -0
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +6 -0
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +5 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +6 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +6 -0
- package/build/question/constants.d.ts.map +1 -0
- package/build/question/constants.js +18 -0
- package/build/question/constants.js.map +1 -0
- package/build/question/create.d.ts +30 -9
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +409 -300
- 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 +19 -30
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +14 -47
- 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 +38 -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 +134 -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 +39 -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 +12 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +133 -35
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +6 -2
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +8 -3
- package/build/question/questionNames.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 +262 -234
- package/build/ui/visitor.js.map +1 -1
- package/package.json +19 -12
- package/resource/package.nls.cs.json +83 -23
- package/resource/package.nls.de.json +81 -21
- package/resource/package.nls.es.json +83 -23
- package/resource/package.nls.fr.json +82 -22
- package/resource/package.nls.it.json +82 -22
- package/resource/package.nls.ja.json +83 -23
- package/resource/package.nls.json +71 -21
- package/resource/package.nls.ko.json +82 -22
- package/resource/package.nls.pl.json +83 -23
- package/resource/package.nls.pt-BR.json +84 -24
- package/resource/package.nls.ru.json +84 -24
- package/resource/package.nls.tr.json +82 -22
- package/resource/package.nls.zh-Hans.json +82 -22
- package/resource/package.nls.zh-Hant.json +82 -22
- package/resource/package.nls.zh-cn.json +82 -22
- package/resource/package.nls.zh-tw.json +82 -22
- package/resource/yaml-schema/{1.1.1 → v1.2}/yaml.schema.json +11 -5
- package/resource/yaml-schema/v1.3/yaml.schema.json +1500 -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/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 -47
- package/build/core/FxCoreImplementV3.d.ts.map +0 -1
- package/build/core/FxCoreImplementV3.js +0 -690
- package/build/core/FxCoreImplementV3.js.map +0 -1
|
@@ -22,9 +22,11 @@ const constants_2 = require("../constants");
|
|
|
22
22
|
const errors_1 = require("../errors");
|
|
23
23
|
const results_1 = require("../results");
|
|
24
24
|
const telemetry_1 = require("./telemetry");
|
|
25
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
26
|
+
const globalVars_1 = require("../../../../core/globalVars");
|
|
25
27
|
class ManifestUtils {
|
|
26
28
|
async readAppManifest(projectPath) {
|
|
27
|
-
const filePath =
|
|
29
|
+
const filePath = this.getTeamsAppManifestPath(projectPath);
|
|
28
30
|
return await this._readAppManifest(filePath);
|
|
29
31
|
}
|
|
30
32
|
async _readAppManifest(manifestTemplatePath) {
|
|
@@ -36,8 +38,13 @@ class ManifestUtils {
|
|
|
36
38
|
let content = await fs_extra_1.default.readFile(manifestTemplatePath, { encoding: "utf-8" });
|
|
37
39
|
content = strip_bom_1.default(content);
|
|
38
40
|
const contentV3 = migrate_1.convertManifestTemplateToV3(content);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
try {
|
|
42
|
+
const manifest = JSON.parse(contentV3);
|
|
43
|
+
return teamsfx_api_1.ok(manifest);
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
return teamsfx_api_1.err(new common_1.JSONSyntaxError(manifestTemplatePath, e, "ManifestUtils"));
|
|
47
|
+
}
|
|
41
48
|
}
|
|
42
49
|
async _writeAppManifest(appManifest, manifestTemplatePath) {
|
|
43
50
|
const content = JSON.stringify(appManifest, undefined, 4);
|
|
@@ -45,7 +52,7 @@ class ManifestUtils {
|
|
|
45
52
|
await fs_extra_1.default.writeFile(manifestTemplatePath, contentV2);
|
|
46
53
|
return teamsfx_api_1.ok(undefined);
|
|
47
54
|
}
|
|
48
|
-
|
|
55
|
+
getTeamsAppManifestPath(projectPath) {
|
|
49
56
|
const filePath = path.join(projectPath, "appPackage", "manifest.json");
|
|
50
57
|
return filePath;
|
|
51
58
|
}
|
|
@@ -70,6 +77,7 @@ class ManifestUtils {
|
|
|
70
77
|
else {
|
|
71
78
|
if (capability.existingApp) {
|
|
72
79
|
const template = lodash_1.cloneDeep(constants_2.STATIC_TABS_TPL_EXISTING_APP[0]);
|
|
80
|
+
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
|
|
73
81
|
template.entityId = "index" + staticTabIndex;
|
|
74
82
|
appManifest.staticTabs.push(template);
|
|
75
83
|
}
|
|
@@ -78,6 +86,7 @@ class ManifestUtils {
|
|
|
78
86
|
? constants_2.STATIC_TABS_TPL_V3[1]
|
|
79
87
|
: constants_2.STATIC_TABS_TPL_V3[0];
|
|
80
88
|
const template = lodash_1.cloneDeep(tabManifest);
|
|
89
|
+
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
|
|
81
90
|
template.entityId = "index" + staticTabIndex;
|
|
82
91
|
appManifest.staticTabs.push(template);
|
|
83
92
|
}
|
|
@@ -229,7 +238,7 @@ class ManifestUtils {
|
|
|
229
238
|
});
|
|
230
239
|
return ids;
|
|
231
240
|
}
|
|
232
|
-
async getManifestV3(manifestTemplatePath, generateIdIfNotResolved = true) {
|
|
241
|
+
async getManifestV3(manifestTemplatePath, context, generateIdIfNotResolved = true) {
|
|
233
242
|
const manifestRes = await exports.manifestUtils._readAppManifest(manifestTemplatePath);
|
|
234
243
|
if (manifestRes.isErr()) {
|
|
235
244
|
return teamsfx_api_1.err(manifestRes.error);
|
|
@@ -245,7 +254,10 @@ class ManifestUtils {
|
|
|
245
254
|
// Add environment variable keys to telemetry
|
|
246
255
|
const customizedKeys = common_2.getEnvironmentVariables(manifestTemplateString);
|
|
247
256
|
const telemetryProps = {};
|
|
248
|
-
telemetryProps[telemetry_1.TelemetryPropertyKey.customizedKeys] =
|
|
257
|
+
telemetryProps[telemetry_1.TelemetryPropertyKey.customizedKeys] = customizedKeys.join(";");
|
|
258
|
+
if (context) {
|
|
259
|
+
context.addTelemetryProperties(telemetryProps);
|
|
260
|
+
}
|
|
249
261
|
const resolvedManifestString = common_2.expandEnvironmentVariable(manifestTemplateString);
|
|
250
262
|
const tokens = common_2.getEnvironmentVariables(resolvedManifestString);
|
|
251
263
|
if (tokens.length > 0) {
|
|
@@ -273,6 +285,12 @@ class ManifestUtils {
|
|
|
273
285
|
return teamsfx_api_1.ok(manifest);
|
|
274
286
|
}
|
|
275
287
|
}
|
|
288
|
+
tslib_1.__decorate([
|
|
289
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "ManifestUtils" })]),
|
|
290
|
+
tslib_1.__metadata("design:type", Function),
|
|
291
|
+
tslib_1.__metadata("design:paramtypes", [String]),
|
|
292
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
293
|
+
], ManifestUtils.prototype, "_readAppManifest", null);
|
|
276
294
|
exports.ManifestUtils = ManifestUtils;
|
|
277
295
|
exports.manifestUtils = new ManifestUtils();
|
|
278
296
|
//# sourceMappingURL=ManifestUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAUgC;AAChC,8DAA6B;AAC7B,gEAA0B;AAC1B,mCAAmC;AACnC,mDAA6B;AAC7B,4BAA0B;AAC1B,kEAAiC;AACjC,+BAA0B;AAC1B,0EAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare enum TelemetryPropertyKey {
|
|
|
11
11
|
tenantId = "tenant-id",
|
|
12
12
|
publishedAppId = "published-app-id",
|
|
13
13
|
customizedKeys = "customized-manifest-keys",
|
|
14
|
+
customizedOpenAPIKeys = "customized-openapi-keys",
|
|
14
15
|
validationErrors = "validation-errors",
|
|
15
16
|
validationWarnings = "validation-warnings",
|
|
16
17
|
OverwriteIfAppAlreadyExists = "overwrite-if-app-already-exists",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,2BAA2B,oCAAoC;IAC/D,MAAM,WAAW;CAClB;AASD,oBAAY,kBAAkB;IAC5B,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,gBAAgB,sBAAsB;IACtC,YAAY,mBAAmB;IAC/B,UAAU,iBAAiB;CAC5B;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAAC;WAEtB,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa;WAIjC,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAY5B,gBAAgB,CAC5B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAS5B,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,GAAG,SAAS,EAC9B,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAwB1C,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAGjC"}
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,qBAAqB,4BAA4B;IACjD,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,2BAA2B,oCAAoC;IAC/D,MAAM,WAAW;CAClB;AASD,oBAAY,kBAAkB;IAC5B,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,gBAAgB,sBAAsB;IACtC,YAAY,mBAAmB;IAC/B,UAAU,iBAAiB;CAC5B;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAAC;WAEtB,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa;WAIjC,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAY5B,gBAAgB,CAC5B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAS5B,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,GAAG,SAAS,EAC9B,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAwB1C,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAGjC"}
|
|
@@ -17,6 +17,7 @@ var TelemetryPropertyKey;
|
|
|
17
17
|
TelemetryPropertyKey["tenantId"] = "tenant-id";
|
|
18
18
|
TelemetryPropertyKey["publishedAppId"] = "published-app-id";
|
|
19
19
|
TelemetryPropertyKey["customizedKeys"] = "customized-manifest-keys";
|
|
20
|
+
TelemetryPropertyKey["customizedOpenAPIKeys"] = "customized-openapi-keys";
|
|
20
21
|
TelemetryPropertyKey["validationErrors"] = "validation-errors";
|
|
21
22
|
TelemetryPropertyKey["validationWarnings"] = "validation-warnings";
|
|
22
23
|
TelemetryPropertyKey["OverwriteIfAppAlreadyExists"] = "overwrite-if-app-already-exists";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAyE;AAEzE,4CAAyC;AAEzC,IAAY,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ export declare function isGroupApp(appDefinition: AppDefinition): boolean;
|
|
|
6
6
|
export declare function needTabAndBotCode(appDefinition: AppDefinition): boolean;
|
|
7
7
|
export declare function needTabCode(appDefinition: AppDefinition): boolean;
|
|
8
8
|
export declare function isBot(appDefinition: AppDefinition): boolean;
|
|
9
|
-
export declare function
|
|
10
|
-
export declare function
|
|
9
|
+
export declare function isBotBasedMessageExtension(appDefinition: AppDefinition): boolean;
|
|
10
|
+
export declare function isBotAndBotBasedMessageExtension(appDefinition: AppDefinition): boolean;
|
|
11
11
|
export declare function needBotCode(appDefinition: AppDefinition): boolean;
|
|
12
12
|
export declare function containsUnsupportedFeature(appDefinition: AppDefinition): boolean;
|
|
13
13
|
export declare function getFeaturesFromAppDefinition(appDefinition: AppDefinition): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhF;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEtF;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAUD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAYhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,qBAAa,YAAY;IACvB,OAAc,OAAO,SAAK;WACN,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAkB3E"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RetryHandler = exports.MeetingsContext = exports.CommandScope = exports.hasMeetingExtension = exports.getFeaturesFromAppDefinition = exports.containsUnsupportedFeature = exports.needBotCode = exports.
|
|
3
|
+
exports.RetryHandler = exports.MeetingsContext = exports.CommandScope = exports.hasMeetingExtension = exports.getFeaturesFromAppDefinition = exports.containsUnsupportedFeature = exports.needBotCode = exports.isBotAndBotBasedMessageExtension = exports.isBotBasedMessageExtension = exports.isBot = exports.needTabCode = exports.needTabAndBotCode = exports.isGroupApp = exports.isPersonalApp = exports.renderTemplate = exports.getCustomizedKeys = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
@@ -69,24 +69,36 @@ function isBot(appDefinition) {
|
|
|
69
69
|
return !!appDefinition.bots && appDefinition.bots.length > 0;
|
|
70
70
|
}
|
|
71
71
|
exports.isBot = isBot;
|
|
72
|
-
function
|
|
73
|
-
return !!appDefinition.messagingExtensions &&
|
|
72
|
+
function isBotBasedMessageExtension(appDefinition) {
|
|
73
|
+
return (!!appDefinition.messagingExtensions &&
|
|
74
|
+
appDefinition.messagingExtensions.length > 0 &&
|
|
75
|
+
!!appDefinition.messagingExtensions[0].botId);
|
|
74
76
|
}
|
|
75
|
-
exports.
|
|
76
|
-
function
|
|
77
|
-
return isBot(appDefinition) &&
|
|
77
|
+
exports.isBotBasedMessageExtension = isBotBasedMessageExtension;
|
|
78
|
+
function isBotAndBotBasedMessageExtension(appDefinition) {
|
|
79
|
+
return isBot(appDefinition) && isBotBasedMessageExtension(appDefinition);
|
|
78
80
|
}
|
|
79
|
-
exports.
|
|
81
|
+
exports.isBotAndBotBasedMessageExtension = isBotAndBotBasedMessageExtension;
|
|
80
82
|
function needBotCode(appDefinition) {
|
|
81
|
-
return isBot(appDefinition) ||
|
|
83
|
+
return isBot(appDefinition) || isBotBasedMessageExtension(appDefinition);
|
|
82
84
|
}
|
|
83
85
|
exports.needBotCode = needBotCode;
|
|
86
|
+
function isApiBasedMessageExtension(appDefinition) {
|
|
87
|
+
var _a;
|
|
88
|
+
return (!!appDefinition.messagingExtensions &&
|
|
89
|
+
appDefinition.messagingExtensions.length > 0 &&
|
|
90
|
+
((_a = appDefinition.messagingExtensions[0].messagingExtensionServiceType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "apibased");
|
|
91
|
+
}
|
|
84
92
|
function containsUnsupportedFeature(appDefinition) {
|
|
85
93
|
var _a, _b, _c, _d, _e;
|
|
86
94
|
const hasScene = (_b = (_a = appDefinition === null || appDefinition === void 0 ? void 0 : appDefinition.meetingExtensionDefinition) === null || _a === void 0 ? void 0 : _a.scenes) === null || _b === void 0 ? void 0 : _b.length;
|
|
87
95
|
const hasConnector = !!((_c = appDefinition === null || appDefinition === void 0 ? void 0 : appDefinition.connectors) === null || _c === void 0 ? void 0 : _c.length);
|
|
88
96
|
const hasActivies = (_e = (_d = appDefinition === null || appDefinition === void 0 ? void 0 : appDefinition.activities) === null || _d === void 0 ? void 0 : _d.activityTypes) === null || _e === void 0 ? void 0 : _e.length;
|
|
89
|
-
return !!hasScene ||
|
|
97
|
+
return (!!hasScene ||
|
|
98
|
+
!!hasConnector ||
|
|
99
|
+
!!hasActivies ||
|
|
100
|
+
hasMeetingExtension(appDefinition) ||
|
|
101
|
+
isApiBasedMessageExtension(appDefinition));
|
|
90
102
|
}
|
|
91
103
|
exports.containsUnsupportedFeature = containsUnsupportedFeature;
|
|
92
104
|
function getFeaturesFromAppDefinition(appDefinition) {
|
|
@@ -104,7 +116,7 @@ function getFeaturesFromAppDefinition(appDefinition) {
|
|
|
104
116
|
if (isBot(appDefinition)) {
|
|
105
117
|
features.push(bot);
|
|
106
118
|
}
|
|
107
|
-
if (
|
|
119
|
+
if (isBotBasedMessageExtension(appDefinition)) {
|
|
108
120
|
features.push(messageExtension);
|
|
109
121
|
}
|
|
110
122
|
return features;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { WrapDriverContext } from "../util/wrapUtil";
|
|
|
5
5
|
import { ValidateManifestArgs } from "./interfaces/ValidateManifestArgs";
|
|
6
6
|
export declare class ValidateManifestDriver implements StepDriver {
|
|
7
7
|
description: string;
|
|
8
|
-
|
|
8
|
+
readonly progressTitle: string;
|
|
9
9
|
execute(args: ValidateManifestArgs, context: DriverContext): Promise<ExecutionResult>;
|
|
10
10
|
validate(args: ValidateManifestArgs, context: WrapDriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
11
11
|
private validateArgs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA2C,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA2C,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAczE,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAoE;IAC/E,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAqIhD,OAAO,CAAC,YAAY;CAYrB"}
|
|
@@ -19,17 +19,12 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
|
19
19
|
const constants_1 = require("../../../common/constants");
|
|
20
20
|
const common_1 = require("../../utils/common");
|
|
21
21
|
const constant_1 = require("../../configManager/constant");
|
|
22
|
-
const updateProgress_1 = require("../middleware/updateProgress");
|
|
23
22
|
const common_2 = require("../../../error/common");
|
|
24
23
|
const actionName = "teamsApp/validateManifest";
|
|
25
24
|
let ValidateManifestDriver = class ValidateManifestDriver {
|
|
26
25
|
constructor() {
|
|
27
26
|
this.description = localizeUtils_1.getLocalizedString("driver.teamsApp.description.validateDriver");
|
|
28
|
-
|
|
29
|
-
async run(args, context) {
|
|
30
|
-
const wrapContext = new wrapUtil_1.WrapDriverContext(context, actionName, actionName);
|
|
31
|
-
const res = await this.validate(args, wrapContext);
|
|
32
|
-
return res;
|
|
27
|
+
this.progressTitle = localizeUtils_1.getLocalizedString("plugins.appstudio.validateManifest.progressBar.message");
|
|
33
28
|
}
|
|
34
29
|
async execute(args, context) {
|
|
35
30
|
const wrapContext = new wrapUtil_1.WrapDriverContext(context, actionName, actionName);
|
|
@@ -46,7 +41,7 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
46
41
|
if (result.isErr()) {
|
|
47
42
|
return teamsfx_api_1.err(result.error);
|
|
48
43
|
}
|
|
49
|
-
const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(common_1.getAbsolutePath(args.manifestPath, context.projectPath));
|
|
44
|
+
const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(common_1.getAbsolutePath(args.manifestPath, context.projectPath), context);
|
|
50
45
|
if (manifestRes.isErr()) {
|
|
51
46
|
return teamsfx_api_1.err(manifestRes.error);
|
|
52
47
|
}
|
|
@@ -119,7 +114,20 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
119
114
|
context.logProvider.info(validationSuccess);
|
|
120
115
|
}
|
|
121
116
|
if (args.showMessage) {
|
|
122
|
-
(
|
|
117
|
+
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
118
|
+
const outputMessage = [
|
|
119
|
+
{
|
|
120
|
+
content: "Teams Toolkit has completed checking your app package against validation rules. " +
|
|
121
|
+
summaryStr +
|
|
122
|
+
".",
|
|
123
|
+
color: teamsfx_api_1.Colors.BRIGHT_GREEN,
|
|
124
|
+
},
|
|
125
|
+
];
|
|
126
|
+
context.logProvider.info(outputMessage);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
(_d = context.ui) === null || _d === void 0 ? void 0 : _d.showMessage("info", validationSuccess, false);
|
|
130
|
+
}
|
|
123
131
|
}
|
|
124
132
|
return teamsfx_api_1.ok(new Map());
|
|
125
133
|
}
|
|
@@ -132,10 +140,7 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
132
140
|
}
|
|
133
141
|
};
|
|
134
142
|
tslib_1.__decorate([
|
|
135
|
-
lib_1.hooks([
|
|
136
|
-
addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
|
|
137
|
-
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("plugins.appstudio.validateManifest.progressBar.message")),
|
|
138
|
-
]),
|
|
143
|
+
lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
|
|
139
144
|
tslib_1.__metadata("design:type", Function),
|
|
140
145
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext]),
|
|
141
146
|
tslib_1.__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkG;AAClG,+CAA8C;AAC9C,mCAAiC;AACjC,2BAAyB;AACzB,mCAA+B;AAG/B,+CAAqD;AAErD,mFAAgF;AAChF,iDAAyE;AACzE,uCAAmD;AACnD,qCAA0C;AAC1C,yDAAsD;AACtD,iEAAqF;AACrF,yDAAsD;AACtD,+CAAqD;AACrD,2DAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { WrapDriverContext } from "../util/wrapUtil";
|
|
|
8
8
|
import { ValidateAppPackageArgs } from "./interfaces/ValidateAppPackageArgs";
|
|
9
9
|
export declare class ValidateAppPackageDriver implements StepDriver {
|
|
10
10
|
description: string;
|
|
11
|
-
|
|
11
|
+
readonly progressTitle: string;
|
|
12
12
|
execute(args: ValidateAppPackageArgs, context: DriverContext): Promise<ExecutionResult>;
|
|
13
13
|
validate(args: ValidateAppPackageArgs, context: WrapDriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
14
14
|
private validateArgs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,MAAM,EACN,OAAO,
|
|
1
|
+
{"version":3,"file":"validateAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,MAAM,EACN,OAAO,EAQR,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAgB7E,qBACa,wBAAyB,YAAW,UAAU;IACzD,WAAW,SAAoE;IAC/E,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAuOhD,OAAO,CAAC,YAAY;CAYrB"}
|
|
@@ -26,17 +26,12 @@ const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
|
26
26
|
const constants_1 = require("./constants");
|
|
27
27
|
const metadataUtil_1 = require("../../utils/metadataUtil");
|
|
28
28
|
const constant_1 = require("../../configManager/constant");
|
|
29
|
-
const updateProgress_1 = require("../middleware/updateProgress");
|
|
30
29
|
const common_1 = require("../../../error/common");
|
|
31
30
|
const actionName = "teamsApp/validateAppPackage";
|
|
32
31
|
let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
33
32
|
constructor() {
|
|
34
33
|
this.description = localizeUtils_1.getLocalizedString("driver.teamsApp.description.validateDriver");
|
|
35
|
-
|
|
36
|
-
async run(args, context) {
|
|
37
|
-
const wrapContext = new wrapUtil_1.WrapDriverContext(context, actionName, actionName);
|
|
38
|
-
const res = await this.validate(args, wrapContext);
|
|
39
|
-
return res;
|
|
34
|
+
this.progressTitle = localizeUtils_1.getLocalizedString("plugins.appstudio.validateAppPackage.progressBar.message");
|
|
40
35
|
}
|
|
41
36
|
async execute(args, context) {
|
|
42
37
|
const wrapContext = new wrapUtil_1.WrapDriverContext(context, actionName, actionName);
|
|
@@ -67,6 +62,9 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
|
67
62
|
const manifestContent = manifestFile.getData().toString();
|
|
68
63
|
const manifest = JSON.parse(manifestContent);
|
|
69
64
|
metadataUtil_1.metadataUtil.parseManifest(manifest);
|
|
65
|
+
// Add common properties like isCopilotPlugin: boolean
|
|
66
|
+
const manifestTelemetries = teamsfx_api_1.ManifestUtil.parseCommonTelemetryProperties(manifest);
|
|
67
|
+
lodash_1.merge(context.telemetryProperties, manifestTelemetries);
|
|
70
68
|
}
|
|
71
69
|
const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
|
|
72
70
|
scopes: tools_1.AppStudioScopes,
|
|
@@ -198,7 +196,7 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
|
198
196
|
localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate", summaryStr.join(", "), errors, warnings, path.resolve((_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
|
|
199
197
|
(_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.info(outputMessage);
|
|
200
198
|
// logs in log file
|
|
201
|
-
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.
|
|
199
|
+
await ((_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.logInFile(teamsfx_api_1.LogLevel.Info, `${outputMessage}\n${errors}\n${warnings}\n${notes}`));
|
|
202
200
|
const defaultMesage = localizeUtils_1.getDefaultString("driver.teamsApp.validate.result", summaryStr.join(", "));
|
|
203
201
|
const displayMessage = localizeUtils_1.getLocalizedString("driver.teamsApp.validate.result.display", summaryStr.join(", "));
|
|
204
202
|
if (args.showMessage) {
|
|
@@ -241,10 +239,7 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
|
241
239
|
}
|
|
242
240
|
};
|
|
243
241
|
tslib_1.__decorate([
|
|
244
|
-
lib_1.hooks([
|
|
245
|
-
addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
|
|
246
|
-
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("plugins.appstudio.validateAppPackage.progressBar.message")),
|
|
247
|
-
]),
|
|
242
|
+
lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
|
|
248
243
|
tslib_1.__metadata("design:type", Function),
|
|
249
244
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext]),
|
|
250
245
|
tslib_1.__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,
|
|
1
|
+
{"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDAUgC;AAChC,+CAA8C;AAC9C,mCAAiC;AACjC,gEAA0B;AAC1B,mDAA6B;AAC7B,2BAAyB;AACzB,mCAA+B;AAG/B,+CAAqD;AAErD,mFAAgF;AAChF,iDAAyE;AACzE,uCAAmD;AACnD,qCAA0C;AAC1C,+DAA4D;AAC5D,iEAAqF;AACrF,iDAAwD;AACxD,8DAA6B;AAC7B,2CAAwC;AACxC,2DAAwD;AACxD,2DAA+D;AAC/D,kDAAmF;AAEnF,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAGjD,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAArC;QACE,gBAAW,GAAG,kCAAkB,CAAC,4CAA4C,CAAC,CAAC;QACtE,kBAAa,GAAG,kCAAkB,CACzC,0DAA0D,CAC3D,CAAC;IAqQJ,CAAC;IAnQQ,KAAK,CAAC,OAAO,CAClB,IAA4B,EAC5B,OAAsB;QAEtB,MAAM,WAAW,GAAG,IAAI,4BAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACnD,OAAO;YACL,MAAM,EAAE,GAAG;YACX,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC;IACJ,CAAC;IAGM,KAAK,CAAC,QAAQ,CACnB,IAA4B,EAC5B,OAA0B;;QAE1B,0BAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;QAED,IAAI,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpC,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;SACjE;QACD,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE;YAC1C,OAAO,iBAAG,CAAC,IAAI,0BAAiB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;SAC/D;QACD,MAAM,YAAY,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAEvD,MAAM,UAAU,GAAG,IAAI,iBAAM,CAAC,YAAY,CAAC,CAAC,UAAU,EAAE,CAAC;QACzD,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,qBAAS,CAAC,aAAa,CAAC,CAAC;QACrF,IAAI,YAAY,EAAE;YAChB,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAqB,CAAC;YACjE,2BAAY,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAErC,sDAAsD;YACtD,MAAM,mBAAmB,GAAG,0BAAY,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;YAClF,cAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;SACzD;QAED,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC;YACvE,MAAM,EAAE,uBAAe;SACxB,CAAC,CAAC;QACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SACrC;QACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;QAE/C,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,iCAAe,CAAC,iCAAiC,CAC9E,YAAY,EACZ,cAAc,CACf,CAAC;YAEF,IAAI,OAAO,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;gBACrC,MAAM,aAAa,GAA8C;oBAC/D;wBACE,OAAO,EAAE,wEAAwE;wBACjF,KAAK,EAAE,oBAAM,CAAC,YAAY;qBAC3B;iBACF,CAAC;gBACF,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtC,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,MAAM,WAAW;wBACrD,KAAK,EAAE,oBAAM,CAAC,UAAU;qBACzB,CAAC,CAAC;oBACH,cAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE;wBACjC,CAAC,gCAAoB,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,MAAM;6BAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;6BACnB,IAAI,CAAC,GAAG,CAAC;qBACb,CAAC,CAAC;iBACJ;gBACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxC,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EACL,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,UAAU;4BAC7C,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;4BACjD,IAAI;wBACN,KAAK,EAAE,oBAAM,CAAC,aAAa;qBAC5B,CAAC,CAAC;oBACH,cAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE;wBACjC,CAAC,gCAAoB,CAAC,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,QAAQ;6BACjE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;6BACnB,IAAI,CAAC,GAAG,CAAC;qBACb,CAAC,CAAC;iBACJ;gBACD,aAAa,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,YAAY;oBACrD,KAAK,EAAE,oBAAM,CAAC,YAAY;iBAC3B,CAAC,CAAC;gBACH,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;oBACpC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,0BAAe,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,oBAAM,CAAC,UAAU,EAAE,CAAC,CAAC;oBACxF,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,MAAM,kCAAkB,CAAC,uBAAuB,CAAC,IAAI;wBAC9E,KAAK,EAAE,oBAAM,CAAC,YAAY;qBAC3B,CAAC,CAAC;oBACH,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,IAAI,EAAE,KAAK,EAAE,oBAAM,CAAC,WAAW,EAAE,CAAC,CAAC;gBACnF,CAAC,CAAC,CAAC;gBACH,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;oBACxC,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EAAE,GAAG,0BAAe,CAAC,WAAW,GAAG;wBAC1C,KAAK,EAAE,oBAAM,CAAC,aAAa;qBAC5B,CAAC,CAAC;oBACH,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,MAAM,kCAAkB,CAAC,uBAAuB,CAAC,IAAI;wBAChF,KAAK,EAAE,oBAAM,CAAC,YAAY;qBAC3B,CAAC,CAAC;oBACH,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,KAAK,EAAE,oBAAM,CAAC,WAAW,EAAE,CAAC,CAAC;gBACrF,CAAC,CAAC,CAAC;gBACH,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBAClC,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EAAE,GAAG,0BAAe,CAAC,SAAS,GAAG;wBACxC,KAAK,EAAE,oBAAM,CAAC,YAAY;qBAC3B,CAAC,CAAC;oBACH,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI;wBAC5B,KAAK,EAAE,oBAAM,CAAC,YAAY;qBAC3B,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,MAAA,OAAO,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;gBACtD,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtC,MAAM,OAAO,GAAG,mFAAmF,gBAAgB,CAAC,MAAM,CAAC,MAAM,UAAU,CAAC;oBAC5I,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAAC,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EAAE;wBAC1E,OAAO;wBACP,OAAO;qBACR,CAAC,CACH,CAAC;iBACH;qBAAM;oBACL,OAAO,gBAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;iBACtB;aACF;iBAAM;gBACL,wBAAwB;gBACxB,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM;qBACnC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;oBACb,OAAO,GAAG,0BAAe,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,MAAM,kCAAkB,CACvE,uBAAuB,CACxB,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;gBACxB,CAAC,CAAC;qBACD,IAAI,CAAC,QAAG,CAAC,CAAC;gBACb,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ;qBACvC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;oBACf,OAAO,GAAG,0BAAe,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,MAAM,kCAAkB,CAC9E,uBAAuB,CACxB,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC1B,CAAC,CAAC;qBACD,IAAI,CAAC,QAAG,CAAC,CAAC;gBACb,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK;qBACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACZ,OAAO,GAAG,0BAAe,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACxD,CAAC,CAAC;qBACD,IAAI,CAAC,QAAG,CAAC,CAAC;gBAEb,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC7C,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAC9C,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/C,MAAM,UAAU,GAAG,EAAE,CAAC;gBACtB,IAAI,MAAM,GAAG,CAAC,EAAE;oBACd,UAAU,CAAC,IAAI,CAAC,kCAAkB,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAC,CAAC;oBACvF,cAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE;wBACjC,CAAC,gCAAoB,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,MAAM;6BAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;6BACnB,IAAI,CAAC,GAAG,CAAC;qBACb,CAAC,CAAC;iBACJ;gBACD,IAAI,KAAK,GAAG,CAAC,EAAE;oBACb,UAAU,CAAC,IAAI,CACb,kCAAkB,CAAC,0CAA0C,EAAE,KAAK,CAAC;wBACnE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CACzB,CAAC;oBACF,cAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE;wBACjC,CAAC,gCAAoB,CAAC,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,QAAQ;6BACjE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;6BACnB,IAAI,CAAC,GAAG,CAAC;qBACb,CAAC,CAAC;iBACJ;gBACD,IAAI,MAAM,GAAG,CAAC,EAAE;oBACd,UAAU,CAAC,IAAI,CAAC,kCAAkB,CAAC,0CAA0C,EAAE,MAAM,CAAC,CAAC,CAAC;iBACzF;gBAED,MAAM,aAAa,GACjB,QAAG;oBACH,kCAAkB,CAChB,kCAAkC,EAClC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EACrB,MAAM,EACN,QAAQ,EACR,IAAI,CAAC,OAAO,CAAC,MAAA,OAAO,CAAC,WAAW,0CAAE,cAAc,EAAE,CAAC,CACpD,CAAC;gBACJ,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBACzC,mBAAmB;gBACnB,MAAM,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,SAAS,CAClC,sBAAQ,CAAC,IAAI,EACb,GAAG,aAAa,KAAK,MAAM,KAAK,QAAQ,KAAK,KAAK,EAAE,CACrD,CAAA,CAAC;gBAEF,MAAM,aAAa,GAAG,gCAAgB,CACpC,iCAAiC,EACjC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CACtB,CAAC;gBACF,MAAM,cAAc,GAAG,kCAAkB,CACvC,yCAAyC,EACzC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CACtB,CAAC;gBACF,IAAI,IAAI,CAAC,WAAW,EAAE;oBACpB,oDAAoD;oBACpD,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;wBACtC,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAAC,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EAAE;4BAC1E,aAAa;4BACb,cAAc;yBACf,CAAC,CACH,CAAC;qBACH;yBAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC/C,MAAA,OAAO,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;qBACxD;yBAAM;wBACL,MAAA,OAAO,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;qBACxD;iBACF;qBAAM;oBACL,8CAA8C;oBAC9C,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;wBACtC,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAAC,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EAAE;4BAC1E,aAAa;4BACb,cAAc;yBACf,CAAC,CACH,CAAC;qBACH;iBACF;aACF;SACF;QAAC,OAAO,CAAM,EAAE;YACf,MAAA,OAAO,CAAC,WAAW,0CAAE,OAAO,CAC1B,kCAAkB,CAAC,mCAAmC,EAAE,CAAC,CAAC,OAAO,CAAC,CACnE,CAAC;YACF,MAAA,OAAO,CAAC,EAAE,0CAAE,WAAW,CACrB,MAAM,EACN,kCAAkB,CAAC,2CAA2C,CAAC,EAC/D,KAAK,CACN,CAAC;SACH;QACD,OAAO,gBAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IACvB,CAAC;IAEO,YAAY,CAAC,IAA4B;QAC/C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACjC,OAAO,iBAAG,CACR,IAAI,gCAAuB,CACzB,UAAU,EACV,CAAC,gBAAgB,CAAC,EAClB,kDAAkD,CACnD,CACF,CAAC;SACH;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CACF,CAAA;AAtPC;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;qDAG9C,4BAAiB;;wDAsO3B;AA3PU,wBAAwB;IADpC,gBAAO,CAAC,UAAU,CAAC;GACP,wBAAwB,CAyQpC;AAzQY,4DAAwB"}
|
|
@@ -17,7 +17,8 @@ export declare class BaseComponentInnerError extends Error {
|
|
|
17
17
|
displayMessage?: string;
|
|
18
18
|
suggestionKey?: string[];
|
|
19
19
|
detail?: string;
|
|
20
|
-
|
|
20
|
+
innerError?: Error;
|
|
21
|
+
constructor(source: string, errorType: "UserError" | "SystemError", name: string, messageKey?: string, messageParams?: string[], suggestionKey?: string[], detail?: string, helpLink?: string, innerError?: Error);
|
|
21
22
|
toFxError(): FxError;
|
|
22
23
|
/**
|
|
23
24
|
* The suggestion message will be localized and add 'Suggestions:' by default
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentError.d.ts","sourceRoot":"","sources":["../../../src/component/error/componentError.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAKR,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"componentError.d.ts","sourceRoot":"","sources":["../../../src/component/error/componentError.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAKR,MAAM,wBAAwB,CAAC;AAMhC;;;;;;;;;;GAUG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,WAAW,GAAG,aAAa,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,KAAK,CAAC;gBAGjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,WAAW,GAAG,aAAa,EACtC,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,KAAK;IAuBpB,SAAS,IAAI,OAAO;IAwBpB;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,MAAM;IASpC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,uBAAuB;CAc7E;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,uBAAuB;IAC/D,UAAU,EAAE,MAAM,CAAC;gBAGjB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM;IAMnB,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,oBAAoB;IAarF,MAAM,CAAC,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,oBAAoB;IAY3F,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB;IAiB9E,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB;CAiBrF;AAED;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,uBAAuB;gBAE1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EAAE,GAAG,SAAS,EACnC,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,QAAQ,CAAC,EAAE,MAAM;IAKnB,MAAM,CAAC,gBAAgB,CACrB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,QAAQ,CAAC,EAAE,MAAM,GAChB,iBAAiB;IAWpB,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB;IAW3F,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB;IAW1F,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAGrC"}
|
|
@@ -7,6 +7,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
7
7
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
8
8
|
const deployConstant_1 = require("../constant/deployConstant");
|
|
9
9
|
const commonConstant_1 = require("../constant/commonConstant");
|
|
10
|
+
const lodash_1 = require("lodash");
|
|
10
11
|
/**
|
|
11
12
|
* component error
|
|
12
13
|
* store more information in FxError's innerError property for telemetry, logging and debugging
|
|
@@ -19,7 +20,7 @@ const commonConstant_1 = require("../constant/commonConstant");
|
|
|
19
20
|
* @property detail detail error message, http response, console output, etc..
|
|
20
21
|
*/
|
|
21
22
|
class BaseComponentInnerError extends Error {
|
|
22
|
-
constructor(source, errorType, name, messageKey, messageParams, suggestionKey, detail, helpLink) {
|
|
23
|
+
constructor(source, errorType, name, messageKey, messageParams, suggestionKey, detail, helpLink, innerError) {
|
|
23
24
|
super(messageKey
|
|
24
25
|
? messageParams
|
|
25
26
|
? localizeUtils_1.getDefaultString(messageKey, ...messageParams)
|
|
@@ -36,12 +37,15 @@ class BaseComponentInnerError extends Error {
|
|
|
36
37
|
: localizeUtils_1.getLocalizedString(messageKey)
|
|
37
38
|
: "";
|
|
38
39
|
this.detail = detail;
|
|
40
|
+
this.innerError = innerError;
|
|
39
41
|
}
|
|
40
42
|
toFxError() {
|
|
43
|
+
var _a, _b;
|
|
41
44
|
if (this.errorType === "UserError") {
|
|
42
45
|
return new teamsfx_api_1.UserError({
|
|
43
|
-
source: this.source,
|
|
44
|
-
|
|
46
|
+
source: lodash_1.camelCase(this.source),
|
|
47
|
+
// if innerError is set, send innerError to telemetry
|
|
48
|
+
error: (_a = this.innerError) !== null && _a !== void 0 ? _a : this,
|
|
45
49
|
helpLink: this.helpLink,
|
|
46
50
|
name: this.name,
|
|
47
51
|
message: this.message,
|
|
@@ -50,10 +54,11 @@ class BaseComponentInnerError extends Error {
|
|
|
50
54
|
}
|
|
51
55
|
else {
|
|
52
56
|
return new teamsfx_api_1.SystemError({
|
|
53
|
-
source: this.source,
|
|
57
|
+
source: lodash_1.camelCase(this.source),
|
|
54
58
|
name: this.name,
|
|
55
59
|
message: this.message,
|
|
56
|
-
|
|
60
|
+
// if innerError is set, send innerError to telemetry
|
|
61
|
+
error: (_b = this.innerError) !== null && _b !== void 0 ? _b : this,
|
|
57
62
|
helpLink: this.helpLink,
|
|
58
63
|
displayMessage: this.toDisplayMessage(),
|
|
59
64
|
});
|
|
@@ -76,7 +81,9 @@ class BaseComponentInnerError extends Error {
|
|
|
76
81
|
: this.message;
|
|
77
82
|
}
|
|
78
83
|
static unknownError(source, error) {
|
|
79
|
-
return new BaseComponentInnerError(source, "SystemError",
|
|
84
|
+
return new BaseComponentInnerError(source, "SystemError",
|
|
85
|
+
// use inner error name instead of "UnhandledError"
|
|
86
|
+
error instanceof Error ? error.name : "UnhandledError", "error.common.UnhandledError", [source, JSON.stringify(error, Object.getOwnPropertyNames(error))], undefined, undefined, undefined, error instanceof Error ? error : undefined);
|
|
80
87
|
}
|
|
81
88
|
}
|
|
82
89
|
exports.BaseComponentInnerError = BaseComponentInnerError;
|