@hecom/codearts 0.1.0 → 0.2.1

package/dist/utils/config-loader.js

@@ -1,56 +1,220 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalConfigPath = getGlobalConfigPath;
+exports.globalConfigExists = globalConfigExists;
+exports.readGlobalConfig = readGlobalConfig;
+exports.writeGlobalConfig = writeGlobalConfig;
+exports.deleteGlobalConfig = deleteGlobalConfig;
 exports.loadConfig = loadConfig;
-const dotenv_1 = __importDefault(require("dotenv"));
-const global_config_1 = require("./global-config");
-// 加载当前目录的 .env 文件（如果存在）
-dotenv_1.default.config();
+exports.getConfig = getConfig;
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const types_1 = require("../types");
+/**
+ * 全局配置管理工具
+ * 配置文件存储在用户主目录下的 .hecom-codearts 目录
+ */
+const CONFIG_DIR = path.join(os.homedir(), '.hecom-codearts');
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
+/**
+ * 确保配置目录存在
+ */
+function ensureConfigDir() {
+    if (!fs.existsSync(CONFIG_DIR)) {
+        fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    }
+}
+/**
+ * 获取全局配置文件路径
+ */
+function getGlobalConfigPath() {
+    return CONFIG_FILE;
+}
+/**
+ * 检查全局配置文件是否存在
+ */
+function globalConfigExists() {
+    return fs.existsSync(CONFIG_FILE);
+}
+/**
+ * 读取全局配置
+ */
+function readGlobalConfig() {
+    if (!globalConfigExists()) {
+        return {};
+    }
+    const config = {};
+    try {
+        const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
+        const lines = content.split('\n');
+        for (const line of lines) {
+            const trimmedLine = line.trim();
+            if (!trimmedLine || trimmedLine.startsWith('#')) {
+                continue;
+            }
+            const equalIndex = trimmedLine.indexOf('=');
+            if (equalIndex > 0) {
+                const key = trimmedLine.substring(0, equalIndex).trim();
+                const value = trimmedLine.substring(equalIndex + 1).trim();
+                // 只保存合法的配置键
+                if (Object.values(types_1.ConfigKey).includes(key)) {
+                    config[key] = value;
+                }
+            }
+        }
+    }
+    catch (error) {
+        console.error('读取全局配置文件失败:', error);
+    }
+    return config;
+}
+/**
+ * 配置项分组和顺序定义
+ */
+const CONFIG_GROUPS = [
+    {
+        title: '华为云IAM认证端点（根据区域调整）',
+        keys: [types_1.ConfigKey.HUAWEI_CLOUD_IAM_ENDPOINT, types_1.ConfigKey.HUAWEI_CLOUD_REGION],
+    },
+    {
+        title: 'IAM用户凭证',
+        keys: [
+            types_1.ConfigKey.HUAWEI_CLOUD_USERNAME,
+            types_1.ConfigKey.HUAWEI_CLOUD_PASSWORD,
+            types_1.ConfigKey.HUAWEI_CLOUD_DOMAIN,
+        ],
+    },
+    {
+        title: '项目配置',
+        keys: [types_1.ConfigKey.CODEARTS_BASE_URL, types_1.ConfigKey.PROJECT_ID, types_1.ConfigKey.ROLE_ID],
+    },
+];
+/**
+ * 写入全局配置
+ * 支持动态配置项，自动按分组组织配置文件
+ */
+function writeGlobalConfig(config) {
+    ensureConfigDir();
+    // 构建配置文件头部
+    let content = `# Hecom CodeArts 全局配置文件`;
+    // 记录已写入的配置项
+    const writtenKeys = new Set();
+    // 按分组写入配置
+    for (const group of CONFIG_GROUPS) {
+        content += `\n# ${group.title}\n`;
+        for (const key of group.keys) {
+            const value = config[key] || '';
+            content += `${key}=${value}\n`;
+            writtenKeys.add(key);
+        }
+    }
+    // 写入未分组的其他配置项（支持未来扩展）
+    const otherKeys = Object.keys(config).filter((key) => !writtenKeys.has(key));
+    if (otherKeys.length > 0) {
+        content += `\n# 其他配置\n`;
+        for (const key of otherKeys) {
+            const value = config[key] || '';
+            content += `${key}=${value}\n`;
+        }
+    }
+    try {
+        fs.writeFileSync(CONFIG_FILE, content, 'utf-8');
+    }
+    catch (error) {
+        throw new Error(`写入全局配置文件失败: ${error}`);
+    }
+}
+/**
+ * 删除全局配置
+ */
+function deleteGlobalConfig() {
+    if (globalConfigExists()) {
+        try {
+            fs.unlinkSync(CONFIG_FILE);
+        }
+        catch (error) {
+            throw new Error(`删除全局配置文件失败: ${error}`);
+        }
+    }
+}
 // 加载全局配置
