@microsoft/teamsfx-core 2.0.10-alpha.fa1ce1fbb.0 → 2.0.10-alpha.ff616a623.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/client/teamsDevPortalClient.d.ts +4 -5
- package/build/client/teamsDevPortalClient.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.js +67 -47
- package/build/client/teamsDevPortalClient.js.map +1 -1
- package/build/common/azureUtils.js +4 -4
- package/build/common/azureUtils.js.map +1 -1
- package/build/common/constants.d.ts +1 -19
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +10 -29
- package/build/common/constants.js.map +1 -1
- package/build/common/correlator.d.ts +1 -0
- package/build/common/correlator.d.ts.map +1 -1
- package/build/common/correlator.js +6 -1
- package/build/common/correlator.js.map +1 -1
- package/build/common/featureFlags.d.ts +49 -19
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +82 -62
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/globalState.js +3 -3
- package/build/common/globalState.js.map +1 -1
- package/build/common/globalVars.d.ts +1 -0
- package/build/common/globalVars.d.ts.map +1 -1
- package/build/common/globalVars.js +2 -1
- package/build/common/globalVars.js.map +1 -1
- package/build/common/jsonUtils.js +10 -10
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/localizeUtils.js +2 -2
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/projectSettingsHelper.js +1 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/projectTypeChecker.js +3 -3
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/samples.js +5 -5
- package/build/common/samples.js.map +1 -1
- package/build/common/secretmasker/dict.d.ts +22 -0
- package/build/common/secretmasker/dict.d.ts.map +1 -0
- package/build/common/secretmasker/dict.js +83 -0
- package/build/common/secretmasker/dict.js.map +1 -0
- package/build/common/secretmasker/feature.d.ts +15 -0
- package/build/common/secretmasker/feature.d.ts.map +1 -0
- package/build/common/secretmasker/feature.js +148 -0
- package/build/common/secretmasker/feature.js.map +1 -0
- package/build/common/secretmasker/masker.d.ts +12 -0
- package/build/common/secretmasker/masker.d.ts.map +1 -0
- package/build/common/secretmasker/masker.js +54 -0
- package/build/common/secretmasker/masker.js.map +1 -0
- package/build/common/stringUtils.d.ts +3 -5
- package/build/common/stringUtils.d.ts.map +1 -1
- package/build/common/stringUtils.js +13 -105
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +12 -2
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +20 -3
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/common/tools.d.ts +1 -6
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +15 -28
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +4 -0
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +38 -1
- package/build/common/utils.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts +1 -0
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +58 -29
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/configManager/actionInjector.js +2 -2
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/configManager/lifecycle.js +9 -9
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js +20 -20
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constant/commonConstant.d.ts +1 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +1 -0
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/constants.js +5 -5
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +87 -212
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.js +10 -10
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/deployUtils.js +4 -4
- package/build/component/deployUtils.js.map +1 -1
- package/build/component/deps-checker/constant/helpLink.d.ts +0 -3
- package/build/component/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/component/deps-checker/constant/helpLink.js +1 -6
- package/build/component/deps-checker/constant/helpLink.js.map +1 -1
- package/build/component/deps-checker/constant/message.js +24 -24
- package/build/component/deps-checker/constant/message.js.map +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.js +13 -13
- package/build/component/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/component/deps-checker/internal/funcToolChecker.js +13 -13
- package/build/component/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/component/deps-checker/internal/testToolChecker.js +21 -21
- package/build/component/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/component/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
- package/build/component/deps-checker/internal/vxTestAppChecker.js +14 -8
- package/build/component/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +15 -15
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +38 -23
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadAppNameTooLongError.js +2 -2
- package/build/component/driver/aad/error/aadAppNameTooLongError.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +27 -27
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js +2 -2
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js.map +1 -1
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js +2 -2
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js.map +1 -1
- package/build/component/driver/aad/error/invalidFieldInManifestError.js +2 -2
- package/build/component/driver/aad/error/invalidFieldInManifestError.js.map +1 -1
- package/build/component/driver/aad/error/missingEnvError.js +2 -2
- package/build/component/driver/aad/error/missingEnvError.js.map +1 -1
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.d.ts +5 -0
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.d.ts.map +1 -0
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.js +23 -0
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.js.map +1 -0
- package/build/component/driver/aad/update.js +16 -16
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +9 -9
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +3 -3
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +5 -5
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +2 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +2 -0
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/add/addWebPart.js +6 -6
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/add/error/noConfigurationError.js +2 -2
- package/build/component/driver/add/error/noConfigurationError.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +23 -20
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js +21 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.js.map +1 -1
- package/build/component/driver/apiKey/update.d.ts.map +1 -1
- package/build/component/driver/apiKey/update.js +20 -20
- package/build/component/driver/apiKey/update.js.map +1 -1
- package/build/component/driver/apiKey/utility/constants.d.ts +1 -1
- package/build/component/driver/apiKey/utility/constants.js +1 -1
- package/build/component/driver/apiKey/utility/utility.js +1 -1
- package/build/component/driver/apiKey/utility/utility.js.map +1 -1
- package/build/component/driver/arm/deploy.js +4 -4
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +19 -17
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +5 -5
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js +9 -9
- package/build/component/driver/arm/util/handleError.js.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.map +1 -1
- package/build/component/driver/botAadApp/create.js +38 -22
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.js +2 -2
- package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.js.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.d.ts +1 -0
- package/build/component/driver/botAadApp/utility/constants.d.ts.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.js +1 -0
- package/build/component/driver/botAadApp/utility/constants.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +14 -14
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/botFramework/error/invalidBotIdError.js +2 -2
- package/build/component/driver/botFramework/error/invalidBotIdError.js.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +3 -3
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +3 -3
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +16 -10
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +8 -8
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +14 -14
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +6 -6
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +8 -8
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +11 -11
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +15 -15
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/createAppCatalogFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/createAppCatalogFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/getGraphTokenFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/getGraphTokenFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/getSPOTokenFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/getSPOTokenFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/getTenantFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/getTenantFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/insufficientPermissionError.js +2 -2
- package/build/component/driver/deploy/spfx/error/insufficientPermissionError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/noSPPackageError.js +2 -2
- package/build/component/driver/deploy/spfx/error/noSPPackageError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/noValidAppCatelogError.js +2 -2
- package/build/component/driver/deploy/spfx/error/noValidAppCatelogError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/uploadAppPackageFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/uploadAppPackageFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/constants.js +5 -5
- package/build/component/driver/deploy/spfx/utility/constants.js.map +1 -1
- package/build/component/driver/devTool/constant.d.ts +8 -8
- package/build/component/driver/devTool/constant.d.ts.map +1 -1
- package/build/component/driver/devTool/constant.js +10 -10
- package/build/component/driver/devTool/constant.js.map +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js +3 -3
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js +3 -3
- package/build/component/driver/devTool/error/funcInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +3 -3
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/installDriver.js +6 -6
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/error/outputEnvironmentVariableUndefinedError.js +2 -2
- package/build/component/driver/error/outputEnvironmentVariableUndefinedError.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +11 -11
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +12 -12
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/index.d.ts +1 -0
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +1 -0
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/m365/acquire.js +12 -12
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +2 -2
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +51 -21
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.js +2 -2
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.js.map +1 -1
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js +21 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js.map +1 -0
- package/build/component/driver/oauth/error/oauthDomainInvalid.js +2 -2
- package/build/component/driver/oauth/error/oauthDomainInvalid.js.map +1 -1
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.js +2 -2
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.js.map +1 -1
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js +21 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js.map +1 -0
- package/build/component/driver/oauth/error/oauthNameTooLong.js +2 -2
- package/build/component/driver/oauth/error/oauthNameTooLong.js.map +1 -1
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts +2 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts +1 -0
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +30 -19
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/constants.d.ts +1 -1
- package/build/component/driver/oauth/utility/constants.js +1 -1
- package/build/component/driver/oauth/utility/utility.js +4 -5
- package/build/component/driver/oauth/utility/utility.js.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +8 -8
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/dotnetBuildDriver.js +3 -3
- package/build/component/driver/script/dotnetBuildDriver.js.map +1 -1
- package/build/component/driver/script/npmBuildDriver.js +3 -3
- package/build/component/driver/script/npmBuildDriver.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +5 -5
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +2 -0
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +28 -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 +43 -54
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +20 -20
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +23 -23
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +15 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +132 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js +8 -8
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +21 -21
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +49 -49
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +6 -2
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +49 -42
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts +2 -0
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/SyncManifest.d.ts +15 -0
- package/build/component/driver/teamsApp/interfaces/SyncManifest.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/SyncManifest.js +5 -0
- package/build/component/driver/teamsApp/interfaces/SyncManifest.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +35 -35
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/syncManifest.d.ts +14 -0
- package/build/component/driver/teamsApp/syncManifest.d.ts.map +1 -0
- package/build/component/driver/teamsApp/syncManifest.js +226 -0
- package/build/component/driver/teamsApp/syncManifest.js.map +1 -0
- package/build/component/driver/teamsApp/teamsappMgr.js +38 -38
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +5 -3
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +45 -21
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.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 +63 -39
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +4 -3
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +36 -18
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +4 -4
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +45 -15
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.js +27 -27
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +52 -38
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +36 -36
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/driver/util/wrapUtil.js +6 -6
- package/build/component/driver/util/wrapUtil.js.map +1 -1
- package/build/component/error/componentError.js +8 -8
- 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 +56 -56
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/createAuthFiles.js +8 -8
- package/build/component/feature/createAuthFiles.js.map +1 -1
- package/build/component/feature/sso.js +4 -4
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/generator/apiSpec/generator.d.ts +15 -0
- package/build/component/generator/apiSpec/generator.d.ts.map +1 -0
- package/build/component/generator/apiSpec/generator.js +260 -0
- package/build/component/generator/apiSpec/generator.js.map +1 -0
- package/build/component/generator/{copilotPlugin → apiSpec}/helper.d.ts +23 -9
- package/build/component/generator/apiSpec/helper.d.ts.map +1 -0
- package/build/component/generator/{copilotPlugin → apiSpec}/helper.js +306 -127
- package/build/component/generator/apiSpec/helper.js.map +1 -0
- package/build/component/generator/constant.d.ts +1 -0
- package/build/component/generator/constant.d.ts.map +1 -1
- package/build/component/generator/constant.js +2 -1
- package/build/component/generator/constant.js.map +1 -1
- package/build/component/generator/{officeXMLAddin → copilotExtension}/generator.d.ts +8 -10
- package/build/component/generator/copilotExtension/generator.d.ts.map +1 -0
- package/build/component/generator/copilotExtension/generator.js +107 -0
- package/build/component/generator/copilotExtension/generator.js.map +1 -0
- package/build/component/generator/copilotExtension/helper.d.ts +4 -0
- package/build/component/generator/copilotExtension/helper.d.ts.map +1 -0
- package/build/component/generator/copilotExtension/helper.js +84 -0
- package/build/component/generator/copilotExtension/helper.js.map +1 -0
- package/build/component/generator/error.d.ts +1 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +5 -5
- 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 +25 -19
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.js +7 -7
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/generatorProvider.js +6 -6
- package/build/component/generator/generatorProvider.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +1 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +39 -41
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +5 -5
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.js +0 -75
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +4 -4
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +4 -4
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.js +19 -19
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +76 -76
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +8 -8
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.js +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts +1 -0
- package/build/component/generator/spfx/utils/utils.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +13 -9
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js.map +1 -1
- package/build/component/generator/templates/templateGenerator.js +13 -13
- package/build/component/generator/templates/templateGenerator.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +1 -0
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +3 -9
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +29 -9
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.js +6 -6
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/local/constants.d.ts +108 -108
- package/build/component/local/localCertificateManager.d.ts.map +1 -1
- package/build/component/local/localCertificateManager.js +11 -9
- package/build/component/local/localCertificateManager.js.map +1 -1
- package/build/component/local/localEnvManager.js +2 -2
- package/build/component/local/localEnvManager.js.map +1 -1
- package/build/component/local/localTelemetryReporter.js +3 -3
- package/build/component/local/localTelemetryReporter.js.map +1 -1
- package/build/component/local/portChecker.js +4 -4
- package/build/component/local/portChecker.js.map +1 -1
- package/build/component/local/taskDefinition.js +3 -3
- package/build/component/local/taskDefinition.js.map +1 -1
- package/build/component/m365/constants.d.ts +3 -0
- package/build/component/m365/constants.d.ts.map +1 -1
- package/build/component/m365/constants.js +4 -1
- package/build/component/m365/constants.js.map +1 -1
- package/build/component/m365/errors.js +2 -2
- package/build/component/m365/errors.js.map +1 -1
- package/build/component/m365/launchHelper.d.ts +2 -2
- package/build/component/m365/launchHelper.d.ts.map +1 -1
- package/build/component/m365/launchHelper.js +25 -17
- package/build/component/m365/launchHelper.js.map +1 -1
- package/build/component/m365/packageService.js +19 -19
- package/build/component/m365/packageService.js.map +1 -1
- package/build/component/messages.js +7 -7
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/actionExecutionMW.js +8 -8
- package/build/component/middleware/actionExecutionMW.js.map +1 -1
- package/build/component/middleware/envMW.js +6 -6
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/middleware/questionMW.js +3 -3
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/migrate.js +4 -4
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.js +24 -24
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +11 -11
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +7 -7
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/resource/botService/errors.js +2 -2
- package/build/component/resource/botService/errors.js.map +1 -1
- package/build/component/resource/botService/messages.js +6 -6
- package/build/component/resource/botService/messages.js.map +1 -1
- package/build/component/resource/botService/strings.js +1 -1
- package/build/component/resource/botService/strings.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +28 -28
- 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/common.d.ts +2 -2
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +5 -5
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/common.js +2 -2
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts +12 -0
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -0
- package/build/component/utils/envFunctionUtils.js +185 -0
- package/build/component/utils/envFunctionUtils.js.map +1 -0
- package/build/component/utils/envUtil.d.ts +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +19 -19
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.js +3 -4
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/component/utils/metadataGraphPermssion.js +3 -3
- package/build/component/utils/metadataGraphPermssion.js.map +1 -1
- package/build/component/utils/metadataUtil.js +2 -2
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/pathUtils.js +5 -5
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/settingsUtil.js +7 -7
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +34 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +671 -351
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.js +65 -65
- package/build/core/collaborator.js.map +1 -1
- package/build/core/crypto.js +4 -4
- package/build/core/crypto.js.map +1 -1
- package/build/core/environment.js +7 -7
- package/build/core/environment.js.map +1 -1
- package/build/core/environmentName.d.ts +0 -1
- package/build/core/environmentName.d.ts.map +1 -1
- package/build/core/environmentName.js +0 -2
- package/build/core/environmentName.js.map +1 -1
- package/build/core/middleware/concurrentLocker.js +13 -13
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/errorHandler.js +4 -4
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +78 -78
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +3 -3
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +9 -9
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +4 -4
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +4 -4
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +10 -10
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +72 -72
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/migrationContext.js +1 -1
- package/build/core/middleware/utils/migrationContext.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +9 -9
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.js +4 -4
- package/build/core/middleware/videoFilterAppBlocker.js.map +1 -1
- package/build/core/telemetry.js +1 -1
- package/build/core/telemetry.js.map +1 -1
- package/build/error/arm.js +10 -10
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.js +20 -20
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +4 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +87 -75
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.js +24 -24
- package/build/error/deploy.js.map +1 -1
- package/build/error/m365.js +6 -6
- 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 +14 -8
- package/build/error/script.js.map +1 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +10 -8
- package/build/error/teamsApp.js.map +1 -1
- package/build/error/upgrade.js +2 -2
- package/build/error/upgrade.js.map +1 -1
- package/build/error/yml.js +12 -12
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +10 -7
- package/build/index.d.ts.map +1 -1
- package/build/index.js +17 -16
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +38 -21
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +285 -270
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +4 -3
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +315 -228
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +6 -2
- package/build/question/generator.js.map +1 -1
- package/build/question/index.d.ts +2 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +21 -15
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +11 -5
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/SyncManifestInputs.d.ts +16 -0
- package/build/question/inputs/SyncManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/SyncManifestInputs.js +5 -0
- package/build/question/inputs/SyncManifestInputs.js.map +1 -0
- package/build/question/inputs/UninstallInputs.d.ts +22 -0
- package/build/question/inputs/UninstallInputs.d.ts.map +1 -0
- package/build/question/inputs/UninstallInputs.js +5 -0
- package/build/question/inputs/UninstallInputs.js.map +1 -0
- package/build/question/inputs/index.d.ts +2 -0
- package/build/question/inputs/index.d.ts.map +1 -1
- package/build/question/inputs/index.js +2 -0
- package/build/question/inputs/index.js.map +1 -1
- package/build/question/options/AddPluginOptions.js +1 -1
- package/build/question/options/AddPluginOptions.js.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +27 -24
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/SyncManifestOptions.d.ts +10 -0
- package/build/question/options/SyncManifestOptions.d.ts.map +1 -0
- package/build/question/options/SyncManifestOptions.js +28 -0
- package/build/question/options/SyncManifestOptions.js.map +1 -0
- package/build/question/options/UninstallOptions.d.ts +10 -0
- package/build/question/options/UninstallOptions.d.ts.map +1 -0
- package/build/question/options/UninstallOptions.js +44 -0
- package/build/question/options/UninstallOptions.js.map +1 -0
- package/build/question/options/index.d.ts +2 -0
- package/build/question/options/index.d.ts.map +1 -1
- package/build/question/options/index.js +2 -0
- package/build/question/options/index.js.map +1 -1
- package/build/question/other.d.ts +2 -0
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +210 -48
- package/build/question/other.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -0
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +41 -27
- package/build/ui/visitor.js.map +1 -1
- package/package.json +15 -10
- package/resource/dict.zip +0 -0
- package/resource/package.nls.json +175 -127
- package/resource/yaml-schema/v1.6/yaml.schema.json +13 -0
- package/resource/yaml-schema/yaml.schema.json +13 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/build/component/generator/copilotPlugin/generator.d.ts +0 -21
- package/build/component/generator/copilotPlugin/generator.d.ts.map +0 -1
- package/build/component/generator/copilotPlugin/generator.js +0 -399
- package/build/component/generator/copilotPlugin/generator.js.map +0 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +0 -1
- package/build/component/generator/copilotPlugin/helper.js.map +0 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +0 -1
- package/build/component/generator/officeXMLAddin/generator.js +0 -173
- package/build/component/generator/officeXMLAddin/generator.js.map +0 -1
|
@@ -7,7 +7,7 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
|
7
7
|
class CommonStrings {
|
|
8
8
|
}
|
|
9
9
|
exports.CommonStrings = CommonStrings;
|
|
10
|
-
CommonStrings.APP_STUDIO_BOT_REGISTRATION = localizeUtils_1.getLocalizedString("plugins.bot.AppStudioBotRegistration");
|
|
10
|
+
CommonStrings.APP_STUDIO_BOT_REGISTRATION = (0, localizeUtils_1.getLocalizedString)("plugins.bot.AppStudioBotRegistration");
|
|
11
11
|
class ConfigNames {
|
|
12
12
|
}
|
|
13
13
|
exports.ConfigNames = ConfigNames;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/strings.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,iEAAmE;AAEnE,MAAa,aAAa;;AAA1B,sCAIC;AAHwB,yCAA2B,GAAG,kCAAkB,
|
|
1
|
+
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/strings.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,iEAAmE;AAEnE,MAAa,aAAa;;AAA1B,sCAIC;AAHwB,yCAA2B,GAAG,IAAA,kCAAkB,EACrE,sCAAsC,CACvC,CAAC;AAGJ,MAAa,WAAW;;AAAxB,kCAIC;AAHwB,2BAAe,GAAG,kBAAkB,CAAC;AAErC,4BAAgB,GAAG,kBAAkB,CAAC"}
|
|
@@ -23,7 +23,7 @@ function selectResourceGroupQuestion(azureAccountProvider, subscriptionId) {
|
|
|
23
23
|
return {
|
|
24
24
|
type: "singleSelect",
|
|
25
25
|
name: constants_1.QuestionNames.TargetResourceGroupName,
|
|
26
|
-
title: localizeUtils_1.getLocalizedString("core.QuestionSelectResourceGroup.title"),
|
|
26
|
+
title: (0, localizeUtils_1.getLocalizedString)("core.QuestionSelectResourceGroup.title"),
|
|
27
27
|
staticOptions: [{ id: exports.newResourceGroupOption, label: exports.newResourceGroupOption }],
|
|
28
28
|
dynamicOptions: async (inputs) => {
|
|
29
29
|
const rmClient = await exports.resourceGroupHelper.createRmClient(azureAccountProvider, subscriptionId);
|
|
@@ -52,7 +52,7 @@ function selectResourceGroupLocationQuestion(azureAccountProvider, subscriptionI
|
|
|
52
52
|
return {
|
|
53
53
|
type: "singleSelect",
|
|
54
54
|
name: constants_1.QuestionNames.NewResourceGroupLocation,
|
|
55
|
-
title: localizeUtils_1.getLocalizedString("core.QuestionNewResourceGroupLocation.title"),
|
|
55
|
+
title: (0, localizeUtils_1.getLocalizedString)("core.QuestionNewResourceGroupLocation.title"),
|
|
56
56
|
staticOptions: [],
|
|
57
57
|
dynamicOptions: async (inputs) => {
|
|
58
58
|
const rmClient = await exports.resourceGroupHelper.createRmClient(azureAccountProvider, subscriptionId);
|
|
@@ -71,14 +71,14 @@ function selectResourceGroupLocationQuestion(azureAccountProvider, subscriptionI
|
|
|
71
71
|
return {
|
|
72
72
|
id: location,
|
|
73
73
|
label: location,
|
|
74
|
-
groupName: localizeUtils_1.getLocalizedString("core.QuestionNewResourceGroupLocation.group.recommended"),
|
|
74
|
+
groupName: (0, localizeUtils_1.getLocalizedString)("core.QuestionNewResourceGroupLocation.group.recommended"),
|
|
75
75
|
};
|
|
76
76
|
}),
|
|
77
77
|
...others.map((location) => {
|
|
78
78
|
return {
|
|
79
79
|
id: location,
|
|
80
80
|
label: location,
|
|
81
|
-
groupName: localizeUtils_1.getLocalizedString("core.QuestionNewResourceGroupLocation.group.others"),
|
|
81
|
+
groupName: (0, localizeUtils_1.getLocalizedString)("core.QuestionNewResourceGroupLocation.group.others"),
|
|
82
82
|
};
|
|
83
83
|
}),
|
|
84
84
|
];
|
|
@@ -92,7 +92,7 @@ function validateResourceGroupName(input, inputs) {
|
|
|
92
92
|
// https://docs.microsoft.com/en-us/rest/api/resources/resource-groups/create-or-update#uri-parameters
|
|
93
93
|
const match = name.match(/^[-\w._()]+$/);
|
|
94
94
|
if (!match) {
|
|
95
|
-
return localizeUtils_1.getLocalizedString("core.QuestionNewResourceGroupName.validation");
|
|
95
|
+
return (0, localizeUtils_1.getLocalizedString)("core.QuestionNewResourceGroupName.validation");
|
|
96
96
|
}
|
|
97
97
|
// To avoid the issue in CLI that using async func for validation and filter will make users input answers twice,
|
|
98
98
|
// we check the existence of a resource group from the list rather than call the api directly for now.
|
|
@@ -111,8 +111,8 @@ function newResourceGroupNameQuestion(defaultResourceGroupName) {
|
|
|
111
111
|
return {
|
|
112
112
|
type: "text",
|
|
113
113
|
name: constants_1.QuestionNames.NewResourceGroupName,
|
|
114
|
-
title: localizeUtils_1.getLocalizedString("core.QuestionNewResourceGroupName.title"),
|
|
115
|
-
placeholder: localizeUtils_1.getLocalizedString("core.QuestionNewResourceGroupName.placeholder"),
|
|
114
|
+
title: (0, localizeUtils_1.getLocalizedString)("core.QuestionNewResourceGroupName.title"),
|
|
115
|
+
placeholder: (0, localizeUtils_1.getLocalizedString)("core.QuestionNewResourceGroupName.placeholder"),
|
|
116
116
|
// default resource group name will change with env name
|
|
117
117
|
forgetLastValue: true,
|
|
118
118
|
default: defaultResourceGroupName,
|
|
@@ -144,10 +144,10 @@ class ResourceGroupHelper {
|
|
|
144
144
|
const rmClient = await this.createRmClient(azureAccountProvider, subscriptionId);
|
|
145
145
|
const maybeExist = await this.checkResourceGroupExistence(resourceGroupName, rmClient);
|
|
146
146
|
if (maybeExist.isErr()) {
|
|
147
|
-
return teamsfx_api_1.err(maybeExist.error);
|
|
147
|
+
return (0, teamsfx_api_1.err)(maybeExist.error);
|
|
148
148
|
}
|
|
149
149
|
if (maybeExist.value) {
|
|
150
|
-
return teamsfx_api_1.err(new azure_1.ResourceGroupConflictError(resourceGroupName, subscriptionId));
|
|
150
|
+
return (0, teamsfx_api_1.err)(new azure_1.ResourceGroupConflictError(resourceGroupName, subscriptionId));
|
|
151
151
|
}
|
|
152
152
|
try {
|
|
153
153
|
const response = await rmClient.resourceGroups.createOrUpdate(resourceGroupName, {
|
|
@@ -155,41 +155,41 @@ class ResourceGroupHelper {
|
|
|
155
155
|
tags: { "created-by": "teamsfx" },
|
|
156
156
|
});
|
|
157
157
|
if (response.name === undefined) {
|
|
158
|
-
return teamsfx_api_1.err(new azure_1.CreateResourceGroupError(resourceGroupName, subscriptionId, `illegal response: ${JSON.stringify(response)}`));
|
|
158
|
+
return (0, teamsfx_api_1.err)(new azure_1.CreateResourceGroupError(resourceGroupName, subscriptionId, `illegal response: ${JSON.stringify(response)}`));
|
|
159
159
|
}
|
|
160
|
-
return teamsfx_api_1.ok(response.name);
|
|
160
|
+
return (0, teamsfx_api_1.ok)(response.name);
|
|
161
161
|
}
|
|
162
162
|
catch (e) {
|
|
163
163
|
delete e["request"];
|
|
164
|
-
return teamsfx_api_1.err(new azure_1.CreateResourceGroupError(resourceGroupName, subscriptionId, e.message || JSON.stringify(e), e));
|
|
164
|
+
return (0, teamsfx_api_1.err)(new azure_1.CreateResourceGroupError(resourceGroupName, subscriptionId, e.message || JSON.stringify(e), e));
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
167
|
async checkResourceGroupExistence(resourceGroupName, rmClient) {
|
|
168
168
|
try {
|
|
169
169
|
const checkRes = await rmClient.resourceGroups.checkExistence(resourceGroupName);
|
|
170
|
-
return teamsfx_api_1.ok(!!checkRes.body);
|
|
170
|
+
return (0, teamsfx_api_1.ok)(!!checkRes.body);
|
|
171
171
|
}
|
|
172
172
|
catch (e) {
|
|
173
173
|
delete e["request"];
|
|
174
|
-
return teamsfx_api_1.err(new azure_1.CheckResourceGroupExistenceError(resourceGroupName, rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
174
|
+
return (0, teamsfx_api_1.err)(new azure_1.CheckResourceGroupExistenceError(resourceGroupName, rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
177
|
async getResourceGroupInfo(resourceGroupName, rmClient) {
|
|
178
178
|
try {
|
|
179
179
|
const getRes = await rmClient.resourceGroups.get(resourceGroupName);
|
|
180
180
|
if (getRes.name) {
|
|
181
|
-
return teamsfx_api_1.ok({
|
|
181
|
+
return (0, teamsfx_api_1.ok)({
|
|
182
182
|
createNewResourceGroup: false,
|
|
183
183
|
name: getRes.name,
|
|
184
184
|
location: getRes.location,
|
|
185
185
|
});
|
|
186
186
|
}
|
|
187
187
|
else
|
|
188
|
-
return teamsfx_api_1.ok(undefined);
|
|
188
|
+
return (0, teamsfx_api_1.ok)(undefined);
|
|
189
189
|
}
|
|
190
190
|
catch (e) {
|
|
191
191
|
delete e["request"];
|
|
192
|
-
return teamsfx_api_1.err(new azure_1.GetResourceGroupError(resourceGroupName, rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
192
|
+
return (0, teamsfx_api_1.err)(new azure_1.GetResourceGroupError(resourceGroupName, rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
193
193
|
}
|
|
194
194
|
}
|
|
195
195
|
async listResourceGroups(rmClient) {
|
|
@@ -203,18 +203,18 @@ class ResourceGroupHelper {
|
|
|
203
203
|
if ((_a = result.value) === null || _a === void 0 ? void 0 : _a.name)
|
|
204
204
|
results.push([result.value.name, result.value.location]);
|
|
205
205
|
} while (!result.done);
|
|
206
|
-
return teamsfx_api_1.ok(results);
|
|
206
|
+
return (0, teamsfx_api_1.ok)(results);
|
|
207
207
|
}
|
|
208
208
|
catch (e) {
|
|
209
209
|
delete e["request"];
|
|
210
|
-
return teamsfx_api_1.err(new azure_1.ListResourceGroupsError(rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
210
|
+
return (0, teamsfx_api_1.err)(new azure_1.ListResourceGroupsError(rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
211
211
|
}
|
|
212
212
|
}
|
|
213
213
|
async getLocations(azureAccountProvider, rmClient) {
|
|
214
214
|
var _a, _b;
|
|
215
215
|
const azureToken = await azureAccountProvider.getIdentityCredentialAsync();
|
|
216
216
|
if (!azureToken)
|
|
217
|
-
return teamsfx_api_1.err(new azure_1.InvalidAzureCredentialError());
|
|
217
|
+
return (0, teamsfx_api_1.err)(new azure_1.InvalidAzureCredentialError());
|
|
218
218
|
const subscriptionClient = new arm_subscriptions_1.SubscriptionClient(azureToken);
|
|
219
219
|
const askSubRes = await azureAccountProvider.getSelectedSubscription(true);
|
|
220
220
|
try {
|
|
@@ -231,13 +231,13 @@ class ResourceGroupHelper {
|
|
|
231
231
|
const resourceLocations = resourceTypeData === null || resourceTypeData === void 0 ? void 0 : resourceTypeData.locations;
|
|
232
232
|
const rgLocations = resourceLocations === null || resourceLocations === void 0 ? void 0 : resourceLocations.filter((item) => locations.includes(item));
|
|
233
233
|
if (!rgLocations || rgLocations.length == 0) {
|
|
234
|
-
return teamsfx_api_1.err(new azure_1.ListResourceGroupLocationsError(rmClient.subscriptionId, "No available locations found!"));
|
|
234
|
+
return (0, teamsfx_api_1.err)(new azure_1.ListResourceGroupLocationsError(rmClient.subscriptionId, "No available locations found!"));
|
|
235
235
|
}
|
|
236
|
-
return teamsfx_api_1.ok(rgLocations);
|
|
236
|
+
return (0, teamsfx_api_1.ok)(rgLocations);
|
|
237
237
|
}
|
|
238
238
|
catch (e) {
|
|
239
239
|
delete e["request"];
|
|
240
|
-
return teamsfx_api_1.err(new azure_1.ListResourceGroupLocationsError(rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
240
|
+
return (0, teamsfx_api_1.err)(new azure_1.ListResourceGroupLocationsError(rmClient.subscriptionId, e.message || JSON.stringify(e), e));
|
|
241
241
|
}
|
|
242
242
|
}
|
|
243
243
|
/**
|
|
@@ -246,18 +246,18 @@ class ResourceGroupHelper {
|
|
|
246
246
|
async askResourceGroupInfoV3(inputs, azureAccountProvider, rmClient, defaultResourceGroupName) {
|
|
247
247
|
const node = resourceGroupQuestionNode(azureAccountProvider, rmClient.subscriptionId, defaultResourceGroupName);
|
|
248
248
|
if (node) {
|
|
249
|
-
const res = await visitor_1.traverse(node, inputs, globalVars_1.TOOLS.ui);
|
|
249
|
+
const res = await (0, visitor_1.traverse)(node, inputs, globalVars_1.TOOLS.ui);
|
|
250
250
|
if (res.isErr()) {
|
|
251
|
-
return teamsfx_api_1.err(res.error);
|
|
251
|
+
return (0, teamsfx_api_1.err)(res.error);
|
|
252
252
|
}
|
|
253
253
|
}
|
|
254
254
|
const targetResourceGroupNameOptionItem = inputs[constants_1.QuestionNames.TargetResourceGroupName];
|
|
255
255
|
const targetResourceGroupName = targetResourceGroupNameOptionItem.id;
|
|
256
256
|
if (!targetResourceGroupName || typeof targetResourceGroupName !== "string") {
|
|
257
|
-
return teamsfx_api_1.err(new error_1.InputValidationError("targetResourceGroupName", "Invalid targetResourceGroupName", "ResourceGroupHelper"));
|
|
257
|
+
return (0, teamsfx_api_1.err)(new error_1.InputValidationError("targetResourceGroupName", "Invalid targetResourceGroupName", "ResourceGroupHelper"));
|
|
258
258
|
}
|
|
259
259
|
if (targetResourceGroupName === exports.newResourceGroupOption) {
|
|
260
|
-
return teamsfx_api_1.ok({
|
|
260
|
+
return (0, teamsfx_api_1.ok)({
|
|
261
261
|
name: inputs[constants_1.QuestionNames.NewResourceGroupName],
|
|
262
262
|
location: inputs[constants_1.QuestionNames.NewResourceGroupLocation],
|
|
263
263
|
createNewResourceGroup: true,
|
|
@@ -265,7 +265,7 @@ class ResourceGroupHelper {
|
|
|
265
265
|
}
|
|
266
266
|
else {
|
|
267
267
|
const location = targetResourceGroupNameOptionItem.description; // location must exist because the user can only select from this list.
|
|
268
|
-
return teamsfx_api_1.ok({
|
|
268
|
+
return (0, teamsfx_api_1.ok)({
|
|
269
269
|
createNewResourceGroup: false,
|
|
270
270
|
name: targetResourceGroupName,
|
|
271
271
|
location: location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAAgE;AAChE,gEAA8D;AAC9D,wDAagC;AAChC,wDAAgD;AAChD,6CAQ2B;AAC3B,wDAA+E;AAC/E,8CAA4C;AAE5C,8DAAgE;AAChE,uCAAmD;AAEnD,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAQxC,+DAA+D;AAClD,QAAA,sBAAsB,GAAG,sBAAsB,CAAC;AAC7D;;GAEG;AACH,SAAgB,2BAA2B,CACzC,oBAA0C,EAC1C,cAAsB;IAEtB,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,yBAAa,CAAC,uBAAuB;QAC3C,KAAK,EAAE,kCAAkB,
|
|
1
|
+
{"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ exports.parseAzureResourceId = parseAzureResourceId;
|
|
|
33
33
|
* @param tokenProvider Azure account provider
|
|
34
34
|
*/
|
|
35
35
|
async function getAzureAccountCredential(tokenProvider) {
|
|
36
|
-
const credential = await azureSdkErrorHandler_1.wrapAzureOperation(() => tokenProvider.getIdentityCredentialAsync(), (e) => componentError_1.ExternalApiCallError.getAzureCredentialRemoteError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, e), (e) => componentError_1.ExternalApiCallError.getAzureCredentialError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, e));
|
|
36
|
+
const credential = await (0, azureSdkErrorHandler_1.wrapAzureOperation)(() => tokenProvider.getIdentityCredentialAsync(), (e) => componentError_1.ExternalApiCallError.getAzureCredentialRemoteError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, e), (e) => componentError_1.ExternalApiCallError.getAzureCredentialError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, e));
|
|
37
37
|
if (!credential) {
|
|
38
38
|
throw componentError_1.PrerequisiteError.somethingIllegal("Deploy", "azureCredential", "plugin.hosting.FailRetrieveAzureCredentials", undefined, "plugin.hosting.LoginToAzure");
|
|
39
39
|
}
|
|
@@ -60,7 +60,7 @@ async function generateSasToken(client, resourceGroupName, storageName) {
|
|
|
60
60
|
sharedAccessStartTime: new Date(Date.now() - deployConstant_1.DeployConstant.SAS_TOKEN_LIFE_TIME_PADDING),
|
|
61
61
|
sharedAccessExpiryTime: new Date(Date.now() + deployConstant_1.DeployConstant.SAS_TOKEN_LIFE_TIME),
|
|
62
62
|
};
|
|
63
|
-
const token = await azureSdkErrorHandler_1.wrapAzureOperation(async () => (await client.listAccountSAS(resourceGroupName, storageName, accountSasParameters)).accountSasToken, (e) => componentError_1.ExternalApiCallError.getSasTokenRemoteError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, JSON.stringify(e)), (e) => componentError_1.ExternalApiCallError.getSasTokenError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, JSON.stringify(e)));
|
|
63
|
+
const token = await (0, azureSdkErrorHandler_1.wrapAzureOperation)(async () => (await client.listAccountSAS(resourceGroupName, storageName, accountSasParameters)).accountSasToken, (e) => componentError_1.ExternalApiCallError.getSasTokenRemoteError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, JSON.stringify(e)), (e) => componentError_1.ExternalApiCallError.getSasTokenError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, JSON.stringify(e)));
|
|
64
64
|
if (!token) {
|
|
65
65
|
throw componentError_1.ExternalApiCallError.getSasTokenError(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE);
|
|
66
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureResourceOperation.js","sourceRoot":"","sources":["../../../src/component/utils/azureResourceOperation.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,4DAAkF;AAElF,sDAAwD;AACxD,oDAAoG;AACpG,+DAA4D;AAE5D,iEAA4D;AAE5D;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,UAAkB,EAAE,OAAe;IACtE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACjC,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,EAAE,0BAA0B,EAAE;YAC3F,YAAY;YACZ,UAAU;SACX,CAAC,CAAC;KACJ;IACD,OAAO;QACL,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QAChC,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QACnC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;KAC7B,CAAC;AACJ,CAAC;AAbD,oDAaC;AAED;;;GAGG;AACI,KAAK,UAAU,yBAAyB,CAC7C,aAAmC;IAEnC,MAAM,UAAU,GAAG,MAAM,yCAAkB,
|
|
1
|
+
{"version":3,"file":"azureResourceOperation.js","sourceRoot":"","sources":["../../../src/component/utils/azureResourceOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,13 @@ import { ExecutionResult } from "../driver/interface/stepDriver";
|
|
|
6
6
|
* @param value parameter value
|
|
7
7
|
*/
|
|
8
8
|
export declare function checkMissingArgs<T>(name: string, value: T | null | undefined): T;
|
|
9
|
-
export declare function asOptional<T>(as: (s: unknown, key: string, helpLink?: string) => T): (s: unknown, key: string, helpLink?: string
|
|
9
|
+
export declare function asOptional<T>(as: (s: unknown, key: string, helpLink?: string) => T): (s: unknown, key: string, helpLink?: string) => T | undefined;
|
|
10
10
|
export declare function asBoolean(s: unknown, key: string, helpLink?: string): boolean;
|
|
11
11
|
export declare function asString(s: unknown, key: string, helpLink?: string): string;
|
|
12
12
|
declare type KeyValidators<T> = {
|
|
13
13
|
[P in keyof T]-?: (s: unknown, key: string, helpLink?: string) => T[P];
|
|
14
14
|
};
|
|
15
|
-
export declare function asFactory<T>(keyValidators: KeyValidators<T>): (data: unknown, helpLink?: string
|
|
15
|
+
export declare function asFactory<T>(keyValidators: KeyValidators<T>): (data: unknown, helpLink?: string) => T;
|
|
16
16
|
export declare function wrapRun(exec: () => Promise<Map<string, string>>, errorSource: string, errorHandler?: () => Promise<void>, logProvider?: LogProvider): Promise<Result<Map<string, string>, FxError>>;
|
|
17
17
|
export declare function errorHandle(error: unknown, errorSource: string, logProvider?: LogProvider, errorHandler?: () => Promise<void>): Promise<Result<Map<string, string>, FxError>>;
|
|
18
18
|
export declare function wrapSummary(exec: () => Promise<Result<Map<string, string>, FxError>>, summary: string[]): Promise<ExecutionResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKjE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,CAKhF;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,OAC7D,OAAO,OAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKjE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,CAKhF;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,OAC7D,OAAO,OAAO,MAAM,aAAa,MAAM,KAAG,CAAC,GAAG,SAAS,CAM5E;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAO7E;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAK3E;AAED,aAAK,aAAa,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,UACnC,OAAO,aAAa,MAAM,KAAG,CAAC,CAgBtD;AAED,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAClC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAM/C;AAED,wBAAsB,WAAW,CAC/B,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,EACzB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAc/C;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,EACzD,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,eAAe,CAAC,CAS1B;AAGD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;KAAG,GAAG,IAAI,MAAM,GAAG,MAAM;CAAE,GACjC,MAAM,CAmBR;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAQjE;AAED,wBAAgB,eAAe,CAAC,sBAAsB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAM3F"}
|
|
@@ -62,7 +62,7 @@ function asFactory(keyValidators) {
|
|
|
62
62
|
exports.asFactory = asFactory;
|
|
63
63
|
async function wrapRun(exec, errorSource, errorHandler, logProvider) {
|
|
64
64
|
try {
|
|
65
|
-
return teamsfx_api_1.ok(await exec());
|
|
65
|
+
return (0, teamsfx_api_1.ok)(await exec());
|
|
66
66
|
}
|
|
67
67
|
catch (error) {
|
|
68
68
|
return await errorHandle(error, errorSource, logProvider, errorHandler);
|
|
@@ -77,19 +77,19 @@ async function errorHandle(error, errorSource, logProvider, errorHandler) {
|
|
|
77
77
|
if (error.detail) {
|
|
78
78
|
logProvider === null || logProvider === void 0 ? void 0 : logProvider.debug(`Error occurred: ${error.detail}`);
|
|
79
79
|
}
|
|
80
|
-
return teamsfx_api_1.err(error.toFxError());
|
|
80
|
+
return (0, teamsfx_api_1.err)(error.toFxError());
|
|
81
81
|
}
|
|
82
82
|
else if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
|
|
83
|
-
return teamsfx_api_1.err(error);
|
|
83
|
+
return (0, teamsfx_api_1.err)(error);
|
|
84
84
|
}
|
|
85
85
|
// always return error as SystemError
|
|
86
|
-
return teamsfx_api_1.err(componentError_1.BaseComponentInnerError.unknownError(errorSource, error).toFxError());
|
|
86
|
+
return (0, teamsfx_api_1.err)(componentError_1.BaseComponentInnerError.unknownError(errorSource, error).toFxError());
|
|
87
87
|
}
|
|
88
88
|
exports.errorHandle = errorHandle;
|
|
89
89
|
async function wrapSummary(exec, summary) {
|
|
90
90
|
const result = await exec();
|
|
91
91
|
if (result.isOk()) {
|
|
92
|
-
const summaries = summary.map((s) => localizeUtils_1.getLocalizedString(s));
|
|
92
|
+
const summaries = summary.map((s) => (0, localizeUtils_1.getLocalizedString)(s));
|
|
93
93
|
return { result, summaries };
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,4DAAqF;AACrF,wDAQgC;AAChC,wDAAwB;AAExB,8DAAgE;AAEhE,MAAM,gBAAgB,GAAG,mCAAmC,CAAC;AAE7D;;;;GAIG;AACH,SAAgB,gBAAgB,CAAI,IAAY,EAAE,KAA2B;IAC3E,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KAC1D;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AALD,4CAKC;AAED,SAAgB,UAAU,CAAI,EAAqD;IACjF,OAAO,UAAU,CAAU,EAAE,GAAW,EAAE,QAAiB;QACzD,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,EAAE;YACjC,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAPD,gCAOC;AAED,SAAgB,SAAS,CAAC,CAAU,EAAE,GAAW,EAAE,QAAiB;IAClE,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;QAC1B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;QAChC,OAAO,CAAC,KAAK,MAAM,CAAC;KACrB;IACD,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AAPD,8BAOC;AAED,SAAgB,QAAQ,CAAC,CAAU,EAAE,GAAW,EAAE,QAAiB;IACjE,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;QACzB,OAAO,CAAC,CAAC;KACV;IACD,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AALD,4BAKC;AAMD,SAAgB,SAAS,CAAI,aAA+B;IAC1D,OAAO,UAAU,IAAa,EAAE,QAAiB;QAC/C,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;YAC7C,MAAM,MAAM,GAAG,IAAoB,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAmB,EAAE;gBAC9D,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;aAC7D;YACD,OAAO,MAAM,CAAC;SACf;QACD,MAAM,kCAAiB,CAAC,gBAAgB,CACtC,QAAQ,EACR,MAAM,EACN,yBAAyB,EACzB,SAAS,EACT,QAAQ,CACT,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,8BAiBC;AAEM,KAAK,UAAU,OAAO,CAC3B,IAAwC,EACxC,WAAmB,EACnB,YAAkC,EAClC,WAAyB;IAEzB,IAAI;QACF,OAAO,gBAAE,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,8 @@ exports.TelemetryMeasurement = exports.TelemtryMessages = exports.DepsCheckerEve
|
|
|
12
12
|
// to copy you changes to function plugin.
|
|
13
13
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
14
14
|
exports.Messages = {
|
|
15
|
-
downloadBicep: () => localizeUtils_1.getLocalizedString("depChecker.downloadBicep"),
|
|
16
|
-
finishInstallBicep: () => localizeUtils_1.getLocalizedString("depChecker.finishInstallBicep"),
|
|
15
|
+
downloadBicep: () => (0, localizeUtils_1.getLocalizedString)("depChecker.downloadBicep"),
|
|
16
|
+
finishInstallBicep: () => (0, localizeUtils_1.getLocalizedString)("depChecker.finishInstallBicep"),
|
|
17
17
|
};
|
|
18
18
|
var DepsCheckerEvent;
|
|
19
19
|
(function (DepsCheckerEvent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/utils/depsChecker/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uDAAuD;AAEvD,QAAQ;AACR,4CAA4C;AAC5C,0FAA0F;AAC1F,oEAAoE;AACpE,+GAA+G;AAC/G,0CAA0C;AAC1C,iEAAmE;AAEtD,QAAA,QAAQ,GAAG;IACtB,aAAa,EAAE,GAAG,EAAE,CAAC,kCAAkB,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/utils/depsChecker/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uDAAuD;AAEvD,QAAQ;AACR,4CAA4C;AAC5C,0FAA0F;AAC1F,oEAAoE;AACpE,+GAA+G;AAC/G,0CAA0C;AAC1C,iEAAmE;AAEtD,QAAA,QAAQ,GAAG;IACtB,aAAa,EAAE,GAAG,EAAE,CAAC,IAAA,kCAAkB,EAAC,0BAA0B,CAAC;IACnE,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAA,kCAAkB,EAAC,+BAA+B,CAAC;CAC9E,CAAC;AAEF,IAAY,gBAcX;AAdD,WAAY,gBAAgB;IAC1B,6GAA6G;IAC7G,0EAA0E;IAC1E,6DAAyC,CAAA;IACzC,qEAAiD,CAAA;IACjD,qEAAiD,CAAA;IACjD,6DAAyC,CAAA;IACzC,kFAA8D,CAAA;IAC9D,0EAAsD,CAAA;IACtD,mEAA+C,CAAA;IAC/C,mHAA+F,CAAA;IAE/F,mEAA+C,CAAA;IAC/C,4DAAwC,CAAA;AAC1C,CAAC,EAdW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAc3B;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,qEAAiD,CAAA;IACjD,uEAAmD,CAAA;AACrD,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAED,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,0DAAkC,CAAA;IAClC,0CAAkB,CAAA;IAClB,gDAAwB,CAAA;AAC1B,CAAC,EAJW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAI/B"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { DriverContext } from "../driver/interface/commonArgs";
|
|
3
|
+
export declare enum ManifestType {
|
|
4
|
+
TeamsManifest = "teams-manifest",
|
|
5
|
+
PluginManifest = "plugin-manifest",
|
|
6
|
+
DeclarativeCopilotManifest = "declarative-copilot-manifest",
|
|
7
|
+
ApiSpec = "api-spec"
|
|
8
|
+
}
|
|
9
|
+
export declare function expandVariableWithFunction(content: string, ctx: DriverContext, envs: {
|
|
10
|
+
[key in string]: string;
|
|
11
|
+
} | undefined, isJson: boolean, manifestType: ManifestType, fromPath: string): Promise<Result<string, FxError>>;
|
|
12
|
+
//# sourceMappingURL=envFunctionUtils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envFunctionUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAGP,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAQhC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAW/D,oBAAY,YAAY;IACtB,aAAa,mBAAmB;IAChC,cAAc,oBAAoB;IAClC,0BAA0B,iCAAiC;IAC3D,OAAO,aAAa;CACrB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE;KAAG,GAAG,IAAI,MAAM,GAAG,MAAM;CAAE,GAAG,SAAS,EAC7C,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAsClC"}
|
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.expandVariableWithFunction = exports.ManifestType = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
// Copyright (c) Microsoft Corporation.
|
|
6
|
+
// Licensed under the MIT license.
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
9
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
10
|
+
const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
11
|
+
const error_1 = require("../../error");
|
|
12
|
+
const common_1 = require("./common");
|
|
13
|
+
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
14
|
+
const featureFlags_1 = require("../../common/featureFlags");
|
|
15
|
+
const source = "ResolveManifestFunction";
|
|
16
|
+
const telemetryEvent = "manifest-with-function";
|
|
17
|
+
const helpLink = undefined; // TODO: update link
|
|
18
|
+
var TelemetryPropertyKey;
|
|
19
|
+
(function (TelemetryPropertyKey) {
|
|
20
|
+
TelemetryPropertyKey["manifestType"] = "manifest-type";
|
|
21
|
+
TelemetryPropertyKey["functionCount"] = "function-count";
|
|
22
|
+
})(TelemetryPropertyKey || (TelemetryPropertyKey = {}));
|
|
23
|
+
var ManifestType;
|
|
24
|
+
(function (ManifestType) {
|
|
25
|
+
ManifestType["TeamsManifest"] = "teams-manifest";
|
|
26
|
+
ManifestType["PluginManifest"] = "plugin-manifest";
|
|
27
|
+
ManifestType["DeclarativeCopilotManifest"] = "declarative-copilot-manifest";
|
|
28
|
+
ManifestType["ApiSpec"] = "api-spec";
|
|
29
|
+
})(ManifestType = exports.ManifestType || (exports.ManifestType = {}));
|
|
30
|
+
async function expandVariableWithFunction(content, ctx, envs, isJson, manifestType, fromPath) {
|
|
31
|
+
if (!featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.EnvFileFunc)) {
|
|
32
|
+
return (0, teamsfx_api_1.ok)(content);
|
|
33
|
+
}
|
|
34
|
+
const regex = /\$\[ *[a-zA-Z][a-zA-Z]*\([^\]]*\) *\]/g;
|
|
35
|
+
const matches = content.match(regex);
|
|
36
|
+
if (!matches) {
|
|
37
|
+
return (0, teamsfx_api_1.ok)(content); // no function
|
|
38
|
+
}
|
|
39
|
+
let count = 0;
|
|
40
|
+
for (const placeholder of matches) {
|
|
41
|
+
const processedRes = await processFunction(placeholder.slice(2, -1).trim(), ctx, envs, fromPath);
|
|
42
|
+
if (processedRes.isErr()) {
|
|
43
|
+
return (0, teamsfx_api_1.err)(processedRes.error);
|
|
44
|
+
}
|
|
45
|
+
let value = processedRes.value;
|
|
46
|
+
if (isJson && value) {
|
|
47
|
+
value = JSON.stringify(value).slice(1, -1);
|
|
48
|
+
}
|
|
49
|
+
if (value) {
|
|
50
|
+
count += 1;
|
|
51
|
+
content = content.replace(placeholder, value);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
if (count > 0) {
|
|
55
|
+
ctx.telemetryReporter.sendTelemetryEvent(telemetryEvent, {
|
|
56
|
+
[TelemetryPropertyKey.manifestType]: manifestType.toString(),
|
|
57
|
+
[TelemetryPropertyKey.functionCount]: count.toString(),
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
return (0, teamsfx_api_1.ok)(content);
|
|
61
|
+
}
|
|
62
|
+
exports.expandVariableWithFunction = expandVariableWithFunction;
|
|
63
|
+
async function processFunction(content, ctx, envs, path) {
|
|
64
|
+
const firstTrimmedContent = content.trim();
|
|
65
|
+
if (!firstTrimmedContent.startsWith("file(") || !firstTrimmedContent.endsWith(")")) {
|
|
66
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorLog", firstTrimmedContent, "file"));
|
|
67
|
+
return (0, teamsfx_api_1.err)(new InvalidFunctionError(ctx.platform));
|
|
68
|
+
}
|
|
69
|
+
// file()
|
|
70
|
+
const trimmedParameter = content.slice(5, -1).trim();
|
|
71
|
+
if (trimmedParameter[0] === "'" && trimmedParameter[trimmedParameter.length - 1] === "'") {
|
|
72
|
+
// static string as function parameter
|
|
73
|
+
const res = await readFileContent(trimmedParameter.substring(1, trimmedParameter.length - 1), ctx, envs, path);
|
|
74
|
+
return res;
|
|
75
|
+
}
|
|
76
|
+
else if (trimmedParameter.startsWith("${{") && trimmedParameter.endsWith("}}")) {
|
|
77
|
+
// env variable inside
|
|
78
|
+
const resolvedParameter = (0, common_1.expandEnvironmentVariable)(trimmedParameter, envs);
|
|
79
|
+
const res = readFileContent(resolvedParameter, ctx, envs, path);
|
|
80
|
+
return res;
|
|
81
|
+
}
|
|
82
|
+
else if (trimmedParameter.startsWith("file(") && trimmedParameter.endsWith(")")) {
|
|
83
|
+
// nested function inside
|
|
84
|
+
const processsedRes = await processFunction(trimmedParameter, ctx, envs, path);
|
|
85
|
+
if (processsedRes.isErr()) {
|
|
86
|
+
return (0, teamsfx_api_1.err)(processsedRes.error);
|
|
87
|
+
}
|
|
88
|
+
const readFileRes = await readFileContent(processsedRes.value, ctx, envs, path);
|
|
89
|
+
return readFileRes;
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
// invalid content inside function
|
|
93
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorLog", trimmedParameter, "file"));
|
|
94
|
+
return (0, teamsfx_api_1.err)(new InvalidFunctionParameter(ctx.platform));
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
async function readFileContent(filePath, ctx, envs, fromPath) {
|
|
98
|
+
const ext = path_1.default.extname(filePath);
|
|
99
|
+
if (ext.toLowerCase() !== ".txt") {
|
|
100
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", filePath, "txt"));
|
|
101
|
+
return (0, teamsfx_api_1.err)(new UnsupportedFileFormatError(ctx.platform));
|
|
102
|
+
}
|
|
103
|
+
const absolutePath = getAbsolutePath(filePath, fromPath);
|
|
104
|
+
if (await fs_extra_1.default.pathExists(absolutePath)) {
|
|
105
|
+
try {
|
|
106
|
+
let fileContent = await fs_extra_1.default.readFile(absolutePath, "utf8");
|
|
107
|
+
fileContent = (0, strip_bom_1.default)(fileContent);
|
|
108
|
+
const processedFileContent = (0, common_1.expandEnvironmentVariable)(fileContent, envs);
|
|
109
|
+
return (0, teamsfx_api_1.ok)(processedFileContent);
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", absolutePath, e === null || e === void 0 ? void 0 : e.toString()));
|
|
113
|
+
return (0, teamsfx_api_1.err)(new ReadFileError(ctx.platform, absolutePath));
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
return (0, teamsfx_api_1.err)(new error_1.FileNotFoundError(source, filePath));
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
function getAbsolutePath(relativeOrAbsolutePath, fromPath) {
|
|
121
|
+
return path_1.default.isAbsolute(relativeOrAbsolutePath)
|
|
122
|
+
? relativeOrAbsolutePath
|
|
123
|
+
: path_1.default.join(path_1.default.dirname(fromPath), relativeOrAbsolutePath);
|
|
124
|
+
}
|
|
125
|
+
class UnsupportedFileFormatError extends teamsfx_api_1.UserError {
|
|
126
|
+
constructor(platform) {
|
|
127
|
+
const message = platform === teamsfx_api_1.Platform.VSCode
|
|
128
|
+
? (0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorMessage", (0, localizeUtils_1.getLocalizedString)("core.error.checkOutput.vsc"))
|
|
129
|
+
: (0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorMessage");
|
|
130
|
+
const errorOptions = {
|
|
131
|
+
source,
|
|
132
|
+
name: "UnsupportedFileFormat",
|
|
133
|
+
message,
|
|
134
|
+
displayMessage: message,
|
|
135
|
+
helpLink,
|
|
136
|
+
};
|
|
137
|
+
super(errorOptions);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
class InvalidFunctionError extends teamsfx_api_1.UserError {
|
|
141
|
+
constructor(platform) {
|
|
142
|
+
const message = platform === teamsfx_api_1.Platform.VSCode
|
|
143
|
+
? (0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorMessage", (0, localizeUtils_1.getLocalizedString)("core.error.checkOutput.vsc"))
|
|
144
|
+
: (0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorMessage", "");
|
|
145
|
+
const errorOptions = {
|
|
146
|
+
source,
|
|
147
|
+
name: "InvalidFunction",
|
|
148
|
+
message,
|
|
149
|
+
displayMessage: message,
|
|
150
|
+
helpLink,
|
|
151
|
+
};
|
|
152
|
+
super(errorOptions);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
class InvalidFunctionParameter extends teamsfx_api_1.UserError {
|
|
156
|
+
constructor(platform) {
|
|
157
|
+
const message = platform === teamsfx_api_1.Platform.VSCode
|
|
158
|
+
? (0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorMessage", "file", (0, localizeUtils_1.getLocalizedString)("core.error.checkOutput.vsc"))
|
|
159
|
+
: (0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorMessage", "file", "");
|
|
160
|
+
const errorOptions = {
|
|
161
|
+
source,
|
|
162
|
+
name: "InvalidFunctionParameter",
|
|
163
|
+
message,
|
|
164
|
+
displayMessage: message,
|
|
165
|
+
helpLink,
|
|
166
|
+
};
|
|
167
|
+
super(errorOptions);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
class ReadFileError extends teamsfx_api_1.UserError {
|
|
171
|
+
constructor(platform, filePath) {
|
|
172
|
+
const message = platform === teamsfx_api_1.Platform.VSCode
|
|
173
|
+
? (0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorMessage", filePath, (0, localizeUtils_1.getLocalizedString)("core.error.checkOutput.vsc"))
|
|
174
|
+
: (0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorMessage", filePath, "");
|
|
175
|
+
const errorOptions = {
|
|
176
|
+
source,
|
|
177
|
+
name: "ReadFileError",
|
|
178
|
+
message,
|
|
179
|
+
displayMessage: message,
|
|
180
|
+
helpLink,
|
|
181
|
+
};
|
|
182
|
+
super(errorOptions);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
//# sourceMappingURL=envFunctionUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envFunctionUtils.js","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"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"}
|