b28-cli 1.6.8 → 1.7.0

package/README.MD

@@ -256,7 +256,15 @@ module.exports = {
 
 ### 原厂代码添加翻译函数
 
-在原厂代码中添加翻译函数`_()`，实现多语言产品需求，同时生成初始的语言包`json`文件，对于无法识别的内容，输出到`人工检查词条.txt`文件，手动检查是否需要添加翻译函数。
+在原厂代码中添加翻译函数`_()`，实现多语言产品需求，同时生成初始的语言包`json`文件。
+
+![处理结果](./img/origin.png)
+
+对于无法识别的内容或风险内容，输出到`log.txt`文件，手动检查是否需要添加翻译函数。
+`log.txt`中存在三种类型的log：
+- **词条不存在**：词条标识字段无法在C文件中找到对应的英文描述词条；
+- **翻译函数缺失？**：当前语句可能需要添加翻译函数，如要添加，请根据提供的文件信息找到当前语句手动添加翻译函数；
+- **文件检查**：当前文件添加翻译函数后可能会存在一定的语法错误，请根据提供的文件信息，找到文件手动检查修正。（问题代码大概率出现在js代码中的html字符串拼接部分）
 
 | 属性           | 值类型                      | 默认值               | 说明                                                |
 | -------------- | --------------------------- | -------------------- | --------------------------------------------------- |

package/dist/ExtractFile.js

@@ -97,6 +97,7 @@ var ExtractFile = function () {
       CONFIG_HONG: this.CONFIG_HONG,
       onlyZH: this.option.onlyZH,
       transWords: this.option.transWords,
+      isOrigin: this.option.isOrigin,
       isTranslate: this.option.isTranslate,
       isCheckTrans: this.option.isCheckTrans,
       baseWritePath: this.option.baseWritePath,
@@ -117,6 +118,7 @@ var ExtractFile = function () {
       CONFIG_HONG: this.CONFIG_HONG,
       onlyZH: this.option.onlyZH,
       transWords: this.option.transWords,
+      isOrigin: this.option.isOrigin,
       isTranslate: this.option.isTranslate,
       isCheckTrans: this.option.isCheckTrans,
       baseWritePath: this.option.baseWritePath,
@@ -157,6 +159,7 @@ var ExtractFile = function () {
       CONFIG_HONG: this.CONFIG_HONG,
       onlyZH: this.option.onlyZH,
       transWords: this.option.transWords,
+      isOrigin: this.option.isOrigin,
       isTranslate: this.option.isTranslate,
       isCheckTrans: this.option.isCheckTrans,
       baseWritePath: this.option.baseWritePath,

package/dist/ExtractFileOrigin.js

@@ -116,11 +116,11 @@ var ExtractFile = function () {
     return Promise.all([this.handleHtml(), this.handleJs()]).then(function (data) {
       var suspectLine = "";
       data.forEach(function (item) {
-        suspectLine += item.join("\n\r");
+        suspectLine += "\n\r" + item.join("\n\r");
       });
-      var suspectPath = _path2.default.join(_this.option.baseWritePath, "人工检查词条.txt");
+      var suspectPath = _path2.default.join(_this.option.baseWritePath, "log.txt");
       (0, _index.writeTextFile)(suspectPath, suspectLine);
-      (0, _index.log)("\u8F93\u51FA\u6587\u4EF6\u4E2D\u7684\u8BCD\u6761\u9700\u8981\u5355\u72EC\u68C0\u67E5\uFF1A" + suspectPath, _index.LOG_TYPE.DONE);
+      (0, _index.log)("\u6DFB\u52A0\u7FFB\u8BD1\u51FD\u6570\u8FC7\u7A0B\u4E2D\u9700\u8981\u624B\u52A8\u6392\u67E5\u95EE\u9898log\uFF1A" + suspectPath, _index.LOG_TYPE.DONE);
       //重置
       _this.exportLangs();
       _this.reset();

package/dist/cmd.js

@@ -37,6 +37,7 @@ var figlet = require("figlet");
 var comments = {
   commandType: "操作类型",
   onlyZH: "只提取中文",
+  isOrigin: "提取接入原厂代码中的词条",
   baseReadPath: "待提取文件地址",
   baseOutPath: "提取的Excel文件输出地址",
   hongPath: "宏文件地址",
@@ -67,260 +68,6 @@ var comments = {
   transEncode: "转码后文件的编码方式(默认UTF-8)"
 };
 
-/**
- * 命令行手动输入参数逐条配置
- */
-// let questions = [
-//   // 提取词条
-//   [
-//     {
-//       type: "confirm",
-//       name: "onlyZH",
-//       message: "只提取中文？"
-//     },
-//     {
-//       type: "input",
-//       name: "baseReadPath",
-//       message: "待提取文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "baseOutPath",
-//       message: "提取的Excel文件输出地址："
-//     },
-//     {
-//       type: "input",
-//       name: "hongPath",
-//       message: "宏文件地址："
-//     }
-//   ],
-//   // 翻译文件
-//   [
-//     {
-//       type: "input",
-//       name: "baseTranslatePath",
-//       message: "待翻译文件根目录："
-//     },
-//     {
-//       type: "input",
-//       name: "baseTransOutPath",
-//       message: "翻译后文件输出根目录："
-//     },
-//     {
-//       type: "input",
-//       name: "hongPath",
-//       message: "宏文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "languagePath",
-//       message: "语言包文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "sheetName",
-//       message: "Excel中对应的sheet："
-//     },
-//     {
-//       type: "input",
-//       name: "keyName",
-//       message: "key对应列：", //指代代码中的词条需要被那一列的数据替换
-//       default: "EN"
-//     },
-//     {
-//       type: "input",
-//       name: "valueName",
-//       message: "value对应列：", //指代代码中目前需要被替换的语言
-//       default: "CN", // ALL代表所有
-//       default: ""
-//     }
-//   ],
-//   // 翻译检查
-//   [
-//     {
-//       type: "input",
-//       name: "baseCheckPath",
-//       message: "待检查文件根目录："
-//     },
-//     {
-//       type: "input",
-//       name: "langJsonPath",
-//       message: "语言包json文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "hongPath",
-//       message: "宏文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "logPath",
-//       message: "检查信息输出路径："
-//     }
-//   ],
-//   // excel转json
-//   [
-//     {
-//       type: "input",
-//       name: "excelPath",
-//       message: "Excel文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "sheetName",
-//       message: "Excel中对应的sheet："
-//     },
-//     {
-//       type: "input",
-//       name: "keyName",
-//       message: "key对应列：",
-//       default: "EN"
-//     },
-//     {
-//       type: "input",
-//       name: "valueName",
-//       message: "value对应列：" // ALL代表所有
-//     },
-//     {
-//       type: "input",
-//       name: "outJsonPath",
-//       message: "输出json文件目录："
-//     }
-//   ],
-//   // json转excel
-//   [
-//     {
-//       type: "input",
-//       name: "jsonPath",
-//       message: "json文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "outExcelPath",
-//       message: "输出Excel文件目录："
-//     }
-//   ],
-//   // json文件合并
-//   [
-//     {
-//       type: "input",
-//       name: "mainJsonPath",
-//       message: "主json文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "mergeJsonPath",
-//       message: "次json文件地址："
-//     },
-//     {
-//       type: "input",
-//       name: "outMergeJsonPath",
-//       message: "合并后输出的地址："
-//     }
-//   ],
-//   // 原厂代码添加翻译函数
-//   [
-//     {
-//       type: "input",
-//       name: "baseProPath",
-//       message: "原厂代码地址："
-//     },
-//     {
-//       type: "input",
-//       name: "baseProOutPath",
-//       message: "添加翻译函数后文件输出地址："
-//     },
-//     {
-//       type: "input",
-//       name: "ignoreCode",
-//       message: "需要注释的代码正则：",
-//       default: "/<!--s*hide|-->/g"
-//     },
-//     {
-//       type: "input",
-//       name: "templateExp",
-//       message: "后台插入表达式正则：",
-//       default: "/<%([^\n]*?)%>/g"
-//     }
-//   ],
-//   // 提取json文件，生成一个excel表格
-//   [
-//     {
-//       type: "input",
-//       name: "baseReadPath",
-//       message: "待提取文件地址：",
-//       validate: valid.folder // 必填，可以是文件也可以是文件夹
-//     },
-//     {
-//       type: "input",
-//       name: "languagePath",
-//       message: "语言包文地址（文件夹）："
-//     },
-//     {
-//       type: "input",
-//       name: "baseOutPath",
-//       message: "提取的Excel文件输出地址：",
-//       default(answers) {
-//         return getDirname(answers.baseReadPath);
-//       }
-//     },
-//     {
-//       type: "input",
-//       name: "hongPath",
-//       message: "宏文件地址：",
-//       default: ""
-//     }
-//   ],
-//   // 翻译文件检查
-//   [
-//     {
-//       type: "input",
-//       name: "outExcel",
-//       message: "输出的excel文件地址：",
-//       default: "C:\\Users\\Administrator\\Desktop\\a.xlsx"
-//     },
-//     {
-//       type: "input",
-//       name: "inExcel",
-//       message: "最终excel文件地址：",
-//       default: "C:\\Users\\Administrator\\Desktop\\b.xlsx"
-//     },
-//     {
-//       type: "input",
-//       name: "baseCheckPath",
-//       message: "待检查文件根目录："
-//     },
-//     {
-//       type: "input",
-//       name: "jsonPath",
-//       message: "语言包文件夹地址："
-//     },
-//     {
-//       type: "input",
-//       name: "outExcelPath",
-//       message: "输出Excel文件目录："
-//     }
-//   ],
-//   // 文件转码
-//   [
-//     {
-//       type: "input",
-//       name: "transFilePath",
-//       message: "待转码文件地址"
-//     },
-//     {
-//       type: "input",
-//       name: "transOutPath",
-//       message: "转码后文件输出地址"
-//     },
-//     {
-//       type: "input",
-//       name: "transEncode",
-//       message: "转码后文件的编码方式(默认UTF-8)"
-//     }
-//   ]
-// ];
-
 /**
  * 初始化b28.config.js文件
  */

package/dist/debug/test.js

@@ -15,8 +15,9 @@ var hongPath = "./test/TestFile/config/index.js";
 function getWords() {
   (0, _index2.default)({
     commandType: _config.COMMAD.GET_WORDS,
-    baseReadPath: "E:/productCode/weiqi/eg100-9.25/code/src",
-    baseOutPath: "E:/productCode/weiqi/eg100-9.25/code/src",
+    isOrigin: true,
+    baseReadPath: "D:/Desktop/trans/test/outSrc",
+    baseOutPath: "D:/Desktop/trans",
     hongPath: hongPath
   }).then(function (data) {
     var t = data;
@@ -227,7 +228,7 @@ function transOrigin() {
 }
 
 module.exports = function () {
-  var command = "origin";
+  var command = "getWord";
   switch (command) {
     case "check":
       check();

package/dist/extract/extract-regexp.js

@@ -32,10 +32,13 @@ var ExtractOld = function (_Extract) {
 
   function ExtractOld(option) {
     (0, _classCallCheck3.default)(this, ExtractOld);
-    return (0, _possibleConstructorReturn3.default)(this, _Extract.call(this, option, 'regexp'));
+    return (0, _possibleConstructorReturn3.default)(this, _Extract.call(this, option, "regexp"));
   }
 
   ExtractOld.prototype.transNode = function transNode(content) {
+    if (this.option.isOrigin) {
+      content = content.replace(/<%([^\n]*?)%>/gi, "");
+    }
     return Promise.resolve(content);
   };
 

package/dist/extract/extract.js

@@ -34,6 +34,8 @@ var Extract = function () {
       isTranslate: false,
       // 是否是检查翻译
       isCheckTrans: false,
+      // 是否是原厂代码
+      isOrigin: false,
       // 翻译文件时，写入的根目录
       baseWritePath: "",
       oldData: {},
@@ -65,6 +67,9 @@ var Extract = function () {
     this.isWorking = true;
     this.curFilePath = filePath;
     return (0, _index.loadFile)(filePath).then(function (data) {
+      if (_this.option.isOrigin) {
+        data = data.replace(/<%([^\n]*?)%>/gi, "");
+      }
       return _this.transNode(data);
     }).then(function (AST) {
       return _this.scanNode(AST);
@@ -165,6 +170,10 @@ var Extract = function () {
       }
     }
 
+    if (/#(if|endif|else|elif)/ig.test(val)) {
+      return "";
+    }
+
     val = (0, _index.trim)(val);
     // 移除首尾空格
     val = val.replace(/(^\s+)|(\s+$)/g, "");

package/dist/extractOrigin/extract.js

@@ -37,6 +37,7 @@ var Extract = function () {
   }
 
   Extract.prototype.init = function init(words) {
+    this.warnings = [];
     this.words = words;
     // 记录当前的文件路径
     this.curFilePath = "";
@@ -85,11 +86,14 @@ var Extract = function () {
         matchs = matchs.filter(function (item) {
           return !(/(alert|confirm)\((.).*?\2\)/gi.test(item) || /_\(.*?\)/g.test(item) || !/\s/g.test(item));
         });
-        if (matchs.length > 0) {
-          var _suspectLine;
+        matchs = matchs.map(function (item) {
+          return "  [\u7FFB\u8BD1\u51FD\u6570\u7F3A\u5931\uFF1F]\uFF1A[" + item + "]";
+        });
+      }
+      if (matchs && matchs.length > 0 || _this.warnings.length > 0) {
+        var _suspectLine;
 
-          (_suspectLine = _this.suspectLine).push.apply(_suspectLine, ["#--#--#--#--#--# " + _this.curFilePath + " #--#--#--#--#--#"].concat(matchs));
-        }
+        (_suspectLine = _this.suspectLine).push.apply(_suspectLine, ["#--#--#--#--#--# \u6587\u4EF6\u5730\u5740\u3010" + _this.curFilePath + "\u3011 #--#--#--#--#--#"].concat(Array.from(new Set(_this.warnings)), matchs || []));
       }
 
       return _this.startTrans();
@@ -123,7 +127,11 @@ var Extract = function () {
   };
 
   Extract.prototype.transWord = function transWord(val) {
-    return this.words[val];
+    var word = this.words[val];
+    if (word === undefined) {
+      this.warnings.push("  [\u8BCD\u6761\u4E0D\u5B58\u5728]\uFF1A[" + val + "]");
+    }
+    return word;
   };
 
   Extract.prototype.complete = function complete() {

package/dist/extractOrigin/extract_html_ori.js

@@ -81,6 +81,7 @@ var ExtractHTML = function (_Extract) {
   ExtractHTML.prototype.scanNode = function scanNode(document) {
     var _this3 = this;
 
+    this.warnings = [];
     // 遍历各节点
     this.listNode(document.documentElement);
 
@@ -121,8 +122,11 @@ var ExtractHTML = function (_Extract) {
     return this.extractJS.transNode(child.innerHTML, true).then(function (AST) {
       return _this5.extractJS.scanNode(AST);
     }).then(function (fileData) {
+      var _warnings;
+
       // 写入文件
       child.innerHTML = fileData;
+      (_warnings = _this5.warnings).push.apply(_warnings, _this5.extractJS.warnings);
       return _this5.nextJsTask();
     }).catch(function (e) {
       (0, _index.log)(e, _index.LOG_TYPE.ERROR);

package/dist/extractOrigin/extract_js_ori.js

@@ -34,6 +34,7 @@ var ExtractJs = function (_Extract) {
   }
 
   ExtractJs.prototype.transNode = function transNode(jsDoc) {
+    this.warnings = [];
     return Promise.resolve(jsDoc);
   };
 
@@ -56,11 +57,14 @@ var ExtractJs = function (_Extract) {
           // 对于'<% xxx %>'添加翻译函数
           .replace(newReg, function (match, p1, p2) {
             return _this2.transWord(p2) ? "_(" + p1 + _this2.transWord(p2) + p1 + ")" : match;
-          })
-          // 对于<% xxx %>添加翻译函数
-          .replace(reg, function (match, p1) {
-            return _this2.transWord(p1) ? "_('" + _this2.transWord(p1) + "')" : match;
           });
+          if (reg.test(jsDoc)) {
+            _this2.warnings.push('  [文件检查]：[该文件中js代码部分可能存在格式不正确的翻译函数或字符串未添加翻译函数]');
+            // 对于<% xxx %>添加翻译函数
+            jsDoc = jsDoc.replace(reg, function (match, p1) {
+              return _this2.transWord(p1) ? _this2.transWord(p1) : match;
+            });
+          }
         }
         // 对alert、confirm添加翻译函数
         jsDoc = jsDoc.replace(/(alert|confirm)\((('|").*?\3)\)/gi, function (a, b, c) {

package/dist/handle.js

@@ -98,6 +98,7 @@ function getWords(cfg) {
     baseReadPath: cfg.baseReadPath,
     baseWritePath: cfg.baseOutPath,
     onlyZH: cfg.onlyZH,
+    isOrigin: cfg.isOrigin,
     hongPath: cfg.hongPath,
     writeExcel: true,
     needFilePath: true

package/dist/util/config.js

@@ -134,6 +134,11 @@ var baseQuestions = [{
   default: function _default(answers) {
     return (0, _index.getDirname)(answers.baseReadPath);
   }
+}, {
+  type: "confirm",
+  name: "isOrigin",
+  message: "提取原厂代码？",
+  default: false
 }, {
   type: "input",
   name: "hongPath",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "b28-cli",
-  "version": "1.6.8",
+  "version": "1.7.0",
   "description": "translate, ExcelToJson, JsonToExcel, getText, l18n",
   "main": "./src/index.js",
   "bin": {