td-octopus 0.1.16 → 0.1.18

package/cmds/storage.js

@@ -0,0 +1,9 @@
+const { main } = require('../src/storage');
+
+exports.command = 'storage';
+
+exports.describe = 'storage 将项目中用到的中英文存储到缓存中';
+
+exports.handler = () => {
+    main()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "td-octopus",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "I18N tool",
   "author": "Anthony Li",
   "bin": {
@@ -27,7 +27,8 @@
     "update-notifier": "^4.1.0",
     "vue-template-compiler": "^2.6.14",
     "xlsx": "0.16.9",
-    "yargs": "^15.3.1"
+    "yargs": "^15.3.1",
+    "eslint": "^8.15.0"
   },
   "keywords": [
     "I18N",

package/src/back/index.js

@@ -3,7 +3,7 @@
  * @Author: 郑泳健
  * @Date: 2022-06-01 13:56:18
  * @LastEditors: 郑泳健
- * @LastEditTime: 2023-01-18 15:25:47
+ * @LastEditTime: 2025-11-11 10:10:55
  */
 const path = require('path')
 const fs = require('fs')
@@ -27,8 +27,6 @@ const TEMPLATE_INNER_REGEX = /I18N\.template\(([\s\S]*?})\)/g
 // 匹配{}之间的内容
 const JSON_KEY_REGEX = /{([\s\S]*?)}/g
 
-// 匹配{}之间的value
-const JSON_VALYR_REGEX = /(?<=: )[^,}]+/g
 
 /**
  * 获取需要back的所有文件目录
@@ -61,14 +59,39 @@ function getFilePaths() {
 /**
  * 获取I18N.template里面{}每个value对应的value
  * @param {*} str {val1: h, val2: m, val3: s}
- * @returns [h, m, s]
+ * @returns obj
  */
 function getTemplateValue(str) {
     try {
-        const values = str.match(JSON_VALYR_REGEX)
-        return values;
+        const result = {};
+        const regex = /(\w+)\s*:\s*/g;
+        let match;
+
+        while ((match = regex.exec(objStr)) !== null) {
+            const key = match[1].trim();
+            let valueStart = regex.lastIndex;
+            let bracketCount = 0;
+            let valueEnd = valueStart;
+
+            for (let i = valueStart; i < objStr.length; i++) {
+                const char = objStr[i];
+                if (char === '(') bracketCount++;
+                if (char === ')') bracketCount--;
+                if ((char === ',' && bracketCount === 0) || (char === '}' && bracketCount === 0)) {
+                    valueEnd = i;
+                    break;
+                }
+            }
+
+            const value = objStr.slice(valueStart, valueEnd).trim();
+            result[key] = value;
+
+            regex.lastIndex = valueEnd + 1; // 继续匹配下一个
+        }
+
+        return result;
     } catch (e) {
-        throw e;
+        throw new Error(`获取I8N.template内的变量出错: ${e.message}`);
     }
 }
 