-const globalConfig = (0, global_config_1.globalConfigExists)() ? (0, global_config_1.readGlobalConfig)() : {};
+const globalConfig = globalConfigExists() ? readGlobalConfig() : {};
 /**
- * 加载配置，优先级：命令行参数 > 当前目录 .env > 全局配置 > 默认值
+ * 加载配置，优先级：命令行参数 > 全局配置
  * @param cliOptions 命令行选项
  * @returns 加载的配置
  */
 function loadConfig(cliOptions = {}) {
-    // 命令行参数 > 当前目录 .env > 全局配置
-    const projectId = cliOptions.projectId || process.env.PROJECT_ID || globalConfig.PROJECT_ID;
-    const roleIdStr = cliOptions.roleId || process.env.ROLE_ID || globalConfig.ROLE_ID;
+    // 命令行参数 > 全局配置
+    const projectId = globalConfig[types_1.ConfigKey.PROJECT_ID];
+    const roleIdStr = cliOptions.roleId || globalConfig[types_1.ConfigKey.ROLE_ID];
     if (!projectId) {
-        throw new Error('缺少必需参数: --project-id 或环境变量 PROJECT_ID\n提示：运行 codearts config 创建配置');
+        throw new Error('缺少项目 ID');
     }
     if (!roleIdStr) {
-        throw new Error('缺少必需参数: --role-id 或环境变量 ROLE_ID\n提示：运行 codearts config 创建配置');
+        throw new Error('缺少角色 ID');
     }
     const roleIds = roleIdStr.split(',').map((id) => parseInt(id.trim()));
     if (roleIds.some((id) => isNaN(id))) {
         throw new Error('ROLE_ID 格式不正确，应为数字或逗号分隔的数字列表');
     }
-    const username = cliOptions.username || process.env.HUAWEI_CLOUD_USERNAME || globalConfig.HUAWEI_CLOUD_USERNAME;
-    const password = cliOptions.password || process.env.HUAWEI_CLOUD_PASSWORD || globalConfig.HUAWEI_CLOUD_PASSWORD;
-    const domain = cliOptions.domain || process.env.HUAWEI_CLOUD_DOMAIN || globalConfig.HUAWEI_CLOUD_DOMAIN;
-    if (!username || !password || !domain) {
-        throw new Error('缺少华为云认证信息: --username, --password, --domain 或对应的环境变量\n提示：运行 codearts config 创建配置');
+    const username = globalConfig[types_1.ConfigKey.HUAWEI_CLOUD_USERNAME];
+    const password = globalConfig[types_1.ConfigKey.HUAWEI_CLOUD_PASSWORD];
+    const domain = globalConfig[types_1.ConfigKey.HUAWEI_CLOUD_DOMAIN];
+    const iamEndpoint = globalConfig[types_1.ConfigKey.HUAWEI_CLOUD_IAM_ENDPOINT];
+    const region = globalConfig[types_1.ConfigKey.HUAWEI_CLOUD_REGION];
+    const endpoint = globalConfig[types_1.ConfigKey.CODEARTS_BASE_URL];
+    if (!username || !password || !domain || !iamEndpoint || !region || !endpoint) {
+        throw new Error('缺少华为云认证信息，请先运行 `npx @hecom/codearts config` 创建配置');
     }
     const config = {
-        iamEndpoint: cliOptions.iamEndpoint ||
-            process.env.HUAWEI_CLOUD_IAM_ENDPOINT ||
-            globalConfig.HUAWEI_CLOUD_IAM_ENDPOINT ||
-            'https://iam.cn-north-4.myhuaweicloud.com',
-        region: cliOptions.region ||
-            process.env.HUAWEI_CLOUD_REGION ||
-            globalConfig.HUAWEI_CLOUD_REGION ||
-            'cn-north-4',
-        endpoint: cliOptions.codeartsUrl ||
-            process.env.CODEARTS_BASE_URL ||
-            globalConfig.CODEARTS_BASE_URL ||
-            'https://projectman-ext.cn-north-4.myhuaweicloud.cn',
+        iamEndpoint,
+        region,
+        endpoint,
         username,
         password,
         domainName: domain,
     };
     return { projectId, roleIds, config };
 }
+/**
+ * 获取最终合并后的配置（用于显示）
+ * @returns 合并后的配置映射
+ */
+function getConfig() {
+    return globalConfig;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hecom/codearts",
-  "version": "0.1.0",
-  "description": "从CodeArts获取日报信息",
+  "version": "0.2.1",
+  "description": "华为云 CodeArts 统计分析工具",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -10,14 +10,14 @@
   "files": [
     "dist",
     "bin",
-    ".env.example",
     "README.md"
   ],
   "scripts": {
     "build": "rm -rf dist && tsc && chmod +x bin/codearts",
     "test": "jest --passWithNoTests",
     "test:coverage": "jest --coverage --passWithNoTests",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "dev": "ts-node src/bin/cli.ts"
   },
   "keywords": [
     "huawei-cloud",
@@ -40,13 +40,12 @@
     "url": "https://github.com/hecom-rn/hecom-codearts/issues"
   },
   "engines": {
-    "node": ">=16.0.0",
+    "node": ">=23.0.0",
     "npm": ">=7.0.0"
   },
   "dependencies": {
     "axios": "^1.5.0",
     "commander": "^12.1.0",
-    "dotenv": "^16.3.1",
     "inquirer": "^9.3.8"
   },
   "devDependencies": {

package/.env.example

@@ -1,20 +0,0 @@
-# 华为云CodeArts API 环境变量配置
-# 复制此文件为 .env 并填入真实的配置值
-
-# 华为云IAM认证端点（根据区域调整）
-HUAWEI_CLOUD_IAM_ENDPOINT=https://iam.cn-north-4.myhuaweicloud.com
-HUAWEI_CLOUD_REGION=cn-north-4
-
-# IAM用户凭证
-HUAWEI_CLOUD_USERNAME=your-iam-username
-HUAWEI_CLOUD_PASSWORD=your-iam-password
-HUAWEI_CLOUD_DOMAIN=your-domain-name
-
-# CodeArts API基础URL（可选，默认根据区域自动生成）
-CODEARTS_BASE_URL=https://projectman-ext.cn-north-4.myhuaweicloud.cn
-
-PROJECT_ID=your-project-id
-
-# 角色ID（支持多个，逗号分隔）
-ROLE_ID=your-role-id
-# 示例：ROLE_ID=1,2,3

package/dist/utils/global-config.d.ts

@@ -1,24 +0,0 @@
-/**
- * 获取全局配置文件路径
- */
-export declare function getGlobalConfigPath(): string;
-/**
- * 检查全局配置文件是否存在
- */
-export declare function globalConfigExists(): boolean;
-/**
- * 读取全局配置
- */
-export declare function readGlobalConfig(): Record<string, string>;
-/**
- * 写入全局配置
- */
-export declare function writeGlobalConfig(config: Record<string, string>): void;
-/**
- * 删除全局配置
- */
-export declare function deleteGlobalConfig(): void;
-/**
- * 获取配置信息（用于显示）
- */
-export declare function getConfigInfo(): string;

package/dist/utils/global-config.js

@@ -1,153 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalConfigPath = getGlobalConfigPath;
-exports.globalConfigExists = globalConfigExists;
-exports.readGlobalConfig = readGlobalConfig;
-exports.writeGlobalConfig = writeGlobalConfig;
-exports.deleteGlobalConfig = deleteGlobalConfig;
-exports.getConfigInfo = getConfigInfo;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const os = __importStar(require("os"));
-/**
- * 全局配置管理工具
- * 配置文件存储在用户主目录下的 .hecom-codearts 目录
- */
-const CONFIG_DIR = path.join(os.homedir(), '.hecom-codearts');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
-/**
- * 确保配置目录存在
- */
-function ensureConfigDir() {
-    if (!fs.existsSync(CONFIG_DIR)) {
-        fs.mkdirSync(CONFIG_DIR, { recursive: true });
-    }
-}
-/**
- * 获取全局配置文件路径
- */
-function getGlobalConfigPath() {
-    return CONFIG_FILE;
-}
-/**
- * 检查全局配置文件是否存在
- */
-function globalConfigExists() {
-    return fs.existsSync(CONFIG_FILE);
-}
-/**
- * 读取全局配置
- */
-function readGlobalConfig() {
-    if (!globalConfigExists()) {
-        return {};
-    }
-    const config = {};
-    try {
-        const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
-        const lines = content.split('\n');
-        for (const line of lines) {
-            const trimmedLine = line.trim();
-            if (!trimmedLine || trimmedLine.startsWith('#')) {
-                continue;
-            }
-            const equalIndex = trimmedLine.indexOf('=');
-            if (equalIndex > 0) {
-                const key = trimmedLine.substring(0, equalIndex).trim();
-                const value = trimmedLine.substring(equalIndex + 1).trim();
-                config[key] = value;
-            }
-        }
-    }
-    catch (error) {
-        console.error('读取全局配置文件失败:', error);
-    }
-    return config;
-}
-/**
- * 写入全局配置
- */
-function writeGlobalConfig(config) {
-    ensureConfigDir();
-    const content = `# Hecom CodeArts 全局配置文件
-# 此文件由 codearts config 命令自动生成
-# 位置: ${CONFIG_FILE}
-
-# 华为云IAM认证端点（根据区域调整）
-HUAWEI_CLOUD_IAM_ENDPOINT=${config.iamEndpoint || ''}
-HUAWEI_CLOUD_REGION=${config.region || ''}
-
-# IAM用户凭证
-HUAWEI_CLOUD_USERNAME=${config.username || ''}
-HUAWEI_CLOUD_PASSWORD=${config.password || ''}
-HUAWEI_CLOUD_DOMAIN=${config.domain || ''}
-
-# 项目配置
-CODEARTS_BASE_URL=${config.codeartsUrl || ''}
-PROJECT_ID=${config.projectId || ''}
-ROLE_ID=${config.roleId || ''}
-`;
-    try {
-        fs.writeFileSync(CONFIG_FILE, content, 'utf-8');
-    }
-    catch (error) {
-        throw new Error(`写入全局配置文件失败: ${error}`);
-    }
-}
-/**
- * 删除全局配置
- */
-function deleteGlobalConfig() {
-    if (globalConfigExists()) {
-        try {
-            fs.unlinkSync(CONFIG_FILE);
-        }
-        catch (error) {
-            throw new Error(`删除全局配置文件失败: ${error}`);
-        }
-    }
-}
-/**
- * 获取配置信息（用于显示）
- */
-function getConfigInfo() {
-    if (globalConfigExists()) {
-        return `全局配置文件: ${CONFIG_FILE}`;
-    }
-    else {
-        return `全局配置文件不存在\n建议运行: codearts config`;
-    }
-}