@microsoft/teamsfx-core 2.0.9-rc-hotfix.2 → 2.0.10-alpha.070ff93c3.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 +127 -0
- package/build/client/teamsDevPortalClient.d.ts.map +1 -0
- package/build/client/teamsDevPortalClient.js +934 -0
- package/build/client/teamsDevPortalClient.js.map +1 -0
- package/build/common/azureUtils.d.ts +3 -0
- package/build/common/azureUtils.d.ts.map +1 -0
- package/build/common/azureUtils.js +50 -0
- package/build/common/azureUtils.js.map +1 -0
- package/build/common/constants.d.ts +10 -19
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +43 -22
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts +33 -25
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +51 -71
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/globalState.js +3 -3
- package/build/{core → common}/globalVars.d.ts +2 -1
- package/build/common/globalVars.d.ts.map +1 -0
- package/build/{core → common}/globalVars.js +11 -1
- package/build/common/globalVars.js.map +1 -0
- package/build/common/localizeUtils.js +1 -1
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +5 -0
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +31 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/requestUtils.d.ts +4 -0
- package/build/common/requestUtils.d.ts.map +1 -0
- package/build/common/requestUtils.js +52 -0
- package/build/common/requestUtils.js.map +1 -0
- package/build/common/samples.d.ts +6 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +6 -6
- package/build/common/samples.js.map +1 -1
- package/build/common/stringUtils.d.ts +8 -0
- package/build/common/stringUtils.d.ts.map +1 -1
- package/build/common/stringUtils.js +63 -1
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +35 -13
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +82 -74
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +2 -32
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +15 -248
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +1 -3
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +5 -14
- 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 +30 -26
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/configManager/lifecycle.js +1 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js +1 -1
- 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/constants.d.ts +3 -223
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +4 -247
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +41 -164
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/deps-checker/checkerFactory.d.ts.map +1 -0
- package/build/component/deps-checker/checkerFactory.js.map +1 -0
- package/build/{common → component}/deps-checker/constant/helpLink.d.ts +0 -3
- package/build/component/deps-checker/constant/helpLink.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/constant/helpLink.js +1 -6
- package/build/component/deps-checker/constant/helpLink.js.map +1 -0
- package/build/component/deps-checker/constant/index.d.ts.map +1 -0
- package/build/component/deps-checker/constant/index.js.map +1 -0
- package/build/component/deps-checker/constant/message.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/constant/message.js +1 -1
- package/build/component/deps-checker/constant/message.js.map +1 -0
- package/build/component/deps-checker/constant/telemetry.d.ts.map +1 -0
- package/build/component/deps-checker/constant/telemetry.js.map +1 -0
- package/build/component/deps-checker/coreDepsLoggerAdapter.d.ts.map +1 -0
- package/build/component/deps-checker/coreDepsLoggerAdapter.js.map +1 -0
- package/build/component/deps-checker/coreDepsTelemetryAdapter.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/coreDepsTelemetryAdapter.js +4 -4
- package/build/component/deps-checker/coreDepsTelemetryAdapter.js.map +1 -0
- package/build/component/deps-checker/depsChecker.d.ts.map +1 -0
- package/build/component/deps-checker/depsChecker.js.map +1 -0
- package/build/component/deps-checker/depsError.d.ts.map +1 -0
- package/build/component/deps-checker/depsError.js.map +1 -0
- package/build/component/deps-checker/depsLogger.d.ts.map +1 -0
- package/build/component/deps-checker/depsLogger.js.map +1 -0
- package/build/component/deps-checker/depsManager.d.ts.map +1 -0
- package/build/component/deps-checker/depsManager.js.map +1 -0
- package/build/component/deps-checker/depsTelemetry.d.ts.map +1 -0
- package/build/component/deps-checker/depsTelemetry.js.map +1 -0
- package/build/component/deps-checker/index.d.ts.map +1 -0
- package/build/component/deps-checker/index.js.map +1 -0
- package/build/component/deps-checker/internal/dotnetChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/dotnetChecker.js +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.js.map +1 -0
- package/build/component/deps-checker/internal/funcToolChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/funcToolChecker.js +4 -4
- package/build/component/deps-checker/internal/funcToolChecker.js.map +1 -0
- package/build/component/deps-checker/internal/nodeChecker.d.ts.map +1 -0
- package/build/component/deps-checker/internal/nodeChecker.js.map +1 -0
- package/build/component/deps-checker/internal/testToolChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/testToolChecker.js +1 -1
- package/build/component/deps-checker/internal/testToolChecker.js.map +1 -0
- package/build/component/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/vxTestAppChecker.js +9 -3
- package/build/component/deps-checker/internal/vxTestAppChecker.js.map +1 -0
- package/build/component/deps-checker/util/cpUtils.d.ts.map +1 -0
- package/build/component/deps-checker/util/cpUtils.js.map +1 -0
- package/build/component/deps-checker/util/downloadHelper.d.ts.map +1 -0
- package/build/component/deps-checker/util/downloadHelper.js.map +1 -0
- package/build/component/deps-checker/util/fileHelper.d.ts.map +1 -0
- package/build/component/deps-checker/util/fileHelper.js.map +1 -0
- package/build/component/deps-checker/util/index.d.ts.map +1 -0
- package/build/component/deps-checker/util/index.js.map +1 -0
- package/build/component/deps-checker/util/progressIndicator.d.ts.map +1 -0
- package/build/component/deps-checker/util/progressIndicator.js.map +1 -0
- package/build/component/deps-checker/util/system.d.ts.map +1 -0
- package/build/component/deps-checker/util/system.js.map +1 -0
- package/build/component/developerPortalScaffoldUtils.d.ts +1 -5
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +71 -87
- 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 +17 -18
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +10 -10
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +11 -11
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts +2 -2
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +29 -29
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +16 -16
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/update.d.ts +1 -1
- package/build/component/driver/apiKey/update.d.ts.map +1 -1
- package/build/component/driver/apiKey/update.js +15 -15
- package/build/component/driver/apiKey/update.js.map +1 -1
- package/build/component/driver/arm/deployImpl.js +1 -1
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.d.ts.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +25 -5
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js +2 -2
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +4 -4
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +13 -13
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +19 -18
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +1 -1
- package/build/component/driver/devTool/installDriver.d.ts.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/m365/acquire.js +4 -4
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +5 -5
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js +3 -3
- package/build/component/driver/middleware/addStartAndEndTelemetry.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +23 -24
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/update.d.ts +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +15 -15
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/utility.js +2 -3
- package/build/component/driver/oauth/utility/utility.js.map +1 -1
- package/build/component/driver/script/scriptDriver.js +1 -1
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +25 -25
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +7 -4
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +60 -60
- package/build/component/driver/teamsApp/clients/appStudioClient.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 +16 -16
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +0 -2
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +14 -24
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +2 -2
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +19 -19
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +21 -21
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +8 -8
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +29 -22
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +34 -34
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +0 -9
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +0 -9
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +1 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +2 -5
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +18 -18
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.d.ts +3 -3
- package/build/component/driver/teamsApp/validateTestCases.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +20 -19
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/driver/util/utils.d.ts +3 -0
- package/build/component/driver/util/utils.d.ts.map +1 -1
- package/build/component/driver/util/utils.js +16 -1
- package/build/component/driver/util/utils.js.map +1 -1
- package/build/component/driver/util/wrapUtil.d.ts.map +1 -1
- package/build/component/driver/util/wrapUtil.js +8 -5
- package/build/component/driver/util/wrapUtil.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +25 -24
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/sso.js +4 -3
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/generator/apiSpec/generator.d.ts +21 -0
- package/build/component/generator/apiSpec/generator.d.ts.map +1 -0
- package/build/component/generator/{copilotPlugin → apiSpec}/generator.js +226 -102
- package/build/component/generator/apiSpec/generator.js.map +1 -0
- package/build/component/generator/{copilotPlugin → apiSpec}/helper.d.ts +5 -14
- package/build/component/generator/apiSpec/helper.d.ts.map +1 -0
- package/build/component/generator/{copilotPlugin → apiSpec}/helper.js +70 -114
- package/build/component/generator/apiSpec/helper.js.map +1 -0
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +16 -10
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +1 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +8 -16
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/generatorProvider.d.ts.map +1 -1
- package/build/component/generator/generatorProvider.js +4 -2
- package/build/component/generator/generatorProvider.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +7 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +69 -36
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts +5 -0
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +37 -0
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts +2 -4
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.js +1 -86
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +8 -7
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +3 -2
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +0 -1
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +1 -5
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +2 -2
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +31 -34
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +0 -13
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +1 -16
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.js +11 -9
- package/build/component/generator/spfx/utils/telemetry-helper.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +1 -1
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.d.ts.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js +5 -5
- package/build/component/generator/templates/ssrTabGenerator.js.map +1 -1
- package/build/component/generator/templates/templateGenerator.d.ts +3 -3
- package/build/component/generator/templates/templateGenerator.d.ts.map +1 -1
- package/build/component/generator/templates/templateGenerator.js +4 -6
- package/build/component/generator/templates/templateGenerator.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +3 -0
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +143 -111
- 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 +18 -12
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.d.ts +4 -12
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +48 -79
- package/build/component/generator/utils.js.map +1 -1
- package/build/{common → component}/local/constants.d.ts +1 -0
- package/build/component/local/constants.d.ts.map +1 -0
- package/build/{common → component}/local/constants.js +1 -0
- package/build/component/local/constants.js.map +1 -0
- package/build/component/local/index.d.ts.map +1 -0
- package/build/component/local/index.js.map +1 -0
- package/build/component/local/localCertificateManager.d.ts.map +1 -0
- package/build/{common → component}/local/localCertificateManager.js +2 -2
- package/build/component/local/localCertificateManager.js.map +1 -0
- package/build/component/local/localEnvManager.d.ts.map +1 -0
- package/build/component/local/localEnvManager.js.map +1 -0
- package/build/component/local/localTelemetryReporter.d.ts.map +1 -0
- package/build/{common → component}/local/localTelemetryReporter.js +1 -1
- package/build/component/local/localTelemetryReporter.js.map +1 -0
- package/build/component/local/npmLogHelper.d.ts.map +1 -0
- package/build/component/local/npmLogHelper.js.map +1 -0
- package/build/component/local/packageJsonHelper.d.ts.map +1 -0
- package/build/component/local/packageJsonHelper.js.map +1 -0
- package/build/component/local/portChecker.d.ts.map +1 -0
- package/build/{common → component}/local/portChecker.js +2 -2
- package/build/component/local/portChecker.js.map +1 -0
- package/build/component/local/process.d.ts.map +1 -0
- package/build/component/local/process.js.map +1 -0
- package/build/component/local/taskDefinition.d.ts.map +1 -0
- package/build/{common → component}/local/taskDefinition.js +3 -3
- package/build/component/local/taskDefinition.js.map +1 -0
- package/build/component/m365/constants.d.ts +9 -0
- package/build/component/m365/constants.d.ts.map +1 -0
- package/build/{common → component}/m365/constants.js +4 -1
- package/build/component/m365/constants.js.map +1 -0
- package/build/component/m365/errors.d.ts.map +1 -0
- package/build/{common → component}/m365/errors.js +1 -1
- package/build/component/m365/errors.js.map +1 -0
- package/build/component/m365/launchHelper.d.ts +12 -0
- package/build/component/m365/launchHelper.d.ts.map +1 -0
- package/build/{common → component}/m365/launchHelper.js +30 -22
- package/build/component/m365/launchHelper.js.map +1 -0
- package/build/component/m365/packageService.d.ts.map +1 -0
- package/build/{common → component}/m365/packageService.js +12 -12
- package/build/component/m365/packageService.js.map +1 -0
- package/build/component/m365/serviceConstant.d.ts +3 -0
- package/build/component/m365/serviceConstant.d.ts.map +1 -0
- package/build/component/m365/serviceConstant.js +8 -0
- package/build/component/m365/serviceConstant.js.map +1 -0
- package/build/component/middleware/actionExecutionMW.d.ts +1 -1
- package/build/component/middleware/actionExecutionMW.d.ts.map +1 -1
- package/build/component/middleware/actionExecutionMW.js +9 -9
- package/build/component/middleware/actionExecutionMW.js.map +1 -1
- package/build/component/middleware/envMW.js +4 -4
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/middleware/questionMW.js +1 -1
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/migrate.d.ts +32 -0
- package/build/component/migrate.d.ts.map +1 -1
- package/build/component/migrate.js +109 -32
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +5 -6
- 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 +12 -11
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +9 -6
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/resource/botService/constants.d.ts +0 -13
- package/build/component/resource/botService/constants.d.ts.map +1 -1
- package/build/component/resource/botService/constants.js +1 -15
- package/build/component/resource/botService/constants.js.map +1 -1
- package/build/component/telemetry.d.ts.map +1 -1
- package/build/component/telemetry.js +6 -7
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +10 -2
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +135 -42
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/charsetUtils.d.ts +1 -1
- package/build/component/utils/charsetUtils.d.ts.map +1 -1
- package/build/component/utils/charsetUtils.js +3 -1
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts +1 -3
- package/build/component/utils/depsChecker/common.d.ts.map +1 -1
- package/build/component/utils/depsChecker/common.js +0 -2
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/envUtil.js +2 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.js +1 -1
- 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 -11
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/settingsUtil.js +1 -1
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.d.ts.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +6 -9
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +3 -4
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +81 -110
- package/build/core/FxCore.js.map +1 -1
- package/build/core/callback.d.ts +2 -2
- package/build/core/callback.d.ts.map +1 -1
- package/build/core/callback.js.map +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +9 -11
- package/build/core/collaborator.js.map +1 -1
- package/build/core/crypto.d.ts.map +1 -1
- package/build/core/crypto.js +1 -2
- package/build/core/crypto.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.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +12 -13
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/errorHandler.js +1 -1
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +5 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +32 -28
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +1 -1
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +5 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +1 -1
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts +1 -0
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +12 -6
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +2 -2
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +4 -4
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.d.ts +2 -0
- package/build/core/middleware/videoFilterAppBlocker.d.ts.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.js +21 -5
- package/build/core/middleware/videoFilterAppBlocker.js.map +1 -1
- package/build/core/telemetry.d.ts +0 -5
- package/build/core/telemetry.d.ts.map +1 -1
- package/build/core/telemetry.js +9 -17
- package/build/core/telemetry.js.map +1 -1
- package/build/error/common.d.ts +33 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +111 -6
- package/build/error/common.js.map +1 -1
- package/build/error/teamsApp.d.ts +3 -0
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +12 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/error/yml.js +1 -1
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +58 -36
- package/build/index.d.ts.map +1 -1
- package/build/index.js +124 -52
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +243 -1
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +1049 -11
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +10 -151
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +258 -1268
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +1 -3
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +2 -6
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +6 -8
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +15 -34
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts +2 -28
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +66 -272
- package/build/question/other.js.map +1 -1
- package/package.json +11 -9
- package/resource/deps-checker/dotnet-install.ps1 +912 -423
- package/resource/deps-checker/dotnet-install.sh +876 -238
- package/resource/package.nls.json +71 -119
- package/resource/yaml-schema/v1.6/yaml.schema.json +1829 -0
- package/resource/yaml-schema/yaml.schema.json +46 -1
- package/templates/core/v3Migration/js.ts.app.local.yml +3 -3
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/aad.manifest.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/aad.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/bot/aad.manifest.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/tab/aad.manifest.template.json +6 -0
- package/build/common/deps-checker/checkerFactory.d.ts.map +0 -1
- package/build/common/deps-checker/checkerFactory.js.map +0 -1
- package/build/common/deps-checker/constant/helpLink.d.ts.map +0 -1
- package/build/common/deps-checker/constant/helpLink.js.map +0 -1
- package/build/common/deps-checker/constant/index.d.ts.map +0 -1
- package/build/common/deps-checker/constant/index.js.map +0 -1
- package/build/common/deps-checker/constant/message.d.ts.map +0 -1
- package/build/common/deps-checker/constant/message.js.map +0 -1
- package/build/common/deps-checker/constant/telemetry.d.ts.map +0 -1
- package/build/common/deps-checker/constant/telemetry.js.map +0 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts.map +0 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.js.map +0 -1
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts.map +0 -1
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js.map +0 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +0 -1
- package/build/common/deps-checker/depsChecker.js.map +0 -1
- package/build/common/deps-checker/depsError.d.ts.map +0 -1
- package/build/common/deps-checker/depsError.js.map +0 -1
- package/build/common/deps-checker/depsLogger.d.ts.map +0 -1
- package/build/common/deps-checker/depsLogger.js.map +0 -1
- package/build/common/deps-checker/depsManager.d.ts.map +0 -1
- package/build/common/deps-checker/depsManager.js.map +0 -1
- package/build/common/deps-checker/depsTelemetry.d.ts.map +0 -1
- package/build/common/deps-checker/depsTelemetry.js.map +0 -1
- package/build/common/deps-checker/index.d.ts.map +0 -1
- package/build/common/deps-checker/index.js.map +0 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/dotnetChecker.js.map +0 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/funcToolChecker.js.map +0 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/nodeChecker.js.map +0 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/testToolChecker.js.map +0 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +0 -1
- package/build/common/deps-checker/util/cpUtils.d.ts.map +0 -1
- package/build/common/deps-checker/util/cpUtils.js.map +0 -1
- package/build/common/deps-checker/util/downloadHelper.d.ts.map +0 -1
- package/build/common/deps-checker/util/downloadHelper.js.map +0 -1
- package/build/common/deps-checker/util/fileHelper.d.ts.map +0 -1
- package/build/common/deps-checker/util/fileHelper.js.map +0 -1
- package/build/common/deps-checker/util/index.d.ts.map +0 -1
- package/build/common/deps-checker/util/index.js.map +0 -1
- package/build/common/deps-checker/util/progressIndicator.d.ts.map +0 -1
- package/build/common/deps-checker/util/progressIndicator.js.map +0 -1
- package/build/common/deps-checker/util/system.d.ts.map +0 -1
- package/build/common/deps-checker/util/system.js.map +0 -1
- package/build/common/local/constants.d.ts.map +0 -1
- package/build/common/local/constants.js.map +0 -1
- package/build/common/local/index.d.ts.map +0 -1
- package/build/common/local/index.js.map +0 -1
- package/build/common/local/localCertificateManager.d.ts.map +0 -1
- package/build/common/local/localCertificateManager.js.map +0 -1
- package/build/common/local/localEnvManager.d.ts.map +0 -1
- package/build/common/local/localEnvManager.js.map +0 -1
- package/build/common/local/localTelemetryReporter.d.ts.map +0 -1
- package/build/common/local/localTelemetryReporter.js.map +0 -1
- package/build/common/local/npmLogHelper.d.ts.map +0 -1
- package/build/common/local/npmLogHelper.js.map +0 -1
- package/build/common/local/packageJsonHelper.d.ts.map +0 -1
- package/build/common/local/packageJsonHelper.js.map +0 -1
- package/build/common/local/portChecker.d.ts.map +0 -1
- package/build/common/local/portChecker.js.map +0 -1
- package/build/common/local/process.d.ts.map +0 -1
- package/build/common/local/process.js.map +0 -1
- package/build/common/local/taskDefinition.d.ts.map +0 -1
- package/build/common/local/taskDefinition.js.map +0 -1
- package/build/common/m365/constants.d.ts +0 -6
- package/build/common/m365/constants.d.ts.map +0 -1
- package/build/common/m365/constants.js.map +0 -1
- package/build/common/m365/errors.d.ts.map +0 -1
- package/build/common/m365/errors.js.map +0 -1
- package/build/common/m365/launchHelper.d.ts +0 -12
- package/build/common/m365/launchHelper.d.ts.map +0 -1
- package/build/common/m365/launchHelper.js.map +0 -1
- package/build/common/m365/packageService.d.ts.map +0 -1
- package/build/common/m365/packageService.js.map +0 -1
- package/build/common/m365/serviceConstant.d.ts +0 -3
- package/build/common/m365/serviceConstant.d.ts.map +0 -1
- package/build/common/m365/serviceConstant.js +0 -8
- package/build/common/m365/serviceConstant.js.map +0 -1
- package/build/common/projectSettingsHelperV3.d.ts +0 -2
- package/build/common/projectSettingsHelperV3.d.ts.map +0 -1
- package/build/common/projectSettingsHelperV3.js +0 -15
- package/build/common/projectSettingsHelperV3.js.map +0 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +0 -13
- package/build/component/generator/copilotPlugin/generator.d.ts.map +0 -1
- 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 +0 -13
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +0 -1
- package/build/component/generator/officeXMLAddin/generator.js +0 -110
- package/build/component/generator/officeXMLAddin/generator.js.map +0 -1
- package/build/component/utils.d.ts +0 -12
- package/build/component/utils.d.ts.map +0 -1
- package/build/component/utils.js +0 -136
- package/build/component/utils.js.map +0 -1
- package/build/component/workflow.d.ts +0 -4
- package/build/component/workflow.d.ts.map +0 -1
- package/build/component/workflow.js +0 -18
- package/build/component/workflow.js.map +0 -1
- package/build/core/error.d.ts +0 -32
- package/build/core/error.d.ts.map +0 -1
- package/build/core/error.js +0 -122
- package/build/core/error.js.map +0 -1
- package/build/core/globalVars.d.ts.map +0 -1
- package/build/core/globalVars.js.map +0 -1
- package/build/failpoint/index.d.ts +0 -3
- package/build/failpoint/index.d.ts.map +0 -1
- package/build/failpoint/index.js +0 -11
- package/build/failpoint/index.js.map +0 -1
- package/build/failpoint/marker.d.ts +0 -13
- package/build/failpoint/marker.d.ts.map +0 -1
- package/build/failpoint/marker.js +0 -8
- package/build/failpoint/marker.js.map +0 -1
- package/build/failpoint/runtime.d.ts +0 -12
- package/build/failpoint/runtime.d.ts.map +0 -1
- package/build/failpoint/runtime.js +0 -67
- package/build/failpoint/runtime.js.map +0 -1
- package/build/question/questionNames.d.ts +0 -78
- package/build/question/questionNames.d.ts.map +0 -1
- package/build/question/questionNames.js +0 -85
- package/build/question/questionNames.js.map +0 -1
- package/build/question/util.d.ts +0 -2
- package/build/question/util.d.ts.map +0 -1
- package/build/question/util.js +0 -18
- package/build/question/util.js.map +0 -1
- /package/build/{common → component}/deps-checker/checkerFactory.d.ts +0 -0
- /package/build/{common → component}/deps-checker/checkerFactory.js +0 -0
- /package/build/{common → component}/deps-checker/constant/index.d.ts +0 -0
- /package/build/{common → component}/deps-checker/constant/index.js +0 -0
- /package/build/{common → component}/deps-checker/constant/message.d.ts +0 -0
- /package/build/{common → component}/deps-checker/constant/telemetry.d.ts +0 -0
- /package/build/{common → component}/deps-checker/constant/telemetry.js +0 -0
- /package/build/{common → component}/deps-checker/coreDepsLoggerAdapter.d.ts +0 -0
- /package/build/{common → component}/deps-checker/coreDepsLoggerAdapter.js +0 -0
- /package/build/{common → component}/deps-checker/coreDepsTelemetryAdapter.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsChecker.js +0 -0
- /package/build/{common → component}/deps-checker/depsError.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsError.js +0 -0
- /package/build/{common → component}/deps-checker/depsLogger.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsLogger.js +0 -0
- /package/build/{common → component}/deps-checker/depsManager.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsManager.js +0 -0
- /package/build/{common → component}/deps-checker/depsTelemetry.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsTelemetry.js +0 -0
- /package/build/{common → component}/deps-checker/index.d.ts +0 -0
- /package/build/{common → component}/deps-checker/index.js +0 -0
- /package/build/{common → component}/deps-checker/internal/dotnetChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/funcToolChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/nodeChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/nodeChecker.js +0 -0
- /package/build/{common → component}/deps-checker/internal/testToolChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/vxTestAppChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/cpUtils.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/cpUtils.js +0 -0
- /package/build/{common → component}/deps-checker/util/downloadHelper.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/downloadHelper.js +0 -0
- /package/build/{common → component}/deps-checker/util/fileHelper.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/fileHelper.js +0 -0
- /package/build/{common → component}/deps-checker/util/index.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/index.js +0 -0
- /package/build/{common → component}/deps-checker/util/progressIndicator.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/progressIndicator.js +0 -0
- /package/build/{common → component}/deps-checker/util/system.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/system.js +0 -0
- /package/build/{common → component}/local/index.d.ts +0 -0
- /package/build/{common → component}/local/index.js +0 -0
- /package/build/{common → component}/local/localCertificateManager.d.ts +0 -0
- /package/build/{common → component}/local/localEnvManager.d.ts +0 -0
- /package/build/{common → component}/local/localEnvManager.js +0 -0
- /package/build/{common → component}/local/localTelemetryReporter.d.ts +0 -0
- /package/build/{common → component}/local/npmLogHelper.d.ts +0 -0
- /package/build/{common → component}/local/npmLogHelper.js +0 -0
- /package/build/{common → component}/local/packageJsonHelper.d.ts +0 -0
- /package/build/{common → component}/local/packageJsonHelper.js +0 -0
- /package/build/{common → component}/local/portChecker.d.ts +0 -0
- /package/build/{common → component}/local/process.d.ts +0 -0
- /package/build/{common → component}/local/process.js +0 -0
- /package/build/{common → component}/local/taskDefinition.d.ts +0 -0
- /package/build/{common → component}/m365/errors.d.ts +0 -0
- /package/build/{common → component}/m365/packageService.d.ts +0 -0
|
@@ -2,27 +2,48 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.convertManifestTemplateToV2 = exports.convertManifestTemplateToV3 = exports.convertProjectSettingsV2ToV3 = exports.EnvStateMigrationComponentNames = void 0;
|
|
5
|
+
exports.convertManifestTemplateToV2 = exports.convertManifestTemplateToV3 = exports.getComponentByScenario = exports.getComponent = exports.convertProjectSettingsV2ToV3 = exports.EnvStateMigrationComponentNames = exports.ComponentNames = void 0;
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
const constants_1 = require("../question/constants");
|
|
11
|
+
exports.ComponentNames = {
|
|
12
|
+
TeamsTab: "teams-tab",
|
|
13
|
+
TeamsBot: "teams-bot",
|
|
14
|
+
TeamsApi: "teams-api",
|
|
15
|
+
AppManifest: "app-manifest",
|
|
16
|
+
AadApp: "aad-app",
|
|
17
|
+
AzureWebApp: "azure-web-app",
|
|
18
|
+
AzureStorage: "azure-storage",
|
|
19
|
+
BotService: "bot-service",
|
|
20
|
+
SPFxTab: "spfx-tab",
|
|
21
|
+
SPFx: "spfx",
|
|
22
|
+
Identity: "identity",
|
|
23
|
+
APIM: "apim",
|
|
24
|
+
KeyVault: "key-vault",
|
|
25
|
+
AzureSQL: "azure-sql",
|
|
26
|
+
TabCode: "tab-code",
|
|
27
|
+
BotCode: "bot-code",
|
|
28
|
+
ApiCode: "api-code",
|
|
29
|
+
Function: "azure-function",
|
|
30
|
+
SimpleAuth: "simple-auth",
|
|
31
|
+
SSO: "sso",
|
|
32
|
+
ApiConnector: "api-connector",
|
|
33
|
+
CICD: "cicd",
|
|
34
|
+
};
|
|
14
35
|
exports.EnvStateMigrationComponentNames = [
|
|
15
36
|
["solution", "solution"],
|
|
16
|
-
["fx-resource-appstudio",
|
|
17
|
-
["fx-resource-identity",
|
|
18
|
-
["fx-resource-azure-sql",
|
|
19
|
-
["fx-resource-aad-app-for-teams",
|
|
20
|
-
["fx-resource-function",
|
|
21
|
-
["fx-resource-apim",
|
|
22
|
-
["fx-resource-key-vault",
|
|
23
|
-
["fx-resource-bot",
|
|
24
|
-
["fx-resource-frontend-hosting",
|
|
25
|
-
["fx-resource-simple-auth",
|
|
37
|
+
["fx-resource-appstudio", exports.ComponentNames.AppManifest],
|
|
38
|
+
["fx-resource-identity", exports.ComponentNames.Identity],
|
|
39
|
+
["fx-resource-azure-sql", exports.ComponentNames.AzureSQL],
|
|
40
|
+
["fx-resource-aad-app-for-teams", exports.ComponentNames.AadApp],
|
|
41
|
+
["fx-resource-function", exports.ComponentNames.TeamsApi],
|
|
42
|
+
["fx-resource-apim", exports.ComponentNames.APIM],
|
|
43
|
+
["fx-resource-key-vault", exports.ComponentNames.KeyVault],
|
|
44
|
+
["fx-resource-bot", exports.ComponentNames.TeamsBot],
|
|
45
|
+
["fx-resource-frontend-hosting", exports.ComponentNames.TeamsTab],
|
|
46
|
+
["fx-resource-simple-auth", exports.ComponentNames.SimpleAuth],
|
|
26
47
|
];
|
|
27
48
|
function convertProjectSettingsV2ToV3(settingsV2, projectPath) {
|
|
28
49
|
var _a, _b, _c, _d;
|
|
@@ -34,13 +55,13 @@ function convertProjectSettingsV2ToV3(settingsV2, projectPath) {
|
|
|
34
55
|
const hasAAD = solutionSettings.activeResourcePlugins.includes("fx-resource-aad-app-for-teams");
|
|
35
56
|
if (hasAAD) {
|
|
36
57
|
settingsV3.components.push({
|
|
37
|
-
name:
|
|
58
|
+
name: exports.ComponentNames.AadApp,
|
|
38
59
|
provision: true,
|
|
39
60
|
deploy: true,
|
|
40
61
|
});
|
|
41
62
|
}
|
|
42
63
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-frontend-hosting")) {
|
|
43
|
-
const hostingComponent = isVS ?
|
|
64
|
+
const hostingComponent = isVS ? exports.ComponentNames.AzureWebApp : exports.ComponentNames.AzureStorage;
|
|
44
65
|
const existsAuthStartFile = fs_extra_1.pathExistsSync(path_1.join(projectPath, "tabs", "public", "auth-start.html"));
|
|
45
66
|
const tabSSO = solutionSettings.capabilities.includes("TabSSO") ||
|
|
46
67
|
solutionSettings.capabilities.includes("SSO") ||
|
|
@@ -70,7 +91,7 @@ function convertProjectSettingsV2ToV3(settingsV2, projectPath) {
|
|
|
70
91
|
};
|
|
71
92
|
settingsV3.components.push(teamsTab);
|
|
72
93
|
}
|
|
73
|
-
const hostingConfig =
|
|
94
|
+
const hostingConfig = getComponent(settingsV3, hostingComponent);
|
|
74
95
|
if (hostingConfig) {
|
|
75
96
|
hostingConfig.connections = hostingConfig.connections || [];
|
|
76
97
|
hostingConfig.connections.push("teams-tab");
|
|
@@ -101,15 +122,15 @@ function convertProjectSettingsV2ToV3(settingsV2, projectPath) {
|
|
|
101
122
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-bot")) {
|
|
102
123
|
const hostType = (_b = (_a = settingsV2.pluginSettings) === null || _a === void 0 ? void 0 : _a["fx-resource-bot"]) === null || _b === void 0 ? void 0 : _b["host-type"];
|
|
103
124
|
let botCapabilities = (_d = (_c = settingsV2.pluginSettings) === null || _c === void 0 ? void 0 : _c["fx-resource-bot"]) === null || _d === void 0 ? void 0 : _d["capabilities"];
|
|
104
|
-
if (solutionSettings.capabilities.includes(
|
|
125
|
+
if (solutionSettings.capabilities.includes(constants_1.CapabilityOptions.me().id) &&
|
|
105
126
|
!(botCapabilities === null || botCapabilities === void 0 ? void 0 : botCapabilities.includes("message-extension"))) {
|
|
106
127
|
botCapabilities = botCapabilities || [];
|
|
107
128
|
botCapabilities.push("message-extension");
|
|
108
129
|
}
|
|
109
130
|
const isHostingFunction = hostType === "azure-functions";
|
|
110
131
|
const hostingComponent = isHostingFunction
|
|
111
|
-
?
|
|
112
|
-
:
|
|
132
|
+
? exports.ComponentNames.Function
|
|
133
|
+
: exports.ComponentNames.AzureWebApp;
|
|
113
134
|
if (isVS) {
|
|
114
135
|
const teamsBot = {
|
|
115
136
|
name: "teams-bot",
|
|
@@ -137,7 +158,7 @@ function convertProjectSettingsV2ToV3(settingsV2, projectPath) {
|
|
|
137
158
|
};
|
|
138
159
|
settingsV3.components.push(teamsBot);
|
|
139
160
|
}
|
|
140
|
-
const hostingConfig =
|
|
161
|
+
const hostingConfig = getComponent(settingsV3, hostingComponent);
|
|
141
162
|
if (hostingConfig) {
|
|
142
163
|
hostingConfig.connections = hostingConfig.connections || [];
|
|
143
164
|
hostingConfig.connections.push("teams-bot");
|
|
@@ -151,43 +172,43 @@ function convertProjectSettingsV2ToV3(settingsV2, projectPath) {
|
|
|
151
172
|
});
|
|
152
173
|
}
|
|
153
174
|
settingsV3.components.push({
|
|
154
|
-
name:
|
|
175
|
+
name: exports.ComponentNames.BotService,
|
|
155
176
|
provision: true,
|
|
156
177
|
});
|
|
157
178
|
}
|
|
158
179
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-identity")) {
|
|
159
180
|
settingsV3.components.push({
|
|
160
|
-
name:
|
|
181
|
+
name: exports.ComponentNames.Identity,
|
|
161
182
|
});
|
|
162
183
|
}
|
|
163
184
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-key-vault")) {
|
|
164
185
|
settingsV3.components.push({
|
|
165
|
-
name:
|
|
186
|
+
name: exports.ComponentNames.KeyVault,
|
|
166
187
|
});
|
|
167
188
|
}
|
|
168
189
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-azure-sql")) {
|
|
169
190
|
settingsV3.components.push({
|
|
170
|
-
name:
|
|
191
|
+
name: exports.ComponentNames.AzureSQL,
|
|
171
192
|
provision: true,
|
|
172
193
|
});
|
|
173
194
|
}
|
|
174
195
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-apim")) {
|
|
175
196
|
settingsV3.components.push({
|
|
176
|
-
name:
|
|
197
|
+
name: exports.ComponentNames.APIM,
|
|
177
198
|
provision: true,
|
|
178
199
|
deploy: true,
|
|
179
200
|
});
|
|
180
201
|
}
|
|
181
202
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-simple-auth")) {
|
|
182
203
|
settingsV3.components.push({
|
|
183
|
-
name:
|
|
204
|
+
name: exports.ComponentNames.SimpleAuth,
|
|
184
205
|
provision: true,
|
|
185
206
|
});
|
|
186
207
|
}
|
|
187
208
|
if (solutionSettings.activeResourcePlugins.includes("fx-resource-function")) {
|
|
188
209
|
settingsV3.components.push({
|
|
189
|
-
name:
|
|
190
|
-
hosting:
|
|
210
|
+
name: exports.ComponentNames.TeamsApi,
|
|
211
|
+
hosting: exports.ComponentNames.Function,
|
|
191
212
|
functionNames: [settingsV2.defaultFunctionName || "getUserProfile"],
|
|
192
213
|
build: true,
|
|
193
214
|
folder: "api",
|
|
@@ -195,15 +216,71 @@ function convertProjectSettingsV2ToV3(settingsV2, projectPath) {
|
|
|
195
216
|
artifactFolder: "api",
|
|
196
217
|
});
|
|
197
218
|
settingsV3.components.push({
|
|
198
|
-
name:
|
|
219
|
+
name: exports.ComponentNames.Function,
|
|
199
220
|
scenario: "Api",
|
|
200
221
|
});
|
|
201
222
|
}
|
|
202
|
-
|
|
223
|
+
ensureComponentConnections(settingsV3);
|
|
203
224
|
}
|
|
204
225
|
return settingsV3;
|
|
205
226
|
}
|
|
206
227
|
exports.convertProjectSettingsV2ToV3 = convertProjectSettingsV2ToV3;
|
|
228
|
+
const ComponentConnections = {
|
|
229
|
+
[exports.ComponentNames.AzureWebApp]: [
|
|
230
|
+
exports.ComponentNames.Identity,
|
|
231
|
+
exports.ComponentNames.AzureSQL,
|
|
232
|
+
exports.ComponentNames.KeyVault,
|
|
233
|
+
exports.ComponentNames.AadApp,
|
|
234
|
+
exports.ComponentNames.TeamsTab,
|
|
235
|
+
exports.ComponentNames.TeamsBot,
|
|
236
|
+
exports.ComponentNames.TeamsApi,
|
|
237
|
+
],
|
|
238
|
+
[exports.ComponentNames.Function]: [
|
|
239
|
+
exports.ComponentNames.Identity,
|
|
240
|
+
exports.ComponentNames.AzureSQL,
|
|
241
|
+
exports.ComponentNames.KeyVault,
|
|
242
|
+
exports.ComponentNames.AadApp,
|
|
243
|
+
exports.ComponentNames.TeamsTab,
|
|
244
|
+
exports.ComponentNames.TeamsBot,
|
|
245
|
+
exports.ComponentNames.TeamsApi,
|
|
246
|
+
],
|
|
247
|
+
[exports.ComponentNames.APIM]: [exports.ComponentNames.TeamsTab, exports.ComponentNames.TeamsBot],
|
|
248
|
+
};
|
|
249
|
+
function getComponent(projectSettings, resourceType) {
|
|
250
|
+
var _a;
|
|
251
|
+
return (_a = projectSettings.components) === null || _a === void 0 ? void 0 : _a.find((r) => r.name === resourceType);
|
|
252
|
+
}
|
|
253
|
+
exports.getComponent = getComponent;
|
|
254
|
+
var Scenarios;
|
|
255
|
+
(function (Scenarios) {
|
|
256
|
+
Scenarios["Tab"] = "Tab";
|
|
257
|
+
Scenarios["Bot"] = "Bot";
|
|
258
|
+
Scenarios["Api"] = "Api";
|
|
259
|
+
})(Scenarios || (Scenarios = {}));
|
|
260
|
+
function getComponentByScenario(projectSetting, resourceType, scenario) {
|
|
261
|
+
var _a;
|
|
262
|
+
return scenario
|
|
263
|
+
? (_a = projectSetting.components) === null || _a === void 0 ? void 0 : _a.find((r) => r.name === resourceType && r.scenario === scenario)
|
|
264
|
+
: getComponent(projectSetting, resourceType);
|
|
265
|
+
}
|
|
266
|
+
exports.getComponentByScenario = getComponentByScenario;
|
|
267
|
+
function ensureComponentConnections(settingsV3) {
|
|
268
|
+
var _a;
|
|
269
|
+
const exists = (c) => getComponent(settingsV3, c) !== undefined;
|
|
270
|
+
const existingConfigNames = Object.keys(ComponentConnections).filter(exists);
|
|
271
|
+
for (const configName of existingConfigNames) {
|
|
272
|
+
const existingResources = ComponentConnections[configName].filter(exists);
|
|
273
|
+
const configs = settingsV3.components.filter((c) => c.name === configName);
|
|
274
|
+
for (const config of configs) {
|
|
275
|
+
config.connections = lodash_1.cloneDeep(existingResources);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
if (getComponent(settingsV3, exports.ComponentNames.TeamsApi) &&
|
|
279
|
+
getComponent(settingsV3, exports.ComponentNames.APIM)) {
|
|
280
|
+
const functionConfig = getComponentByScenario(settingsV3, exports.ComponentNames.Function, Scenarios.Api);
|
|
281
|
+
(_a = functionConfig === null || functionConfig === void 0 ? void 0 : functionConfig.connections) === null || _a === void 0 ? void 0 : _a.push(exports.ComponentNames.APIM);
|
|
282
|
+
}
|
|
283
|
+
}
|
|
207
284
|
function convertManifestTemplateToV3(content) {
|
|
208
285
|
for (const pluginAndComponentArray of exports.EnvStateMigrationComponentNames) {
|
|
209
286
|
const pluginName = pluginAndComponentArray[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/component/migrate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uCAA0C;AAC1C,mCAAmC;AACnC,+BAA4B;AAC5B,2EAA8D;AAC9D
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/component/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAuB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrF,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,cAAM,cAAc;IAClB;;;OAGG;IACG,kBAAkB,CACtB,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAkCvC,mBAAmB,CACvB,MAAM,EAAE,qBAAqB,EAC7B,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAoCxC,eAAe,CACnB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAwBpC,wBAAwB,CAC5B,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,aAAa,GAAG,SAAS,EACrC,YAAY,EAAE,gBAAgB,EAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA8CtC,yBAAyB,CACvB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC;CA0B9B;AASD,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
|
|
@@ -8,13 +8,12 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
8
8
|
const constants_1 = require("../common/constants");
|
|
9
9
|
const localizeUtils_1 = require("../common/localizeUtils");
|
|
10
10
|
const telemetry_1 = require("../common/telemetry");
|
|
11
|
-
const
|
|
12
|
-
const globalVars_1 = require("../
|
|
11
|
+
const stringUtils_1 = require("../common/stringUtils");
|
|
12
|
+
const globalVars_1 = require("../common/globalVars");
|
|
13
13
|
const azure_1 = require("../error/azure");
|
|
14
14
|
const common_1 = require("../error/common");
|
|
15
15
|
const m365_1 = require("../error/m365");
|
|
16
16
|
const constants_2 = require("./constants");
|
|
17
|
-
const constants_3 = require("./driver/teamsApp/constants");
|
|
18
17
|
const ResourceGroupHelper_1 = require("./utils/ResourceGroupHelper");
|
|
19
18
|
class ProvisionUtils {
|
|
20
19
|
/**
|
|
@@ -88,12 +87,12 @@ class ProvisionUtils {
|
|
|
88
87
|
// Just to trigger M365 login before the concurrent execution of localDebug.
|
|
89
88
|
// Because concurrent execution of localDebug may getAccessToken() concurrently, which
|
|
90
89
|
// causes 2 M365 logins before the token caching in common lib takes effect.
|
|
91
|
-
const appStudioTokenRes = await m365TokenProvider.getAccessToken({ scopes:
|
|
90
|
+
const appStudioTokenRes = await m365TokenProvider.getAccessToken({ scopes: constants_1.AppStudioScopes });
|
|
92
91
|
if (appStudioTokenRes.isErr()) {
|
|
93
92
|
return teamsfx_api_1.err(appStudioTokenRes.error);
|
|
94
93
|
}
|
|
95
94
|
const appStudioTokenJsonRes = await m365TokenProvider.getJsonObject({
|
|
96
|
-
scopes:
|
|
95
|
+
scopes: constants_1.AppStudioScopes,
|
|
97
96
|
});
|
|
98
97
|
const appStudioTokenJson = appStudioTokenJsonRes.isOk()
|
|
99
98
|
? appStudioTokenJsonRes.value
|
|
@@ -125,7 +124,7 @@ class ProvisionUtils {
|
|
|
125
124
|
const confirm = (confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isOk()) ? confirmRes.value : undefined;
|
|
126
125
|
(_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(telemetry_1.TelemetryEvent.ConfirmProvision, envName
|
|
127
126
|
? {
|
|
128
|
-
[telemetry_1.TelemetryProperty.Env]:
|
|
127
|
+
[telemetry_1.TelemetryProperty.Env]: stringUtils_1.getHashedEnv(envName),
|
|
129
128
|
[constants_2.SolutionTelemetryProperty.SubscriptionId]: azureSubInfo.subscriptionId,
|
|
130
129
|
[constants_2.SolutionTelemetryProperty.M365TenantId]: (_c = m365tenant === null || m365tenant === void 0 ? void 0 : m365tenant.tenantIdInToken) !== null && _c !== void 0 ? _c : "",
|
|
131
130
|
[constants_2.SolutionTelemetryProperty.ConfirmRes]: !confirm ? "Cancel" : "Provision",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAgE;AAChE,wDAUgC;AAChC,
|
|
1
|
+
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAkB,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAkB,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjF,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAqCtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,OAAO,CAA0B;WAElC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa;IAiBlE;;;OAGG;WACW,SAAS,CAAC,MAAM,EAAE,MAAM;WAIlB,kBAAkB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;WAmBpB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,GAAG,SAAS,CAAC;WAiBhE,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAWtD,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,gBAAgB,EAC9B,cAAc,UAAO,EACrB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC;WAyBI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;WAgBI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
|
|
@@ -8,18 +8,19 @@ const tslib_1 = require("tslib");
|
|
|
8
8
|
* @author Qianhao Dong <qidon@microsoft.com>
|
|
9
9
|
*/
|
|
10
10
|
const IBotRegistration_1 = require("./interfaces/IBotRegistration");
|
|
11
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
12
|
+
const constants_1 = require("../../../../common/constants");
|
|
13
|
+
const globalVars_1 = require("../../../../common/globalVars");
|
|
14
|
+
const wrappedAxiosClient_1 = require("../../../../common/wrappedAxiosClient");
|
|
11
15
|
const commonConstant_1 = require("../../../constant/commonConstant");
|
|
12
16
|
const appStudioClient_1 = require("../../../driver/teamsApp/clients/appStudioClient");
|
|
13
|
-
const
|
|
17
|
+
const constants_2 = require("../../../driver/teamsApp/constants");
|
|
14
18
|
const common_1 = require("../common");
|
|
15
|
-
const
|
|
19
|
+
const constants_3 = require("../constants");
|
|
16
20
|
const errors_1 = require("../errors");
|
|
17
21
|
const messages_1 = require("../messages");
|
|
18
22
|
const retryHandler_1 = require("../retryHandler");
|
|
19
23
|
const strings_1 = require("../strings");
|
|
20
|
-
const globalVars_1 = require("../../../../core/globalVars");
|
|
21
|
-
const hooks_1 = require("@feathersjs/hooks");
|
|
22
|
-
const wrappedAxiosClient_1 = require("../../../../common/wrappedAxiosClient");
|
|
23
24
|
function handleBotFrameworkError(e, apiName) {
|
|
24
25
|
var _a, _b, _c, _d;
|
|
25
26
|
if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === commonConstant_1.HttpStatusCode.NOTFOUND) {
|
|
@@ -35,7 +36,7 @@ function handleBotFrameworkError(e, apiName) {
|
|
|
35
36
|
throw new errors_1.BotFrameworkConflictResultError();
|
|
36
37
|
}
|
|
37
38
|
else {
|
|
38
|
-
e.teamsfxUrlName =
|
|
39
|
+
e.teamsfxUrlName = constants_3.TeamsFxUrlNames[apiName];
|
|
39
40
|
throw appStudioClient_1.AppStudioClient.wrapException(e, apiName);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
@@ -77,7 +78,7 @@ class AppStudioClient {
|
|
|
77
78
|
}
|
|
78
79
|
}
|
|
79
80
|
catch (e) {
|
|
80
|
-
handleBotFrameworkError(e,
|
|
81
|
+
handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.GET_BOT);
|
|
81
82
|
}
|
|
82
83
|
}
|
|
83
84
|
static async listBots(token) {
|
|
@@ -93,7 +94,7 @@ class AppStudioClient {
|
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
96
|
catch (e) {
|
|
96
|
-
handleBotFrameworkError(e,
|
|
97
|
+
handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.LIST_BOT);
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
100
|
static async deleteBot(token, botId) {
|
|
@@ -102,7 +103,7 @@ class AppStudioClient {
|
|
|
102
103
|
await retryHandler_1.RetryHandler.Retry(() => axiosInstance.delete(`${AppStudioClient.baseUrl}/api/botframework/${botId}`));
|
|
103
104
|
}
|
|
104
105
|
catch (e) {
|
|
105
|
-
handleBotFrameworkError(e,
|
|
106
|
+
handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.DELETE_BOT);
|
|
106
107
|
}
|
|
107
108
|
}
|
|
108
109
|
static async createBotRegistration(token, registration, checkExistence = true, context) {
|
|
@@ -122,7 +123,7 @@ class AppStudioClient {
|
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
125
|
catch (e) {
|
|
125
|
-
handleBotFrameworkError(e,
|
|
126
|
+
handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.CREATE_BOT);
|
|
126
127
|
}
|
|
127
128
|
return;
|
|
128
129
|
}
|
|
@@ -149,7 +150,7 @@ class AppStudioClient {
|
|
|
149
150
|
}
|
|
150
151
|
}
|
|
151
152
|
catch (e) {
|
|
152
|
-
handleBotFrameworkError(e,
|
|
153
|
+
handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.UPDATE_BOT);
|
|
153
154
|
}
|
|
154
155
|
return;
|
|
155
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,oEAAiF;
|
|
1
|
+
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @author Qianhao Dong <qidon@microsoft.com>
|
|
3
3
|
*/
|
|
4
|
+
import { FxError, LogProvider, M365TokenProvider, Result } from "@microsoft/teamsfx-api";
|
|
4
5
|
import { IBotRegistration } from "../appStudio/interfaces/IBotRegistration";
|
|
5
|
-
import { FxError, Result, M365TokenProvider, LogProvider } from "@microsoft/teamsfx-api";
|
|
6
6
|
export declare function createOrUpdateBotRegistration(m365TokenProvider: M365TokenProvider, botRegistration: IBotRegistration, logger?: LogProvider): Promise<Result<boolean, FxError>>;
|
|
7
7
|
//# sourceMappingURL=botFrameworkRegistration.d.ts.map
|
package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botFrameworkRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"botFrameworkRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAGlG,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAG5E,wBAAsB,6BAA6B,CACjD,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,gBAAgB,EACjC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAkCnC"}
|
|
@@ -3,9 +3,12 @@
|
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.createOrUpdateBotRegistration = void 0;
|
|
6
|
+
/**
|
|
7
|
+
* @author Qianhao Dong <qidon@microsoft.com>
|
|
8
|
+
*/
|
|
6
9
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
10
|
+
const teamsDevPortalClient_1 = require("../../../../client/teamsDevPortalClient");
|
|
11
|
+
const constants_1 = require("../../../../common/constants");
|
|
9
12
|
const utils_1 = require("./utils");
|
|
10
13
|
async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration, logger) {
|
|
11
14
|
// 1. Get bot registration from remote.
|
|
@@ -14,18 +17,18 @@ async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration,
|
|
|
14
17
|
// 3.1 Merge bot registration (remote + passed-in, respect passed-in).
|
|
15
18
|
// 3.2 Update bot registration.
|
|
16
19
|
const appStudioTokenRes = await m365TokenProvider.getAccessToken({
|
|
17
|
-
scopes:
|
|
20
|
+
scopes: constants_1.AppStudioScopes,
|
|
18
21
|
});
|
|
19
22
|
if (appStudioTokenRes.isErr()) {
|
|
20
23
|
return teamsfx_api_1.err(appStudioTokenRes.error);
|
|
21
24
|
}
|
|
22
25
|
const appStudioToken = appStudioTokenRes.value;
|
|
23
26
|
logger === null || logger === void 0 ? void 0 : logger.debug(`Input bot registration: ${JSON.stringify(botRegistration)}`);
|
|
24
|
-
const remoteBotRegistration = await
|
|
27
|
+
const remoteBotRegistration = await teamsDevPortalClient_1.teamsDevPortalClient.getBotRegistration(appStudioToken, botRegistration.botId);
|
|
25
28
|
if (!remoteBotRegistration) {
|
|
26
29
|
// Not Found case.
|
|
27
30
|
logger === null || logger === void 0 ? void 0 : logger.verbose("Bot registration not found, create a new one.");
|
|
28
|
-
await
|
|
31
|
+
await teamsDevPortalClient_1.teamsDevPortalClient.createBotRegistration(appStudioToken, botRegistration, false);
|
|
29
32
|
}
|
|
30
33
|
else {
|
|
31
34
|
// Update bot registration.
|
|
@@ -33,7 +36,7 @@ async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration,
|
|
|
33
36
|
logger === null || logger === void 0 ? void 0 : logger.debug(`Existing bot registration: ${JSON.stringify(remoteBotRegistration)}`);
|
|
34
37
|
const mergedBotRegistration = utils_1.Utils.mergeIBotRegistration(botRegistration, remoteBotRegistration);
|
|
35
38
|
logger === null || logger === void 0 ? void 0 : logger.debug(`Merged bot registration: ${JSON.stringify(mergedBotRegistration)}`);
|
|
36
|
-
await
|
|
39
|
+
await teamsDevPortalClient_1.teamsDevPortalClient.updateBotRegistration(appStudioToken, mergedBotRegistration);
|
|
37
40
|
}
|
|
38
41
|
return teamsfx_api_1.ok(remoteBotRegistration !== undefined);
|
|
39
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AACH,wDAAkG;AAClG,kFAA+E;AAC/E,4DAA+D;AAE/D,mCAAgC;AAEzB,KAAK,UAAU,6BAA6B,CACjD,iBAAoC,EACpC,eAAiC,EACjC,MAAoB;IAEpB,uCAAuC;IACvC,uDAAuD;IACvD,WAAW;IACX,2EAA2E;IAC3E,oCAAoC;IACpC,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;QAC/D,MAAM,EAAE,2BAAe;KACxB,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACrC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;IAC/C,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,MAAM,2CAAoB,CAAC,kBAAkB,CACzE,cAAc,EACd,eAAe,CAAC,KAAM,CACvB,CAAC;IACF,IAAI,CAAC,qBAAqB,EAAE;QAC1B,kBAAkB;QAClB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,+CAA+C,CAAC,CAAC;QACjE,MAAM,2CAAoB,CAAC,qBAAqB,CAAC,cAAc,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;KAC1F;SAAM;QACL,2BAA2B;QAC3B,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACtD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,qBAAqB,GAAG,aAAK,CAAC,qBAAqB,CACvD,eAAe,EACf,qBAAqB,CACtB,CAAC;QACF,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACnF,MAAM,2CAAoB,CAAC,qBAAqB,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;KACzF;IACD,OAAO,gBAAE,CAAC,qBAAqB,KAAK,SAAS,CAAC,CAAC;AACjD,CAAC;AAtCD,sEAsCC"}
|
|
@@ -20,19 +20,6 @@ export declare class ErrorNames {
|
|
|
20
20
|
static readonly FORBIDDEN_RESULT_BOT_FRAMEWORK_ERROR = "ForbiddenResultBotFrameworkError";
|
|
21
21
|
static readonly CONFLICT_RESULT_BOT_FRAMEWORK_ERROR = "ConflictResultBotFrameworkError";
|
|
22
22
|
}
|
|
23
|
-
export declare class TelemetryKeys {
|
|
24
|
-
static readonly Component = "component";
|
|
25
|
-
static readonly Success = "success";
|
|
26
|
-
static readonly ErrorType = "error-type";
|
|
27
|
-
static readonly ErrorMessage = "error-message";
|
|
28
|
-
static readonly ErrorCode = "error-code";
|
|
29
|
-
static readonly AppId = "appid";
|
|
30
|
-
static readonly HostType = "bot-host-type";
|
|
31
|
-
static readonly BotCapabilities = "bot-capabilities";
|
|
32
|
-
static readonly StatusCode = "status-code";
|
|
33
|
-
static readonly Url = "url";
|
|
34
|
-
static readonly Method = "method";
|
|
35
|
-
}
|
|
36
23
|
export declare const TeamsFxUrlNames: {
|
|
37
24
|
[index: string]: string;
|
|
38
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,qBAAa,KAAK;IAChB,gBAAuB,WAAW,KAAK;IACvC,gBAAuB,eAAe,QAAQ;CAC/C;AAED,qBAAa,UAAU;IAErB,gBAAuB,kBAAkB,uBAAuB;IAChE,gBAAuB,eAAe,oBAAoB;IAC1D,gBAAuB,qBAAqB,yBAAyB;IACrE,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,+BAA+B,kCAAkC;IACxF,gBAAuB,2BAA2B,kCAAkC;IACpF,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,wBAAwB,2BAA2B;IAC1E,gBAAuB,iCAAiC,mCAAmC;IAG3F,gBAAuB,wBAAwB,iCAAiC;IAChF,gBAAuB,iCAAiC,mCAAmC;IAC3F,gBAAuB,oCAAoC,sCAAsC;IACjG,gBAAuB,mCAAmC,qCAAqC;CAChG;AAED,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,qBAAa,KAAK;IAChB,gBAAuB,WAAW,KAAK;IACvC,gBAAuB,eAAe,QAAQ;CAC/C;AAED,qBAAa,UAAU;IAErB,gBAAuB,kBAAkB,uBAAuB;IAChE,gBAAuB,eAAe,oBAAoB;IAC1D,gBAAuB,qBAAqB,yBAAyB;IACrE,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,+BAA+B,kCAAkC;IACxF,gBAAuB,2BAA2B,kCAAkC;IACpF,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,wBAAwB,2BAA2B;IAC1E,gBAAuB,iCAAiC,mCAAmC;IAG3F,gBAAuB,wBAAwB,iCAAiC;IAChF,gBAAuB,iCAAiC,mCAAmC;IAC3F,gBAAuB,oCAAoC,sCAAsC;IACjG,gBAAuB,mCAAmC,qCAAqC;CAChG;AAED,eAAO,MAAM,eAAe,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAItD,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.TeamsFxUrlNames = exports.
|
|
5
|
+
exports.TeamsFxUrlNames = exports.ErrorNames = exports.Retry = void 0;
|
|
6
6
|
const constants_1 = require("../../driver/teamsApp/constants");
|
|
7
7
|
/**
|
|
8
8
|
* @author Qianhao Dong <qidon@microsoft.com>
|
|
@@ -30,20 +30,6 @@ ErrorNames.PACK_DIR_EXISTENCE_ERROR = "PackDirectoryExistenceError";
|
|
|
30
30
|
ErrorNames.ACQUIRE_BOT_FRAMEWORK_TOKEN_ERROR = "AcquireBotFrameworkTokenError";
|
|
31
31
|
ErrorNames.FORBIDDEN_RESULT_BOT_FRAMEWORK_ERROR = "ForbiddenResultBotFrameworkError";
|
|
32
32
|
ErrorNames.CONFLICT_RESULT_BOT_FRAMEWORK_ERROR = "ConflictResultBotFrameworkError";
|
|
33
|
-
class TelemetryKeys {
|
|
34
|
-
}
|
|
35
|
-
exports.TelemetryKeys = TelemetryKeys;
|
|
36
|
-
TelemetryKeys.Component = "component";
|
|
37
|
-
TelemetryKeys.Success = "success";
|
|
38
|
-
TelemetryKeys.ErrorType = "error-type";
|
|
39
|
-
TelemetryKeys.ErrorMessage = "error-message";
|
|
40
|
-
TelemetryKeys.ErrorCode = "error-code";
|
|
41
|
-
TelemetryKeys.AppId = "appid";
|
|
42
|
-
TelemetryKeys.HostType = "bot-host-type";
|
|
43
|
-
TelemetryKeys.BotCapabilities = "bot-capabilities";
|
|
44
|
-
TelemetryKeys.StatusCode = "status-code";
|
|
45
|
-
TelemetryKeys.Url = "url";
|
|
46
|
-
TelemetryKeys.Method = "method";
|
|
47
33
|
exports.TeamsFxUrlNames = {
|
|
48
34
|
[constants_1.APP_STUDIO_API_NAMES.CREATE_BOT]: "<create-bot-registration>",
|
|
49
35
|
[constants_1.APP_STUDIO_API_NAMES.GET_BOT]: "<get-bot-registration>",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,+DAAuE;AAEvE;;GAEG;AACH,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,iBAAW,GAAG,CAAC,CAAC;AAChB,qBAAe,GAAG,IAAI,CAAC;AAGhD,MAAa,UAAU;;AAAvB,gCAiBC;AAhBC,oBAAoB;AACG,6BAAkB,GAAG,mBAAmB,CAAC;AACzC,0BAAe,GAAG,gBAAgB,CAAC;AACnC,gCAAqB,GAAG,qBAAqB,CAAC;AAC9C,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,0CAA+B,GAAG,8BAA8B,CAAC;AACjE,sCAA2B,GAAG,8BAA8B,CAAC;AAC7D,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,mCAAwB,GAAG,uBAAuB,CAAC;AACnD,4CAAiC,GAAG,+BAA+B,CAAC;AAE3F,kBAAkB;AACK,mCAAwB,GAAG,6BAA6B,CAAC;AACzD,4CAAiC,GAAG,+BAA+B,CAAC;AACpE,+CAAoC,GAAG,kCAAkC,CAAC;AAC1E,8CAAmC,GAAG,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,+DAAuE;AAEvE;;GAEG;AACH,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,iBAAW,GAAG,CAAC,CAAC;AAChB,qBAAe,GAAG,IAAI,CAAC;AAGhD,MAAa,UAAU;;AAAvB,gCAiBC;AAhBC,oBAAoB;AACG,6BAAkB,GAAG,mBAAmB,CAAC;AACzC,0BAAe,GAAG,gBAAgB,CAAC;AACnC,gCAAqB,GAAG,qBAAqB,CAAC;AAC9C,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,0CAA+B,GAAG,8BAA8B,CAAC;AACjE,sCAA2B,GAAG,8BAA8B,CAAC;AAC7D,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,mCAAwB,GAAG,uBAAuB,CAAC;AACnD,4CAAiC,GAAG,+BAA+B,CAAC;AAE3F,kBAAkB;AACK,mCAAwB,GAAG,6BAA6B,CAAC;AACzD,4CAAiC,GAAG,+BAA+B,CAAC;AACpE,+CAAoC,GAAG,kCAAkC,CAAC;AAC1E,8CAAmC,GAAG,iCAAiC,CAAC;AAGpF,QAAA,eAAe,GAAgC;IAC1D,CAAC,gCAAoB,CAAC,UAAU,CAAC,EAAE,2BAA2B;IAC9D,CAAC,gCAAoB,CAAC,OAAO,CAAC,EAAE,wBAAwB;IACxD,CAAC,gCAAoB,CAAC,UAAU,CAAC,EAAE,2BAA2B;CAC/D,CAAC"}
|