@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAA6E;AAC7E,wDAAoD;AACpD,+CAAwE;AAExE;;;GAGG;AACI,MAAM,cAAc,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;IACvF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM;QAAE,sBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI;QACF,MAAM,IAAI,EAAE,CAAC;KACd;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,OAAO,GAAG,sBAAa,CAAC,CAAC,CAAC,CAAC;QACjC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;IACD,IAAI,MAAA,GAAG,CAAC,MAAM,0CAAE,KAAK,EAAE,EAAE;QACvB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAChC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC;AAdW,QAAA,cAAc,kBAczB;AAEF,MAAM,IAAI,GACR,mMAAmM,CAAC;AACtM,MAAM,IAAI,GAAG,6EAA6E,CAAC;AAC3F,MAAM,IAAI,GAAG,yCAAyC,CAAC;AACvD,MAAM,IAAI,GACR,yJAAyJ,CAAC;AAC5J,MAAM,IAAI,GACR,uIAAuI,CAAC;AAC1I,MAAM,IAAI,GACR,sGAAsG,CAAC;AACzG,MAAM,IAAI,GAAG,4CAA4C,CAAC;AAC1D,MAAM,IAAI,GACR,4FAA4F,CAAC;AAC/F,MAAM,IAAI,GAAG,kDAAkD,CAAC;AAChE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAC3C,MAAM,KAAK,GAAG,kCAAkC,CAAC;AACjD,MAAM,KAAK,GAAG,6BAA6B,CAAC;AAC5C,qDAAqD;AACrD,kDAAkD;AAClD,yCAAyC;AACzC,MAAM,KAAK,GAAG,gCAAgC,CAAC;AAE/C,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEzF,SAAgB,YAAY,CAAC,GAAU;IACrC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;IACxB,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IACrB,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QAC5B,MAAM,SAAS,GAAG,IAAI,4BAAmB,CAAC,GAAG,EAAG,GAAW,CAAC,MAAM,CAAC,CAAC;QACpE,OAAO,SAAS,CAAC;KAClB;IACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,SAAS,GAAG,IAAI,uBAAS,CAC5B,GAAW,CAAC,MAAM,EACnB,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,OAAO,EACV,GAAW,CAAC,cAAc,CAC5B,CAAC;YACF,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YAC5B,OAAO,SAAS,CAAC;SAClB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AApBD,oCAoBC"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @author xzf0587 <zhaofengxu@microsoft.com>
|
|
3
|
+
*/
|
|
1
4
|
import { Middleware } from "@feathersjs/hooks/lib";
|
|
2
5
|
import { CoreHookContext } from "../types";
|
|
3
|
-
import { MigrationContext } from "./utils/migrationContext";
|
|
4
6
|
import { VersionForMigration } from "./types";
|
|
7
|
+
import { MigrationContext } from "./utils/migrationContext";
|
|
5
8
|
export declare const learnMoreLink = "https://aka.ms/teams-toolkit-5.0-upgrade";
|
|
6
9
|
export declare const errorNames: {
|
|
7
10
|
manifestTemplateNotExist: string;
|
|
@@ -20,6 +23,7 @@ export declare function preMigration(context: MigrationContext): Promise<void>;
|
|
|
20
23
|
export declare function checkVersionForMigration(ctx: CoreHookContext): Promise<VersionForMigration>;
|
|
21
24
|
export declare function generateAppYml(context: MigrationContext): Promise<void>;
|
|
22
25
|
export declare function updateLaunchJson(context: MigrationContext): Promise<void>;
|
|
26
|
+
export declare function isSPFxProject(projectSettings?: any): boolean;
|
|
23
27
|
export declare function manifestsMigration(context: MigrationContext): Promise<void>;
|
|
24
28
|
export declare function azureParameterMigration(context: MigrationContext): Promise<void>;
|
|
25
29
|
export declare function showNotification(ctx: CoreHookContext, versionForMigration: VersionForMigration): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAyBjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAoC9C,OAAO,EAAE,gBAAgB,EAAgB,MAAM,0BAA0B,CAAC;AA+D1E,eAAO,MAAM,aAAa,6CAA6C,CAAC;AAGxE,eAAO,MAAM,UAAU;;;;CAItB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,MAAM,MAAyD,CAAC;AAO7F,aAAK,SAAS,GAAG,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAC9D,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,SAAS,CAY1C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UA6CjC,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBhG;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAUnE;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhF;AAWD,wBAAsB,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKtE;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWjG;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD/E;AAUD,wBAAgB,aAAa,CAAC,eAAe,CAAC,EAAE,GAAG,GAAG,OAAO,CAO5D;AACD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8GjF;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BtF;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,OAAO,CAAC,CAkBlB;AAmHD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE/E;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD9E;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhF;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE7E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAQ9D;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC3F;AAED,wBAAsB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBtF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E"}
|
|
@@ -2,36 +2,31 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.updateGitignore = exports.checkActiveResourcePlugins = exports.generateApimPluginEnvContent = exports.checkapimPluginExists = exports.debugMigration = exports.userdataMigration = exports.statesMigration = exports.configsMigration = exports.showNotification = exports.azureParameterMigration = exports.manifestsMigration = exports.updateLaunchJson = exports.generateAppYml = exports.checkVersionForMigration = exports.preMigration = exports.migrate = exports.rollbackMigration = exports.buildErrorMessage = exports.wrapRunMigration = exports.ProjectMigratorMWV3 = exports.subMigrations = exports.moreInfoButton = exports.errorNames = exports.learnMoreLink = void 0;
|
|
5
|
+
exports.updateGitignore = exports.checkActiveResourcePlugins = exports.generateApimPluginEnvContent = exports.checkapimPluginExists = exports.debugMigration = exports.userdataMigration = exports.statesMigration = exports.configsMigration = exports.showNotification = exports.azureParameterMigration = exports.manifestsMigration = exports.isSPFxProject = exports.updateLaunchJson = exports.generateAppYml = exports.checkVersionForMigration = exports.preMigration = exports.migrate = exports.rollbackMigration = exports.buildErrorMessage = exports.wrapRunMigration = exports.ProjectMigratorMWV3 = exports.subMigrations = exports.moreInfoButton = exports.errorNames = exports.learnMoreLink = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
/**
|
|
8
|
-
* @author xzf0587 <zhaofengxu@microsoft.com>
|
|
9
|
-
*/
|
|
10
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
11
|
-
const
|
|
8
|
+
const commentJson = tslib_1.__importStar(require("comment-json"));
|
|
9
|
+
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
10
|
+
const os_1 = require("os");
|
|
12
11
|
const path = tslib_1.__importStar(require("path"));
|
|
13
|
-
const
|
|
12
|
+
const globalVars_1 = require("../../common/globalVars");
|
|
13
|
+
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
14
14
|
const telemetry_1 = require("../../common/telemetry");
|
|
15
|
-
const
|
|
16
|
-
const error_1 = require("../error");
|
|
17
|
-
const appYmlGenerator_1 = require("./utils/appYmlGenerator");
|
|
18
|
-
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
15
|
+
const versionMetadata_1 = require("../../common/versionMetadata");
|
|
19
16
|
const constants_1 = require("../../component/driver/teamsApp/constants");
|
|
17
|
+
const ManifestUtils_1 = require("../../component/driver/teamsApp/utils/ManifestUtils");
|
|
18
|
+
const error_1 = require("../../error");
|
|
19
|
+
const folder_1 = require("../../folder");
|
|
20
|
+
const projectSettingsLoader_1 = require("./projectSettingsLoader");
|
|
20
21
|
const MigrationUtils_1 = require("./utils/MigrationUtils");
|
|
21
|
-
const
|
|
22
|
-
const
|
|
22
|
+
const appYmlGenerator_1 = require("./utils/appYmlGenerator");
|
|
23
|
+
const appLocalYmlGenerator_1 = require("./utils/debug/appLocalYmlGenerator");
|
|
24
|
+
const constants_2 = require("./utils/debug/constants");
|
|
23
25
|
const debugMigrationContext_1 = require("./utils/debug/debugMigrationContext");
|
|
24
26
|
const debugV3MigrationUtils_1 = require("./utils/debug/debugV3MigrationUtils");
|
|
25
27
|
const taskMigrator_1 = require("./utils/debug/taskMigrator");
|
|
26
|
-
const
|
|
27
|
-
const
|
|
28
|
-
const folder_1 = require("../../folder");
|
|
29
|
-
const versionMetadata_1 = require("../../common/versionMetadata");
|
|
30
|
-
const tools_1 = require("../../common/tools");
|
|
31
|
-
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
32
|
-
const constants_2 = require("./utils/debug/constants");
|
|
33
|
-
const ManifestUtils_1 = require("../../component/driver/teamsApp/utils/ManifestUtils");
|
|
34
|
-
const error_2 = require("../../error");
|
|
28
|
+
const migrationContext_1 = require("./utils/migrationContext");
|
|
29
|
+
const v3MigrationUtils_1 = require("./utils/v3MigrationUtils");
|
|
35
30
|
const Constants = {
|
|
36
31
|
vscodeProvisionBicepPath: "./templates/azure/provision.bicep",
|
|
37
32
|
launchJsonPath: ".vscode/launch.json",
|
|
@@ -99,7 +94,7 @@ const ProjectMigratorMWV3 = async (ctx, next) => {
|
|
|
99
94
|
// abandoned v3 project which will not be supported. Show user the message to create new project.
|
|
100
95
|
if (versionForMigration.source === versionMetadata_1.VersionSource.settings) {
|
|
101
96
|
await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.migrationV3.abandonedProject"), true));
|
|
102
|
-
ctx.result = teamsfx_api_1.err(error_1.AbandonedProjectError());
|
|
97
|
+
ctx.result = teamsfx_api_1.err(new error_1.AbandonedProjectError());
|
|
103
98
|
return;
|
|
104
99
|
}
|
|
105
100
|
const projectPath = v3MigrationUtils_1.getParameterFromCxt(ctx, "projectPath", "");
|
|
@@ -145,7 +140,7 @@ async function wrapRunMigration(context, exec) {
|
|
|
145
140
|
}
|
|
146
141
|
catch (error) {
|
|
147
142
|
const errorMessage = buildErrorMessage(error, context.currentStep);
|
|
148
|
-
const fxError =
|
|
143
|
+
const fxError = error_1.assembleError(error, telemetry_1.Component.core);
|
|
149
144
|
fxError.message = errorMessage;
|
|
150
145
|
sendTelemetryErrorEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorError, fxError, context.telemetryProperties);
|
|
151
146
|
await rollbackMigration(context);
|
|
@@ -257,6 +252,15 @@ async function loadProjectSettings(projectPath) {
|
|
|
257
252
|
throw oldProjectSettings.error;
|
|
258
253
|
}
|
|
259
254
|
}
|
|
255
|
+
function isSPFxProject(projectSettings) {
|
|
256
|
+
const solutionSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings;
|
|
257
|
+
if (solutionSettings) {
|
|
258
|
+
const selectedPlugins = solutionSettings.activeResourcePlugins;
|
|
259
|
+
return selectedPlugins && selectedPlugins.indexOf("fx-resource-spfx") !== -1;
|
|
260
|
+
}
|
|
261
|
+
return false;
|
|
262
|
+
}
|
|
263
|
+
exports.isSPFxProject = isSPFxProject;
|
|
260
264
|
async function manifestsMigration(context) {
|
|
261
265
|
// Check manifest existing
|
|
262
266
|
const oldAppPackageFolderPath = path.join(v3MigrationUtils_1.getTemplateFolderPath(context), teamsfx_api_1.AppPackageFolderName);
|
|
@@ -265,13 +269,13 @@ async function manifestsMigration(context) {
|
|
|
265
269
|
const oldManifestExists = await fs.pathExists(oldManifestAbsolutePath);
|
|
266
270
|
if (!oldManifestExists) {
|
|
267
271
|
// templates/appPackage/manifest.template.json does not exist
|
|
268
|
-
throw error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.manifestNotExist")), exports.errorNames.manifestTemplateNotExist, exports.learnMoreLink);
|
|
272
|
+
throw new error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.manifestNotExist")), exports.errorNames.manifestTemplateNotExist, exports.learnMoreLink);
|
|
269
273
|
}
|
|
270
274
|
// Validate manifest template
|
|
271
275
|
{
|
|
272
276
|
const res = await ManifestUtils_1.manifestUtils._readAppManifest(path.join(context.projectPath, oldManifestPath));
|
|
273
277
|
if (res.isErr()) {
|
|
274
|
-
throw error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.manifestInvalid")), exports.errorNames.manifestTemplateInvalid);
|
|
278
|
+
throw new error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.manifestInvalid")), exports.errorNames.manifestTemplateInvalid);
|
|
275
279
|
}
|
|
276
280
|
}
|
|
277
281
|
// Backup templates/appPackage
|
|
@@ -294,7 +298,7 @@ async function manifestsMigration(context) {
|
|
|
294
298
|
const projectSettings = await loadProjectSettings(context.projectPath);
|
|
295
299
|
const capabilities = v3MigrationUtils_1.getCapabilityStatus(projectSettings);
|
|
296
300
|
const appIdUri = v3MigrationUtils_1.generateAppIdUri(capabilities);
|
|
297
|
-
const isSpfx =
|
|
301
|
+
const isSpfx = isSPFxProject(projectSettings);
|
|
298
302
|
if (!isSpfx) {
|
|
299
303
|
await v3MigrationUtils_1.addMissingValidDomainForManifest(path.join(context.projectPath, oldManifestPath), capabilities.Tab, capabilities.BotSso, context.isBotValidDomain);
|
|
300
304
|
}
|
|
@@ -326,7 +330,7 @@ async function manifestsMigration(context) {
|
|
|
326
330
|
await context.fsWriteFile(versionMetadata_1.MetadataV3.aadManifestFileName, aadManifest);
|
|
327
331
|
}
|
|
328
332
|
else if (aadRequired && !oldAadManifestExists) {
|
|
329
|
-
throw error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.aadManifestNotExist")), exports.errorNames.aadManifestTemplateNotExist, exports.learnMoreLink);
|
|
333
|
+
throw new error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.aadManifestNotExist")), exports.errorNames.aadManifestTemplateNotExist, exports.learnMoreLink);
|
|
330
334
|
}
|
|
331
335
|
await context.fsRemove(oldAppPackageFolderPath);
|
|
332
336
|
}
|
|
@@ -396,7 +400,7 @@ async function askUserConfirm(ctx, versionForMigration) {
|
|
|
396
400
|
[TelemetryPropertyKey.button]: TelemetryPropertyValue.cancel,
|
|
397
401
|
[TelemetryPropertyKey.mode]: TelemetryPropertyValue.modal,
|
|
398
402
|
});
|
|
399
|
-
ctx.result = teamsfx_api_1.err(error_1.UpgradeV3CanceledError());
|
|
403
|
+
ctx.result = teamsfx_api_1.err(new error_1.UpgradeV3CanceledError());
|
|
400
404
|
v3MigrationUtils_1.outputCancelMessage(versionForMigration.currentVersion, versionForMigration.platform);
|
|
401
405
|
return false;
|
|
402
406
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMigratorV3.js","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,wDAA0F;AAG1F,+DAA0E;AAC1E,mDAA6B;AAC7B,mEAA6E;AAC7E,sDAKgC;AAChC,8CAAsC;AACtC,oCAKkB;AAClB,6DAA0D;AAC1D,qDAA+B;AAC/B,yEAA0F;AAC1F,2DAA4E;AAC5E,+DAsBkC;AAClC,kEAA4C;AAC5C,+EAA4E;AAC5E,+EAO6C;AAC7C,6DAqBoC;AACpC,6EAA0E;AAC1E,2BAAyB;AACzB,yCAAkD;AAClD,kEAAmG;AACnG,8CAAmD;AAEnD,8DAAgE;AAChE,uDAA4E;AAC5E,uFAAoF;AACpF,uCAA4C;AAE5C,MAAM,SAAS,GAAG;IAChB,wBAAwB,EAAE,mCAAmC;IAC7D,cAAc,EAAE,qBAAqB;IACrC,aAAa,EAAE,oBAAoB;IACnC,UAAU,EAAE,kBAAkB;IAC9B,cAAc,EAAE;QACd,qEAAqE;QACrE,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE,IAAI;KACX;IACD,aAAa,EAAE,OAAO;CACvB,CAAC;AAEF,MAAM,UAAU,GAAG;IACjB,eAAe,EAAE,iBAAiB;IAClC,iBAAiB,EAAE,mBAAmB;IACtC,WAAW,EAAE,aAAa;CAC3B,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,cAAc,EAAE,iBAAiB;IACjC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,sBAAsB,GAAG;IAC7B,EAAE,EAAE,IAAI;IACR,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,cAAc;IAC3B,eAAe,EAAE,mBAAmB;IACpC,cAAc,EAAE,KAAK;CACtB,CAAC;AAEW,QAAA,aAAa,GAAG,0CAA0C,CAAC;AAExE,yIAAyI;AAC5H,QAAA,UAAU,GAAG;IACxB,wBAAwB,EAAE,0BAA0B;IACpD,uBAAuB,EAAE,yBAAyB;IAClD,2BAA2B,EAAE,6BAA6B;CAC3D,CAAC;AACF,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,kCAAkB,CAAC,qBAAqB,CAAC,CAAC;AAC/D,MAAM,cAAc,GAAiB,GAAG,EAAE,CAAC,kCAAkB,CAAC,sBAAsB,CAAC,CAAC;AAAhF,QAAA,cAAc,kBAAkE;AAC7F,MAAM,uBAAuB,GAAG,GAAG,EAAE,CAAC,CAAC,aAAa,EAAE,EAAE,sBAAc,EAAE,CAAC,CAAC;AAE1E,MAAM,mBAAmB,GAAG;IAC1B,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,cAAc;CAC7E,CAAC;AAGW,QAAA,aAAa,GAAqB;IAC7C,YAAY;IACZ,kBAAkB;IAClB,cAAc;IACd,gBAAgB;IAChB,eAAe;IACf,iBAAiB;IACjB,4BAA4B;IAC5B,gBAAgB;IAChB,uBAAuB;IACvB,cAAc;IACd,eAAe;CAChB,CAAC;AAEK,MAAM,mBAAmB,GAAe,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IAChG,MAAM,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAChE,iGAAiG;IACjG,IAAI,mBAAmB,CAAC,MAAM,KAAK,+BAAa,CAAC,QAAQ,EAAE;QACzD,MAAM,CAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,WAAW,CACzB,MAAM,EACN,kCAAkB,CAAC,mCAAmC,CAAC,EACvD,IAAI,CACL,CAAA,CAAC;QACF,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,6BAAqB,EAAE,CAAC,CAAC;QAC1C,OAAO;KACR;IACD,MAAM,WAAW,GAAG,sCAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,OAAO,IAAI,mBAAmB,CAAC,KAAK,KAAK,8BAAY,CAAC,WAAW,CAAC;IACxF,IAAI,aAAa,EAAE;QACjB,2FAA2F;QAC3F,MAAM,cAAc,GAAG,sCAAmB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAClE,IAAI,cAAc,EAAE;YAClB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,gCAAwB,EAAE,CAAC,CAAC;YACjD,OAAO;SACR;QAED,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;QACxE,IAAI,cAAc,EAAE;YAClB,MAAM,iBAAiB,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;YACjF,IAAI,iBAAiB,EAAE;gBACrB,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,CAAC;gBAChE,IAAI,mBAAmB,CAAC,KAAK,KAAK,8BAAY,CAAC,WAAW,EAAE;oBAC1D,GAAG,CAAC,MAAM,GAAG,gBAAE,CAAC,SAAS,CAAC,CAAC;oBAC3B,OAAO;iBACR;aACF;YACD,MAAM,gBAAgB,GAAG,MAAM,mCAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5D,MAAM,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAClD,GAAG,CAAC,MAAM,GAAG,gBAAE,CAAC,SAAS,CAAC,CAAC;SAC5B;QACD,OAAO;KACR;SAAM;QACL,gCAAgC;QAChC,qCAAqC;QACrC,8CAA8C;QAC9C,MAAM,IAAI,EAAE,CAAC;KACd;AACH,CAAC,CAAC;AA7CW,QAAA,mBAAmB,uBA6C9B;AAEK,KAAK,UAAU,gBAAgB,CAAC,OAAyB,EAAE,IAAe;IAC/E,IAAI;QACF,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,CAAC,CAAC;QACzF,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QACpB,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACjC,4BAA4B,CAC1B,qBAAS,CAAC,IAAI,EACd,0BAAc,CAAC,sBAAsB,EACrC,OAAO,CAAC,mBAAmB,CAC5B,CAAC;KACH;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,qBAAa,CAAC,KAAK,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO,CAAC,OAAO,GAAG,YAAY,CAAC;QAC/B,iCAAiC,CAC/B,qBAAS,CAAC,IAAI,EACd,0BAAc,CAAC,oBAAoB,EACnC,OAAO,EACP,OAAO,CAAC,mBAAmB,CAC5B,CAAC;QACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,KAAK,CAAC;KACb;IACD,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;AAC7B,CAAC;AAxBD,4CAwBC;AAED,SAAgB,iBAAiB,CAAC,KAAU,EAAE,IAAa;IACzD,IAAI,OAAO,GAAG,KAAK,CAAC,OAAiB,CAAC;IACtC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,GAAG,iBAAiB,QAAQ,KAAK,OAAO,EAAE,CAAC;KACnD;IACD,IAAI,IAAI,EAAE;QACR,OAAO,GAAG,kBAAkB,IAAI,KAAK,OAAO,EAAE,CAAC;KAChD;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAVD,8CAUC;AAEM,KAAK,UAAU,iBAAiB,CAAC,OAAyB;IAC/D,MAAM,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACnC,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;IAC9B,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;AAC9B,CAAC;AAJD,8CAIC;AAED,KAAK,UAAU,iBAAiB,CAAC,OAAyB;;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,kBAAkB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAE/F,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACzC,MAAM,CAAA,MAAA,MAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,0CAAE,QAAQ,mDAAG,WAAW,CAAC,CAAA,CAAC;AAC3C,CAAC;AAEM,KAAK,UAAU,OAAO,CAAC,OAAyB;IACrD,KAAK,MAAM,YAAY,IAAI,qBAAa,EAAE;QACxC,OAAO,CAAC,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC;QACxC,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;KAC7B;AACH,CAAC;AALD,0BAKC;AAEM,KAAK,UAAU,YAAY,CAAC,OAAyB;IAC1D,MAAM,OAAO,CAAC,MAAM,CAAC,4BAAU,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC;AAFD,oCAEC;AAEM,KAAK,UAAU,wBAAwB,CAAC,GAAoB;IACjE,MAAM,WAAW,GAAG,MAAM,oCAAiB,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,kCAAe,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,EAAE,sBAAQ,CAAC,MAAM,CAAa,CAAC;IAEnF,OAAO;QACL,cAAc,EAAE,WAAW,CAAC,OAAO;QACnC,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,KAAK,EAAE,YAAY;QACnB,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC;AAXD,4DAWC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAyB;;IAC5D,MAAM,YAAY,GAAW,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,MAAM,eAAe,GAAG,IAAI,iCAAe,CACzC,kBAAkB,EAClB,YAAY,EACZ,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,YAAY,GAAW,MAAM,eAAe,CAAC,cAAc,EAAE,CAAC;IACpE,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC/D,IAAI,CAAA,MAAA,kBAAkB,CAAC,mBAAmB,0CAAE,WAAW,EAAE,MAAK,QAAQ,EAAE;QACtE,MAAM,mBAAmB,GAAG,MAAM,8CAAsB,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,iBAAiB,GAAW,MAAM,eAAe,CAAC,mBAAmB,CACzE,mBAAmB,CACpB,CAAC;QACF,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;KAC1E;AACH,CAAC;AAjBD,wCAiBC;AAEM,KAAK,UAAU,gBAAgB,CAAC,OAAyB;IAC9D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IAChF,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;QACvC,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,iBAAiB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1E,IAAI,kBAAkB,CAAC,MAAM,EAAE;YAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACjD,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,KAAK,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAClF,CAAC;YACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,KAAK,EAAE,yBAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,qBAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CACtF,CAAC;YACF,IAAI,gDAAwB,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;gBAC3D,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,OAAO,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,CACzF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CACV,mBAAO,CAAC,OAAO,EACf,yBAAa,CAAC,MAAM,EACpB,QAAQ,EACR,qBAAS,CAAC,gBAAgB,EAC1B,CAAC,CACF,CACF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,MAAM,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CACvF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,MAAM,EAAE,yBAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,qBAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CAC3F,CAAC;aACH;iBAAM,IAAI,gDAAwB,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;gBAClE,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,OAAO,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,CACzF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CACV,mBAAO,CAAC,OAAO,EACf,yBAAa,CAAC,MAAM,EACpB,QAAQ,EACR,qBAAS,CAAC,gBAAgB,EAC1B,CAAC,CACF,CACF,CAAC;aACH;YACD,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;SACzD;QACD,MAAM,MAAM,GAAG,iBAAiB;aAC7B,OAAO,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;aAC/C,OAAO,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CAAC,gBAAgB;aACvE,OAAO,CAAC,sBAAsB,EAAE,yBAAyB,CAAC;aAC1D,OAAO,CAAC,8BAA8B,EAAE,wBAAwB,CAAC,CAAC,CAAC,gBAAgB;QACtF,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;KAC7D;AACH,CAAC;AAxDD,4CAwDC;AAED,KAAK,UAAU,mBAAmB,CAAC,WAAmB;IACpD,MAAM,kBAAkB,GAAG,MAAM,0DAAkC,CAAC,WAAW,CAAC,CAAC;IACjF,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;QAC7B,OAAO,kBAAkB,CAAC,KAAK,CAAC;KACjC;SAAM;QACL,MAAM,kBAAkB,CAAC,KAAK,CAAC;KAChC;AACH,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,OAAyB;IAChE,0BAA0B;IAC1B,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,wCAAqB,CAAC,OAAO,CAAC,EAAE,kCAAoB,CAAC,CAAC;IAChG,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,yCAA6B,CAAC,CAAC;IAC1F,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAChF,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IACvE,IAAI,CAAC,iBAAiB,EAAE;QACtB,6DAA6D;QAC7D,MAAM,sBAAc,CAClB,IAAI,KAAK,CAAC,kCAAkB,CAAC,mCAAmC,CAAC,CAAC,EAClE,kBAAU,CAAC,wBAAwB,EACnC,qBAAa,CACd,CAAC;KACH;IAED,6BAA6B;IAC7B;QACE,MAAM,GAAG,GAAG,MAAM,6BAAa,CAAC,gBAAgB,CAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAChD,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,sBAAc,CAClB,IAAI,KAAK,CAAC,kCAAkB,CAAC,kCAAkC,CAAC,CAAC,EACjE,kBAAU,CAAC,uBAAuB,CACnC,CAAC;SACH;KACF;IAED,8BAA8B;IAC9B,MAAM,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;IAE9C,aAAa;IACb,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,+CAA4B,CAAC,YAAY,CAAC,EAAE;QAC9C,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;KACjC;IAED,oBAAoB;IACpB,MAAM,OAAO,CAAC,WAAW,CAAC,kCAAoB,CAAC,CAAC;IAEhD,4FAA4F;IAC5F,MAAM,kBAAkB,GAAG,MAAM,EAAE,CAAC,OAAO,CACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC,CACxD,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE;QACrC,IAAI,IAAI,KAAK,yCAA6B,IAAI,IAAI,KAAK,4BAAU,CAAC,mBAAmB,EAAE;YACrF,MAAM,OAAO,CAAC,MAAM,CAClB,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,EACxC,IAAI,CAAC,IAAI,CAAC,kCAAoB,EAAE,IAAI,CAAC,CACtC,CAAC;SACH;KACF;IAED,mCAAmC;IACnC,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,YAAY,GAAG,sCAAmB,CAAC,eAAe,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,mCAAgB,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,qBAAa,CAAC,eAAe,CAAC,CAAC;IAE9C,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,mDAAgC,CACpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAC/C,YAAY,CAAC,GAAG,EAChB,YAAY,CAAC,MAAM,EACnB,OAAO,CAAC,gBAAgB,CACzB,CAAC;KACH;IACD,yEAAyE;IACzE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,kCAAoB,EAAE,4BAAU,CAAC,qBAAqB,CAAC,CAAC;IACvF,IAAI,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IAC7F,WAAW,GAAG,kCAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,yCAAwB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACrE,IAAI,MAAM,EAAE;QACV,MAAM,+CAA4B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;KACvD;SAAM;QACL,MAAM,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;KACnD;IAED,oEAAoE;IACpE,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,4BAAU,CAAC,mBAAmB,CAAC,CAAC;IAC9F,MAAM,oBAAoB,GAAG,MAAM,EAAE,CAAC,UAAU,CAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,kBAAkB,CAAC,CACnD,CAAC;IAEF,MAAM,qBAAqB,GAAG,eAAe,CAAC,gBAAgB,CAAC,qBAA8B,CAAC;IAC9F,MAAM,SAAS,GAAG,eAAe,CAAC,UAAmB,CAAC;IACtD,MAAM,WAAW,GACf,CAAC,qBAAqB,IAAI,qBAAqB,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;QAC1F,CAAC,SAAS;YACR,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC5C,OAAO,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEb,IAAI,oBAAoB,IAAI,WAAW,EAAE;QACvC,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CACpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAClD,OAAO,CACR,CAAC;QACF,cAAc,GAAG,kCAAe,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,yCAAwB,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAC3E,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;KACxE;SAAM,IAAI,WAAW,IAAI,CAAC,oBAAoB,EAAE;QAC/C,MAAM,sBAAc,CAClB,IAAI,KAAK,CAAC,kCAAkB,CAAC,sCAAsC,CAAC,CAAC,EACrE,kBAAU,CAAC,2BAA2B,EACtC,qBAAa,CACd,CAAC;KACH;IAED,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;AAClD,CAAC;AA9GD,gDA8GC;AAEM,KAAK,UAAU,uBAAuB,CAAC,OAAyB;IACrE,8BAA8B;IAC9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC5E,IAAI,CAAC,sBAAsB,EAAE;QAC3B,kEAAkE;QAClE,OAAO;KACR;IAED,aAAa;IACb,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,wCAAqB,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC3D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;YAC7C,SAAS;SACV;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjF,mFAAmF;QACnF,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;YACrC,SAAS;SACV;QACD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,UAAU,GAAG,yCAAwB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;KAC7E;AACH,CAAC;AA7BD,0DA6BC;AAEM,KAAK,UAAU,gBAAgB,CACpC,GAAoB,EACpB,mBAAwC;IAExC,MAAM,iBAAiB,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACjF,IAAI,iBAAiB,EAAE;QACrB,OAAO,MAAM,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;KACjE;IACD,MAAM,WAAW,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACrE,IAAI,WAAW,EAAE;QACf,OAAO,MAAM,2BAA2B,CAAC,GAAG,CAAC,CAAC;KAC/C;IACD,MAAM,eAAe,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7E,IAAI,eAAe,EAAE;QACnB,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;YACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,eAAe;SACpE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,cAAc,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;AACxD,CAAC;AArBD,4CAqBC;AAED,KAAK,UAAU,cAAc,CAC3B,GAAoB,EACpB,mBAAwC;IAExC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,CAAC,CAAC;IAC9F,IAAI,MAAM,CAAC;IACX,GAAG;QACD,MAAM,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACtD,IAAI,MAAM,KAAK,sBAAc,EAAE,EAAE;YAC/B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,OAAO,CAAC,qBAAa,CAAC,CAAC;YACjC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;gBACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,SAAS;gBAC/D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,KAAK;aAC1D,CAAC,CAAC;SACJ;KACF,QAAQ,MAAM,KAAK,sBAAc,EAAE,EAAE;IACtC,IAAI,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC1D,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,MAAM;YAC5D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,KAAK;SAC1D,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,8BAAsB,EAAE,CAAC,CAAC;QAC3C,sCAAmB,CAAC,mBAAmB,CAAC,cAAc,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACtF,OAAO,KAAK,CAAC;KACd;IACD,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;QACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;QACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,KAAK;KAC1D,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,GAAoB,EACpB,mBAAwC;IAExC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,CAAC,CAAC;IAC9F,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC/D,IAAI,MAAM,KAAK,sBAAc,EAAE,EAAE;QAC/B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,OAAO,CAAC,qBAAa,CAAC,CAAC;QACjC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,SAAS;YAC/D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,QAAQ;SAC7D,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,MAAM,KAAK,aAAa,EAAE,EAAE;QACrC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;YACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,QAAQ;SAC7D,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,2BAA2B,CAAC,GAAoB;IAC7D,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,CAAC,CAAC;IAC9F,MAAM,GAAG,GAAG,MAAM,CAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,WAAW,CACrC,MAAM,EACN,kCAAkB,CAAC,sCAAsC,CAAC,EAC1D,IAAI,EACJ,IAAI,CACL,CAAA,CAAC;IACF,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,KAAI,GAAG,CAAC,KAAK,KAAK,IAAI,EAAE;QACrC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;YACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,WAAW;SAChE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;SAAM;QACL,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,MAAM;YAC5D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,WAAW;SAChE,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,mBAAwC;IAExC,OAAO,MAAM,YAAY,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvD,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,mBAAwC;IAExC,OAAO,MAAM,YAAY,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;AACxD,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,mBAAwC,EACxC,OAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,CAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,WAAW,CACrC,MAAM,EACN,+CAA4B,CAAC,mBAAmB,CAAC,EACjD,OAAO,EACP,GAAG,uBAAuB,EAAE,CAC7B,CAAA,CAAC;IACF,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,EAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,OAAwB;IAC3D,MAAM,WAAW,GAAG,sCAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IACpE,IAAI;QACF,MAAM,SAAS,GAAG,MAAM,wCAAqB,CAAC,WAAW,CAAC,CAAC;QAC3D,mBAAmB,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;KACjE;IAAC,OAAO,KAAK,EAAE;QACd,yCAAyC;KAC1C;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,OAAyB;IAC9D,UAAU;IACV,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,EAAE;QAC3D,yBAAyB;QACzB,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,mCAAmC;QAC1G,KAAK,MAAM,QAAQ,IAAI,SAAS;YAC9B,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBAClC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC,CAAC,gBAAgB;gBAC5F,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,IAAI,cAAc,IAAI,IAAI,EAAE;oBAC1B,cAAc;oBACd,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBAClC,sCAAsC;oBACtC,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;oBAC/D,IACE,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAC1B,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC,EACF;wBACA,kBAAkB;wBAClB,MAAM,OAAO,CAAC,YAAY,CACxB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;wBACF,4BAA4B;wBAC5B,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,4BAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,4BAAU,CAAC,iBAAiB,EACnF,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;oBACD,MAAM,GAAG,GAAG,MAAM,+BAAY,CAC5B,OAAO,EACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC,CAC3D,CAAC;oBACF,IAAI,GAAG,CAAC,UAAU,CAAC,EAAE;wBACnB,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;wBACrD,MAAM,WAAW,GAAG,EAAE;6BACnB,YAAY,CACX,IAAI,CAAC,IAAI,CACP,OAAO,CAAC,WAAW,EACnB,4BAAU,CAAC,wBAAwB,EACnC,SAAS,CAAC,aAAa,GAAG,OAAO,CAClC,CACF;6BACA,QAAQ,EAAE;6BACV,QAAQ,CAAC,cAAc,CAAC;4BACzB,CAAC,CAAC,EAAE;4BACJ,CAAC,CAAC,cAAc,GAAG,OAAO,GAAG,QAAG,GAAG,kBAAkB,GAAG,OAAO,GAAG,QAAG,CAAC;wBACxE,4DAA4D;wBAC5D,MAAM,OAAO,GACX,WAAW;4BACX,2CAAwB,CACtB,GAAG,CAAC,UAAU,CAAC,EACf,WAAW,EACX,EAAE,EACF,yBAAQ,CAAC,MAAM,EACf,YAAY,CACb,CAAC;wBACJ,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,EACP,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;iBACF;aACF;KACJ;AACH,CAAC;AAnED,4CAmEC;AAEM,KAAK,UAAU,eAAe,CAAC,OAAyB;IAC7D,UAAU;IACV,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,EAAE;QAC1D,yBAAyB;QACzB,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,mCAAmC;QACzG,KAAK,MAAM,QAAQ,IAAI,SAAS;YAC9B,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBACjC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC,CAAC,eAAe;gBAC1F,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,IAAI,cAAc,IAAI,IAAI,EAAE;oBAC1B,cAAc;oBACd,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBAClC,sCAAsC;oBACtC,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;oBAC/D,IACE,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAC1B,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC,EACF;wBACA,kBAAkB;wBAClB,MAAM,OAAO,CAAC,YAAY,CACxB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;wBACF,4BAA4B;wBAC5B,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,4BAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,4BAAU,CAAC,iBAAiB,EACnF,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;oBACD,MAAM,GAAG,GAAG,MAAM,+BAAY,CAC5B,OAAO,EACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,CACzD,CAAC;oBACF,IAAI,GAAG,EAAE;wBACP,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;wBACrD,qBAAqB;wBACrB,MAAM,OAAO,GAAG,2CAAwB,CACtC,GAAG,EACH,QAAQ,EACR,EAAE,EACF,yBAAQ,CAAC,KAAK,EACd,YAAY,CACb,CAAC;wBACF,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,EACP,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;iBACF;aACF;KACJ;AACH,CAAC;AArDD,0CAqDC;AAEM,KAAK,UAAU,iBAAiB,CAAC,OAAyB;IAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,YAAY,EAAE,4BAAU,CAAC,WAAW,CAAC,CAAC;IAC/E,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE;QAC9C,OAAO;KACR;IACD,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,gCAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,mCAAmC;IAC3F,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,OAAO,GAAG,4CAAyB,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,OAAO,EAAE;YACX,cAAc;YACd,MAAM,WAAW,GAAG,uCAAoB,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;YACrD,MAAM,OAAO,GACX,4BAAU,CAAC,iBAAiB;gBAC5B,QAAG;gBACH,4BAAU,CAAC,aAAa;gBACxB,CAAC,MAAM,yCAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;YAC3F,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,WAAW,CAAC,EAC3D,OAAO,EACP,SAAS,CAAC,cAAc,CACzB,CAAC;SACH;KACF;AACH,CAAC;AAzBD,8CAyBC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAyB;IAC5D,2BAA2B;IAC3B,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAE9C,0BAA0B;IAC1B,MAAM,gBAAgB,GAAG,MAAM,2CAAmB,CAChD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,aAAa,CAAC,CACxD,CAAC;IACF,IAAI,CAAC,uCAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE;QACnF,6BAA6B;QAC7B,OAAO;KACR;IAED,6BAA6B;IAC7B,MAAM,gBAAgB,GAAG;QACvB,6CAA8B;QAC9B,2CAA4B;QAC5B,4CAA6B;QAC7B,8BAAe;QACf,8BAAe;QACf,8BAAe;QACf,qCAAsB;QACtB,uCAAwB;QACxB,0CAA2B;QAC3B,8CAA+B;QAC/B,mCAAoB;QACpB,+BAAgB;QAChB,8BAAe;QACf,kCAAmB;QACnB,kCAAmB;QACnB,mCAAoB;QACpB,gDAAiC;QACjC,oCAAqB;QACrB,uCAAwB;QACxB,wCAAyB;KAC1B,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,MAAM,mBAAmB,GAAG,MAAM,8CAAsB,CAAC,OAAO,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,IAAI,6CAAqB,CAC5C,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,EACzB,kBAAkB,EAClB,mBAAmB,CACpB,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE;QACnC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;KAC1B;IAED,2BAA2B;IAC3B,MAAM,OAAO,CAAC,WAAW,CACvB,SAAS,CAAC,aAAa,EACvB,WAAW,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CACjD,CAAC;IAEF,yBAAyB;IACzB,MAAM,eAAe,GAAG,IAAI,2CAAoB,CAC9C,kBAAkB,EAClB,YAAY,CAAC,YAAY,EACzB,mBAAmB,CACpB,CAAC;IACF,MAAM,YAAY,GAAW,MAAM,eAAe,CAAC,cAAc,EAAE,CAAC;IACpE,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AACtE,CAAC;AAjED,wCAiEC;AAED,SAAgB,qBAAqB,CAAC,UAAe;IACnD,IAAI,UAAU,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE;QAC1C,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC;YACxC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM;gBAAE,OAAO,IAAI,CAAC;QAC/E,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AARD,sDAQC;AAEM,KAAK,UAAU,4BAA4B,CAAC,OAAyB;IAC1E,UAAU;IACV,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAAC,EAAE;QACnF,MAAM,sBAAsB,GAAG,EAAE,CAAC,YAAY,CAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,sBAAsB,CAAC,CACzE,CAAC;QACF,8BAA8B;QAC9B,IAAI,qBAAqB,CAAC,sBAAsB,CAAC,EAAE;YACjD,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;YACtE,KAAK,MAAM,QAAQ,IAAI,SAAS;gBAC9B,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBAClC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC,CAAC,gBAAgB;oBACxF,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAChD,IAAI,cAAc,IAAI,IAAI,EAAE;wBAC1B,cAAc;wBACd,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;wBAClC,IAAI,OAAO,IAAI,OAAO,EAAE;4BACtB,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;4BAC/D,IACE,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAC1B,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;gCAEF,MAAM,OAAO,CAAC,YAAY,CACxB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;4BACJ,MAAM,uBAAuB,GAC3B,gKAAgK;gCAChK,QAAG;gCACH,uJAAuJ;gCACvJ,QAAG,CAAC;4BACN,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,uBAAuB,EACvB,SAAS,CAAC,cAAc,CACzB,CAAC;yBACH;qBACF;iBACF;SACJ;KACF;AACH,CAAC;AAzCD,oEAyCC;AAEM,KAAK,UAAU,0BAA0B,CAAC,WAAmB;IAClE,IAAI;QACF,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;QAC1D,IAAI,eAAe,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,qBAAqB,EAAE;YACjF,OAAO,IAAI,CAAC;SACb;aAAM;YACL,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,6BAA6B,EAAE;gBACzF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,0BAA0B;aAC1D,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,6BAA6B,EAAE;YACzF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO;SAC7C,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAlBD,gEAkBC;AAEM,KAAK,UAAU,eAAe,CAAC,OAAyB;IAC7D,MAAM,aAAa,GAAG,YAAY,CAAC;IACnC,MAAM,eAAe,GAAY,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACrE,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;KAC3C;IAED,IAAI,iBAAiB,GAAW,MAAM,EAAE,CAAC,QAAQ,CAC/C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,EAC7C,MAAM,CACP,CAAC;IACF,iBAAiB,IAAI,QAAG,GAAG,GAAG,4BAAU,CAAC,wBAAwB,IAAI,uCAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;IACjG,iBAAiB,IAAI,QAAG,GAAG,GAAG,4BAAU,CAAC,wBAAwB,IAAI,mCAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;IACjG,iBAAiB,IAAI,QAAG,GAAG,GAAG,+BAAY,IAAI,CAAC;IAC/C,iBAAiB,IAAI,QAAG,GAAG,yCAAiB,CAAC;IAE7C,MAAM,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;AAC9D,CAAC;AAjBD,0CAiBC;AAED,SAAS,4BAA4B,CACnC,SAAiB,EACjB,SAAiB,EACjB,UAAoC,EACpC,YAAsC;IAEtC,MAAM,gBAAgB,mCAAQ,UAAU,GAAK,mBAAmB,CAAE,CAAC;IACnE,8BAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,iCAAiC,CACxC,SAAiB,EACjB,SAAiB,EACjB,OAAgB,EAChB,UAAoC;IAEpC,MAAM,gBAAgB,mCAAQ,UAAU,GAAK,mBAAmB,CAAE,CAAC;IACnE,mCAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAC3E,CAAC"}
|
|
1
|
+
{"version":3,"file":"projectMigratorV3.js","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const projectSettingsHelper_1 = require("../../common/projectSettingsHelper");
|
|
|
12
12
|
const telemetry_1 = require("../../common/telemetry");
|
|
13
13
|
const versionMetadata_1 = require("../../common/versionMetadata");
|
|
14
14
|
const migrate_1 = require("../../component/migrate");
|
|
15
|
-
const globalVars_1 = require("
|
|
15
|
+
const globalVars_1 = require("../../common/globalVars");
|
|
16
16
|
// export this for V2 -> V3 migration purpose
|
|
17
17
|
async function loadProjectSettingsByProjectPathV2(projectPath) {
|
|
18
18
|
const settingsFile = getProjectSettingPathV2(projectPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,mDAA6B;AAE7B,wDAA6F;AAE7F,8EAAiE;AACjE,sDAKgC;AAChC,kEAAsE;AACtE,qDAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,mDAA6B;AAE7B,wDAA6F;AAE7F,8EAAiE;AACjE,sDAKgC;AAChC,kEAAsE;AACtE,qDAAuE;AACvE,wDAAqD;AAGrD,6CAA6C;AACtC,KAAK,UAAU,kCAAkC,CACtD,WAAmB;IAEnB,MAAM,YAAY,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAQ,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC7D,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;QAC9B,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACtC,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,aAAa,EAAE;YAC/D,CAAC,6BAAiB,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC,SAAS;SACzD,CAAC,CAAC;KACJ;IACD,uBAAU,CAAC,IAAI,GAAG,mCAAW,CAAC,eAAe,CAAC,CAAC;IAC/C,OAAO,gBAAE,CAAC,sCAA4B,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;AACxE,CAAC;AAbD,gFAaC;AAED,SAAgB,aAAa,CAAC,GAAoB;IAChD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE1B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,MAAM,KAAK,cAAc,EAAE;QAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAU,CAAC;QACvC,QAAQ,GAAG,IAAI,KAAK,mBAAK,CAAC,MAAM,CAAC;KAClC;IAED,OAAO,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,MAAM,CAAC,cAAc,CAAC;AACxF,CAAC;AAXD,sCAWC;AAED,SAAgB,sBAAsB,CAAC,WAAmB;IACxD,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,4BAAU,CAAC,UAAU,CAAC,CAAC;AAC1D,CAAC;AAFD,wDAEC;AAED,SAAgB,uBAAuB,CAAC,WAAmB;IACzD,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,4BAAU,CAAC,YAAY,EAAE,SAAS,EAAE,4BAAU,CAAC,UAAU,CAAC,CAAC;AAC9F,CAAC;AAFD,0DAEC"}
|
|
@@ -6,10 +6,10 @@ exports.ProjectVersionCheckerMW = void 0;
|
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
8
|
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
9
|
+
const globalVars_1 = require("../../common/globalVars");
|
|
9
10
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
10
11
|
const versionMetadata_1 = require("../../common/versionMetadata");
|
|
11
|
-
const
|
|
12
|
-
const globalVars_1 = require("../globalVars");
|
|
12
|
+
const common_1 = require("../../error/common");
|
|
13
13
|
const projectMigratorV3_1 = require("./projectMigratorV3");
|
|
14
14
|
const v3MigrationUtils_1 = require("./utils/v3MigrationUtils");
|
|
15
15
|
const ProjectVersionCheckerMW = async (ctx, next) => {
|
|
@@ -39,12 +39,12 @@ function showDialog(ctx) {
|
|
|
39
39
|
void globalVars_1.TOOLS.ui.openUrl(versionMetadata_1.MetadataV2.updateToolkitLink);
|
|
40
40
|
}
|
|
41
41
|
}, () => { });
|
|
42
|
-
return Promise.resolve(
|
|
42
|
+
return Promise.resolve(new common_1.IncompatibleProjectError(messageKey));
|
|
43
43
|
}
|
|
44
44
|
else if (inputs.platform === teamsfx_api_1.Platform.CLI) {
|
|
45
45
|
const messageKey = "core.projectVersionChecker.cliUseNewVersion";
|
|
46
46
|
globalVars_1.TOOLS.logProvider.warning(localizeUtils_1.getLocalizedString(messageKey));
|
|
47
|
-
return Promise.resolve(
|
|
47
|
+
return Promise.resolve(new common_1.IncompatibleProjectError(messageKey));
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
const messageKey = "core.projectVersionChecker.vs.incompatibleProject";
|
|
@@ -54,7 +54,7 @@ function showDialog(ctx) {
|
|
|
54
54
|
void globalVars_1.TOOLS.ui.openUrl(projectMigratorV3_1.learnMoreLink);
|
|
55
55
|
}
|
|
56
56
|
}, () => { });
|
|
57
|
-
return Promise.resolve(
|
|
57
|
+
return Promise.resolve(new common_1.IncompatibleProjectError(messageKey));
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
//# sourceMappingURL=projectVersionChecker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectVersionChecker.js","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,wDAAwE;AACxE,4DAA4B;AAC5B,8DAAgE;AAChE,kEAAsF;AACtF
|
|
1
|
+
{"version":3,"file":"projectVersionChecker.js","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.replacePlaceholdersForV3 = exports.convertPluginId = exports.namingConverterV3 = exports.fixedNamingsV3 = exports.FileType = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
-
const error_1 = require("
|
|
7
|
+
const error_1 = require("../../../error");
|
|
8
8
|
var FileType;
|
|
9
9
|
(function (FileType) {
|
|
10
10
|
FileType[FileType["STATE"] = 0] = "STATE";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationUtils.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"MigrationUtils.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export declare abstract class BaseAppYmlGenerator {
|
|
|
5
5
|
constructor(oldProjectSettings: any);
|
|
6
6
|
protected buildHandlebarsTemplate(templateName: string): Promise<string>;
|
|
7
7
|
}
|
|
8
|
+
export declare function hasFunctionBot(projectSettings: any): boolean;
|
|
8
9
|
export declare class AppYmlGenerator extends BaseAppYmlGenerator {
|
|
9
10
|
private bicepContent;
|
|
10
11
|
private projectPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appYmlGenerator.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appYmlGenerator.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,8BAAsB,mBAAmB;IAE3B,SAAS,CAAC,kBAAkB,EAAE,GAAG;IAD7C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;gBACpB,kBAAkB,EAAE,GAAG;cAE7B,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAM/E;AACD,wBAAgB,cAAc,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAI5D;AACD,qBAAa,eAAgB,SAAQ,mBAAmB;IAgBjB,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,WAAW;IAftF,SAAS,CAAC,iBAAiB,EAAE;QAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,aAAa,EAAE,OAAO,CAAC;QACvB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,YAAY,EAAE,OAAO,CAAC;QACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;QACxC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;QACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;KAC7B,CAAC;gBACU,kBAAkB,EAAE,GAAG,EAAU,YAAY,EAAE,MAAM,EAAU,WAAW,EAAE,MAAM;IAmBjF,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAqBjC,mBAAmB,CAAC,mBAAmB,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;YAgBjF,gCAAgC;IA8C9C,OAAO,CAAC,8BAA8B;IAuCtC,OAAO,CAAC,qBAAqB;CAO9B"}
|
|
@@ -2,17 +2,16 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.AppYmlGenerator = exports.BaseAppYmlGenerator = void 0;
|
|
5
|
+
exports.AppYmlGenerator = exports.hasFunctionBot = exports.BaseAppYmlGenerator = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
-
const MigrationUtils_1 = require("./MigrationUtils");
|
|
9
|
-
const path = tslib_1.__importStar(require("path"));
|
|
10
8
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
11
9
|
const handlebars = tslib_1.__importStar(require("handlebars"));
|
|
12
|
-
const
|
|
10
|
+
const path = tslib_1.__importStar(require("path"));
|
|
13
11
|
const versionMetadata_1 = require("../../../common/versionMetadata");
|
|
14
|
-
const projectSettingsHelperV3_1 = require("../../../common/projectSettingsHelperV3");
|
|
15
12
|
const migrate_1 = require("../../../component/migrate");
|
|
13
|
+
const folder_1 = require("../../../folder");
|
|
14
|
+
const MigrationUtils_1 = require("./MigrationUtils");
|
|
16
15
|
class BaseAppYmlGenerator {
|
|
17
16
|
constructor(oldProjectSettings) {
|
|
18
17
|
this.oldProjectSettings = oldProjectSettings;
|
|
@@ -25,6 +24,13 @@ class BaseAppYmlGenerator {
|
|
|
25
24
|
}
|
|
26
25
|
}
|
|
27
26
|
exports.BaseAppYmlGenerator = BaseAppYmlGenerator;
|
|
27
|
+
function hasFunctionBot(projectSettings) {
|
|
28
|
+
const botComponent = migrate_1.getComponent(projectSettings, migrate_1.ComponentNames.TeamsBot);
|
|
29
|
+
if (!botComponent)
|
|
30
|
+
return false;
|
|
31
|
+
return botComponent.hosting === migrate_1.ComponentNames.Function;
|
|
32
|
+
}
|
|
33
|
+
exports.hasFunctionBot = hasFunctionBot;
|
|
28
34
|
class AppYmlGenerator extends BaseAppYmlGenerator {
|
|
29
35
|
constructor(oldProjectSettings, bicepContent, projectPath) {
|
|
30
36
|
super(oldProjectSettings);
|
|
@@ -122,7 +128,7 @@ class AppYmlGenerator extends BaseAppYmlGenerator {
|
|
|
122
128
|
this.setPlaceholderMapping("state.fx-resource-bot.botWebAppResourceId");
|
|
123
129
|
this.setPlaceholderMapping("state.fx-resource-function.functionAppResourceId");
|
|
124
130
|
this.setPlaceholderMapping("state.fx-resource-function.functionEndpoint");
|
|
125
|
-
this.handlebarsContext.isFunctionBot =
|
|
131
|
+
this.handlebarsContext.isFunctionBot = hasFunctionBot(projectSettings); // if not function bot but a resource bot, then a webApp bot
|
|
126
132
|
// Match teams-bot or fx-resource-bot output obj
|
|
127
133
|
const pluginRegex = new RegExp("output +(\\S+) +object += +{" + // Mataches start of output declaration and capture output name. Example: output functionOutput object = {
|
|
128
134
|
"[^{]*" + // Matches everything between '{' and plugin id declaration. For example: comments, extra properties. Will match multilines.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appYmlGenerator.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA8D;AAC9D,qDAA+
|
|
1
|
+
{"version":3,"file":"appYmlGenerator.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.migrateGetFuncPathCommand = exports.migrateNgrokStartCommand = exports.migrateNgrokStartTask = exports.migratePreDebugCheck = exports.migrateValidateLocalPrerequisites = exports.migrateBackendStart = exports.migrateBackendWatch = exports.migrateBotStart = exports.migrateAuthStart = exports.migrateFrontendStart = exports.migrateBackendExtensionsInstall = exports.migrateValidateDependencies = exports.migrateInstallAppInTeams = exports.migratePrepareManifest = exports.migrateSetUpSSO = exports.migrateSetUpBot = exports.migrateSetUpTab = exports.migrateTransparentNpmInstall = exports.migrateTransparentLocalTunnel = exports.migrateTransparentPrerequisite = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const comment_json_1 = require("comment-json");
|
|
8
|
-
const local_1 = require("../../../../
|
|
8
|
+
const local_1 = require("../../../../component/local");
|
|
9
9
|
const debugV3MigrationUtils_1 = require("./debugV3MigrationUtils");
|
|
10
10
|
const crypto_1 = require("../../../crypto");
|
|
11
11
|
const os = tslib_1.__importStar(require("os"));
|
|
12
12
|
const path = tslib_1.__importStar(require("path"));
|
|
13
|
-
const nodeChecker_1 = require("../../../../
|
|
13
|
+
const nodeChecker_1 = require("../../../../component/deps-checker/internal/nodeChecker");
|
|
14
14
|
async function migrateTransparentPrerequisite(context) {
|
|
15
15
|
for (const task of context.tasks) {
|
|
16
16
|
if (!debugV3MigrationUtils_1.isCommentObject(task) ||
|