@hecom/codearts 0.2.2 → 0.3.0

package/dist/commands/config.command.js

@@ -40,11 +40,14 @@ exports.configCommand = configCommand;
 exports.updateProjectConfigCommand = updateProjectConfigCommand;
 exports.getAvailableProjectConfigs = getAvailableProjectConfigs;
 exports.showConfigCommand = showConfigCommand;
-const inquirer_1 = __importDefault(require("inquirer"));
+const prompts_1 = require("@inquirer/prompts");
+const ora_1 = __importDefault(require("ora"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const readline = __importStar(require("readline"));
 const business_service_1 = require("../services/business.service");
 const types_1 = require("../types");
 const config_loader_1 = require("../utils/config-loader");
+const inquirer_theme_1 = require("../utils/inquirer-theme");
 const logger_1 = require("../utils/logger");
 /**
  * 清除终端上指定行数的内容
@@ -56,76 +59,58 @@ function clearLines(lines) {
         readline.clearLine(process.stdout, 0); // 清除当前行
     }
 }
+async function inputRoleIds(existingValue) {
+    return await (0, prompts_1.input)({
+        message: '角色 ID（支持逗号分隔，如: 1,2,3）:',
+        default: existingValue || '',
+        validate: (inputValue) => {
+            if (!inputValue.trim()) {
+                return '角色 ID 不能为空';
+            }
+            const ids = inputValue.split(',').map((id) => id.trim());
+            const allValid = ids.every((id) => /^\d+$/.test(id));
+            return allValid ? true : '角色 ID 必须是数字或逗号分隔的数字列表';
+        },
+    });
+}
 /**
  * 配置角色 ID
  */
 async function configureRoleIds(businessService, projectId, existingValue) {
+    let roles = [];
     try {
-        const roles = await businessService.getProjectRoles(projectId);
-        if (roles.length === 0) {
-            // 如果没有获取到角色，使用手动输入
-            const { manualRoleId } = await inquirer_1.default.prompt([
-                {
-                    type: 'input',
-                    name: 'manualRoleId',
-                    message: '角色 ID（支持逗号分隔，如: 1,2,3）:',
-                    default: existingValue || '',
-                    validate: (input) => {
-                        if (!input.trim()) {
-                            return '角色 ID 不能为空';
-                        }
-                        const ids = input.split(',').map((id) => id.trim());
-                        const allValid = ids.every((id) => /^\d+$/.test(id));
-                        return allValid ? true : '角色 ID 必须是数字或逗号分隔的数字列表';
-                    },
-                },
-            ]);
-            return manualRoleId;
-        }
-        else {
-            // 使用多选框选择角色
-            const roleChoices = roles.map((role) => ({
-                name: `${role.role_name} (${role.role_id})`,
-                value: role.role_id.toString(),
-                checked: existingValue ? existingValue.split(',').includes(role.role_id.toString()) : false,
-            }));
-            const { selectedRoleIds } = await inquirer_1.default.prompt([
-                {
-                    type: 'checkbox',
-                    name: 'selectedRoleIds',
-                    message: '请选择角色：',
-                    choices: roleChoices,
-                    validate: (input) => {
-                        if (input.length === 0) {
-                            return '至少选择一个角色';
-                        }
-                        return true;
-                    },
-                },
-            ]);
-            return selectedRoleIds.join(',');
-        }
+        const spinner = (0, ora_1.default)('正在获取角色列表...').start();
+        roles = await businessService.getProjectRoles(projectId);
+        spinner.stop();
     }
     catch (error) {
         logger_1.logger.error('❌ 获取角色列表失败:', error);
         // 如果获取失败，使用手动输入
-        const { manualRoleId } = await inquirer_1.default.prompt([
-            {
-                type: 'input',
-                name: 'manualRoleId',
-                message: '角色 ID（支持逗号分隔，如: 1,2,3）:',
-                default: existingValue || '',
-                validate: (input) => {
-                    if (!input.trim()) {
-                        return '角色 ID 不能为空';
-                    }
-                    const ids = input.split(',').map((id) => id.trim());
-                    const allValid = ids.every((id) => /^\d+$/.test(id));
-                    return allValid ? true : '角色 ID 必须是数字或逗号分隔的数字列表';
-                },
+        return await inputRoleIds(existingValue);
+    }
+    if (roles.length === 0) {
+        // 如果没有获取到角色，使用手动输入
+        return await inputRoleIds(existingValue);
+    }
+    else {
+        // 使用多选框选择角色
+        const roleChoices = roles.map((role) => ({
+            name: `${role.role_name} (${role.role_id})`,
+            value: role.role_id.toString(),
+            checked: existingValue ? existingValue.split(',').includes(role.role_id.toString()) : false,
+        }));
+        const selectedRoleIds = await (0, prompts_1.checkbox)({
+            message: '请选择角色：',
+            choices: roleChoices,
+            validate: (answer) => {
+                if (answer.length === 0) {
+                    return '至少需要选择一个角色';
+                }
+                return true;
             },
-        ]);
-        return manualRoleId;
+            theme: inquirer_theme_1.globalTheme,
+        });
+        return selectedRoleIds.join(',');
     }
 }
 /**
@@ -145,25 +130,28 @@ const PROJECT_CONFIG_ITEMS = [
     //   configure: configureCustomField,
     // },
 ];
+async function inputPassword() {
+    return await (0, prompts_1.password)({
+        message: 'IAM 密码:',
+        mask: '*',
+        validate: (inputValue) => (inputValue.trim() ? true : 'IAM 密码不能为空'),
+    });
+}
 /**
  * 交互式配置向导命令
  * 引导用户创建或更新全局配置文件
  */
 async function configCommand() {
-    logger_1.logger.info('\n欢迎使用 Hecom CodeArts 配置向导');
+    logger_1.logger.info('欢迎使用 Hecom CodeArts 配置向导');
     logger_1.logger.info('='.repeat(60));
-    logger_1.logger.info('此向导将帮助您配置华为云 CodeArts API 访问凭证。');
+    logger_1.logger.info('此向导将帮助您配置华为云 CodeArts API 访问凭证以及项目相关设置');
     logger_1.logger.info(`配置将保存到: ${(0, config_loader_1.getConfigPath)()}\n`);
     const existingConfig = (0, config_loader_1.configExists)() ? (0, config_loader_1.readConfig)() : {};
     if ((0, config_loader_1.configExists)()) {
-        const { overwrite } = await inquirer_1.default.prompt([
-            {
-                type: 'confirm',
-                name: 'overwrite',
-                message: '检测到已存在全局配置，是否覆盖？',
-                default: false,
-            },
-        ]);
+        const overwrite = await (0, prompts_1.confirm)({
+            message: '检测到已存在全局配置，是否覆盖？',
+            default: true,
+        });
         if (!overwrite) {
             logger_1.logger.info('\n已取消配置。');
             return;
@@ -181,53 +169,52 @@ async function configCommand() {
         password: '',
     };
     while (!credentialsValid) {
-        iamAnswers = await inquirer_1.default.prompt([
-            {
-                type: 'input',
-                name: 'iamEndpoint',
+        iamAnswers = {
+            iamEndpoint: await (0, prompts_1.input)({
                 message: 'IAM 认证端点:',
                 default: existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_IAM_ENDPOINT] ||
                     'https://iam.cn-north-4.myhuaweicloud.com',
-                validate: (input) => (input.trim() ? true : 'IAM 认证端点不能为空'),
-            },
-            {
-                type: 'input',
-                name: 'region',
+                validate: (inputValue) => (inputValue.trim() ? true : 'IAM 认证端点不能为空'),
+            }),
+            region: await (0, prompts_1.input)({
                 message: '华为云区域:',
                 default: existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_REGION] || 'cn-north-4',
-                validate: (input) => (input.trim() ? true : '华为云区域不能为空'),
-            },
-            {
-                type: 'input',
-                name: 'codeartsUrl',
+                validate: (inputValue) => (inputValue.trim() ? true : '华为云区域不能为空'),
+            }),
+            codeartsUrl: await (0, prompts_1.input)({
                 message: 'CodeArts API 地址:',
                 default: existingConfig[types_1.ConfigKey.CODEARTS_BASE_URL] ||
                     'https://projectman-ext.cn-north-4.myhuaweicloud.cn',
-                validate: (input) => (input.trim() ? true : 'CodeArts API 地址不能为空'),
-            },
-            {
-                type: 'input',
-                name: 'domain',
+                validate: (inputValue) => (inputValue.trim() ? true : 'CodeArts API 地址不能为空'),
+            }),
+            domain: await (0, prompts_1.input)({
                 message: '华为云账号名:',
                 default: existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_DOMAIN] || '',
-                validate: (input) => (input.trim() ? true : '华为云账号名不能为空'),
-            },
-            {
-                type: 'input',
-                name: 'username',
+                validate: (inputValue) => (inputValue.trim() ? true : '华为云账号名不能为空'),
+            }),
+            username: await (0, prompts_1.input)({
                 message: 'IAM 用户名:',
                 default: existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_USERNAME] || '',
-                validate: (input) => (input.trim() ? true : 'IAM 用户名不能为空'),
-            },
-            {
-                type: 'password',
-                name: 'password',
-                message: 'IAM 密码:',
-                mask: '*',
-                default: existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_PASSWORD] || '',
-                validate: (input) => (input.trim() ? true : 'IAM 密码不能为空'),
-            },
-        ]);
+                validate: (inputValue) => (inputValue.trim() ? true : 'IAM 用户名不能为空'),
+            }),
+            password: '',
+        };
+        // 处理密码：如果存在旧密码，询问是否重用
+        if (existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_PASSWORD]) {
+            const useExistingPassword = await (0, prompts_1.confirm)({
+                message: 'IAM 密码: 是否使用已保存的密码？',
+                default: true,
+            });
+            if (useExistingPassword) {
+                iamAnswers.password = existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_PASSWORD];
+            }
+            else {
+                iamAnswers.password = await inputPassword();
+            }
+        }
+        else {
+            iamAnswers.password = await inputPassword();
+        }
         // 创建 BusinessService 实例
         businessService = new business_service_1.BusinessService({
             iamEndpoint: iamAnswers.iamEndpoint,
@@ -239,21 +226,19 @@ async function configCommand() {
             enableLogging: false,
         });
         // 验证凭证
+        const spinner = (0, ora_1.default)('正在验证 IAM 凭证...').start();
         const validationResult = await businessService.validateCredentials();
+        spinner.stop();
         if (validationResult.success) {
             credentialsValid = true;
         }
         else {
             const errorMessage = `❌ IAM 凭证验证失败: ${validationResult.error}\n`;
             logger_1.logger.error(errorMessage);
-            const { retry } = await inquirer_1.default.prompt([
-                {
-                    type: 'confirm',
-                    name: 'retry',
-                    message: '是否重新配置 IAM 凭证？',
-                    default: true,
-                },
-            ]);
+            const retry = await (0, prompts_1.confirm)({
+                message: '是否重新配置 IAM 凭证？',
+                default: true,
+            });
             if (!retry) {
                 logger_1.logger.info('\n已取消配置。');
                 return;
@@ -267,51 +252,42 @@ async function configCommand() {
     }
     // 第二阶段：获取项目列表并选择项目
     let projectId;
+    let projects = [];
+    async function inputProjectId() {
+        return await (0, prompts_1.input)({
+            message: '项目 ID:',
+            default: existingConfig[types_1.ConfigKey.PROJECT_ID] || '',
+            validate: (inputValue) => (inputValue.trim() ? true : '项目 ID 不能为空'),
+        });
+    }
     try {
-        const projects = await businessService.getProjects(100);
-        if (projects.length === 0) {
-            const { manualProjectId } = await inquirer_1.default.prompt([
-                {
-                    type: 'input',
-                    name: 'manualProjectId',
-                    message: '项目 ID:',
-                    default: existingConfig[types_1.ConfigKey.PROJECT_ID] || '',
-                    validate: (input) => (input.trim() ? true : '项目 ID 不能为空'),
-                },
-            ]);
-            projectId = manualProjectId;
-        }
-        else {
-            const projectChoices = projects.map((p) => ({
-                name: `${p.project_name} (${p.project_id})`,
-                value: p.project_id,
-            }));
-            const { selectedProjectId } = await inquirer_1.default.prompt([
-                {
-                    type: 'list',
-                    name: 'selectedProjectId',
-                    message: '请选择项目:',
-                    choices: projectChoices,
-                    default: existingConfig[types_1.ConfigKey.PROJECT_ID] || projectChoices[0]?.value,
-                },
-            ]);
-            projectId = selectedProjectId;
-        }
+        const spinner = (0, ora_1.default)('正在获取项目列表...').start();
+        projects = await businessService.getProjects(100);
+        spinner.stop();
     }
     catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
         logger_1.logger.error(`❌ 获取项目列表失败: `, error);
         // 获取失败，使用手动输入
-        const { manualProjectId } = await inquirer_1.default.prompt([
-            {
-                type: 'input',
-                name: 'manualProjectId',
-                message: '项目 ID:',
-                default: existingConfig[types_1.ConfigKey.PROJECT_ID] || '',
-                validate: (input) => (input.trim() ? true : '项目 ID 不能为空'),
-            },
-        ]);
-        projectId = manualProjectId;
+        projectId = await inputProjectId();
+    }
+    if (projects.length === 0) {
+        projectId = await inputProjectId();
+    }
+    else {
+        const projectChoices = projects.map((p) => ({
+            name: `${p.project_name} (${p.project_id})`,
+            value: p.project_id,
+        }));
+        // 确定默认项目 ID
+        const existingProjectId = existingConfig[types_1.ConfigKey.PROJECT_ID];
+        const isExistingProjectValid = existingProjectId && projects.some((p) => p.project_id === existingProjectId);
+        const defaultProjectId = isExistingProjectValid ? existingProjectId : projectChoices[0]?.value;
+        projectId = await (0, prompts_1.select)({
+            message: '请选择项目:',
+            choices: projectChoices,
+            default: defaultProjectId,
+            theme: inquirer_theme_1.globalTheme,
+        });
     }
     // 第三阶段：配置项目相关配置
     const projectConfigs = {};
@@ -363,16 +339,6 @@ async function updateProjectConfigCommand(configKey) {
     }
     // 读取现有配置
     const existingConfig = (0, config_loader_1.readConfig)();
-    // 检查必要的配置是否存在
-    if (!existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_USERNAME] ||
-        !existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_PASSWORD]) {
-        logger_1.logger.error('\n❌ 全局配置不完整，请先运行 `npx @hecom/codearts config` 完成配置。');
-        process.exit(1);
-    }
-    if (!existingConfig[types_1.ConfigKey.PROJECT_ID]) {
-        logger_1.logger.error('\n❌ 项目 ID 未配置，请先运行 `npx @hecom/codearts config` 完成配置。');
-        process.exit(1);
-    }
     // 创建 BusinessService 实例
     const businessService = new business_service_1.BusinessService({
         iamEndpoint: existingConfig[types_1.ConfigKey.HUAWEI_CLOUD_IAM_ENDPOINT],
@@ -414,7 +380,7 @@ async function showConfigCommand() {
     // 获取最终合并后的配置
     const config = (0, config_loader_1.getConfig)();
     // 按类别显示配置
-    logger_1.logger.info('\n【华为云 IAM 凭证】');
+    logger_1.logger.info(picocolors_1.default.cyan('【华为云 IAM 凭证】'));
     const iamKeys = [
         types_1.ConfigKey.HUAWEI_CLOUD_IAM_ENDPOINT,
         types_1.ConfigKey.HUAWEI_CLOUD_REGION,
@@ -427,7 +393,8 @@ async function showConfigCommand() {
         const displayValue = key.includes('PASSWORD') && value !== '(未配置)' ? '********' : value;
         logger_1.logger.info(`  ${formatKeyName(key)}: ${displayValue}`);
     }
-    logger_1.logger.info('\n【CodeArts 配置】');
+    logger_1.logger.info();
+    logger_1.logger.info(picocolors_1.default.cyanBright('【CodeArts 配置】'));
     const codeartsKeys = [
         types_1.ConfigKey.CODEARTS_BASE_URL,
         types_1.ConfigKey.PROJECT_ID,