@microsoft/teamsfx-core 2.0.4-alpha.24f52e6c7.0 → 2.0.4-alpha.2fdf2b99b.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +2 -2
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +2 -2
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +7 -7
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/deps-checker/util/cpUtils.js +1 -1
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -1
- package/build/common/deps-checker/util/fileHelper.js +2 -0
- package/build/common/deps-checker/util/fileHelper.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +2 -0
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/local/localCertificateManager.js +1 -1
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config-v3.json +213 -21
- package/build/common/samples.d.ts +9 -4
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +21 -26
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts +5 -0
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -0
- package/build/common/spec-parser/adaptiveCardGenerator.js +113 -0
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -0
- package/build/common/spec-parser/constants.d.ts +15 -1
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +15 -1
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +61 -18
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +13 -10
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +5 -0
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -0
- package/build/common/spec-parser/manifestUpdater.js +77 -0
- package/build/common/spec-parser/manifestUpdater.js.map +1 -0
- package/build/common/spec-parser/specFilter.d.ts +3 -0
- package/build/common/spec-parser/specFilter.d.ts.map +1 -0
- package/build/common/spec-parser/specFilter.js +47 -0
- package/build/common/spec-parser/specFilter.js.map +1 -0
- package/build/common/spec-parser/specParser.d.ts +9 -4
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +106 -15
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +7 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -0
- package/build/common/spec-parser/utils.js +79 -0
- package/build/common/spec-parser/utils.js.map +1 -0
- package/build/common/telemetry.d.ts +0 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +2 -11
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.js +2 -2
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +1 -0
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +5 -1
- package/build/common/utils.js.map +1 -1
- package/build/component/configManager/constant.d.ts.map +1 -1
- package/build/component/configManager/constant.js +4 -2
- package/build/component/configManager/constant.js.map +1 -1
- package/build/component/configManager/interface.d.ts +2 -0
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/interface.js +2 -3
- package/build/component/configManager/interface.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +7 -4
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.d.ts.map +1 -1
- package/build/component/configManager/parser.js +18 -9
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts +0 -3
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +3 -10
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +5 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +5 -0
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +5 -3
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +28 -7
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.d.ts.map +1 -1
- package/build/component/coordinator/summary.js +2 -0
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +4 -4
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +1 -1
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/interface/AADApplication.js +1 -1
- package/build/component/driver/aad/interface/AADApplication.js.map +1 -1
- package/build/component/driver/aad/interface/AADManifest.js +1 -1
- package/build/component/driver/aad/interface/AADManifest.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts +2 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +7 -0
- 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 +2 -0
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/validator.d.ts.map +1 -1
- package/build/component/driver/arm/validator.js +3 -3
- package/build/component/driver/arm/validator.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +2 -0
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +2 -2
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/installDriver.js +3 -3
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/interface/buildAndDeployArgs.d.ts +3 -6
- package/build/component/driver/interface/buildAndDeployArgs.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +2 -0
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +6 -6
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +3 -13
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +0 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +1 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.js +1 -1
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +26 -0
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/results.d.ts.map +1 -1
- package/build/component/driver/teamsApp/results.js +2 -0
- package/build/component/driver/teamsApp/results.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +6 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +17 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +0 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +1 -10
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +7 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +23 -12
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/error/componentError.d.ts +0 -4
- package/build/component/error/componentError.d.ts.map +1 -1
- package/build/component/error/componentError.js +2 -11
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +25 -15
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/createAuthFiles.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +8 -0
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -0
- package/build/component/generator/copilotPlugin/generator.js +117 -0
- package/build/component/generator/copilotPlugin/generator.js.map +1 -0
- package/build/component/generator/copilotPlugin/helper.d.ts +28 -0
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -0
- package/build/component/generator/copilotPlugin/helper.js +213 -0
- package/build/component/generator/copilotPlugin/helper.js.map +1 -0
- package/build/component/generator/generator.js +2 -2
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +4 -3
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.js +2 -0
- package/build/component/generator/officeAddin/config/projectProperties.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.js +2 -0
- package/build/component/generator/officeAddin/config/projectsJsonData.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +3 -1
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +8 -10
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +7 -7
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +16 -14
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +1 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +2 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/utils.d.ts +10 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +4 -3
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/migrate.d.ts.map +1 -1
- package/build/component/migrate.js +2 -0
- package/build/component/migrate.js.map +1 -1
- package/build/component/telemetry.d.ts.map +1 -1
- package/build/component/telemetry.js +3 -6
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/azureResourceOperation.js +2 -2
- package/build/component/utils/azureResourceOperation.js.map +1 -1
- package/build/component/utils/charsetUtils.d.ts.map +1 -1
- package/build/component/utils/charsetUtils.js +2 -0
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +1 -2
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts.map +1 -1
- package/build/component/utils/depsChecker/common.js +1 -1
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +1 -1
- package/build/component/utils/depsChecker/cpUtils.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +2 -0
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +7 -6
- 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 +2 -0
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.d.ts.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +3 -6
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts +6 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +9 -0
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts +6 -2
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +50 -1
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/collaborator.d.ts +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +18 -12
- package/build/core/collaborator.js.map +1 -1
- package/build/core/error.d.ts +6 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +23 -1
- package/build/core/error.js.map +1 -1
- package/build/core/index.js +1 -0
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/errorHandler.d.ts +2 -0
- package/build/core/middleware/errorHandler.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +16 -25
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +3 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +1 -2
- package/build/core/middleware/projectMigratorV3.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/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +3 -2
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +30 -15
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +2 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +2 -0
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +12 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +150 -18
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +10 -8
- package/build/error/deploy.js.map +1 -1
- package/build/error/index.d.ts.map +1 -1
- package/build/error/index.js +2 -0
- package/build/error/index.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +2 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +2 -0
- package/build/error/script.js.map +1 -1
- package/build/error/upgrade.d.ts.map +1 -1
- package/build/error/upgrade.js +2 -0
- package/build/error/upgrade.js.map +1 -1
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +2 -0
- package/build/error/yml.js.map +1 -1
- package/build/failpoint/index.d.ts.map +1 -1
- package/build/failpoint/index.js +2 -0
- package/build/failpoint/index.js.map +1 -1
- package/build/failpoint/marker.d.ts.map +1 -1
- package/build/failpoint/marker.js +2 -0
- package/build/failpoint/marker.js.map +1 -1
- package/build/failpoint/runtime.d.ts.map +1 -1
- package/build/failpoint/runtime.js +3 -4
- package/build/failpoint/runtime.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -1
- package/build/index.js.map +1 -1
- package/build/question/create.d.ts +4 -12
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +160 -75
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +2 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +8 -0
- package/build/question/index.js.map +1 -1
- package/build/question/other.d.ts +1 -0
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +14 -1
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +2 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/question/util.d.ts.map +1 -1
- package/build/question/util.js +2 -2
- package/build/question/util.js.map +1 -1
- package/build/ui/validationUtils.d.ts +12 -0
- package/build/ui/validationUtils.d.ts.map +1 -0
- package/build/ui/validationUtils.js +84 -0
- package/build/ui/validationUtils.js.map +1 -0
- package/build/ui/visitor.d.ts +5 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +212 -83
- package/build/ui/visitor.js.map +1 -1
- package/package.json +14 -7
- package/resource/package.nls.json +26 -5
- package/resource/yaml-schema/1.1.1/yaml.schema.json +1468 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/build/component/configManager/diagnostic.d.ts +0 -9
- package/build/component/configManager/diagnostic.d.ts.map +0 -1
- package/build/component/configManager/diagnostic.js +0 -47
- package/build/component/configManager/diagnostic.js.map +0 -1
package/build/ui/visitor.js
CHANGED
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.traverse = exports.getSingleOption = exports.isAutoSkipSelect = void 0;
|
|
5
|
+
exports.traverse = exports.collect = exports.getSingleOption = exports.isAutoSkipSelect = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
+
const lodash_1 = require("lodash");
|
|
7
8
|
const error_1 = require("../error");
|
|
9
|
+
const validationUtils_1 = require("./validationUtils");
|
|
8
10
|
function isAutoSkipSelect(q) {
|
|
9
11
|
if (q.type === "singleSelect" || q.type === "multiSelect") {
|
|
10
12
|
const select = q;
|
|
@@ -48,6 +50,10 @@ async function getCallFuncValue(inputs, raw) {
|
|
|
48
50
|
*/
|
|
49
51
|
const questionVisitor = async function (question, ui, inputs, step, totalSteps) {
|
|
50
52
|
if (inputs[question.name] !== undefined) {
|
|
53
|
+
// validate existing answer in inputs object
|
|
54
|
+
const res = await validationUtils_1.validationUtils.validateManualInputs(question, inputs);
|
|
55
|
+
if (res)
|
|
56
|
+
return teamsfx_api_1.err(new error_1.InputValidationError(question.name, res));
|
|
51
57
|
return teamsfx_api_1.ok({ type: "skip", result: inputs[question.name] });
|
|
52
58
|
}
|
|
53
59
|
const title = (await getCallFuncValue(inputs, question.title));
|
|
@@ -68,28 +74,43 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
|
|
|
68
74
|
if (typeof res === "object" && "isOk" in res) {
|
|
69
75
|
const fxresult = res;
|
|
70
76
|
if (fxresult.isOk()) {
|
|
71
|
-
return teamsfx_api_1.ok({ type: "
|
|
77
|
+
return teamsfx_api_1.ok({ type: "skip", result: fxresult.value });
|
|
72
78
|
}
|
|
73
79
|
else {
|
|
74
80
|
return teamsfx_api_1.err(fxresult.error);
|
|
75
81
|
}
|
|
76
82
|
}
|
|
77
|
-
return teamsfx_api_1.ok({ type: "
|
|
83
|
+
return teamsfx_api_1.ok({ type: "skip", result: res });
|
|
78
84
|
}
|
|
79
85
|
catch (e) {
|
|
80
86
|
return teamsfx_api_1.err(error_1.assembleError(e));
|
|
81
87
|
}
|
|
82
88
|
}
|
|
83
89
|
else {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
90
|
+
let defaultValue = undefined;
|
|
91
|
+
if (question.forgetLastValue !== true && question.value)
|
|
92
|
+
defaultValue = question.value;
|
|
93
|
+
else {
|
|
94
|
+
if (question.default) {
|
|
95
|
+
if (typeof question.default === "function") {
|
|
96
|
+
defaultValue = async () => {
|
|
97
|
+
return question.default(inputs);
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
defaultValue = question.default;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
87
105
|
const placeholder = (await getCallFuncValue(inputs, question.placeholder));
|
|
88
106
|
const prompt = (await getCallFuncValue(inputs, question.prompt));
|
|
89
107
|
if (question.type === "text") {
|
|
90
108
|
const validationFunc = question.validation
|
|
91
109
|
? teamsfx_api_1.getValidationFunction(question.validation, inputs)
|
|
92
110
|
: undefined;
|
|
111
|
+
const additionalValidationOnAcceptFunc = question.additionalValidationOnAccept
|
|
112
|
+
? teamsfx_api_1.getValidationFunction(question.additionalValidationOnAccept, inputs)
|
|
113
|
+
: undefined;
|
|
93
114
|
const inputQuestion = question;
|
|
94
115
|
return await ui.inputText({
|
|
95
116
|
name: question.name,
|
|
@@ -101,6 +122,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
|
|
|
101
122
|
validation: validationFunc,
|
|
102
123
|
step: step,
|
|
103
124
|
totalSteps: totalSteps,
|
|
125
|
+
additionalValidationOnAccept: additionalValidationOnAcceptFunc,
|
|
104
126
|
});
|
|
105
127
|
}
|
|
106
128
|
else if (question.type === "singleSelect" || question.type === "multiSelect") {
|
|
@@ -170,6 +192,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
|
|
|
170
192
|
title: title,
|
|
171
193
|
placeholder: placeholder,
|
|
172
194
|
prompt: prompt,
|
|
195
|
+
default: defaultValue,
|
|
173
196
|
step: step,
|
|
174
197
|
totalSteps: totalSteps,
|
|
175
198
|
validation: validationFunc,
|
|
@@ -210,6 +233,10 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
|
|
|
210
233
|
const validationFunc = question.validation
|
|
211
234
|
? teamsfx_api_1.getValidationFunction(question.validation, inputs)
|
|
212
235
|
: undefined;
|
|
236
|
+
const additionalValidationOnAcceptFunc = question.inputBoxConfig.additionalValidationOnAccept
|
|
237
|
+
? teamsfx_api_1.getValidationFunction({ validFunc: question.inputBoxConfig.additionalValidationOnAccept }, inputs)
|
|
238
|
+
: undefined;
|
|
239
|
+
question.inputBoxConfig.additionalValidationOnAccept = additionalValidationOnAcceptFunc;
|
|
213
240
|
const res = await ui.selectFileOrInput({
|
|
214
241
|
name: question.name,
|
|
215
242
|
title: title,
|
|
@@ -227,105 +254,207 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
|
|
|
227
254
|
}
|
|
228
255
|
return teamsfx_api_1.err(new teamsfx_api_1.UserError("API", "UnsupportedNodeType", `Unsupported question node type:${JSON.stringify(question)}`, `Unsupported question node type:${JSON.stringify(question)}`));
|
|
229
256
|
};
|
|
257
|
+
// export async function traverse(
|
|
258
|
+
// root: IQTreeNode,
|
|
259
|
+
// inputs: Inputs,
|
|
260
|
+
// ui: UserInteraction,
|
|
261
|
+
// telemetryReporter?: TelemetryReporter,
|
|
262
|
+
// visitor: QuestionTreeVisitor = questionVisitor
|
|
263
|
+
// ): Promise<Result<Void, FxError>> {
|
|
264
|
+
// const stack: IQTreeNode[] = [];
|
|
265
|
+
// const history: IQTreeNode[] = [];
|
|
266
|
+
// stack.push(root);
|
|
267
|
+
// let step = 1; // manual input step
|
|
268
|
+
// let totalStep = 1;
|
|
269
|
+
// const parentMap = new Map<IQTreeNode, IQTreeNode>();
|
|
270
|
+
// // const valueMap = new Map<QTreeNode, unknown>();
|
|
271
|
+
// const autoSkipSet = new Set<IQTreeNode>();
|
|
272
|
+
// while (stack.length > 0) {
|
|
273
|
+
// const curr = stack.pop();
|
|
274
|
+
// if (!curr) continue;
|
|
275
|
+
// //visit
|
|
276
|
+
// if (curr.data.type !== "group") {
|
|
277
|
+
// const question = curr.data;
|
|
278
|
+
// totalStep = step + stack.length;
|
|
279
|
+
// let qvRes;
|
|
280
|
+
// try {
|
|
281
|
+
// qvRes = await visitor(question, ui, inputs, step, totalStep);
|
|
282
|
+
// sendTelemetryEvent(telemetryReporter, qvRes, question, inputs);
|
|
283
|
+
// } catch (e) {
|
|
284
|
+
// return err(assembleError(e));
|
|
285
|
+
// }
|
|
286
|
+
// if (qvRes.isErr()) {
|
|
287
|
+
// // Cancel or Error
|
|
288
|
+
// return err(qvRes.error);
|
|
289
|
+
// }
|
|
290
|
+
// const inputResult = qvRes.value;
|
|
291
|
+
// if (inputResult.type === "back") {
|
|
292
|
+
// stack.push(curr);
|
|
293
|
+
// // find the previous input that is neither group nor func nor single option select
|
|
294
|
+
// let found = false;
|
|
295
|
+
// while (history.length > 0) {
|
|
296
|
+
// const last = history.pop();
|
|
297
|
+
// if (!last) continue;
|
|
298
|
+
// if (last.children) {
|
|
299
|
+
// while (stack.length > 0) {
|
|
300
|
+
// const tmp = stack[stack.length - 1];
|
|
301
|
+
// if (last.children.includes(tmp)) {
|
|
302
|
+
// stack.pop();
|
|
303
|
+
// } else {
|
|
304
|
+
// break;
|
|
305
|
+
// }
|
|
306
|
+
// }
|
|
307
|
+
// }
|
|
308
|
+
// stack.push(last);
|
|
309
|
+
// if (last.data.type !== "group") delete inputs[last.data.name];
|
|
310
|
+
// const lastIsAutoSkip = autoSkipSet.has(last);
|
|
311
|
+
// if (last.data.type !== "group" && last.data.type !== "func" && !lastIsAutoSkip) {
|
|
312
|
+
// found = true;
|
|
313
|
+
// break;
|
|
314
|
+
// }
|
|
315
|
+
// }
|
|
316
|
+
// if (!found) {
|
|
317
|
+
// return err(new UserCancelError());
|
|
318
|
+
// }
|
|
319
|
+
// --step;
|
|
320
|
+
// continue; //ignore the following steps
|
|
321
|
+
// } else {
|
|
322
|
+
// //success or skip
|
|
323
|
+
// question.value = inputResult.result;
|
|
324
|
+
// inputs[question.name] = question.value;
|
|
325
|
+
// if (inputResult.type === "skip" || question.type === "func") {
|
|
326
|
+
// if (inputResult.type === "skip") autoSkipSet.add(curr);
|
|
327
|
+
// } else {
|
|
328
|
+
// ++step;
|
|
329
|
+
// }
|
|
330
|
+
// }
|
|
331
|
+
// }
|
|
332
|
+
// history.push(curr);
|
|
333
|
+
// if (curr.children) {
|
|
334
|
+
// const matchChildren: IQTreeNode[] = [];
|
|
335
|
+
// const valueInMap = findValue(curr, parentMap); //curr.data.type !== "group" ? curr.data.value : undefined; //valueMap.get(curr);
|
|
336
|
+
// for (const child of curr.children) {
|
|
337
|
+
// if (!child) continue;
|
|
338
|
+
// if (child.condition) {
|
|
339
|
+
// const validRes = await validate(
|
|
340
|
+
// child.condition,
|
|
341
|
+
// valueInMap as string | string[] | OptionItem | OptionItem[],
|
|
342
|
+
// inputs
|
|
343
|
+
// );
|
|
344
|
+
// if (validRes !== undefined) {
|
|
345
|
+
// continue;
|
|
346
|
+
// }
|
|
347
|
+
// }
|
|
348
|
+
// matchChildren.push(child);
|
|
349
|
+
// }
|
|
350
|
+
// for (let i = matchChildren.length - 1; i >= 0; --i) {
|
|
351
|
+
// const child = matchChildren[i];
|
|
352
|
+
// parentMap.set(child, curr);
|
|
353
|
+
// stack.push(child);
|
|
354
|
+
// }
|
|
355
|
+
// }
|
|
356
|
+
// }
|
|
357
|
+
// return ok(Void);
|
|
358
|
+
// }
|
|
359
|
+
/**
|
|
360
|
+
* serialize the tree node into array in DFS order
|
|
361
|
+
*/
|
|
362
|
+
function collect(node, list, parentMap) {
|
|
363
|
+
list.push(node);
|
|
364
|
+
if (node.children) {
|
|
365
|
+
for (const child of node.children) {
|
|
366
|
+
if (child) {
|
|
367
|
+
parentMap.set(child, node);
|
|
368
|
+
collect(child, list, parentMap);
|
|
369
|
+
}
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
exports.collect = collect;
|
|
230
374
|
async function traverse(root, inputs, ui, telemetryReporter, visitor = questionVisitor) {
|
|
231
|
-
|
|
232
|
-
const
|
|
233
|
-
|
|
234
|
-
let step = 1; // manual input step
|
|
235
|
-
let totalStep = 1;
|
|
375
|
+
// The reason to clone is that we don't want to change the original inputs if user cancel the process
|
|
376
|
+
const clonedInputs = lodash_1.cloneDeep(inputs);
|
|
377
|
+
// 1. collect all nodes into array
|
|
236
378
|
const parentMap = new Map();
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
if
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
379
|
+
const nodeList = [];
|
|
380
|
+
collect(root, nodeList, parentMap);
|
|
381
|
+
const visitedNodeSet = new Set();
|
|
382
|
+
const visitedInputNodeArray = [];
|
|
383
|
+
let i = 0;
|
|
384
|
+
for (; i < nodeList.length; ++i) {
|
|
385
|
+
const node = nodeList[i];
|
|
386
|
+
// if parent node is not visited, current node should not be visited
|
|
387
|
+
const parent = parentMap.get(node);
|
|
388
|
+
if (parent) {
|
|
389
|
+
if (!visitedNodeSet.has(parent)) {
|
|
390
|
+
continue;
|
|
391
|
+
}
|
|
392
|
+
}
|
|
393
|
+
// 1. check condition
|
|
394
|
+
if (node.condition) {
|
|
395
|
+
let parentValue = undefined;
|
|
396
|
+
// const parent = parentMap.get(node);
|
|
397
|
+
if (parent) {
|
|
398
|
+
parentValue = findValue(parent, parentMap);
|
|
399
|
+
}
|
|
400
|
+
const validRes = await teamsfx_api_1.validate(node.condition, parentValue, clonedInputs);
|
|
401
|
+
if (validRes !== undefined) {
|
|
402
|
+
continue;
|
|
403
|
+
}
|
|
404
|
+
}
|
|
405
|
+
// 2. visit node if not group
|
|
406
|
+
if (node.data.type !== "group") {
|
|
407
|
+
const question = node.data;
|
|
408
|
+
let res;
|
|
248
409
|
try {
|
|
249
|
-
|
|
250
|
-
sendTelemetryEvent(telemetryReporter,
|
|
410
|
+
res = await visitor(question, ui, clonedInputs, visitedInputNodeArray.length + 1, undefined);
|
|
411
|
+
sendTelemetryEvent(telemetryReporter, res, question, clonedInputs);
|
|
251
412
|
}
|
|
252
413
|
catch (e) {
|
|
253
414
|
return teamsfx_api_1.err(error_1.assembleError(e));
|
|
254
415
|
}
|
|
255
|
-
if (
|
|
416
|
+
if (res.isErr()) {
|
|
256
417
|
// Cancel or Error
|
|
257
|
-
return teamsfx_api_1.err(
|
|
418
|
+
return teamsfx_api_1.err(res.error);
|
|
258
419
|
}
|
|
259
|
-
const inputResult =
|
|
420
|
+
const inputResult = res.value;
|
|
260
421
|
if (inputResult.type === "back") {
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
}
|
|
274
|
-
else {
|
|
275
|
-
break;
|
|
276
|
-
}
|
|
277
|
-
}
|
|
422
|
+
const prevNode = visitedInputNodeArray.pop();
|
|
423
|
+
if (!prevNode) {
|
|
424
|
+
return teamsfx_api_1.err(new error_1.UserCancelError());
|
|
425
|
+
}
|
|
426
|
+
for (--i; i >= 0; --i) {
|
|
427
|
+
const tmpNode = nodeList[i];
|
|
428
|
+
visitedNodeSet.delete(tmpNode);
|
|
429
|
+
// clear prevNode data
|
|
430
|
+
if (tmpNode.data.type !== "group") {
|
|
431
|
+
delete tmpNode.data.value;
|
|
432
|
+
delete tmpNode.data.valueType;
|
|
433
|
+
delete clonedInputs[tmpNode.data.name];
|
|
278
434
|
}
|
|
279
|
-
|
|
280
|
-
if (last.data.type !== "group")
|
|
281
|
-
delete inputs[last.data.name];
|
|
282
|
-
const lastIsAutoSkip = autoSkipSet.has(last);
|
|
283
|
-
if (last.data.type !== "group" && last.data.type !== "func" && !lastIsAutoSkip) {
|
|
284
|
-
found = true;
|
|
435
|
+
if (tmpNode === prevNode) {
|
|
285
436
|
break;
|
|
286
437
|
}
|
|
287
438
|
}
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
}
|
|
291
|
-
--step;
|
|
292
|
-
continue; //ignore the following steps
|
|
439
|
+
--i;
|
|
440
|
+
continue;
|
|
293
441
|
}
|
|
294
442
|
else {
|
|
295
|
-
//success or skip
|
|
443
|
+
//success or skip: set value
|
|
296
444
|
question.value = inputResult.result;
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
else {
|
|
303
|
-
++step;
|
|
445
|
+
question.valueType = inputResult.type;
|
|
446
|
+
clonedInputs[question.name] = question.value;
|
|
447
|
+
visitedNodeSet.add(node);
|
|
448
|
+
if (question.valueType === "success") {
|
|
449
|
+
visitedInputNodeArray.push(node);
|
|
304
450
|
}
|
|
305
451
|
}
|
|
306
452
|
}
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
const matchChildren = [];
|
|
310
|
-
const valueInMap = findValue(curr, parentMap); //curr.data.type !== "group" ? curr.data.value : undefined; //valueMap.get(curr);
|
|
311
|
-
for (const child of curr.children) {
|
|
312
|
-
if (!child)
|
|
313
|
-
continue;
|
|
314
|
-
if (child.condition) {
|
|
315
|
-
const validRes = await teamsfx_api_1.validate(child.condition, valueInMap, inputs);
|
|
316
|
-
if (validRes !== undefined) {
|
|
317
|
-
continue;
|
|
318
|
-
}
|
|
319
|
-
}
|
|
320
|
-
matchChildren.push(child);
|
|
321
|
-
}
|
|
322
|
-
for (let i = matchChildren.length - 1; i >= 0; --i) {
|
|
323
|
-
const child = matchChildren[i];
|
|
324
|
-
parentMap.set(child, curr);
|
|
325
|
-
stack.push(child);
|
|
326
|
-
}
|
|
453
|
+
else {
|
|
454
|
+
visitedNodeSet.add(node);
|
|
327
455
|
}
|
|
328
456
|
}
|
|
457
|
+
lodash_1.assign(inputs, clonedInputs);
|
|
329
458
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
330
459
|
}
|
|
331
460
|
exports.traverse = traverse;
|
package/build/ui/visitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../src/ui/visitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../src/ui/visitor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "2.0.4-alpha.
|
|
3
|
+
"version": "2.0.4-alpha.2fdf2b99b.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -51,9 +51,16 @@
|
|
|
51
51
|
"test:azureFuncDeploy": "nyc mocha \"tests/component/driver/deploy/azure/AzureFunctionDeployDriver.test.ts\"",
|
|
52
52
|
"test:devportal": "nyc mocha \"tests/component/developerPortalScaffoldUtils.test.ts\"",
|
|
53
53
|
"test:visitor": "nyc mocha \"tests/ui/qm.visitor.test.ts\"",
|
|
54
|
+
"test:validUtils": "nyc mocha \"tests/ui/validationUtils.test.ts\"",
|
|
54
55
|
"test:question": "nyc mocha \"tests/question/*.test.ts\"",
|
|
55
56
|
"test:coll": "nyc mocha \"tests/core/collaborator.test.ts\"",
|
|
56
57
|
"test:specParser": "npx mocha \"tests/common/spec-parser/**/specParser.test.ts\"",
|
|
58
|
+
"test:specFilter": "npx mocha \"tests/common/spec-parser/**/specFilter.test.ts\"",
|
|
59
|
+
"test:specParserUtils": "npx mocha \"tests/common/spec-parser/**/utils.test.ts\"",
|
|
60
|
+
"test:manifestUpdater": "npx mocha \"tests/common/spec-parser/**/manifestUpdater.test.ts\"",
|
|
61
|
+
"test:adaptiveCardGenerator": "npx mocha \"tests/common/spec-parser/**/adaptiveCardGenerator.test.ts\"",
|
|
62
|
+
"test:error": "nyc mocha \"tests/error/*.test.ts\"",
|
|
63
|
+
"test:cutils": "nyc mocha \"tests/component/utils.test.ts\"",
|
|
57
64
|
"clean": "rm -rf build",
|
|
58
65
|
"build": "rimraf build && npx tsc -p ./",
|
|
59
66
|
"lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
|
|
@@ -77,13 +84,13 @@
|
|
|
77
84
|
"@azure/arm-subscriptions": "^5.0.0",
|
|
78
85
|
"@azure/core-auth": "^1.4.0",
|
|
79
86
|
"@azure/identity": "^3.1.3",
|
|
80
|
-
"@azure/ms-rest-js": "^2.
|
|
87
|
+
"@azure/ms-rest-js": "^2.7.0",
|
|
81
88
|
"@azure/msal-node": "^1.14.6",
|
|
82
89
|
"@azure/storage-blob": "^12.7.0",
|
|
83
90
|
"@feathersjs/hooks": "^0.6.5",
|
|
84
91
|
"@microsoft/dev-tunnels-contracts": "~1.0.7360",
|
|
85
92
|
"@microsoft/dev-tunnels-management": "~1.0.7360",
|
|
86
|
-
"@microsoft/teamsfx-api": "0.22.4-alpha.
|
|
93
|
+
"@microsoft/teamsfx-api": "0.22.4-alpha.2fdf2b99b.0",
|
|
87
94
|
"@npmcli/arborist": "^4.2.0",
|
|
88
95
|
"@types/proper-lockfile": "^4.1.1",
|
|
89
96
|
"adm-zip": "^0.5.5",
|
|
@@ -127,13 +134,12 @@
|
|
|
127
134
|
"uuid": "^8.3.2",
|
|
128
135
|
"validator": "^13.7.0",
|
|
129
136
|
"xml2js": "^0.5.0",
|
|
130
|
-
"yaml": "^2.2.2"
|
|
131
|
-
"yaml-language-server": "1.7.0"
|
|
137
|
+
"yaml": "^2.2.2"
|
|
132
138
|
},
|
|
133
139
|
"devDependencies": {
|
|
134
140
|
"@azure/storage-blob": "^12.5.0",
|
|
135
141
|
"@istanbuljs/nyc-config-typescript": "^1.0.1",
|
|
136
|
-
"@microsoft/eslint-plugin-teamsfx": "0.0.
|
|
142
|
+
"@microsoft/eslint-plugin-teamsfx": "0.0.5-alpha.2fdf2b99b.0",
|
|
137
143
|
"@types/adm-zip": "^0.4.33",
|
|
138
144
|
"@types/chai": "^4.2.14",
|
|
139
145
|
"@types/chai-as-promised": "^7.1.3",
|
|
@@ -174,6 +180,7 @@
|
|
|
174
180
|
"copy-webpack-plugin": "^6.4.1",
|
|
175
181
|
"dotenv": "^8.2.0",
|
|
176
182
|
"eslint": "^7.22.0",
|
|
183
|
+
"eslint-plugin-header": "^3.1.1",
|
|
177
184
|
"eslint-plugin-import": "^2.25.2",
|
|
178
185
|
"eslint-plugin-no-secrets": "^0.8.9",
|
|
179
186
|
"eslint-plugin-prettier": "^4.0.0",
|
|
@@ -201,7 +208,7 @@
|
|
|
201
208
|
"resource/**/*",
|
|
202
209
|
"templates/**/*"
|
|
203
210
|
],
|
|
204
|
-
"gitHead": "
|
|
211
|
+
"gitHead": "9f4c3520cb0244146cbeabe53b462a79160d7f54",
|
|
205
212
|
"publishConfig": {
|
|
206
213
|
"access": "public"
|
|
207
214
|
},
|
|
@@ -77,7 +77,9 @@
|
|
|
77
77
|
"plugins.spfx.questions.packageSelect.installLocally.noVersion.label": "Install the latest SPFx locally in Teams Toolkit directory ",
|
|
78
78
|
"plugins.spfx.questions.spfxSolution.title": "SharePoint Solution",
|
|
79
79
|
"plugins.spfx.questions.spfxSolution.createNew": "Create a New SPFx Solution",
|
|
80
|
+
"plugins.spfx.questions.spfxSolution.createNew.detail": "Create a Teams Tab application using SPFx web parts",
|
|
80
81
|
"plugins.spfx.questions.spfxSolution.importExisting": "Import an Existing SPFx Solution",
|
|
82
|
+
"plugins.spfx.questions.spfxSolution.importExisting.detail": "Expose SPFx client-side web part as Microsoft Teams tab or personal app",
|
|
81
83
|
"plugins.spfx.deployNotice": "SharePoint package %s has been successfully deployed to [%s](%s).",
|
|
82
84
|
"plugins.spfx.cannotFindPackage": "Cannot find SharePoint package %s",
|
|
83
85
|
"plugins.spfx.cannotGetSPOToken": "Cannot get SPO access token",
|
|
@@ -207,6 +209,7 @@
|
|
|
207
209
|
"error.generator.DownloadSampleApiLimitError": "Unable to download sample due to throttling. Retry later after rate limit reset (This may take up to 1 hour). Alternatively, you can go to %s to git clone the repo manually",
|
|
208
210
|
"error.generator.DownloadSampleNetworkError": "Unable to download sample due to network error. Check your network connection and retry. Alternatively, you can go to %s to git clone the repo manually",
|
|
209
211
|
"error.generator.ParseUrlError": "Unable to parse url %s",
|
|
212
|
+
"error.copilotPlugin.openAiPluginManifest.CannotGetManifest": "Unable to get OpenAI plugin manifest from '%s'.",
|
|
210
213
|
"error.m365.NotExtendedToM365Error": "Unable to extend Teams app to Microsoft 365. Use 'teamsApp/extendToM365' action to extend your Teams app to Microsoft 365.",
|
|
211
214
|
"core.QuestionAppName.validation.pattern": "Application name must start with letters and contain at least two letters or digits. It can not contain some special characters.",
|
|
212
215
|
"core.QuestionAppName.validation.maxlength": "Application name is longer than the maximum length of 30.",
|
|
@@ -239,6 +242,15 @@
|
|
|
239
242
|
"core.TabSPFxOption.detailNew": "Build UI with SharePoint Framework",
|
|
240
243
|
"core.TabNonSso.label": "Basic Tab",
|
|
241
244
|
"core.TabNonSso.detail": "A simple implementation of a web app that's ready to customize",
|
|
245
|
+
"core.copilotPlugin.validate.apiSpec.summary": "Teams Toolkit has checked your API spec:\n\nSummary:\n%s.\n%s\n%s",
|
|
246
|
+
"core.copilotPlugin.validate.openAIPluginManifest.summary": "Teams Toolkit has checked your OpenAI plugin manifest:\n\nSummary:\n%s.\n%s\n%s",
|
|
247
|
+
"core.copilotPlugin.validate.summary.validate.failed": "%s failed",
|
|
248
|
+
"core.copilotPlugin.validate.summary.validate.warning": "%s warning",
|
|
249
|
+
"core.copilotPlugin.scaffold.summary": "We have detected the following issues for your OpenAPI specification file:\n%s",
|
|
250
|
+
"core.copilotPlugin.scaffold.summary.warning.operationId": "%s Mitigation: Not required, operationId has been automatically generated and added into \"%s\" file.",
|
|
251
|
+
"core.copilotPlugin.scaffold.summary.warning.teamsManifest.lengthExceeding": "\"%s\" must not have more than %s characters. ",
|
|
252
|
+
"core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingFullDescription": "Missing full description. ",
|
|
253
|
+
"core.copilotPlugin.scaffold.summary.warning.teamsManifest.mitigation": "Mitigation: update \"%s\" field in \"%s\".",
|
|
242
254
|
"core.createCapabilityQuestion.titleNew": "Capabilities",
|
|
243
255
|
"core.createCapabilityQuestion.placeholder": "Select a capability",
|
|
244
256
|
"core.createProjectQuestion.option.description.previewOnWindow": "Preview on Windows",
|
|
@@ -269,10 +281,16 @@
|
|
|
269
281
|
"core.createProjectQuestion.apiSpec.placeholder": "Enter OpenAPI Specification URL",
|
|
270
282
|
"core.createProjectQuestion.apiSpecInputUrl.label": "Enter OpenAPI Specification Location",
|
|
271
283
|
"core.createProjectQuestion.AIPluginManifest.title": "OpenAI Plugin Manifest",
|
|
272
|
-
"core.createProjectQuestion.AIPluginManifest.placeholder": "Enter
|
|
284
|
+
"core.createProjectQuestion.AIPluginManifest.placeholder": "Enter your website domain",
|
|
273
285
|
"core.createProjectQuestion.invalidUrl.message": "Please enter a valid URL",
|
|
286
|
+
"core.createProjectQuestion.invalidDomain.message": "Please enter a valid domain",
|
|
274
287
|
"core.createProjectQuestion.apiSpec.operation.title": "Select an Operation",
|
|
275
288
|
"core.createProjectQuestion.apiSpec.operation.placeholder": "Only GET and POST methods are listed.",
|
|
289
|
+
"core.createProjectQuestion.apiSpec.operation.placeholder.skipExisting": "Methods defined in manifest.json are not listed",
|
|
290
|
+
"core.createProjectQuestion.apiSpec.multipleValidationErrors.message": "Invalid API specification. Check output panel for details.",
|
|
291
|
+
"core.createProjectQuestion.apiSpec.multipleValidationErrors.vscode.message": "Invalid API specification. Check [output panel](command:fx-extension.showOutputChannel) for details.",
|
|
292
|
+
"core.createProjectQuestion.openAiPluginManifest.multipleValidationErrors.message": "Invalid OpenAI plugin manifest. Check output panel for details.",
|
|
293
|
+
"core.createProjectQuestion.openAiPluginManifest.multipleValidationErrors.vscode.message": "Invalid OpenAI plugin manifest. Check [output panel](command:fx-extension.showOutputChannel) for details.",
|
|
276
294
|
"core.spfxFolder.title": "SPFx solution folder",
|
|
277
295
|
"core.spfxFolder.placeholder": "Select the folder that contains your SPFx solution",
|
|
278
296
|
"core.QuestionSelectTargetEnvironment.title": "Select an environment",
|
|
@@ -370,7 +388,9 @@
|
|
|
370
388
|
"core.summary.actionFailed": "%s failed.",
|
|
371
389
|
"core.summary.actionSucceeded": "%s was executed successfully.",
|
|
372
390
|
"core.summary.createdEnvFile": "Environment file was created at",
|
|
391
|
+
"core.copilot.addAPI.success": "%s have(has) been successfully added to %s",
|
|
373
392
|
"ui.select.LoadingOptionsPlaceholder": "Loading options ...",
|
|
393
|
+
"ui.select.LoadingDefaultPlaceholder": "Loading default value ...",
|
|
374
394
|
"error.aad.manifest.NameIsMissing": "name is missing\n",
|
|
375
395
|
"error.aad.manifest.SignInAudienceIsMissing": "signInAudience is missing\n",
|
|
376
396
|
"error.aad.manifest.RequiredResourceAccessIsMissing": "requiredResourceAccess is missing\n",
|
|
@@ -396,8 +416,6 @@
|
|
|
396
416
|
"plugins.bot.FailRetrieveAzureCredentials": "Unable to retrieve Azure credentials.",
|
|
397
417
|
"plugins.bot.ProvisionBotRegistration": "Provisioning bot registration.",
|
|
398
418
|
"plugins.bot.ProvisionBotRegistrationSuccess": "Successfully provisioned bot registration.",
|
|
399
|
-
"plugins.bot.CheckCommandOutput": "Please check the command output and try to fix it.",
|
|
400
|
-
"plugins.bot.RunFailedCommand": "Please run failed command '%s' in the folder: '%s'.",
|
|
401
419
|
"plugins.bot.CheckLogAndFix": "Please check log in Output panel and try to fix this issue.",
|
|
402
420
|
"plugins.bot.AppStudioBotRegistration": "Developer Portal bot registration",
|
|
403
421
|
"plugins.function.getTemplateFromLocal": "Unable to get newest template from github, trying to use the local template.",
|
|
@@ -548,7 +566,7 @@
|
|
|
548
566
|
"driver.botFramework.summary.update": "The bot registration has been updated successfully (%s).",
|
|
549
567
|
"driver.botFramework.progressBar.createOrUpdateBot": "Creating or updating bot registration.",
|
|
550
568
|
"driver.botFramework.error.InvalidBotId": "Bot ID %s is invalid. It must be a GUID.",
|
|
551
|
-
"error.yaml.InvalidYamlSchemaError": "Unable to parse yaml file: %s. Please
|
|
569
|
+
"error.yaml.InvalidYamlSchemaError": "Unable to parse yaml file: %s. Please open the yaml file for detailed errors.",
|
|
552
570
|
"error.yaml.InvalidYamlSchemaErrorWithReason": "Unable to parse yaml file: %s. Reason: %s Please review the yaml file.",
|
|
553
571
|
"error.yaml.VersionNotSupported": "version %s is not supported. Supported versions: %s.",
|
|
554
572
|
"error.yaml.YamlFieldTypeError": "Field '%s' should have %s type, yaml file: %s",
|
|
@@ -564,6 +582,7 @@
|
|
|
564
582
|
"error.common.ReadFileError": "Unable to read file for reason: %s",
|
|
565
583
|
"error.common.UnhandledError": "An unexpected error has occurred while performing the %s task. %s",
|
|
566
584
|
"error.common.WriteFileError": "Unable to write file for reason: %s",
|
|
585
|
+
"error.common.FilePermissionError": "File operation is not permitted, ensure that you have the necessary permissions: %s",
|
|
567
586
|
"error.common.MissingRequiredInputError": "Missing required input: %s",
|
|
568
587
|
"error.common.InputValidationError": "Input '%s' validation failed: %s",
|
|
569
588
|
"error.common.NoEnvFilesError": "Unable to find .env files.",
|
|
@@ -612,5 +631,7 @@
|
|
|
612
631
|
"error.deploy.AzureStorageGetContainerPropertiesError.Notification": "Unable to get properties of container '%s' in Azure Storage Account '%s' due to error: %s. Refer to the [Output panel](command:fx-extension.showOutputChannel) for more details.",
|
|
613
632
|
"error.deploy.AzureStorageGetContainerPropertiesError": "Unable to get properties of container '%s' in Azure Storage Account '%s' due to error: %s. The error responses from Azure are:\n %s. \nIf the error message specifies the reason, fix the error and try again.",
|
|
614
633
|
"error.deploy.AzureStorageSetContainerPropertiesError.Notification": "Unable to set properties of container '%s' in Azure Storage Account '%s' due to error: %s. Refer to the [Output panel](command:fx-extension.showOutputChannel) for more details.",
|
|
615
|
-
"error.deploy.AzureStorageSetContainerPropertiesError": "Unable to set properties of container '%s' in Azure Storage Account '%s' due to error: %s. The error responses from Azure are:\n %s. \nIf the error message specifies the reason, fix the error and try again."
|
|
634
|
+
"error.deploy.AzureStorageSetContainerPropertiesError": "Unable to set properties of container '%s' in Azure Storage Account '%s' due to error: %s. The error responses from Azure are:\n %s. \nIf the error message specifies the reason, fix the error and try again.",
|
|
635
|
+
"error.core.failedToLoadManifestId": "Unable to load manifest id from path: %s. You must run provision first.",
|
|
636
|
+
"error.core.appIdNotExist": "Cannot find app id: %s. Maybe your current M365 account does not have permission, or the app has alredy been deleted."
|
|
616
637
|
}
|