b28-cli 1.6.9 → 1.7.1

package/README.MD

@@ -181,6 +181,7 @@ module.exports = {
 | 属性         | 值类型  | 默认值         | 说明                      |
 | ------------ | ------- | -------------- | ------------------------- |
 | onlyZH       | Boolean | false          | 只提取中文词条            |
+| isOrigin       | Boolean | false          | 是否是提取接入原厂代码词条            |
 | baseReadPath | String  | `必填`         | 待提取文件根目录          |
 | baseOutPath  | String  | `baseReadPath` | 提取的 Excel 文件输出目录 |
 | hongPath     | String  | 空             | 功能宏文件地址            |
@@ -280,7 +281,7 @@ module.exports = {
 >
 > `otherLangPath`: 原厂代码存储其它语言词条的C文件地址，多个文件用逗号连接，用于生成初始语言包json文件
 
-
+**注意：**原厂代码修改完成后，可以用词条提取工具进行词条提取，将提取工具的`isOrigin`设为`true`即可。
 
 **预设不进行翻译配置如下**
 

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/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/test",
+    baseOutPath: "D:/Desktop",
     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-html.js

@@ -223,6 +223,8 @@ var ExtractHTML = function (_Extract) {
       return _this4.nextJsTask();
     }).catch(function (error) {
       console.log(error);
+      _this4.jsHandleList = [];
+      _this4.errorList.push(_this4.curFilePath);
       (0, _index.log)("\u5185\u8054JS\u5904\u7406\u51FA\u9519- " + error, _index.LOG_TYPE.error);
       return _this4.nextJsTask();
     });

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/handle.js

@@ -93,11 +93,15 @@ function addTrans(cfg) {
   return extractOri.scanFile();
 }
 
+/**
+ * 提取词条
+ */
 function getWords(cfg) {
   var extract = new _ExtractFile2.default({
     baseReadPath: cfg.baseReadPath,
     baseWritePath: cfg.baseOutPath,
     onlyZH: cfg.onlyZH,
+    isOrigin: cfg.isOrigin,
     hongPath: cfg.hongPath,
     writeExcel: true,
     needFilePath: true
@@ -195,6 +199,9 @@ function checkExcel(cfg) {
   });
 }
 
+/**
+ * 提取词条及json文件生成一个excel表格
+ */
 function getAllWords(cfg) {
   var extract = new _ExtractFile2.default({
     jsonPath: cfg.languagePath,

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.9",
+  "version": "1.7.1",
   "description": "translate, ExcelToJson, JsonToExcel, getText, l18n",
   "main": "./src/index.js",
   "bin": {