@zzclub/z-cli 0.5.3 → 0.6.0

package/CHANGELOG.md

@@ -1,6 +1,30 @@
 # Changelog
 
 
+## v0.6.0
+
+[compare changes](https://github.com/aatrooox/z-cli/compare/v0.5.4...v0.6.0)
+
+### 🚀 Enhancements
+
+- 改造i18n，使其能够直接提取中文 ([bb05eac](https://github.com/aatrooox/z-cli/commit/bb05eac))
+
+### ❤️ Contributors
+
+- Aatrox <gnakzz@qq.com>
+
+## v0.5.4
+
+[compare changes](https://github.com/aatrooox/z-cli/compare/v0.5.3...v0.5.4)
+
+### 🚀 Enhancements
+
+- 增加node版本提示 ([5eb02cb](https://github.com/aatrooox/z-cli/commit/5eb02cb))
+
+### ❤️ Contributors
+
+- Aatrox <gnakzz@qq.com>
+
 ## v0.5.3
 
 [compare changes](https://github.com/aatrooox/z-cli/compare/v0.5.2...v0.5.3)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zzclub/z-cli",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "all-in-one 工具箱，专为提升日常及工作效率而生",
   "main": "src/index.js",
   "type": "module",

package/src/command/i18n.js

@@ -68,14 +68,14 @@ const i18nCmd = {
           for (const file of filePaths) {
             const content = fs.readFileSync(file, 'utf-8');
             const fileName = path.basename(file, '.vue');
-            const i18nKeys = extractI18nKeys(content);
+            const { keys: i18nKeys, commentMap } = extractI18nKeys(content);
             
             if (i18nKeys.length > 0) {
               file_spinner.succeed(`从 ${chalk.yellow(fileName)} 中提取了 ${chalk.green(i18nKeys.length)} 个国际化键值`);
               
               // 处理每个提取的键值
               for (const key of i18nKeys) {
-                await processI18nKey(key, i18nMap);
+                await processI18nKey(key, i18nMap, commentMap);
               }
             }
           }
@@ -109,7 +109,7 @@ const i18nCmd = {
       
       const content = fs.readFileSync(filePath, 'utf-8');
       const fileName = path.basename(filePath, '.vue');
-      const i18nKeys = extractI18nKeys(content);
+      const { keys: i18nKeys, commentMap } = extractI18nKeys(content);
       
       if (i18nKeys.length > 0) {
         const i18nMap = {};
@@ -118,7 +118,7 @@ const i18nCmd = {
         
         // 处理每个提取的键值
         for (const key of i18nKeys) {
-          await processI18nKey(key, i18nMap);
+          await processI18nKey(key, i18nMap, commentMap);
         }
         
         // 如果没有指定输出目录，使用当前处理的文件所在目录
@@ -163,25 +163,81 @@ function getAllVueFiles(dirPath, filePaths) {
  * 从 Vue 文件内容中提取国际化键值
  * @param {string} content 文件内容
  * @param {string} ignorePrefix 要忽略的前缀
- * @returns {Array} 提取的键值数组
+ * @returns {Object} 提取的键值数组和注释映射
  */
 function extractI18nKeys(content, ignorePrefix = "common") {
+  // 原有正则表达式，提取键名
   const regex = /\$t\(['"]i18n\.([^'"]+)['"]\)/g;
+  // 提取键名和注释中的中文
+  const regexWithComment = /\$t\(['"]i18n\.([^'"]+)['"]\)[\s,]*\/\/\s*([\u4e00-\u9fa5].*?)(?=\n|$)/g;
+  // 新增：提取HTML注释中的i18n信息
+  const regexHtmlComment = /<!--i18n\s+(.*?)-->/g;
+  
   const keys = [];
+  const commentMap = {}; // 存储键名和对应的注释内容
   let match;
   
+  // 提取HTML注释中的i18n信息
+  while ((match = regexHtmlComment.exec(content)) !== null) {
+    const commentContent = match[1].trim();
+    // 解析注释内容中的多个键值对
+    const keyValuePairs = commentContent.split(/\s+/);
+    
+    for (const pair of keyValuePairs) {
+      const [key, value] = pair.split('=');
+      if (key && value) {
+        // 将简短键（如addTitle）与完整键（如monthlyForecast.pageTitle.addTitle）进行匹配
+        // 这里我们需要在后续处理中找到对应的完整键
+        commentMap[key] = value;
+      }
+    }
+  }
+  
+  // 提取带注释的国际化键
+  while ((match = regexWithComment.exec(content)) !== null) {
+    const key = match[1];
+    const comment = match[2].trim();
+    
+    // 如果设置了忽略前缀且键以该前缀开头，则跳过
+    if (ignorePrefix && key.startsWith(`${ignorePrefix}.`)) {
+      continue;
+    }
+    
+    keys.push(key);
+    // JS注释优先级高于HTML注释
+    commentMap[key] = comment;
+    
+    // 同时为简短键名存储注释
+    const shortKey = key.split('.').pop();
+    if (!commentMap[shortKey]) {
+      commentMap[shortKey] = comment;
+    }
+  }
+  
+  // 提取不带注释的国际化键
   while ((match = regex.exec(content)) !== null) {
     const key = match[1];
+    
     // 如果设置了忽略前缀且键以该前缀开头，则跳过
     if (ignorePrefix && key.startsWith(`${ignorePrefix}.`)) {
       continue;
     }
+    
     keys.push(key);
+    
+    // 检查是否有对应的HTML注释
+    const shortKey = key.split('.').pop();
+    if (commentMap[shortKey] && !commentMap[key]) {
+      commentMap[key] = commentMap[shortKey];
+    }
   }
   
-  return [...new Set(keys)]; // 去重
+  // 返回去重后的键名数组和注释映射
+  return {
+    keys: [...new Set(keys)],
+    commentMap
+  };
 }
-
 function unquoteKeys(json) {
   return json.replace(/"(\\[^]|[^\\"])*"\s*:?/g, function (match) {
     if (/:$/.test(match)) {
@@ -196,8 +252,9 @@ function unquoteKeys(json) {
  * 处理单个国际化键值
  * @param {string} key 键值
  * @param {Object} i18nMap 国际化映射对象
+ * @param {Object} commentMap 注释映射
  */
-async function processI18nKey(key, i18nMap) {
+async function processI18nKey(key, i18nMap, commentMap = {}) {
   // 解析键值 fee-forecast-maintain.placeholder.yearNum
   const parts = key.split('.');
   
@@ -223,8 +280,8 @@ async function processI18nKey(key, i18nMap) {
 
   // 设置最终的键值
   if (!current[lastKey]) {
-    // 使用键名作为默认值
-    current[lastKey] = lastKey;
+    // 如果有注释，使用注释作为值，否则使用键名
+    current[lastKey] = commentMap[key] || lastKey;
   }
 }
 

package/src/index.js

@@ -7,11 +7,12 @@ import { configCmd } from "./command/config.js";
 import { setCmd } from "./command/set.js";
 import { tinyCmd } from "./command/tiny.js";
 import { picgoCmd } from "./command/picgo.js";
-import { checkUpdate } from './utils/common.js'
+import { checkUpdate, checkNodeVersion } from './utils/common.js'
  import { i18nCmd } from "./command/i18n.js";
 const program = new Command();
 
 initProgram(program, async () => {
+  checkNodeVersion()
   await checkUpdate()
   registerCommand(program, translateCmd);
 

package/src/utils/common.js

@@ -198,3 +198,21 @@ export async function checkUpdate() {
       // 静默处理错误
     }
 }
+
+
+export async function checkNodeVersion() {
+  const currentNodeVersion = process.versions.node;
+  const semver = currentNodeVersion.split('.');
+  const major = parseInt(semver[0], 10);
+  const minor = parseInt(semver[1], 10);
+
+  if (major < 18 || (major === 18 && minor < 18)) {
+    console.error(
+      chalk.red('\n❌ Node版本过低：') +
+      chalk.yellow('建议升级到 ') + 
+      chalk.green('18.18.0') + 
+      chalk.yellow(' 或更高版本。\n') +
+      chalk.gray('当前版本：') + chalk.red(currentNodeVersion) 
+    );
+  }
+}