b28-cli 1.6.7 → 1.6.9

package/README.MD

@@ -256,21 +256,31 @@ module.exports = {
 
 ### 原厂代码添加翻译函数
 
-在原厂代码中添加翻译函数`_()`，实现多语言产品需求
+在原厂代码中添加翻译函数`_()`，实现多语言产品需求，同时生成初始的语言包`json`文件。
+
+![处理结果](./img/origin.png)
+
+对于无法识别的内容或风险内容，输出到`log.txt`文件，手动检查是否需要添加翻译函数。
+`log.txt`中存在三种类型的log：
+- **词条不存在**：词条标识字段无法在C文件中找到对应的英文描述词条；
+- **翻译函数缺失？**：当前语句可能需要添加翻译函数，如要添加，请根据提供的文件信息找到当前语句手动添加翻译函数；
+- **文件检查**：当前文件添加翻译函数后可能会存在一定的语法错误，请根据提供的文件信息，找到文件手动检查修正。（问题代码大概率出现在js代码中的html字符串拼接部分）
 
 | 属性           | 值类型                      | 默认值               | 说明                                                |
 | -------------- | --------------------------- | -------------------- | --------------------------------------------------- |
-| baseProPath    | String                      | `必填`               | 原厂代码地址                                        |
-| baseProOutPath | String                      | `baseProPath`        | 添加翻译函数后文件输出地址                          |
-| ignoreCode     | `String`/`Regexp`           | `/<!--\s*hide|-->/g` | 需要注释的代码正则                                  |
-| templateExp    | `String`/`Regexp`           | `/<%([^\n]*?)%>/g`   | JS 文件中后台用于插入替换的模板表达式对应的正则     |
-| customRules    | `Array`/`Function`/`Regexp` | `[]`                 | 自定义不提词条规则列表，可以是正则也可以是 function |
+| baseProPath    | `String`                      | `必填`               | 原厂代码地址                                        |
+| baseProOutPath | `String`                      | `baseProPath`        | 添加翻译函数后文件输出地址                          |
+| templateExp    | `String`/`Regexp`           | `/<%\s*multilang\(([^\n]*?)\);*\s*%>/g`   | JS 文件中后台用于插入替换的模板表达式对应的正则     |
+| enPath    | `String` | `必填`                 | 原厂代码存储英文词条的C文件地址： |
+| otherLangPath    | `String` | -                | 原厂代码存储其它语言词条的C文件地址 |
 
-> `ignoreCode`: 原厂代码中需要注释的代码对应的`正则`，不注释对应的 js 代码会有语法错误，例如部分原厂代码中在代码开头会包含`<!--\s*hide`代码段等
+> `templateExp`: 原厂中没有实现前后端分离，通过特定的模板语法注入参数的代码段对应的`正则`，如`/<%\s*multilang\(([^\n]*?)\);*\s*%>/g`，正则只能存在一个捕获组。捕获组的内容为占位符，例如源码占位符`<% multilang(LANG_LOGIN_USER); %>`中的`LANG_LOGIN_USER`为捕获组的内容
 >
-> `templateExp`: 原厂中没有实现前后端分离，通过特定的模板语法注入参数的代码段对应的`正则`，如`<%ejGetOther(sessionKey)%>`
+> `enPath`: 原原厂代码存储英文词条的C文件地址，用于找到模板语法中的占位符对应的词条，例如`multilang_en_EN.c`文件
 >
-> `customRules`: 用于设置默认规则外，不进行提取的词条
+> `otherLangPath`: 原厂代码存储其它语言词条的C文件地址，多个文件用逗号连接，用于生成初始语言包json文件
+
+
 
 **预设不进行翻译配置如下**
 
@@ -282,6 +292,7 @@ module.exports = {
 - 全大写字母
 - url
 - 数字，字母，特殊符号(不包含空格)组成的字符串，必须包含[数字,=,?]中的一个
+>>>>>>> 7b6d160444e451fcb078542162ed451f53be2fb9
 
 ### 提取全部词条及其对应全部翻译
 
@@ -380,6 +391,10 @@ b28-cli
 
 ## 更新日志
 
+#### 【2021.8.19】
+
+- 添加`Vue`自定义指令支持
+- 修复已知bug（Vue bind中使用运算符词条解析出错）
 #### 【2020.11.19】
 
 - 添加`ts`语法支持

package/dist/ExtractFileOrigin.js

@@ -41,13 +41,18 @@ var ExtractFile = function () {
 
     this.option = Object.assign({}, {
       baseReadPath: "",
-      baseWritePath: ""
+      baseWritePath: "",
+      enPath: "",
+      otherLangPath: [""]
     }, option);
 
     this.option.baseReadPath = (0, _index.correctPath)(this.option.baseReadPath);
-    this.option.baseWritePath = (0, _index.correctPath)(this.option.baseWritePath);
-    this.option.baseWritePath = _path2.default.join(this.option.baseWritePath, "outSrc");
+    this.option.baseWritePath = _path2.default.join((0, _index.correctPath)(this.option.baseWritePath), "outSrc");
     this.option.needCopy = true;
+    this.enPath = (0, _index.correctPath)(this.option.enPath);
+    this.otherLangPath = this.option.otherLangPath.map(function (item) {
+      return (0, _index.correctPath)(item);
+    });
 
     this.fileList = {
       // 需要进行提取和翻译的文件
@@ -69,13 +74,16 @@ var ExtractFile = function () {
     this.option.ignoreCode && (obj.ignoreCode = this.option.ignoreCode);
     this.option.templateExp && (obj.templateExp = this.option.templateExp);
 
-    this.extractHTML = new _extract_html_ori2.default(obj);
-
-    this.extractJS = new _extract_js_ori2.default(obj);
+    this.getWord();
+    this.extractHTML = new _extract_html_ori2.default(obj, this.words);
+    this.extractJS = new _extract_js_ori2.default(obj, this.words);
 
     (0, _index.createFolder)(this.option.baseWritePath);
   };
 
+  // 入口函数
+
+
   ExtractFile.prototype.scanFile = function scanFile() {
     var _this = this;
 
@@ -106,7 +114,15 @@ var ExtractFile = function () {
 
     // 将提取的词条文件，输出为excel
     return Promise.all([this.handleHtml(), this.handleJs()]).then(function (data) {
+      var suspectLine = "";
+      data.forEach(function (item) {
+        suspectLine += "\n\r" + item.join("\n\r");
+      });
+      var suspectPath = _path2.default.join(_this.option.baseWritePath, "log.txt");
+      (0, _index.writeTextFile)(suspectPath, suspectLine);
+      (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();
       (0, _index.log)("\u5904\u7406\u5B8C\u6210", _index.LOG_TYPE.DONE);
       return _this.outData;
@@ -181,6 +197,80 @@ var ExtractFile = function () {
     }
   };
 
+  ExtractFile.prototype.getWord = function getWord() {
+    var _this4 = this;
+
+    this.words = this.analyseWord(this.enPath);
+    this.otherLang = {};
+    this.otherLangPath.forEach(function (filePath) {
+      var lang = _path2.default.basename(filePath, _path2.default.extname(filePath));
+      _this4.otherLang[lang] = _this4.analyseWord(filePath);
+    });
+  };
+
+  ExtractFile.prototype.analyseWord = function analyseWord(filePath) {
+    var str = (0, _index.loadFileSync)(filePath);
+
+    if (typeof str !== "string") {
+      (0, _index.log)("\u6587\u4EF6[" + filePath + "]\u5904\u7406\u51FA\u9519- " + str.message, _index.LOG_TYPE.ERROR);
+      this.copyFile(filePath);
+      return {};
+    }
+
+    var obj = {};
+    str = str.match(/\{([\s\S]*?)\}/g);
+    if (str === null) {
+      return obj;
+    }
+    str = str[0];
+    str = str.replace(/(^\s*\{})|(\s*\}$)/g, "").split(/\n|\r/);
+    str.forEach(function (item) {
+      item.replace(/\[(.*?)\]\s*=\s*"(.*?)"/g, function (m, a, b) {
+        if (b !== "") {
+          obj[a] = b;
+        }
+        return m;
+      });
+    });
+    return obj;
+  };
+
+  ExtractFile.prototype.exportLangs = function exportLangs() {
+    if (this.otherLangPath.length === 0) {
+      return;
+    }
+    var outJson = {};
+    for (var key in this.otherLang) {
+      outJson[key] = {};
+    }
+    for (var _iterator = Object.entries(this.words), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      var _ref2 = _ref,
+          _key2 = _ref2[0],
+          value = _ref2[1];
+
+      for (var lang in this.otherLang) {
+        outJson[lang][value] = this.otherLang[lang][_key2];
+      }
+    }
+
+    for (var _key in outJson) {
+      var filePath = _path2.default.join(this.option.baseWritePath, "exportLang", _key + ".json");
+      (0, _index.log)("\u5199\u5165\u8BED\u8A00\u5305\u6587\u4EF6[" + filePath + "]", _index.LOG_TYPE.DONE);
+      (0, _index.writeJson)(outJson[_key], filePath);
+    }
+  };
+
   return ExtractFile;
 }();
 

package/dist/cmd.js

@@ -2,8 +2,6 @@
 
 exports.__esModule = true;
 
-var _ref;
-
 var _package = require("../package.json");
 
 var _package2 = _interopRequireDefault(_package);
@@ -72,161 +70,256 @@ var comments = {
 /**
  * 命令行手动输入参数逐条配置
  */
-var 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"
-}, (_ref = {
-  type: "input",
-  name: "valueName",
-  message: "value对应列：", //指代代码中目前需要被替换的语言
-  default: "CN" }, _ref["default"] = "", _ref)], [{
-  type: "input",
-  name: "baseCheckPath",
-  message: "待检查文件根目录："
-}, {
-  type: "input",
-  name: "langJsonPath",
-  message: "语言包json文件地址："
-}, {
-  type: "input",
-  name: "hongPath",
-  message: "宏文件地址："
-}, {
-  type: "input",
-  name: "logPath",
-  message: "检查信息输出路径："
-}], [{
-  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文件目录："
-}], [{
-  type: "input",
-  name: "jsonPath",
-  message: "json文件地址："
-}, {
-  type: "input",
-  name: "outExcelPath",
-  message: "输出Excel文件目录："
-}], [{
-  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"
-}], [{
-  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)"
-}]];
+// 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文件
@@ -235,7 +328,7 @@ function handleInit() {
   var config = {};
   inquirer.prompt(_config.baseQuestions).then(function (answers) {
     config.commandType = answers.commandType;
-    return inquirer.prompt(questions[answers.commandType]);
+    return inquirer.prompt(_config.questions[answers.commandType]);
   }).then(function (answers) {
     answers = Object.assign({}, config, answers);
     return answers;

package/dist/debug/test.js

@@ -212,8 +212,22 @@ function transAllFile() {
   });
 }
 
+function transOrigin() {
+  (0, _index2.default)({
+    commandType: _config.COMMAD.ORIGINAL_CODE,
+    baseProPath: "D:/Desktop/trans/test/web",
+    baseProOutPath: "D:/Desktop/trans/test",
+    enPath: "D:/Desktop/trans/test/server/multilang_en_EN.c",
+    otherLangPath: "D:/Desktop/trans/test/server/multilang_ru_RU.c,D:/Desktop/trans/test/server/multilang_zh_CN.c"
+    // ignoreCode:"",
+    // templateExp: /<%([^\n]*?)%>/g
+  }).then(function (data) {
+    var t = data;
+  });
+}
+
 module.exports = function () {
-  var command = "getLan";
+  var command = "origin";
   switch (command) {
     case "check":
       check();
@@ -279,5 +293,8 @@ module.exports = function () {
     case "getWord":
       getWords();
       break;
+    case "origin":
+      transOrigin();
+      break;
   }
 };