b28-cli 1.6.7 → 1.6.9

package/dist/extractOrigin/extract_js_ori.js

@@ -14,420 +14,69 @@ var _inherits2 = require("babel-runtime/helpers/inherits");
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _babylon = require("babylon");
-
-var _babelGenerator = require("babel-generator");
-
-var _babelGenerator2 = _interopRequireDefault(_babelGenerator);
-
 var _extract = require("./extract");
 
 var _extract2 = _interopRequireDefault(_extract);
 
-var _config = require("../util/config");
-
 var _index = require("../util/index");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var htmlparser = require("htmlparser2");
-var HANDLE_ATTRIBUTE = ["alt", "placeholder", "title"];
-
 /**
  * JS文件解析类
  */
-
 var ExtractJs = function (_Extract) {
   (0, _inherits3.default)(ExtractJs, _Extract);
 
-  function ExtractJs(option) {
+  function ExtractJs(option, words) {
     (0, _classCallCheck3.default)(this, ExtractJs);
-
-    var _this = (0, _possibleConstructorReturn3.default)(this, _Extract.call(this, option));
-
-    _this.isAST = true;
-    _this.tempNodes = [];
-    _this.oldCode = "";
-    _this.newCode = "";
-    _this.offSet = 0;
-    return _this;
+    return (0, _possibleConstructorReturn3.default)(this, _Extract.call(this, option, words));
   }
 
-  ExtractJs.prototype.transNode = function transNode(jsDoc, fromHtml) {
-    var _this2 = this;
-
-    this.fromHtml = !!fromHtml;
-    this.newCode = jsDoc;
-    // 修正原厂代码中的语法错误项，默认语法错误项是不需要进行提取的项
-    this.oldCode = jsDoc = this.correctCode(jsDoc);
-
-    if (this.oldCode.length !== this.newCode.length) {
-      return Promise.resolve(this.newCode);
-    }
-
-    return new Promise(function (resolve, reject) {
-      try {
-        var AST = (0, _babylon.parse)(jsDoc, {
-          sourceType: "script"
-        });
-        resolve(AST);
-      } catch (err) {
-        var _AST = (0, _babylon.parse)(jsDoc, {
-          sourceType: "module"
-        });
-
-        resolve(_AST);
-      }
-    }).catch(function (err) {
-      _this2.fromHtml ? (0, _index.log)("\u5185\u8054JS\u5904\u7406\u51FA\u9519- " + err, _index.LOG_TYPE.ERROR) : (0, _index.log)("js代码包含语法错误，故无法添加翻译函数！" + err.message, _index.LOG_TYPE.ERROR);
-    });
+  ExtractJs.prototype.transNode = function transNode(jsDoc) {
+    this.warnings = [];
+    return Promise.resolve(jsDoc);
   };
 
   // 扫描节点，提取字段
 
 
-  ExtractJs.prototype.scanNode = function scanNode(AST) {
-    var _this3 = this;
+  ExtractJs.prototype.scanNode = function scanNode(jsDoc) {
+    var _this2 = this;
 
-    this.offSet = 0;
     return new Promise(function (resolve, reject) {
-      var body = AST.program.body;
-      body.forEach(function (node) {
-        _this3.listAst(node);
-      });
-
-      if (_this3.fromHtml) {
-        _this3.newCode = _this3.newCode.replace(/\(\[([^\n]*?)\]\)/g, function (match, val) {
-          return "<%" + val + "%>";
-        });
-      }
-      resolve(_this3.newCode);
-    });
-  };
-
-  ExtractJs.prototype.getValue = function getValue(nodeArgs) {
-    if (nodeArgs) {
-      if (nodeArgs.value !== undefined) {
-        return nodeArgs.value;
-      }
-
-      var value = "",
-          left = nodeArgs.left;
-
-      while (left && left.right) {
-        value += left.right.value;
-        left = left.left;
-      }
-
-      value = (left ? left.value : "") + value + (nodeArgs.right ? nodeArgs.right.value : "");
-      return value;
-    }
-    return "";
-  };
-
-  ExtractJs.prototype.listAst = function listAst(astNode) {
-    var _this4 = this;
-
-    var type = (0, _index.getType)(astNode);
-    if (type === "Object") {
-      if (/^(BinaryExpression|BinaryExpression)$/i.test(astNode.type)) {
-        return;
-      }
-
-      if (/^(CallExpression|StringLiteral)$/i.test(astNode.type)) {
-        this.listNode(astNode);
-        return;
-      }
-      // 对于注释的项不进行遍历
-      var ignoreKeys = ["leadingComments", "trailingComments", "sourceElements", "loc", "id"];
-      for (var key in astNode) {
-        if (ignoreKeys.includes(key)) {
-          continue;
-        }
-        this.listAst(astNode[key]);
-      }
-    } else if (type === "Array") {
-      astNode.forEach(function (node) {
-        _this4.listAst(node);
-      });
-    }
-  };
-
-  ExtractJs.prototype.listNode = function listNode(node) {
-    switch (node.type) {
-      case "CallExpression":
-        if (node.callee) {
-          var name = "";
-          if (node.callee.type === "Identifier") {
-            name = node.callee.name;
-          } else {
-            name = this.oldCode.substring(node.callee.start, node.callee.end);
-          }
-          if (/^(confirm|alert|document\.write(ln)?)$/i.test(name)) {
-            //    解析表达式的值，并且重写函数
-            if (node.arguments.length === 1) {
-              this.addCallTrans(node.arguments[0]);
-            }
-          } else {
-            // 对于字符串相关的表达式不进行提取
-          }
-        }
-        break;
-      case "StringLiteral":
-        this.addStringTrans(node);
-        break;
-    }
-  };
-
-  // 给源码中的文本添加翻译函数
-
-
-  ExtractJs.prototype.addStringTrans = function addStringTrans(node) {
-    var res = this.getWord(node.value);
-    if (!res) {
-      return;
-    }
-    var htmlAst = htmlparser.parseDOM(res);
-
-    if (htmlAst.length > 0) {
-      if (htmlAst.length > 1 || htmlAst[0].type !== "text") {
-        // 解析html
-        res = this.analyseDom(htmlAst, [], res);
-      } else {
-        res = "_('" + res.replace(/'/g, "\\") + "')";
-      }
-      this.addTrans(res, { start: node.start, end: node.end });
-    }
-  };
-
-  // 替换源码中的文本
-
-
-  ExtractJs.prototype.addTrans = function addTrans(val, loc) {
-    //去除无效的表达式
-    val = val.replace(/'[\s]*' \+ /g, "").replace(/\+ '[\s]*'/g, "").replace(/^\s+|\s+$/g, "");
-
-    this.newCode = this.newCode.splice(loc.start + this.offSet, loc.end + this.offSet, val);
-    this.offSet += val.length - (loc.end - loc.start);
-  };
-
-  // 给源码中的表达式添加翻译函数
-
-
-  ExtractJs.prototype.addCallTrans = function addCallTrans(node) {
-    switch (node.type) {
-      case "BinaryExpression":
-        // 遍历参数
-        var res = void 0,
-            arr = [],
-            args = "";
-        res = this.analyseBinarry(node, arr);
-
-        // 对于无string参与的表达式不进行翻译函数的添加
-        if (!res.hasStr || !res.text) {
-          break;
-        }
-
-        res = res.text;
-        var htmlAst = htmlparser.parseDOM(res);
-        if (htmlAst.length > 1 || htmlAst[0].type !== "text") {
-          // 解析html
-          res = this.analyseDom(htmlAst, arr, res);
-        } else {
-          // 将标记还原
-          if (arr.length > 0) {
-            args = ", [" + arr.join(", ") + "]";
-            res = res.replace(/\{%s\}/g, function () {
-              return "%s";
-            });
-          }
-          res = "_('" + res.replace(/'/g, "\\") + "'" + args + ")";
-        }
-        this.addTrans(res, { start: node.start, end: node.end });
-        break;
-      case "StringLiteral":
-        this.addStringTrans(node);
-        break;
-    }
-  };
-
-  ExtractJs.prototype.analyseBinarry = function analyseBinarry(node, args) {
-    var res = "",
-        right = void 0,
-        left = node.left,
-        hasStr = false;
-
-    if (right = node.right) {
-      if (right.type === "StringLiteral") {
-        hasStr = true;
-        res = right.value.replace(/\n/, "\\n") + res;
-      } else {
-        args.unshift(this.oldCode.substring(right.start, right.end));
-        res = "{%s}" + res;
-      }
-    }
-
-    switch (left.type) {
-      case "BinaryExpression":
-        var innerRes = this.analyseBinarry(left, args);
-        hasStr = hasStr || innerRes.hasStr;
-        res = innerRes.text + res;
-        break;
-      case "StringLiteral":
-        hasStr = true;
-        res = left.value.replace(/\n/, "\\n") + res;
-        break;
-      default:
-        // 默认当做参数进行处理
-        args.unshift(this.oldCode.substring(left.start, left.end));
-        res = "{%s}" + res;
-        break;
-    }
-    return {
-      text: res,
-      hasStr: hasStr
-    };
-  };
-
-  ExtractJs.prototype.analyseDom = function analyseDom(ast, args, nodeHtml) {
-    var res = this.analyseHtmlNode(ast, args, nodeHtml.toLowerCase().match(/<\/[a-z0-9]+?>/gi) || []),
-        text = res.text,
-        isTranStart = res.isTranStart;
-
-    if (!isTranStart) {
-      text = "'" + text;
-    }
-
-    if (res.isStrEnd) {
-      text = text + "'";
-    }
-
-    return text;
-  };
-
-  // 解析html节点元素，生成对应的代码，此处解析的字符串htmlAst为将参数替换为{%s}后的ast
-  // <td><input type='text' id='vid{%s}' value='{%s}'></td>
-
-
-  ExtractJs.prototype.analyseHtmlNode = function analyseHtmlNode(ast, args, endTags) {
-    var _this5 = this;
-
-    var res = "",
-        isStrEnd = true;
-    ast.forEach(function (item) {
-      if (item.children) {
-        var nodeHtml = (isStrEnd ? "" : "+ '") + ("<" + item.name);
-        for (var key in item.attribs) {
-          var attr = item.attribs[key];
-          if (/\{%s\}/g.test(attr)) {
-            attr = attr.replace(/\{%s\}/g, function () {
-              return "'+ " + args.shift() + " + '";
+      try {
+        var reg = _this2.option.templateExp;
+        if (reg.test(jsDoc)) {
+          var s1 = reg.toString();
+          var s2 = reg.source;
+          var s3 = "('|\")" + s2 + "\\1";
+          var newReg = new RegExp(s3, s1.slice(s1.lastIndexOf("/") + 1));
+
+          jsDoc = jsDoc
+          // 对于'<% xxx %>'添加翻译函数
+          .replace(newReg, function (match, p1, p2) {
+            return _this2.transWord(p2) ? "_(" + p1 + _this2.transWord(p2) + 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;
             });
-          } else if (HANDLE_ATTRIBUTE.includes(key)) {
-            // 处理input的value等属性
-            attr = "'+ _('" + attr.replace(/'/g, "'") + "') + '";
-          } else if (key === "value" && item.name === "input" && /button|submit|reset/gi.test(item.attribs["type"])) {
-            attr = "'+ _('" + attr.replace(/'/g, "'") + "') + '";
           }
-
-          nodeHtml += attr ? " " + key + "=\"" + attr + "\"" : " " + key;
-        }
-        if (/^(input|br)$/i.test(item.name)) {
-          nodeHtml += "/>";
-          isStrEnd = true;
-        } else {
-          nodeHtml += ">";
-          var data = _this5.analyseHtmlNode(item.children, args, endTags);
-          var endTag = "</" + item.name + ">";
-          data.isTranStart && (nodeHtml += "' + ");
-          nodeHtml += data.text;
-          data.isStrEnd || (nodeHtml += " + '");
-          // nodeHtml += ;
-          if (endTags.length > 0) {
-            if (endTags[0] === endTag) {
-              endTags.shift();
-            }
-            nodeHtml += endTag;
-          }
-        }
-        // 对于还有结余的标签全部补上
-        while (endTags.length > 0) {
-          nodeHtml += "" + endTags.shift();
         }
-        res += nodeHtml;
-        isStrEnd = true;
-      } else {
-        // 用于类似_(member[1])的词条不添加翻译
-        if (/^\s*\{%s\}\s*$/.test(item.data)) {
-          res += "'+ _(" + args.shift() + ")";
-          isStrEnd = false;
-        } else {
-          var _data = _this5.analyseHtmlText(item, args);
-          if (_data) {
-            if (/^_/.test(_data)) {
-              res += isStrEnd ? "' + " + _data : " + " + _data;
-              isStrEnd = false;
-            } else {
-              res += _data;
-              isStrEnd = true;
-            }
+        // 对alert、confirm添加翻译函数
+        jsDoc = jsDoc.replace(/(alert|confirm)\((('|").*?\3)\)/gi, function (a, b, c) {
+          if (/_\(.*?\)/g.test(a)) {
+            return a;
           }
-        }
-      }
-    });
-
-    return {
-      isStrEnd: isStrEnd,
-      text: res,
-      isTranStart: /^_/.test(res)
-    };
-  };
-
-  // 解析html文本元素，生成对应的代码
-
-
-  ExtractJs.prototype.analyseHtmlText = function analyseHtmlText(node, args) {
-    var val = this.getWord(node.data).replace(/^\s+|\s+$/g, "");
-    if (val) {
-      var match = 0;
-      val = val.replace(/\{%s\}/gi, function () {
-        match++;
-        return "%s";
-      });
-
-      if (match) {
-        return "_('" + val.replace(/'/g, "\\") + "', [" + args.splice(0, match) + "])";
-      } else {
-        return "_('" + val.replace(/'/g, "\\") + "')";
-      }
-    } else {
-      // html中ignore文本同样需要翻译
-      val = node.data.replace(/^\s+|\s+$/g, "");
-      if (val && !/^(&nbsp;)+$/gi.test(val)) {
-        return "_('" + val.replace(/'/g, "\\") + "')";
-      }
-    }
-    return node.data.replace(/^\s+|\s+$/g, "");
-  };
-
-  ExtractJs.prototype.listTenpAst = function listTenpAst() {
-    var _this6 = this;
-
-    this.tempNodes.forEach(function (item) {
-      _this6.listAst(item);
-    });
-    this.tempNodes = [];
-  };
-
-  ExtractJs.prototype.correctCode = function correctCode(str) {
-    return str.replace(this.option.ignoreCode, function (match) {
-      if (match.length >= 4) {
-        return "/*" + match.slice(2, -2) + "*/";
-      } else {
-        return Math.pow(10, match.length - 1) + "";
+          return a.replace(c, "_(" + c + ")");
+        });
+        resolve(jsDoc);
+      } catch (e) {
+        (0, _index.log)(e, _index.LOG_TYPE.ERROR);
       }
-    }).replace(this.option.templateExp, function (match, val) {
-      return "([" + val.replace(/;$/, " ") + "])";
     });
   };
 

package/dist/handle.js

@@ -86,7 +86,9 @@ function addTrans(cfg) {
     baseReadPath: cfg.baseProPath,
     baseWritePath: cfg.baseProOutPath,
     ignoreCode: cfg.ignoreCode,
-    templateExp: cfg.templateExp
+    templateExp: cfg.templateExp,
+    enPath: cfg.enPath,
+    otherLangPath: cfg.otherLangPath ? cfg.otherLangPath.split(",") : []
   });
   return extractOri.scanFile();
 }

package/dist/util/config.js

@@ -62,7 +62,7 @@ var COMMAD = {
   TRANS_ENCODE: 9
 };
 
-var COMMAD_TEXT = ["提取词条", "翻译文件", "翻译检查", "Excel转JSON", "JSON转Excel", "JSON合并", "添加翻译", "提取翻译", "翻译文件检查", "文件转码"];
+var COMMAD_TEXT = ["提取词条", "翻译文件", "翻译检查", "Excel转JSON", "JSON转Excel", "JSON合并", "原厂代码添加翻译", "提取词条及json文件生成一个excel表格", "翻译文件检查", "文件转码"];
 
 var valid = {
   // 空或者存在的地址
@@ -277,6 +277,16 @@ var baseQuestions = [{
   default: function _default(answers) {
     return (0, _index.getDirname)(answers.baseProPath);
   }
+}, {
+  type: "input",
+  name: "enPath",
+  message: "原厂代码存储英文词条的C文件地址：",
+  validate: valid.existFile
+}, {
+  type: "input",
+  name: "otherLangPath",
+  message: "原厂代码存储其它语言词条的C文件地址，多个文件用逗号连接：",
+  default: ''
 }, {
   type: "input",
   name: "ignoreCode",

package/dist/util/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.getNowFormatDate = exports.log = exports.trim = exports.getType = exports.deepClone = exports.LOG_TYPE = exports.getDirname = exports.partMerge = exports.mergeObject = exports.writeJson = exports.correctPath = exports.writeExcel = exports.string2Regexp = exports.writeTextFile = exports.copyFile = exports.createFolder = exports.scanFolder = exports.loadExcel = exports.loadJson = exports.loadFile = exports.loadJsonSync = exports.deepMerge = exports.decodeKey = exports.formatKey = undefined;
+exports.escapeRegExp = exports.getNowFormatDate = exports.log = exports.trim = exports.getType = exports.deepClone = exports.LOG_TYPE = exports.getDirname = exports.partMerge = exports.mergeObject = exports.writeJson = exports.correctPath = exports.writeExcel = exports.string2Regexp = exports.writeTextFile = exports.copyFile = exports.createFolder = exports.scanFolder = exports.loadExcel = exports.loadJson = exports.loadFileSync = exports.loadFile = exports.loadJsonSync = exports.deepMerge = exports.decodeKey = exports.formatKey = undefined;
 
 var _typeof2 = require("babel-runtime/helpers/typeof");
 
@@ -78,6 +78,14 @@ function loadFile(src) {
   });
 }
 
+function loadFileSync(src) {
+  try {
+    return _fs2.default.readFileSync(src, "utf8");
+  } catch (e) {
+    return e;
+  }
+}
+
 /**
  * 异步加载json文件
  * 返回Promise，参数为Object
@@ -451,11 +459,17 @@ function getNowFormatDate() {
   var currentdate = year + month + strDate + hour + min + second;
   return currentdate;
 }
+
+function escapeRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 exports.formatKey = formatKey;
 exports.decodeKey = decodeKey;
 exports.deepMerge = deepMerge;
 exports.loadJsonSync = loadJsonSync;
 exports.loadFile = loadFile;
+exports.loadFileSync = loadFileSync;
 exports.loadJson = loadJson;
 exports.loadExcel = loadExcel;
 exports.scanFolder = scanFolder;
@@ -474,4 +488,5 @@ exports.deepClone = deepClone;
 exports.getType = getType;
 exports.trim = trim;
 exports.log = log;
-exports.getNowFormatDate = getNowFormatDate;
+exports.getNowFormatDate = getNowFormatDate;
+exports.escapeRegExp = escapeRegExp;

package/package.json

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