@microsoft/teamsfx-core 1.22.0 → 1.22.1-alpha.034f24ebd.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/azure-hosting/hostingConstant.d.ts +9 -9
- package/build/common/azure-hosting/hostingConstant.d.ts.map +1 -1
- package/build/common/azure-hosting/hostingConstant.js +9 -9
- package/build/common/azure-hosting/hostingConstant.js.map +1 -1
- package/build/common/azure-hosting/hostingError.js +7 -7
- package/build/common/azure-hosting/hostingError.js.map +1 -1
- package/build/common/azure-hosting/utils.js +2 -2
- package/build/common/azure-hosting/utils.js.map +1 -1
- package/build/common/deps-checker/constant/message.d.ts +27 -31
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +33 -31
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +12 -10
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +11 -9
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.js +5 -5
- package/build/common/deps-checker/internal/ngrokChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +7 -3
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +4 -4
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +11 -11
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +21 -16
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config-v3.json +24 -0
- package/build/common/samples-config.json +2 -32
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +21 -60
- package/build/common/tools.js.map +1 -1
- package/build/component/code/api/depsChecker/funcHelper.js +2 -2
- package/build/component/code/api/depsChecker/funcHelper.js.map +1 -1
- package/build/component/code/tab/tabCode.js +4 -4
- package/build/component/code/tab/tabCode.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +10 -10
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/constants.d.ts +25 -25
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +281 -213
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +2 -0
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +78 -40
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/core.d.ts.map +1 -1
- package/build/component/core.js +11 -11
- package/build/component/core.js.map +1 -1
- package/build/component/deployUtils.d.ts +2 -0
- package/build/component/deployUtils.d.ts.map +1 -1
- package/build/component/deployUtils.js +11 -0
- package/build/component/deployUtils.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts +4 -0
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +40 -6
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +15 -1
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +21 -9
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureDeployDriver.js +3 -0
- package/build/component/driver/deploy/azure/azureDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +17 -7
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/baseDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/baseDeployDriver.js +3 -1
- package/build/component/driver/deploy/azure/baseDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +9 -9
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/constants.d.ts +5 -5
- package/build/component/driver/deploy/spfx/utility/constants.d.ts.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/interface/baseDeployStepDriver.d.ts +1 -0
- package/build/component/driver/interface/baseDeployStepDriver.d.ts.map +1 -1
- package/build/component/driver/interface/baseDeployStepDriver.js +1 -0
- package/build/component/driver/interface/baseDeployStepDriver.js.map +1 -1
- package/build/component/driver/interface/buildAndDeployArgs.d.ts +1 -0
- package/build/component/driver/interface/buildAndDeployArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts +6 -0
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +21 -5
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +1 -0
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +16 -0
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +27 -5
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/CreateAppPackageArgs.d.ts +1 -1
- package/build/component/driver/teamsApp/interfaces/CreateAppPackageArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ValidateTeamsAppArgs.d.ts +1 -1
- package/build/component/driver/teamsApp/interfaces/ValidateTeamsAppArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +16 -0
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +1 -0
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +17 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/feature/apiconnector/ApiConnectorImpl.js +22 -22
- package/build/component/feature/apiconnector/ApiConnectorImpl.js.map +1 -1
- package/build/component/feature/apiconnector/questions.d.ts +15 -15
- package/build/component/feature/apiconnector/questions.d.ts.map +1 -1
- package/build/component/feature/apiconnector/questions.js +138 -93
- package/build/component/feature/apiconnector/questions.js.map +1 -1
- package/build/component/feature/apiconnector/utils.d.ts +1 -1
- package/build/component/feature/apiconnector/utils.d.ts.map +1 -1
- package/build/component/feature/apiconnector/utils.js +1 -1
- package/build/component/feature/apiconnector/utils.js.map +1 -1
- package/build/component/feature/bot/bot.js +14 -14
- package/build/component/feature/bot/bot.js.map +1 -1
- package/build/component/feature/bot/question.js +4 -4
- package/build/component/feature/bot/question.js.map +1 -1
- package/build/component/feature/cicd/cicd.js +2 -2
- package/build/component/feature/cicd/cicd.js.map +1 -1
- package/build/component/feature/cicd/constants.d.ts +3 -3
- package/build/component/feature/cicd/constants.d.ts.map +1 -1
- package/build/component/feature/cicd/constants.js +3 -3
- package/build/component/feature/cicd/constants.js.map +1 -1
- package/build/component/feature/cicd/errors.js +3 -3
- package/build/component/feature/cicd/errors.js.map +1 -1
- package/build/component/feature/cicd/existingTemplatesStat.js +2 -2
- package/build/component/feature/cicd/existingTemplatesStat.js.map +1 -1
- package/build/component/feature/cicd/questions.d.ts +5 -5
- package/build/component/feature/cicd/questions.d.ts.map +1 -1
- package/build/component/feature/cicd/questions.js +38 -25
- package/build/component/feature/cicd/questions.js.map +1 -1
- package/build/component/feature/spfx.js +1 -1
- package/build/component/feature/spfx.js.map +1 -1
- package/build/component/feature/sso.js +2 -2
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/feature/tab.js +1 -1
- package/build/component/feature/tab.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +3 -2
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/question.d.ts +2 -2
- package/build/component/generator/officeAddin/question.d.ts.map +1 -1
- package/build/component/generator/officeAddin/question.js +14 -12
- package/build/component/generator/officeAddin/question.js.map +1 -1
- package/build/component/generator/spfxGenerator.js +1 -1
- package/build/component/generator/spfxGenerator.js.map +1 -1
- package/build/component/generator/utils.d.ts +1 -0
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +8 -3
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/middleware/envMW.js +1 -1
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/migrate.js +3 -3
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +1 -0
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/question.d.ts +12 -13
- package/build/component/question.d.ts.map +1 -1
- package/build/component/question.js +176 -159
- package/build/component/question.js.map +1 -1
- package/build/component/resource/apim/services/apimService.d.ts.map +1 -1
- package/build/component/resource/apim/services/apimService.js +23 -44
- package/build/component/resource/apim/services/apimService.js.map +1 -1
- package/build/component/resource/appManifest/appManifest.js +3 -3
- package/build/component/resource/appManifest/appManifest.js.map +1 -1
- package/build/component/resource/appManifest/appStudio.d.ts +1 -1
- package/build/component/resource/appManifest/appStudio.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudio.js +54 -18
- package/build/component/resource/appManifest/appStudio.js.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.d.ts +8 -1
- package/build/component/resource/appManifest/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.js +82 -10
- package/build/component/resource/appManifest/appStudioClient.js.map +1 -1
- package/build/component/resource/appManifest/authSvcClient.d.ts +1 -1
- package/build/component/resource/appManifest/authSvcClient.d.ts.map +1 -1
- package/build/component/resource/appManifest/authSvcClient.js +4 -3
- package/build/component/resource/appManifest/authSvcClient.js.map +1 -1
- package/build/component/resource/appManifest/constants.d.ts +1 -0
- package/build/component/resource/appManifest/constants.d.ts.map +1 -1
- package/build/component/resource/appManifest/constants.js +1 -0
- package/build/component/resource/appManifest/constants.js.map +1 -1
- package/build/component/resource/appManifest/errors.d.ts +2 -46
- package/build/component/resource/appManifest/errors.d.ts.map +1 -1
- package/build/component/resource/appManifest/errors.js +9 -89
- package/build/component/resource/appManifest/errors.js.map +1 -1
- package/build/component/resource/appManifest/interfaces/IValidationResult.d.ts +28 -0
- package/build/component/resource/appManifest/interfaces/IValidationResult.d.ts.map +1 -0
- package/build/component/resource/appManifest/interfaces/IValidationResult.js +5 -0
- package/build/component/resource/appManifest/interfaces/IValidationResult.js.map +1 -0
- package/build/component/resource/appManifest/questions.d.ts +2 -2
- package/build/component/resource/appManifest/questions.d.ts.map +1 -1
- package/build/component/resource/appManifest/questions.js +16 -10
- package/build/component/resource/appManifest/questions.js.map +1 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.js +4 -4
- package/build/component/resource/appManifest/utils/ManifestUtils.js.map +1 -1
- package/build/component/resource/azureSql/clients/management.js +1 -1
- package/build/component/resource/azureSql/clients/management.js.map +1 -1
- package/build/component/resource/azureStorage/configs.js +2 -2
- package/build/component/resource/azureStorage/configs.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts +5 -0
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +7 -0
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +2 -2
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/depsChecker/bicepChecker.js +11 -11
- package/build/component/utils/depsChecker/bicepChecker.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts +7 -7
- package/build/component/utils/depsChecker/common.js +7 -7
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/core/FxCore.js +2 -2
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +5 -10
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/downloadSample.js +1 -1
- package/build/core/downloadSample.js.map +1 -1
- package/build/core/error.d.ts +2 -1
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +8 -2
- package/build/core/error.js.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.js +2 -2
- package/build/core/middleware/envInfoLoaderV3.js.map +1 -1
- package/build/core/middleware/projectMigrator.js +4 -4
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +2 -0
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +43 -12
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/questionModel.js +20 -20
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +1 -0
- 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 +9 -0
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts +1 -0
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +5 -2
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts +2 -0
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +54 -2
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts +3 -0
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +175 -9
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts +1 -0
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +6 -3
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/question.d.ts +16 -16
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +264 -209
- package/build/core/question.js.map +1 -1
- package/package.json +4 -4
- package/resource/package.nls.json +13 -16
- package/templates/core/v3Migration/csharp.app.local.yml +2 -2
- package/templates/core/v3Migration/csharp.app.yml +5 -5
- package/templates/core/v3Migration/js.ts.app.local.yml +7 -2
- package/templates/core/v3Migration/js.ts.app.yml +30 -8
- package/templates/core/v3Migration/spfx.app.yml +4 -4
- package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.notification-function-base.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
- package/templates/fallback/bot.csharp.workflow.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.js.workflow.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.workflow.zip +0 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.csharp.non-sso.zip +0 -0
- package/templates/fallback/tab.js.dashboard.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.dashboard.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml +19 -19
- package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml +19 -19
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +19 -22
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +18 -22
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +2 -6
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +1 -5
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +2 -6
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +1 -5
package/build/component/core.js
CHANGED
|
@@ -78,7 +78,7 @@ let TeamsfxCore = class TeamsfxCore {
|
|
|
78
78
|
* create project
|
|
79
79
|
*/
|
|
80
80
|
async create(context, inputs, actionContext) {
|
|
81
|
-
const folder = inputs[
|
|
81
|
+
const folder = inputs["folder"];
|
|
82
82
|
if (!folder) {
|
|
83
83
|
return teamsfx_api_1.err(error_1.InvalidInputError("folder is undefined"));
|
|
84
84
|
}
|
|
@@ -86,7 +86,7 @@ let TeamsfxCore = class TeamsfxCore {
|
|
|
86
86
|
const scratch = inputs[question_1.CoreQuestionNames.CreateFromScratch];
|
|
87
87
|
let projectPath;
|
|
88
88
|
const automaticNpmInstall = "automaticNpmInstall";
|
|
89
|
-
if (scratch === question_1.ScratchOptionNo.id) {
|
|
89
|
+
if (scratch === question_1.ScratchOptionNo().id) {
|
|
90
90
|
// create from sample
|
|
91
91
|
const downloadRes = await downloadSample_1.downloadSample(inputs, undefined, context);
|
|
92
92
|
if (downloadRes.isErr()) {
|
|
@@ -110,7 +110,7 @@ let TeamsfxCore = class TeamsfxCore {
|
|
|
110
110
|
// set isVS global var when creating project
|
|
111
111
|
globalVars_1.globalVars.isVS = inputs[question_1.CoreQuestionNames.ProgrammingLanguage] === "csharp";
|
|
112
112
|
const features = inputs.capabilities;
|
|
113
|
-
const isInitExistingApp = features === constants_2.ExistingTabOptionItem.id;
|
|
113
|
+
const isInitExistingApp = features === constants_2.ExistingTabOptionItem().id;
|
|
114
114
|
if (isInitExistingApp) {
|
|
115
115
|
const folderExist = await fs_extra_1.default.pathExists(projectPath);
|
|
116
116
|
if (folderExist) {
|
|
@@ -144,26 +144,26 @@ let TeamsfxCore = class TeamsfxCore {
|
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
else {
|
|
147
|
-
if (features === constants_2.M365SsoLaunchPageOptionItem.id ||
|
|
148
|
-
features === constants_2.M365SearchAppOptionItem.id) {
|
|
147
|
+
if (features === constants_2.M365SsoLaunchPageOptionItem().id ||
|
|
148
|
+
features === constants_2.M365SearchAppOptionItem().id) {
|
|
149
149
|
context.projectSetting.isM365 = true;
|
|
150
150
|
inputs.isM365 = true;
|
|
151
151
|
}
|
|
152
|
-
if (constants_2.BotFeatureIds.includes(features)) {
|
|
152
|
+
if (constants_2.BotFeatureIds().includes(features)) {
|
|
153
153
|
inputs[constants_2.AzureSolutionQuestionNames.Features] = features;
|
|
154
154
|
const component = typedi_1.Container.get(constants_3.ComponentNames.TeamsBot);
|
|
155
155
|
const res = await component.add(context, inputs);
|
|
156
156
|
if (res.isErr())
|
|
157
157
|
return teamsfx_api_1.err(res.error);
|
|
158
158
|
}
|
|
159
|
-
if (constants_2.TabFeatureIds.includes(features)) {
|
|
159
|
+
if (constants_2.TabFeatureIds().includes(features)) {
|
|
160
160
|
inputs[constants_2.AzureSolutionQuestionNames.Features] = features;
|
|
161
161
|
const component = typedi_1.Container.get(constants_3.ComponentNames.TeamsTab);
|
|
162
162
|
const res = await component.add(context, inputs);
|
|
163
163
|
if (res.isErr())
|
|
164
164
|
return teamsfx_api_1.err(res.error);
|
|
165
165
|
}
|
|
166
|
-
if (features === constants_2.TabSPFxItem.id) {
|
|
166
|
+
if (features === constants_2.TabSPFxItem().id) {
|
|
167
167
|
inputs[constants_2.AzureSolutionQuestionNames.Features] = features;
|
|
168
168
|
const component = typedi_1.Container.get("spfx-tab");
|
|
169
169
|
const res = await component.add(context, inputs);
|
|
@@ -188,10 +188,10 @@ let TeamsfxCore = class TeamsfxCore {
|
|
|
188
188
|
var _a, _b, _c, _d, _e, _f;
|
|
189
189
|
const features = inputs[constants_2.AzureSolutionQuestionNames.Features];
|
|
190
190
|
let component;
|
|
191
|
-
if (constants_2.BotFeatureIds.includes(features)) {
|
|
191
|
+
if (constants_2.BotFeatureIds().includes(features)) {
|
|
192
192
|
component = typedi_1.Container.get(constants_3.ComponentNames.TeamsBot);
|
|
193
193
|
}
|
|
194
|
-
else if (constants_2.TabFeatureIds.includes(features)) {
|
|
194
|
+
else if (constants_2.TabFeatureIds().includes(features)) {
|
|
195
195
|
component = typedi_1.Container.get(constants_3.ComponentNames.TeamsTab);
|
|
196
196
|
}
|
|
197
197
|
else if (features === constants_2.AzureResourceSQLNewUI.id) {
|
|
@@ -215,7 +215,7 @@ let TeamsfxCore = class TeamsfxCore {
|
|
|
215
215
|
else if (features === constants_2.SingleSignOnOptionItem.id) {
|
|
216
216
|
component = typedi_1.Container.get("sso");
|
|
217
217
|
}
|
|
218
|
-
else if (features === constants_2.TabSPFxNewUIItem.id) {
|
|
218
|
+
else if (features === constants_2.TabSPFxNewUIItem().id) {
|
|
219
219
|
component = typedi_1.Container.get(constants_3.ComponentNames.SPFxTab);
|
|
220
220
|
}
|
|
221
221
|
if (component) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/component/core.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAgBgC;AAChC,gEAA0B;AAC1B,wDAAwB;AACxB,4BAA0B;AAC1B,mCAA4C;AAC5C,+CAK0B;AAC1B,6EAAoG;AACpG,mBAAiB;AACjB,8BAA4B;AAC5B,0BAAwB;AACxB,8BAA4B;AAC5B,8BAA4B;AAC5B,mCAAiC;AACjC,4CAA0C;AAC1C,0CAAwC;AACxC,mCAAwE;AACxE,6CAAiD;AACjD,6BAA2B;AAC3B,+CAA6C;AAC7C,0BAAwB;AACxB,6BAA2B;AAC3B,+BAA6B;AAC7B,8BAA4B;AAC5B,0BAAwB;AACxB,yBAAuB;AACvB,yBAAuB;AACvB,yBAAuB;AACvB,gCAA8B;AAE9B,oDAAkD;AAClD,kDAAgD;AAChD,+BAA6B;AAC7B,gDAA8C;AAC9C,4CAA0C;AAC1C,+BAA6B;AAC7B,2BAAyB;AACzB,oCAAkC;AAClC,iCAA+B;AAE/B,+DAAyC;AACzC,mCAA0C;AAC1C,mDAAwD;AACxD,uDAA0D;AAC1D,2DAA+E;AAC/E,+EAAuF;AACvF,2CAA2D;AAC3D,2DAAwD;AACxD,yCAKuB;AACvB,mDAAgD;AAChD,wDAAwB;AACxB,2CAgBqB;AACrB,2CAA6D;AAC7D,uCAAqD;AACrD,yCAIoB;AACpB,+CAA8C;AAC9C,sEAAmE;AACnE,mDAAwE;AACxE,yCAA0C;AAC1C,qDAAyD;AACzD,+CAA4C;AAC5C,qDAAkD;AAClD,sCAA+C;AAC/C,2CAA4D;AAC5D,2CAAwD;AACxD,oEAAkF;AAClF,2DAAwD;AACxD,+CAAuD;AACvD,oFAAkF;AAElF,IAAa,WAAW,GAAxB,MAAa,WAAW;IAAxB;QACE,SAAI,GAAG,IAAI,CAAC;IAilBd,CAAC;IA/kBC;;OAEG;IAWH,KAAK,CAAC,MAAM,CACV,OAAkB,EAClB,MAA6B,EAC7B,aAA6B;QAE7B,MAAM,MAAM,GAAG,MAAM,CAAC,6BAAkB,CAAC,IAAI,CAAW,CAAC;QACzD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,iBAAG,CAAC,yBAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;SACtD;QACD,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,MAAM,OAAO,GAAG,MAAM,CAAC,4BAAiB,CAAC,iBAAiB,CAAW,CAAC;QACtE,IAAI,WAAmB,CAAC;QACxB,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;QAClD,IAAI,OAAO,KAAK,0BAAe,CAAC,EAAE,EAAE;YAClC,qBAAqB;YACrB,MAAM,WAAW,GAAG,MAAM,+BAAc,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YACrE,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;gBACvB,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aAC/B;YACD,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;SACjC;aAAM;YACL,kBAAkB;YAClB,MAAM,OAAO,GAAG,MAAM,CAAC,4BAAiB,CAAC,OAAO,CAAW,CAAC;YAC5D,IAAI,SAAS,KAAK,OAAO;gBAAE,OAAO,iBAAG,CAAC,yBAAiB,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC,CAAC;YACtF,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAClD,OAAO,EAAE,6BAAkB;aAC5B,CAAC,CAAC;YACH,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7D,OAAO,iBAAG,CAAC,yBAAiB,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;aAC9E;YACD,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACzC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YACjC,4CAA4C;YAC5C,uBAAU,CAAC,IAAI,GAAG,MAAM,CAAC,4BAAiB,CAAC,mBAAmB,CAAC,KAAK,QAAQ,CAAC;YAC7E,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAsB,CAAC;YAE/C,MAAM,iBAAiB,GAAG,QAAQ,KAAK,iCAAqB,CAAC,EAAE,CAAC;YAChE,IAAI,iBAAiB,EAAE;gBACrB,MAAM,WAAW,GAAG,MAAM,kBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;gBACrD,IAAI,WAAW,EAAE;oBACf,OAAO,iBAAG,CAAC,IAAI,+BAAuB,CAAC,WAAW,CAAC,CAAC,CAAC;iBACtD;aACF;iBAAM;gBACL,MAAM,OAAO,GAAG,sCAAc,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,OAAO,EAAE;oBACX,OAAO,iBAAG,CACR,IAAI,kCAA0B,CAAC,kDAAkD,CAAC,CACnF,CAAC;iBACH;aACF;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;YACpE,IAAI,OAAO,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAE/C,OAAO,MAAM,CAAC,MAAM,CAAC;YAErB,IAAI,iBAAiB,EAAE;gBACrB,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;oBACnC,CAAC,6BAAiB,CAAC,YAAY,CAAC,EAAE,QAAQ;iBAC3C,CAAC,CAAC;gBACH,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAc,0BAAc,CAAC,WAAW,CAAC,CAAC;gBAC3E,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,MAA+B,EAAE;oBACjF,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE;iBACzC,CAAC,CAAC;gBACH,IAAI,SAAS,CAAC,KAAK,EAAE;oBAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBACnD,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,MAAM,EAAE,2BAAa,CAAC,CAAC;gBAChF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;oBACzC,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,2BAAa,CAAC,CAAC;oBACtE,MAAM,kBAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;iBACnD;aACF;iBAAM;gBACL,IACE,QAAQ,KAAK,uCAA2B,CAAC,EAAE;oBAC3C,QAAQ,KAAK,mCAAuB,CAAC,EAAE,EACvC;oBACA,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC;oBACrC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;iBACtB;gBACD,IAAI,yBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACpC,MAAM,CAAC,sCAA0B,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;oBACvD,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,QAAQ,CAAQ,CAAC;oBAChE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBACjD,IAAI,GAAG,CAAC,KAAK,EAAE;wBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACxC;gBACD,IAAI,yBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACpC,MAAM,CAAC,sCAA0B,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;oBACvD,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,QAAQ,CAAQ,CAAC;oBAChE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBACjD,IAAI,GAAG,CAAC,KAAK,EAAE;wBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACxC;gBACD,IAAI,QAAQ,KAAK,uBAAW,CAAC,EAAE,EAAE;oBAC/B,MAAM,CAAC,sCAA0B,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;oBACvD,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,UAAU,CAAQ,CAAC;oBACnD,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBACjD,IAAI,GAAG,CAAC,KAAK,EAAE;wBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACxC;aACF;YAED,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;gBACnC,CAAC,6BAAiB,CAAC,OAAO,CAAC,EAAE,QAAQ;aACtC,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;YACvC,MAAM,+BAAiB,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;SACpD;QACD,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;QAElC,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IACD;;OAEG;IAWH,KAAK,CAAC,UAAU,CACd,OAAkB,EAClB,MAA6B,EAC7B,aAA6B;;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,sCAA0B,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,SAAS,CAAC;QACd,IAAI,yBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACpC,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC;SACpD;aAAM,IAAI,yBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC3C,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC;SACpD;aAAM,IAAI,QAAQ,KAAK,iCAAqB,CAAC,EAAE,EAAE;YAChD,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAClC;aAAM,IAAI,QAAQ,KAAK,sCAA0B,CAAC,EAAE,EAAE;YACrD,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC;SACpD;aAAM,IAAI,QAAQ,KAAK,6BAAiB,CAAC,EAAE,EAAE;YAC5C,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,WAAW,CAAC,CAAC;SACvD;aAAM,IAAI,QAAQ,KAAK,sCAA0B,CAAC,EAAE,EAAE;YACrD,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;SAChD;aAAM,IAAI,QAAQ,KAAK,0BAAc,CAAC,EAAE,EAAE;YACzC,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACnC;aAAM,IAAI,QAAQ,KAAK,mCAAuB,CAAC,EAAE,EAAE;YAClD,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;SAC5C;aAAM,IAAI,QAAQ,KAAK,kCAAsB,CAAC,EAAE,EAAE;YACjD,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAClC;aAAM,IAAI,QAAQ,KAAK,4BAAgB,CAAC,EAAE,EAAE;YAC3C,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,OAAO,CAAC,CAAC;SACnD;QACD,IAAI,SAAS,EAAE;YACb,MAAM,GAAG,GAAG,MAAO,SAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1D,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;gBACnC,CAAC,6BAAiB,CAAC,OAAO,CAAC,EAAE,QAAQ;aACtC,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,QAAQ,KAAK,mCAAuB,CAAC,EAAE,IAAI,QAAQ,KAAK,0BAAc,CAAC,EAAE,EAAE;gBAC7E,IACE,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,0CAAE,kBAAkB,MAAK,IAAI;oBAC7D,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,0CAAE,kBAAkB,MAAK,MAAM,EAC/D;oBACA,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;iBAC3D;gBACD,MAAM,gCAAkB,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;aAC/D;YACD,OAAO,gBAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,IAAI,CACR,OAAkB,EAClB,MAA6B,EAC7B,iBAAiB,GAAG,KAAK;QAEzB,MAAM,eAAe,GAAG,0CAAkB,EAAuB,CAAC;QAClE,eAAe,CAAC,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7C,eAAe,CAAC,UAAU,GAAG,EAAE,CAAC;QAChC,IAAI,MAAM,CAAC,SAAS,EAAE;YACpB,eAAe,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;SAC9C;QACD,OAAO,CAAC,cAAc,GAAG,eAAe,CAAC;QACzC,MAAM,kBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvC,MAAM,kBAAE,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,8BAAgB,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,kBAAE,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,8BAAgB,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;QACrF,MAAM,cAAc,GAAG,MAAM,mCAA0B,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;YAC1B,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;SAClC;QAED,IAAI,iBAAiB,EAAE;YACrB,+DAA+D;YAC/D,qBAAqB;YACrB,iEAAiE;YACjE,IAAI;YACJ,sDAAsD;YACtD,iBAAiB;YACjB,gBAAgB;YAChB,yFAAyF;YACzF,OAAO;YACP,IAAI;YACJ,8BAA8B;YAC9B,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC1D,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;gBAC1B,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;aAClC;SACF;QAED;YACE,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAc,0BAAc,CAAC,WAAW,CAAC,CAAC;YAC3E,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;YACvE,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,GAAG,CAAC;SAC7B;QACD;YACE,MAAM,QAAQ,GAAG,MAAM,CAAC,4BAAiB,CAAC,mBAAmB,CAAW,CAAC;YACzE,MAAM,eAAe,GAAG,MAAM,8BAAiB,CAC7C,gCAAkB,CAAC,iBAAiB,EAAE,EACtC,eAAe,CAAC,OAAQ,EACxB,MAA+B,EAC/B,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CACzC,CAAC;YACF,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;gBAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;aACnC;YAED,MAAM,oBAAoB,GAAG,MAAM,8BAAiB,CAClD,gCAAkB,CAAC,eAAe,EAAE,EACpC,eAAe,CAAC,OAAQ,EACxB,MAA+B,EAC/B,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CACzC,CAAC;YACF,IAAI,oBAAoB,CAAC,KAAK,EAAE,EAAE;gBAChC,OAAO,iBAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;aACxC;SACF;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAWD,KAAK,CAAC,SAAS,CACb,GAAsB,EACtB,MAA6B,EAC7B,aAA6B;QAE7B,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC9D,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAEtD,mBAAmB;QACnB;YACE,MAAM,GAAG,GAAG,MAAM,+BAAc,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3D,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxC;QACD,wBAAwB;QACxB,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAc,0BAAc,CAAC,WAAW,CAAC,CAAC;QAC3E;YACE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrD,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxC;QAED,kCAAkC;QAClC,MAAM,qBAAqB,GAAG,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACvF;YACE,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,MAAM,eAAe,IAAI,qBAAqB,EAAE;gBACnD,MAAM,iBAAiB,GAAG,kBAAS,CAAC,GAAG,CAAgB,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC7E,IAAI,iBAAiB,CAAC,SAAS,EAAE;oBAC/B,MAAM,CAAC,IAAI,CAAC;wBACV,UAAU,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE;wBACrC,QAAQ,EAAE,WAAW;wBACrB,KAAK,EAAE,GAAG,EAAE;4BACV,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC;gCACrC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;4BAChD,OAAO,iBAAiB,CAAC,SAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;wBACnD,CAAC;qBACF,CAAC,CAAC;iBACJ;aACF;YACD,MAAM,eAAe,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YAC3E,IAAI,eAAe,CAAC,IAAI,KAAK,SAAS,EAAE;gBACtC,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;aACnC;YACD,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,kCAAkB,CAAC,sCAAsC,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CACvF,CAAC;SACH;QAED,IAAI;QACJ,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE;YACnC,qBAAqB;YACrB,MAAM,mBAAmB,GAAG,MAAM,6BAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrE,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;gBAC/B,OAAO,iBAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;aACvC;SACF;aAAM,IAAI,4CAAkB,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE;YACvD,qCAAqC;YACrC,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,kCAAkB,CAAC,qCAAqC,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CACtF,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,aAAG,CAAC,kBAAkB,CACzC,GAAG,EACH,MAAM,EACN,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,aAAa,CAAC,oBAAoB,CACvC,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC1B;SACF;QAED,wCAAwC;QACxC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAS,0BAAc,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,gCAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;YAC9B,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC9D,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxC;QACD,kCAAkC;QAClC;YACE,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,MAAM,eAAe,IAAI,qBAAqB,EAAE;gBACnD,MAAM,iBAAiB,GAAG,kBAAS,CAAC,GAAG,CAAgB,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC7E,IAAI,iBAAiB,CAAC,SAAS,EAAE;oBAC/B,MAAM,CAAC,IAAI,CAAC;wBACV,UAAU,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE;wBACrC,QAAQ,EAAE,WAAW;wBACrB,KAAK,EAAE,GAAG,EAAE;4BACV,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC;gCACrC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;4BAChD,OAAO,iBAAiB,CAAC,SAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;wBACnD,CAAC;qBACF,CAAC,CAAC;iBACJ;aACF;YACD,MAAM,YAAY,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YACxE,IAAI,YAAY,CAAC,IAAI,KAAK,SAAS,EAAE;gBACnC,OAAO,iBAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;aAChC;YACD,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,kCAAkB,CAAC,0CAA0C,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAC3F,CAAC;SACH;QAED,KAAK;QACL,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE;YACnC,MAAM,iBAAiB,GAAG,MAAM,8BAAsB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACpE,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;gBAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;aACrC;SACF;QAED,sBAAsB;QACtB;YACE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrD,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxC;QAED,gCAAgC;QAChC,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE;YACnC,MAAM,GAAG,GAAG,gCAAwB,CAClC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,EACzC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EACnC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAC7C,CAAC;YACF,MAAM,GAAG,GAAG,kCAAkB,CAAC,8BAA8B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC3F,IAAI,GAAG,EAAE;gBACP,MAAM,KAAK,GAAG,kCAAkB,CAAC,8BAA8B,CAAC,CAAC;gBACjE,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE;oBAC9E,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;oBAC9D,IAAI,YAAY,KAAK,KAAK,EAAE;wBAC1B,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;qBAClC;gBACH,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;aACrD;YACD,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC3B;QACD,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,CAAC,6BAAiB,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAC5C,qBAAqB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CACzD;SACF,CAAC,CAAC;QACH,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC;QACrD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAED;;;;;;;;;;;OAWG;IAWH,KAAK,CAAC,MAAM,CACV,OAA0B,EAC1B,MAA6B,EAC7B,aAA6B;;QAE7B,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,CAAC,qCAAyB,CAAC,kBAAkB,CAAC,EAC5C,MAAA,MAAM,CAAC,qBAAS,CAAC,oBAAoB,CAAC,mCAAI,IAAI;SACjD,CAAC,CAAC;QACH,+BAA+B;QAC/B,MAAM,6BAA6B,GACjC,MAAM,CAAC,qBAAS,CAAC,oBAAoB,CAAC,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,CAAC;QAC1F,IAAI,6BAA6B,EAAE;YACjC,OAAO,yBAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SACzD;QACD,OAAO,CAAC,WAAW,CAAC,IAAI,CACtB,UAAU,sCAA0B,CAAC,qBAAqB,OACxD,MAAM,CAAC,sCAA0B,CAAC,qBAAqB,CACzD,EAAE,CACH,CAAC;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,cAAmC,CAAC;QACpE,MAAM,YAAY,GAAG,MAAM,CAAC,sCAA0B,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QACpF,IAAI,mBAAmB,GAAG,YAAY,CAAC,GAAG,CAAC,kCAAwB,CAAa,CAAC;QACjF,IAAI,mBAAmB,CAAC,QAAQ,CAAC,0BAAc,CAAC,MAAM,CAAC,EAAE;YACvD,IAAI,MAAM,CAAC,qBAAS,CAAC,oBAAoB,CAAC,IAAI,KAAK,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;gBACvF,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,0BAAc,CAAC,MAAM,CAAC,CAAC;aACtF;SACF;QACD,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,iCAAiC;QACjC,MAAM,IAAI,GAAG,mCAAW,CAAC,eAAe,CAAC,CAAC;QAC1C,KAAK,MAAM,SAAS,IAAI,eAAe,CAAC,UAAU,EAAE;YAClD,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE;gBAC9E,MAAM,mBAAmB,GAAG,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC;gBAChE,MAAM,gBAAgB,GAAG,kBAAS,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAQ,CAAC;gBAC9D,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC;gBAClE,MAAM,CAAC,IAAI,CAAC;oBACV,UAAU,EAAE,GAAG,SAAS,CAAC,IAAI,EAAE;oBAC/B,QAAQ,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ;oBAC7D,KAAK,EAAE,KAAK,IAAI,EAAE;wBAChB,MAAM,YAAY,GAAG,kBAAS,CAAC,MAAM,CAAC,CAAC;wBACvC,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;wBACvC,YAAY,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,IAAI,YAAY,CAAC,MAAM,CAAC;wBAC9E,YAAY,CAAC,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC;wBAC1C,IAAI,gBAAgB,CAAC,KAAK,EAAE;4BAC1B,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;4BACrE,IAAI,QAAQ,CAAC,KAAK,EAAE;gCAAE,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;yBAClD;wBACD,8EAA8E;wBAC9E,YAAY,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;wBACvD,OAAO,MAAM,eAAe,CAAC,MAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAC9D,CAAC;iBACF,CAAC,CAAC;gBACH,IAAI,0BAAc,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;oBAChD,gBAAgB,GAAG,IAAI,CAAC;iBACzB;aACF;SACF;QACD,IACE,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,MAAM,CAAC,sBAAsB,CAAC,KAAK,IAAI,CAAC;YAC5E,mBAAmB,CAAC,QAAQ,CAAC,0BAAc,CAAC,WAAW,CAAC,EACxD;YACA,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAc,0BAAc,CAAC,WAAW,CAAC,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC;gBACV,UAAU,EAAE,0BAAc,CAAC,WAAW;gBACtC,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,KAAK,IAAI,EAAE;oBAChB,OAAO,MAAM,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBACtD,CAAC;aACF,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,IAAI,EACJ,0BAA0B,EAC1B,gCAAgB,CAAC,uBAAuB,CAAC,EACzC,kCAAkB,CAAC,uBAAuB,CAAC,CAC5C,CACF,CAAC;SACH;QAED,OAAO,CAAC,WAAW,CAAC,IAAI,CACtB,kCAAkB,CAChB,2CAA2C,EAC3C,6BAAiB,CAAC,QAAQ,EAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAChD,CACF,CAAC;QAEF,yBAAyB;QACzB,IAAI,gBAAgB,EAAE;YACpB,MAAM,kBAAkB,GAAG,MAAM,yBAAW,CAAC,4BAA4B,CACvE,OAAO,EACP,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,aAAa,CAAC,oBAAoB,CAC3C,CAAC;YACF,IAAI,kBAAkB,CAAC,KAAK,EAAE,EAAE;gBAC9B,OAAO,iBAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;aACtC;YACD,MAAM,OAAO,GAAG,MAAM,yBAAW,CAAC,mBAAmB,CACnD,OAAO,EACP,OAAO,CAAC,aAAa,CAAC,oBAAoB,EAC1C,OAAO,CAAC,OAAO,CAChB,CAAC;YACF,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;gBACnB,OAAO,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;aAC3B;SACF;QAED,cAAc;QACd,IAAI;QACJ,mDAAmD;QACnD,4CAA4C;QAC5C,IAAI;QAEJ,kBAAkB;QAClB,OAAO,CAAC,WAAW,CAAC,IAAI,CACtB,kCAAkB,CAAC,yBAAyB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAC1E,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAEtE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;YAC7B,IAAI,gBAAgB,EAAE;gBACpB,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,gCAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;gBACrF,MAAM,GAAG,GACP,kCAAkB,CAAC,2BAA2B,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC/E,kBAAkB,CAAC,cAAc,CAAC;gBACpC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC9B,IAAI,kBAAkB,CAAC,cAAc,EAAE;oBACrC,8DAA8D;oBAC9D,OAAO,CAAC,eAAe;yBACpB,WAAW,CACV,MAAM,EACN,GAAG,kCAAkB,CAAC,2BAA2B,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAChF,kBAAkB,CAAC,aACrB,EAAE,EACF,KAAK,EACL,kBAAkB,CAAC,mBAAmB,CACvC;yBACA,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;wBACf,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC9D,IAAI,YAAY,KAAK,kBAAkB,CAAC,mBAAmB,EAAE;4BAC3D,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;yBACtE;oBACH,CAAC,CAAC,CAAC;iBACN;qBAAM;oBACL,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;iBACzD;aACF;YACD,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;gBACnC,CAAC,6BAAiB,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAC/E,CAAC,6BAAiB,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CACzC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,uBAAY,CAAC,eAAe,EAAE,CAAC,CAAC,UAAU,CAAC,0CAAE,OAAO,CAAA,EAAA,CAAC,CACxE;aACF,CAAC,CAAC;YACH,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;aAAM;YACL,MAAM,GAAG,GAAG,kCAAkB,CAAC,wBAAwB,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACzF,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC;CACF,CAAA;AAlkBC;IAVC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC5B,OAAO,8CAA8B,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;YACD,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,0BAAc,CAAC,aAAa;YAChD,sBAAsB,EAAE,MAAM;SAC/B,CAAC;KACH,CAAC;;;;yCA6GD;AAcD;IAVC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC5B,OAAO,sCAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACtD,CAAC;YACD,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,0BAAc,CAAC,UAAU;YAC7C,sBAAsB,EAAE,MAAM;SAC/B,CAAC;KACH,CAAC;;;;6CA+CD;AA8ED;IAVC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,QAAQ,EAAE,KAAK,EAAE,OAAkB,EAAE,MAA6B,EAAE,EAAE;gBACpE,OAAO,MAAM,qCAA0B,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC;YACD,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,0BAAc,CAAC,SAAS;YAC5C,sBAAsB,EAAE,MAAM;SAC/B,CAAC;KACH,CAAC;;;;4CAiJD;AAwBD;IAVC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,QAAQ,EAAE,KAAK,EAAE,OAAkB,EAAE,MAA6B,EAAE,EAAE;gBACpE,OAAO,MAAM,kCAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,OAAQ,CAAC,CAAC;YAC1E,CAAC;YACD,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,0BAAc,CAAC,MAAM;YACzC,sBAAsB,EAAE,MAAM;SAC/B,CAAC;KACH,CAAC;;;;yCAoKD;AAjlBU,WAAW;IADvB,gBAAO,CAAC,IAAI,CAAC;GACD,WAAW,CAklBvB;AAllBY,kCAAW;AAolBxB,8BAA8B;AACvB,KAAK,UAAU,QAAQ,CAAC,WAAmB;IAChD,MAAM,UAAU,GAAG,IAAI,KAAK,EAAU,CAAC;IACvC,0CAA0C;IAC1C,MAAM,YAAY,GAAG,8CAAsB,CAAC,WAAW,CAAC,CAAC;IACzD,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QACrC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC/B;IACD,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAc,0BAAc,CAAC,WAAW,CAAC,CAAC;IAC3E,uCAAuC;IACvC,MAAM,sBAAsB,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACvE,UAAU,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAE3C,qCAAqC;IACrC,MAAM,cAAc,GAAG,gCAAkB,CAAC,gBAAgB,CACxD,gCAAkB,CAAC,iBAAiB,EAAE,EACtC,WAAW,CACZ,CAAC;IACF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;QACvC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;KACjC;IAED,MAAM,YAAY,GAAG,gCAAkB,CAAC,gBAAgB,CACtD,gCAAkB,CAAC,eAAe,EAAE,EACpC,WAAW,CACZ,CAAC;IACF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QACrC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC/B;IAED,+BAA+B;IAC/B,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAmB,CAAC,CAAC;IAC/D,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACnC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KAC7B;IAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,OAAO,iBAAG,CAAC,IAAI,wCAAgC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACzE;IAED,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAxCD,4BAwCC;AASD,SAAgB,yBAAyB,CAAC,KAAc;IACtD,MAAM,mBAAmB,GACvB,uGAAuG,CAAC;IAC1G,MAAM,mBAAmB,GAAG,kCAAkB,CAAC,6BAA6B,CAAC,CAAC;IAC9E,MAAM,wBAAwB,GAAG,kCAAkB,CAAC,uCAAuC,CAAC,CAAC;IAC7F,MAAM,kBAAkB,GAAG,GAAG,mBAAmB,IAAI,wBAAwB,KAAK,mBAAmB,GAAG,CAAC;IAEzG,OAAO;QACL,gBAAgB,EAAE,mBAAmB;QACrC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;QAC/C,aAAa,EAAE,mBAAmB;QAClC,mBAAmB,EAAE,wBAAwB;KACpB,CAAC;AAC9B,CAAC;AAbD,8DAaC"}
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/component/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AzureAccountProvider, FxError, InputsWithProjectPath, ResourceContextV3, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { DriverContext } from "./driver/interface/commonArgs";
|
|
2
3
|
export declare class DeployUtils {
|
|
3
4
|
/**
|
|
4
5
|
* make sure subscription is correct before deployment
|
|
@@ -7,6 +8,7 @@ export declare class DeployUtils {
|
|
|
7
8
|
checkDeployAzureSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, azureAccountProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
|
|
8
9
|
deployAadFromVscode(context: ResourceContextV3, inputs: InputsWithProjectPath): Promise<Result<undefined, FxError>>;
|
|
9
10
|
askForDeployConsent(ctx: v2.Context, azureAccountProvider: AzureAccountProvider, envInfo: v3.EnvInfoV3): Promise<Result<Void, FxError>>;
|
|
11
|
+
askForDeployConsentV3(ctx: DriverContext): Promise<Result<Void, FxError>>;
|
|
10
12
|
}
|
|
11
13
|
export declare const deployUtils: DeployUtils;
|
|
12
14
|
//# sourceMappingURL=deployUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployUtils.d.ts","sourceRoot":"","sources":["../../src/component/deployUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EAIpB,OAAO,EACP,qBAAqB,EAErB,iBAAiB,EACjB,MAAM,EAGN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"deployUtils.d.ts","sourceRoot":"","sources":["../../src/component/deployUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EAIpB,OAAO,EACP,qBAAqB,EAErB,iBAAiB,EACjB,MAAM,EAGN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAYhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAK9D,qBAAa,WAAW;IACtB;;;OAGG;IACG,4BAA4B,CAChC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAmD3B,mBAAmB,CACvB,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA+DhC,mBAAmB,CACvB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAuB3B,qBAAqB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAUhF;AACD,eAAO,MAAM,WAAW,aAAoB,CAAC"}
|
|
@@ -103,6 +103,17 @@ class DeployUtils {
|
|
|
103
103
|
}
|
|
104
104
|
return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, "UserCancel", "UserCancel"));
|
|
105
105
|
}
|
|
106
|
+
async askForDeployConsentV3(ctx) {
|
|
107
|
+
var _a;
|
|
108
|
+
const msg = localizeUtils_1.getLocalizedString("core.deploy.confirmEnvNoticeV3", process.env.TEAMSFX_ENV);
|
|
109
|
+
const deployOption = localizeUtils_1.getLocalizedString("core.option.deploy");
|
|
110
|
+
const result = await ((_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.showMessage("warn", msg, true, deployOption));
|
|
111
|
+
const choice = (result === null || result === void 0 ? void 0 : result.isOk()) ? result.value : undefined;
|
|
112
|
+
if (choice === deployOption) {
|
|
113
|
+
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
114
|
+
}
|
|
115
|
+
return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, "UserCancel", "UserCancel"));
|
|
116
|
+
}
|
|
106
117
|
}
|
|
107
118
|
exports.DeployUtils = DeployUtils;
|
|
108
119
|
exports.deployUtils = new DeployUtils();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployUtils.js","sourceRoot":"","sources":["../../src/component/deployUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAegC;AAChC,mCAAmC;AACnC,mCAAmC;AACnC,mDAAwD;AACxD,2DAA+E;AAC/E,2CAKqB;AACrB,2CAA6C;
|
|
1
|
+
{"version":3,"file":"deployUtils.js","sourceRoot":"","sources":["../../src/component/deployUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @author Yuqi Zhou <yuqzho@microsoft.com>
|
|
3
|
+
*/
|
|
1
4
|
import { AppDefinition } from "./resource/appManifest/interfaces/appDefinition";
|
|
2
5
|
import { Result, FxError, ContextV3, Inputs } from "@microsoft/teamsfx-api";
|
|
3
6
|
export declare const answerToRepaceBotId = "bot";
|
|
@@ -10,5 +13,6 @@ export declare enum TabUrlType {
|
|
|
10
13
|
ContentUrl = "ContentUrl"
|
|
11
14
|
}
|
|
12
15
|
export declare function getTemplateId(teamsApp: AppDefinition): string | undefined;
|
|
16
|
+
export declare function isFromDevPortalInVSC(inputs: Inputs): boolean;
|
|
13
17
|
export declare const developerPortalScaffoldUtils: DeveloperPortalScaffoldUtils;
|
|
14
18
|
//# sourceMappingURL=developerPortalScaffoldUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"developerPortalScaffoldUtils.d.ts","sourceRoot":"","sources":["../../src/component/developerPortalScaffoldUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAGhF,OAAO,EAEL,MAAM,EAEN,OAAO,EAEP,SAAS,EACT,MAAM,
|
|
1
|
+
{"version":3,"file":"developerPortalScaffoldUtils.d.ts","sourceRoot":"","sources":["../../src/component/developerPortalScaffoldUtils.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAGhF,OAAO,EAEL,MAAM,EAEN,OAAO,EAEP,SAAS,EACT,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAmChC,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AACzC,eAAO,MAAM,oCAAoC,qBAAqB,CAAC;AAEvE,qBAAa,4BAA4B;IACjC,iBAAiB,CACrB,GAAG,EAAE,SAAS,EACd,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAqBvC;AAED,oBAAY,UAAU;IACpB,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAkOD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CA2BzE;AAMD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,eAAO,MAAM,4BAA4B,8BAAqC,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.developerPortalScaffoldUtils = exports.getTemplateId = exports.TabUrlType = exports.DeveloperPortalScaffoldUtils = exports.answerToReplaceMessageExtensionBotId = exports.answerToRepaceBotId = void 0;
|
|
5
|
+
exports.developerPortalScaffoldUtils = exports.isFromDevPortalInVSC = exports.getTemplateId = exports.TabUrlType = exports.DeveloperPortalScaffoldUtils = exports.answerToReplaceMessageExtensionBotId = exports.answerToRepaceBotId = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const appStudio = tslib_1.__importStar(require("./resource/appManifest/appStudio"));
|
|
8
8
|
const os = tslib_1.__importStar(require("os"));
|
|
@@ -83,6 +83,22 @@ async function updateManifest(ctx, appDefinition, inputs) {
|
|
|
83
83
|
manifest.id = "${{TEAMS_APP_ID}}";
|
|
84
84
|
manifest.icons.color = "resources/color.png";
|
|
85
85
|
manifest.icons.outline = "resources/outline.png";
|
|
86
|
+
// Adding a feature with groupchat scope in TDP won't pass manifest validation in TTK.
|
|
87
|
+
// This is a short-term solution to convert the value to what TTK expects.
|
|
88
|
+
if (!!manifest.configurableTabs && manifest.configurableTabs.length > 0) {
|
|
89
|
+
if (manifest.configurableTabs[0].scopes) {
|
|
90
|
+
{
|
|
91
|
+
manifest.configurableTabs[0].scopes = updateScope(manifest.configurableTabs[0].scopes);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
if (!!manifest.bots && manifest.bots.length > 0) {
|
|
96
|
+
if (manifest.bots[0].scopes) {
|
|
97
|
+
{
|
|
98
|
+
manifest.bots[0].scopes = updateScope(manifest.bots[0].scopes);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
86
102
|
// manifest: tab
|
|
87
103
|
const tabs = manifest.staticTabs;
|
|
88
104
|
let needUpdateStaticTabUrls = false;
|
|
@@ -127,6 +143,17 @@ async function updateManifest(ctx, appDefinition, inputs) {
|
|
|
127
143
|
}
|
|
128
144
|
}
|
|
129
145
|
}
|
|
146
|
+
// manifest: no tab, bot or me selected on TDP before
|
|
147
|
+
if (!getTemplateId(appDefinition)) {
|
|
148
|
+
// which means user selects a capability through TTK UI.
|
|
149
|
+
manifest.bots = existingManifestTemplate.bots;
|
|
150
|
+
manifest.composeExtensions = existingManifestTemplate.composeExtensions;
|
|
151
|
+
manifest.staticTabs = existingManifestTemplate.staticTabs;
|
|
152
|
+
manifest.configurableTabs = existingManifestTemplate.configurableTabs;
|
|
153
|
+
manifest.permissions = existingManifestTemplate.permissions;
|
|
154
|
+
manifest.validDomains = existingManifestTemplate.validDomains;
|
|
155
|
+
manifest.webApplicationInfo = existingManifestTemplate.webApplicationInfo;
|
|
156
|
+
}
|
|
130
157
|
// manifest: developer
|
|
131
158
|
if (manifest.developer) {
|
|
132
159
|
if (!manifest.developer.websiteUrl) {
|
|
@@ -202,26 +229,33 @@ function findTabBasedOnName(name, tabs) {
|
|
|
202
229
|
function getTemplateId(teamsApp) {
|
|
203
230
|
// tab with bot, tab with message extension, tab with bot and message extension
|
|
204
231
|
if (utils_1.needTabAndBotCode(teamsApp)) {
|
|
205
|
-
return constants_2.TabNonSsoAndDefaultBotItem.id;
|
|
232
|
+
return constants_2.TabNonSsoAndDefaultBotItem().id;
|
|
206
233
|
}
|
|
207
234
|
// tab only
|
|
208
235
|
if (utils_1.needTabCode(teamsApp)) {
|
|
209
|
-
return constants_2.TabNonSsoItem.id;
|
|
236
|
+
return constants_2.TabNonSsoItem().id;
|
|
210
237
|
}
|
|
211
238
|
// bot and message extension
|
|
212
239
|
if (utils_1.isBotAndMessageExtension(teamsApp)) {
|
|
213
|
-
return constants_2.DefaultBotAndMessageExtensionItem.id;
|
|
240
|
+
return constants_2.DefaultBotAndMessageExtensionItem().id;
|
|
214
241
|
}
|
|
215
242
|
// message extension
|
|
216
243
|
if (utils_1.isMessageExtension(teamsApp)) {
|
|
217
|
-
return constants_2.MessageExtensionNewUIItem.id;
|
|
244
|
+
return constants_2.MessageExtensionNewUIItem().id;
|
|
218
245
|
}
|
|
219
246
|
// bot
|
|
220
247
|
if (utils_1.isBot(teamsApp)) {
|
|
221
|
-
return constants_2.BotOptionItem.id;
|
|
248
|
+
return constants_2.BotOptionItem().id;
|
|
222
249
|
}
|
|
223
250
|
return undefined;
|
|
224
251
|
}
|
|
225
252
|
exports.getTemplateId = getTemplateId;
|
|
253
|
+
function updateScope(scopes) {
|
|
254
|
+
return scopes.map((o) => o.toLowerCase());
|
|
255
|
+
}
|
|
256
|
+
function isFromDevPortalInVSC(inputs) {
|
|
257
|
+
return !!inputs.teamsAppFromTdp && inputs.platform === teamsfx_api_1.Platform.VSCode;
|
|
258
|
+
}
|
|
259
|
+
exports.isFromDevPortalInVSC = isFromDevPortalInVSC;
|
|
226
260
|
exports.developerPortalScaffoldUtils = new DeveloperPortalScaffoldUtils();
|
|
227
261
|
//# sourceMappingURL=developerPortalScaffoldUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"developerPortalScaffoldUtils.js","sourceRoot":"","sources":["../../src/component/developerPortalScaffoldUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;
|
|
1
|
+
{"version":3,"file":"developerPortalScaffoldUtils.js","sourceRoot":"","sources":["../../src/component/developerPortalScaffoldUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AA0BjF,qBACa,qBAAsB,YAAW,UAAU;IACtD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAEvC;IAEW,GAAG,CACd,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,mBAAmB,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAahF,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAsFF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;CAMzB"}
|
|
@@ -6,6 +6,7 @@ exports.CreateBotAadAppDriver = void 0;
|
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const typedi_1 = require("typedi");
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
+
const timer_1 = tslib_1.__importDefault(require("@dbpiper/timer"));
|
|
9
10
|
const invalidParameterUserError_1 = require("./error/invalidParameterUserError");
|
|
10
11
|
const unhandledError_1 = require("./error/unhandledError");
|
|
11
12
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
@@ -18,6 +19,11 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
|
18
19
|
const constants_2 = require("../../resource/botService/botRegistration/constants");
|
|
19
20
|
const actionName = "botAadApp/create"; // DO NOT MODIFY the name
|
|
20
21
|
const helpLink = "https://aka.ms/teamsfx-actions/botaadapp-create";
|
|
22
|
+
const successRegisterBotAad = `${actionName}/success`;
|
|
23
|
+
const propertyKeys = {
|
|
24
|
+
reusingExistingBotAad: "reuse-existing-bot-aad",
|
|
25
|
+
registerBotAadTime: "register-bot-aad-time",
|
|
26
|
+
};
|
|
21
27
|
let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
22
28
|
constructor() {
|
|
23
29
|
this.description = localizeUtils_1.getLocalizedString("driver.botAadApp.create.description");
|
|
@@ -54,16 +60,24 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
54
60
|
};
|
|
55
61
|
const botRegistration = new remoteBotRegistration_1.RemoteBotRegistration();
|
|
56
62
|
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString(constants_2.progressBarKeys.creatingBotAadApp)));
|
|
63
|
+
const timer = new timer_1.default();
|
|
64
|
+
timer.start();
|
|
57
65
|
const createRes = await botRegistration.createBotRegistration(context.m365TokenProvider, args.name, args.name, botConfig, context.logProvider);
|
|
66
|
+
const timeResult = timer.stop();
|
|
58
67
|
if (createRes.isErr()) {
|
|
59
68
|
throw createRes.error;
|
|
60
69
|
}
|
|
70
|
+
const isReusingExisting = botConfig.botId && botConfig.botPassword;
|
|
61
71
|
const successCreateBotAadLog = localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.successCreateBotAad, createRes.value.botId);
|
|
62
72
|
const useExistingBotAadLog = localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.useExistingBotAad, botConfig.botId);
|
|
63
|
-
const summary =
|
|
73
|
+
const summary = isReusingExisting ? useExistingBotAadLog : successCreateBotAadLog;
|
|
64
74
|
(_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info(summary);
|
|
65
75
|
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
|
|
66
76
|
(_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.successExecuteDriver, actionName));
|
|
77
|
+
context.telemetryReporter.sendTelemetryEvent(successRegisterBotAad, {
|
|
78
|
+
[propertyKeys.reusingExistingBotAad]: isReusingExisting,
|
|
79
|
+
[propertyKeys.registerBotAadTime]: timeResult.milliseconds.toString(),
|
|
80
|
+
});
|
|
67
81
|
return {
|
|
68
82
|
output: new Map([
|
|
69
83
|
["BOT_ID", createRes.value.botId],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAiC;AAGjC,wDAAiF;AACjF,iFAA8E;AAC9E,2DAAkF;AAClF,0DAA0B;AAC1B,+CAA6C;AAK7C,2GAAwG;AACxG,+CAA8C;AAC9C,mFAAgF;AAChF,mDAAqD;AACrD,iEAAmE;AACnE,mFAAsF;AAEtF,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,yBAAyB;AAChE,MAAM,QAAQ,GAAG,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureAppServiceDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAW5F,qBACa,2BAA4B,YAAW,UAAU;IAC5D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IAEI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"azureAppServiceDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAW5F,qBACa,2BAA4B,YAAW,UAAU;IAC5D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IAEI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASzF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAgB3E;AAED,qBAAa,+BAAgC,SAAQ,iBAAiB;IACpE,OAAO,SAC6F;IACpG,SAAS,CAAC,QAAQ,SAA6D;IAEzE,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAoBhB,iBAAiB,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,SAAS;CAOtE"}
|
|
@@ -22,10 +22,17 @@ let AzureAppServiceDeployDriver = class AzureAppServiceDeployDriver {
|
|
|
22
22
|
const impl = new AzureAppServiceDeployDriverImpl(args, context);
|
|
23
23
|
return common_1.wrapRun(() => impl.run(), () => impl.cleanup(), context.logProvider);
|
|
24
24
|
}
|
|
25
|
-
execute(args, ctx) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
async execute(args, ctx) {
|
|
26
|
+
const impl = new AzureAppServiceDeployDriverImpl(args, ctx);
|
|
27
|
+
const res = await common_1.wrapRun(() => impl.run(), () => impl.cleanup(), ctx.logProvider);
|
|
28
|
+
if (impl.dryRun) {
|
|
29
|
+
return common_1.wrapSummary(async () => {
|
|
30
|
+
return res;
|
|
31
|
+
}, ["driver.deploy.notice.deployDryRunComplete"]);
|
|
32
|
+
}
|
|
33
|
+
return common_1.wrapSummary(async () => {
|
|
34
|
+
return res;
|
|
35
|
+
}, ["driver.deploy.azureAppServiceDeploySummary"]);
|
|
29
36
|
}
|
|
30
37
|
};
|
|
31
38
|
tslib_1.__decorate([
|
|
@@ -45,19 +52,24 @@ class AzureAppServiceDeployDriverImpl extends azureDeployDriver_1.AzureDeployDri
|
|
|
45
52
|
this.helpLink = "https://aka.ms/teamsfx-actions/azure-app-service-deploy";
|
|
46
53
|
}
|
|
47
54
|
async azureDeploy(args, azureResource, azureCredential) {
|
|
48
|
-
var _a, _b, _c, _d;
|
|
55
|
+
var _a, _b, _c, _d, _e;
|
|
49
56
|
await ((_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.start());
|
|
50
57
|
const cost = await this.zipDeploy(args, azureResource, azureCredential);
|
|
51
|
-
|
|
58
|
+
if (this.dryRun) {
|
|
59
|
+
await ((_b = this.progressBar) === null || _b === void 0 ? void 0 : _b.end(true));
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
await ((_c = this.progressBar) === null || _c === void 0 ? void 0 : _c.next(messages_1.ProgressMessages.restartAzureService));
|
|
52
63
|
await this.restartFunctionApp(azureResource);
|
|
53
|
-
await ((
|
|
64
|
+
await ((_d = this.progressBar) === null || _d === void 0 ? void 0 : _d.end(true));
|
|
54
65
|
if (cost > deployConstant_1.DeployConstant.DEPLOY_OVER_TIME) {
|
|
55
|
-
await ((
|
|
66
|
+
await ((_e = this.context.logProvider) === null || _e === void 0 ? void 0 : _e.info(messages_1.getLocalizedMessage("driver.deploy.notice.deployAcceleration", "https://aka.ms/teamsfx-config-run-from-package").localized));
|
|
56
67
|
}
|
|
57
68
|
}
|
|
58
69
|
createProgressBar(ui) {
|
|
59
70
|
var _a;
|
|
60
|
-
|
|
71
|
+
const steps = this.dryRun ? 1 : 6;
|
|
72
|
+
return ui === null || ui === void 0 ? void 0 : ui.createProgressBar(`Deploying ${(_a = this.workingDirectory) !== null && _a !== void 0 ? _a : ""} to Azure App Service`, steps);
|
|
61
73
|
}
|
|
62
74
|
}
|
|
63
75
|
exports.AzureAppServiceDeployDriverImpl = AzureAppServiceDeployDriverImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureAppServiceDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,2DAAwD;AAExD,mCAAiC;AAIjC,kDAA6D;AAC7D,+CAA8C;AAC9C,sFAAmF;AACnF,qEAAqE;AACrE,qEAAkE;AAClE,gDAA0E;AAC1E,oEAAsE;AAEtE,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAG7C,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAAxC;QACW,gBAAW,GAAW,kCAAkB,CAC/C,kDAAkD,CACnD,CAAC;
|
|
1
|
+
{"version":3,"file":"azureAppServiceDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureDeployDriver.ts"],"names":[],"mappings":";AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EAEjB,UAAU,EAEV,YAAY,EACb,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAMlD,8BAAsB,iBAAkB,SAAQ,gBAAgB;IAC9D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEnB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7C;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"azureDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureDeployDriver.ts"],"names":[],"mappings":";AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EAEjB,UAAU,EAEV,YAAY,EACb,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAMlD,8BAAsB,iBAAkB,SAAQ,gBAAgB;IAC9D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEnB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7C;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IA6ClB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC;IA8DlB;;;;;;;OAOG;cACa,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAuCpC;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD;;;;;OAKG;cACa,uBAAuB,CACrC,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC;cAiCb,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAWpF"}
|
|
@@ -53,6 +53,9 @@ class AzureDeployDriver extends baseDeployDriver_1.BaseDeployDriver {
|
|
|
53
53
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
54
54
|
await ((_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.packingCode));
|
|
55
55
|
const zipBuffer = await this.packageToZip(args, this.context);
|
|
56
|
+
if (this.dryRun) {
|
|
57
|
+
return -1;
|
|
58
|
+
}
|
|
56
59
|
await ((_b = this.progressBar) === null || _b === void 0 ? void 0 : _b.next(messages_1.ProgressMessages.getAzureAccountInfoForDeploy));
|
|
57
60
|
await this.context.logProvider.debug("Start to get Azure account info for deploy");
|
|
58
61
|
const config = await this.createAzureDeployConfig(azureResource, azureCredential);
|