@@ -89,13 +112,8 @@ function transformTemplate(filePath, code, flatObj) {
                 let matchList = getValueByI18N(filePath, i, flatObj) || [];
                 matchText = matchList[0] && matchList[0]['value']
                 if (matchText) {
-                    matchText = matchText.replace(/{(val\d+)}/g, (match, group, index) => {
-                        if (!keys[0]) {
-                            throw new Error(`${filePath}文件中的 ${highlightText(i)} 转换有问题，请手动检查`)
-                        }
-                        const res = '${' + keys[0].trim() + '}'
-                        keys.splice(0, 1)
-                        return res
+                    matchText = matchText.replace(/{(val\d+)}/g, (_, transKey) => {
+                        return `\${${keys[transKey]}}`;
                     })
 
                     code = code.replace(i, '`' + matchText + '`')

package/src/check/index.js

@@ -3,19 +3,19 @@
  * @Author: 郑泳健
  * @Date: 2024-12-12 15:00:24
  * @LastEditors: 郑泳健
- * @LastEditTime: 2025-09-11 09:56:54
+ * @LastEditTime: 2025-11-11 09:57:48
  */
-const path = require('path')
-const fs = require('fs')
-const shell = require('shelljs');
-const { getSpecifiedFiles, isFile } = require('../utils/file')
-const syncLang = require('../utils/syncLang')
-const { flatObject, rewriteFiles, getFileKeyValueList, getAdjustLangObjAndAddList } = require('../utils/translate');
-const { failInfo, highlightText } = require('../utils/colors');
-const { getProjectConfig, autoImportJSFiles } = require('../utils/index')
-const ora = require('ora');
+const path = require('path');
+const fs = require('fs');
+const { parse } = require('@babel/parser');
+const generate = require('@babel/generator').default;
+const syncLang = require('../utils/syncLang');
+const { flatObject, rewriteFiles, getFileKeyValueList } = require('../utils/translate');
+const { autoImportJSFiles } = require('../utils/index');
+
+const { ESLint } = require('eslint');
 
-const CONFIG = getProjectConfig();
+const ora = require('ora');
 
 const spinner = ora('开始check');
 
@@ -23,9 +23,9 @@ function extractThreeLevelI18NKeys(code) {
     // 匹配恰好三级的I18N键值（I18N.xxx.xxx.xxx）
     // 使用正则表达式确保前面不是点，后面也不是点或字母数字下划线
     const pattern = /(?<!\.)I18N\.[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+(?![a-zA-Z0-9_\.])/g;
-    
+
     const matches = code.match(pattern) || [];
-    
+
     // 去重并返回
     return [...new Set(matches)];
 }
@@ -33,84 +33,82 @@ function extractThreeLevelI18NKeys(code) {
 // 递归读取文件夹中所有 .js 文件内容
 function readJsFiles(folderPath) {
     let jsContent = '';
-  
+
     const files = fs.readdirSync(folderPath); // 读取文件夹内容
     for (const file of files) {
-      const fullPath = path.join(folderPath, file);
-      const stats = fs.statSync(fullPath); // 获取文件或文件夹状态
-  
-      if (stats.isDirectory()) {
-        // 如果是文件夹，递归处理
-        jsContent += readJsFiles(fullPath);
-      } else if (path.extname(fullPath) === '.js') {
-        // 如果是 .js 文件，读取文件内容
-        const content = fs.readFileSync(fullPath, 'utf-8');
-        jsContent += `\n/* File: ${fullPath} */\n${content}\n`;
-      }
+        const fullPath = path.join(folderPath, file);
+        const stats = fs.statSync(fullPath); // 获取文件或文件夹状态
+
+        if (stats.isDirectory()) {
+            // 如果是文件夹，递归处理
+            jsContent += readJsFiles(fullPath);
+        } else if (path.extname(fullPath) === '.js') {
+            // 如果是 .js 文件，读取文件内容
+            let content = fs.readFileSync(fullPath, 'utf-8');
+            const ast = parse(source, { sourceType: 'module', plugins: ['jsx', 'typescript'] });
+            const output = generate(ast, { comments: false });
+            content = output.code;
+            jsContent += `\n/* File: ${fullPath} */\n${content}\n`;
+        }
     }
-  
+
     return jsContent;
-  }
+}
 
 // 同步不同的语言包
 function main() {
     (async () => {
-        const distLang = Array.isArray(CONFIG.distLangs) ? CONFIG.distLangs : []
         const zhCN = syncLang('zh-CN');
         const zhCNFlat = flatObject(zhCN);
-        // 当前项目所有的key
-        const keys = Object.keys(zhCNFlat)
-        const totalText = readJsFiles(path.resolve(process.cwd(), 'src'))
+        const totalText = readJsFiles(path.resolve(process.cwd(), 'src'));
         const totalTranslateList = extractThreeLevelI18NKeys(totalText);
-        const zhCnKey = Object.keys(zhCNFlat)
-        let result = {}
-        const lostKey = totalTranslateList.filter(item => !zhCnKey.includes(item.replace('I18N.', '')))
-        fs.writeFileSync(path.resolve(process.cwd(), 'lostI18N.js'), JSON.stringify(lostKey, null, 4), 'utf-8')
-       
-        if(!lostKey.length) {
-            spinner.succeed(`查询完毕，无丢失`);
-            return 
+        const zhCnKey = Object.keys(zhCNFlat);
+        const lostKey = totalTranslateList.filter((item) => !zhCnKey.includes(item.replace('I18N.', '')));
+        fs.writeFileSync(path.resolve(process.cwd(), 'lostI18N.js'), JSON.stringify(lostKey, null, 4), 'utf-8');
+
+        if (!lostKey.length) {
+            spinner.succeed('查询完毕，无丢失');
+            return;
         }
-        
-        if (!fs.existsSync(path.resolve(process.cwd(), 'public/.octopus'))) {
+
+        if (!fs.existsSync(path.resolve(__dirname, '../octopus/zh-CN.js'))) {
             spinner.succeed(`查询完毕，共计丢失${lostKey.length}个，请在lostI18N.js中查看`);
-            spinner.warn('请将原始项目的.octopus复制到当前项目public目录下，会帮你自助将缺失的key补充上去');
+            spinner.warn('请先执行otp storage');
             return;
         }
         spinner.start(`查询完毕，共计丢失${lostKey.length}个,开始同步开始`);
-        const zhFrom = syncLang('zh-CN', path.resolve(process.cwd(), 'public/.octopus'))
-        const enFrom = syncLang('en-US', path.resolve(process.cwd(), 'public/.octopus'))
-        const zhFromFlat = flatObject(zhFrom);
-        const enFromFlat = flatObject(enFrom);
+        const zhFromFlat = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../octopus/zh-CN.js'), 'utf-8'));
+        const enFromFlat = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../octopus/en-US.js'), 'utf-8'));
 
         const enUS = syncLang('en-US');
         const enUSFlat = flatObject(enUS);
 
         const zhCNResult = lostKey.reduce((total, item) => {
-            if(zhFromFlat[item.replace('I18N.', '')]){
-                total[item.replace('I18N.', '')] = zhFromFlat[item.replace('I18N.', '')]
+            if (zhFromFlat[item.replace('I18N.', '')]) {
+                total[item.replace('I18N.', '')] = zhFromFlat[item.replace('I18N.', '')];
             }
             return total;
-        }, zhCNFlat)
-      
+        }, zhCNFlat);
+
         const enCNResult = lostKey.reduce((total, item) => {
-            if(enFromFlat[item.replace('I18N.', '')]){
-                total[item.replace('I18N.', '')] = enFromFlat[item.replace('I18N.', '')]
+            if (enFromFlat[item.replace('I18N.', '')]) {
+                total[item.replace('I18N.', '')] = enFromFlat[item.replace('I18N.', '')];
             }
             return total;
-        }, enUSFlat)
+        }, enUSFlat);
 
         rewriteFiles(getFileKeyValueList(zhCNResult), 'zh-CN');
         rewriteFiles(getFileKeyValueList(enCNResult), 'en-US');
         const cnJSON = fs.readFileSync(path.resolve(process.cwd(), '.octopus/zh-CN/index.js'), 'utf-8');
         const enJSON = fs.readFileSync(path.resolve(process.cwd(), '.octopus/en-US/index.js'), 'utf-8');
 
-        autoImportJSFiles(path.resolve(process.cwd(), '.octopus/zh-CN'), cnJSON)
-        autoImportJSFiles(path.resolve(process.cwd(), '.octopus/en-US'), enJSON)
-        spinner.succeed(`同步完成`);
-    })()
+        autoImportJSFiles(path.resolve(process.cwd(), '.octopus/zh-CN'), cnJSON);
+        autoImportJSFiles(path.resolve(process.cwd(), '.octopus/en-US'), enJSON);
+        fs.rmSync(path.resolve(__dirname, '../octopus'), { recursive: true, force: true });
+        spinner.succeed('同步完成,如果需要重新check，请先执行otp storage');
+    })();
 }
 
 module.exports = {
     main
-}
+};

package/src/storage/index.js

@@ -0,0 +1,35 @@
+/*
+ * @Descripttion: 将项目中用到的中英文存储到缓存中
+ * @Author: 郑泳健
+ * @Date: 2024-12-12 15:00:24
+ * @LastEditors: 郑泳健
+ * @LastEditTime: 2025-10-13 10:55:39
+ */
+const path = require('path');
+const fs = require('fs');
+const syncLang = require('../utils/syncLang');
+const { flatObject } = require('../utils/translate');
+const ora = require('ora');
+
+const spinner = ora('开始check');
+
+// 同步不同的语言包
+function main() {
+    (async () => {
+        const zhCN = syncLang('zh-CN');
+        const zhCNFlat = flatObject(zhCN);
+        const enUS = syncLang('en-US');
+        const enUSFlat = flatObject(enUS);
+        const outpuDir = path.resolve(__dirname, '../octopus');
+
+        fs.mkdirSync(outpuDir, { recursive: true });
+        spinner.start('开始缓存');
+        fs.writeFileSync(path.resolve(outpuDir, 'zh-CN.js'), JSON.stringify(zhCNFlat, null, 2), 'utf-8');
+        fs.writeFileSync(path.resolve(outpuDir, 'en-US.js'), JSON.stringify(enUSFlat, null, 2), 'utf-8');
+        spinner.succeed('缓存完成');
+    })();
+}
+
+module.exports = {
+    main
+};