b28-cli 1.6.6 → 1.6.8

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();
@@ -255,19 +269,19 @@ module.exports = function () {
       //   // onlyZH: true,
       //   // baseReadPath: "C:/Users/lenovo/Desktop/src",
       //   // baseOutPath: "C:/Users/lenovo/Desktop"
-      //   // baseReadPath: "./test/vue/debug/file",
-      //   // baseOutPath: "./test/vue/debug"
-      //   baseReadPath: "D:/project/GNEUI/SourceCodes/Trunk/GNEUIv1.0/A27",
-      //   baseOutPath: "C:/Users/lenovo/Desktop"
+      //   baseReadPath: "./test/vue/debug/file",
+      //   baseOutPath: "./test/vue/debug"
+      //   // baseReadPath: "D:/project/GNEUI/SourceCodes/Trunk/GNEUIv1.0/A27",
+      //   // baseOutPath: "C:/Users/lenovo/Desktop"
       // });
       (0, _index2.default)({
         commandType: _config.COMMAD.TRANSLATE,
-        // baseTranslatePath: "./test/vue/debug/file",
-        // baseTransOutPath: "./test/vue/debug/out",
-        // languagePath: "./test/vue/debug/lang.xlsx",
-        baseTranslatePath: "C:/Users/lenovo/Desktop/src",
-        baseTransOutPath: "C:/Users/lenovo/Desktop/out",
-        languagePath: "C:/Users/lenovo/Desktop/lang.xlsx",
+        baseTranslatePath: "./test/vue/debug/file",
+        baseTransOutPath: "./test/vue/debug/out",
+        languagePath: "./test/vue/debug/lang.xlsx",
+        // baseTranslatePath: "C:/Users/lenovo/Desktop/src",
+        // baseTransOutPath: "C:/Users/lenovo/Desktop/out",
+        // languagePath: "C:/Users/lenovo/Desktop/lang.xlsx",
         hongPath: "",
         sheetName: "",
         // keyName: "CN",
@@ -279,5 +293,8 @@ module.exports = function () {
     case "getWord":
       getWords();
       break;
+    case "origin":
+      transOrigin();
+      break;
   }
 };

package/dist/extract/vue/html-parser.js

@@ -118,6 +118,7 @@ function parseText(text, delimiters // 纯文本插入分隔符。默认为["{{"
 function parseExp(tocken) {
   var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var needMerge = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var isAbsolute = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
   var ast = void 0,
       start = tocken.start + offset;
@@ -128,7 +129,12 @@ function parseExp(tocken) {
       plugins: ["objectRestSpread"]
     });
   } catch (err) {
-    return [];
+    // 处理解析报错/未能解析的语法
+    return {
+      value: tocken.value,
+      start: tocken.start + offset,
+      isAbsolute: isAbsolute
+    };
   }
 
   ast = ast.program;
@@ -243,6 +249,72 @@ function parseExp(tocken) {
   }
 }
 
+function filter(keys, key, index) {
+  return keys.some(function (v) {
+    if (v === key || key.lastIndexOf(v) !== -1 && key.lastIndexOf(v) === index - v.length) return true;
+  });
+}
+
+function getTockensFromStr(content, offset) {
+  var regqutoe = new RegExp(/((["'])(?:\\.|[^\\\n])*?\2)/g); //获取""和''内的内容包括引号
+  var matchKeyWord = ["_("];
+  var maxBackLen = 25; //定义最长回溯长度,一般js里的关键字长度不会超过25
+
+  var ret = [];
+
+  //对于已注释的代码不进行提取操作
+  //去除 /* xxx */ 或者// 注释的代码段
+  //   content = content.replace(
+  //     /((\/\*)((.|\s)*?)(\*\/))|((\/\/)((?:\\.|[^\\\n])*?)(\n))/g,
+  //     ""
+  //   );
+  //end
+
+  content.replace(regqutoe, function (matchString) {
+    var tocken = {
+      start: arguments[3] + offset,
+      end: arguments[3] + offset + matchString.length,
+      value: matchString,
+      isTrans: false,
+      type: "string"
+    };
+
+    if (arguments[3] >= 2 && content.slice(arguments[3] - 2, arguments[3]) === "_(") {
+      tocken.isTrans = true;
+      tocken.start += 1;
+      tocken.end -= 1;
+      tocken.type = "";
+    }
+    matchString = matchString.slice(1, matchString.length - 1);
+    if (matchString.trim().length > 0) {
+      if (/[\u4e00-\u9fa5]/.test(matchString)) {
+        //是否含有中文
+        if (/_\(['"].*?['"][\),]/.test(matchString)) {
+          //说明是在引号中间包裹的_("")
+          //分为带参数，不带参数
+          //双引号  单引号的四种情况
+          matchString = matchString.split("_('").pop().split("_(\"").pop().split("',")[0].split("\",")[0].split("\")")[0].split("')")[0];
+        }
+        tocken.value = matchString;
+        ret.push(tocken);
+      } else {
+        if (matchString.trim().length > 1 && /[a-z]/i.test(matchString)) {
+          var backLength = arguments[3] >= maxBackLen ? maxBackLen : arguments[3]; //计算回溯长度,一般js里的关键字长度不会超过25
+
+          var backStr = content.substr(arguments[3] - backLength, backLength);
+          if (filter(matchKeyWord, backStr, backLength) || matchString.indexOf(" ") > -1 && !/^[#\.\=\+\-\*\/]/.test(matchString.trim())) {
+            tocken.value = matchString;
+            //回溯查找
+            ret.push(tocken);
+          }
+        }
+      }
+    }
+  });
+
+  return ret;
+}
+
 /**
  * 解析parseExp的结果，即{{}}模板表达式内的ast，提取词条或者合并词条
  * 如果文本中存在翻译函数，则直接处理翻译函数，其它词条文本会被处理，但是不会进行任何的参数合并操作，只处理词条
@@ -252,8 +324,17 @@ function listModuleTockens(tockens, text) {
     args: [],
     text: "",
     isTrans: false,
-    trans: []
+    trans: [],
+    stringTrans: false
   };
+  // 处理未能解析的词条
+  if (Object.prototype.toString.call(tockens) === "[object Object]") {
+    outData.stringTrans = true;
+    // 解析当前字符串，找出是否有需要处理的词条
+    outData.trans = getTockensFromStr(text, tockens.isAbsolute ? tockens.start : 0);
+    return outData;
+  }
+
   for (var i = 0, l = tockens.length; i < l; i++) {
     var tocken = tockens[i];
 
@@ -514,16 +595,18 @@ function parseTemplate(template, target) {
 
   parseHTML(template, {
     start: function start(attrs) {
+      var _this = this;
+
       var word = "";
       attrs.forEach(function (attr) {
         // 指令默认已添加翻译函数，未添加翻译函数代表不提取
         if (attr.directive) {
           // value的偏移量，计算value的ast时，start index需要偏移到value的起始位置
           var _offset = template.slice(attr.start, attr.end).indexOf(attr.value);
-          var tockens = parseExp(attr, _offset);
+          var tockens = parseExp(attr, _offset, false, true);
           var outData = listModuleTockens(tockens, attr.value);
           // 对于v-bind指令，只有当指令内容包含翻译函数时才会进行处理，其它情况不进行处理
-          if (outData.isTrans) {
+          if (outData.isTrans || outData.stringTrans) {
             outData.trans.forEach(function (item) {
               word = "";
               if (item.isTrans) {
@@ -542,39 +625,50 @@ function parseTemplate(template, target) {
               }
             });
           }
-        } else {
-          if (_util.chineseRE.test(attr.value)) {
-            word = getWord(attr.value);
-            if (word && word !== attr.value) {
-              langs.push({
-                start: attr.start,
-                end: attr.end,
-                value: word,
-                name: attr.name,
-                needBind: true
-              });
-            }
+        } else if (/^v-/.test(attr.name)) {
+          // v-指令解析 +2为="的长度
+          var attrVal = template.slice(attr.start, attr.end);
+          var start = attr.start + attrVal.indexOf(attr.value);
+          _this.chars(attr.value, start, attr.end - 1, true);
+        } else if (_util.chineseRE.test(attr.value)) {
+          word = getWord(attr.value);
+          if (word && word !== attr.value) {
+            langs.push({
+              start: attr.start,
+              end: attr.end,
+              value: word,
+              name: attr.name,
+              needBind: true
+            });
           }
         }
       });
     },
 
     // 处理文本元素textnode
-    chars: function chars(text, start, end) {
+    chars: function chars(text, start, end, isDirective) {
       if (!text.trim()) {
         return;
       }
 
       // 文本直接添加，指令则为对象
       var textArr = [];
-
-      var _parseText = parseText(text, delimiters),
-          tockens = _parseText.tockens,
-          needMerge = _parseText.needMerge;
+      var tockens = void 0,
+          needMerge = void 0;
+      if (isDirective) {
+        tockens = [{
+          value: text,
+          directive: true,
+          start: start,
+          end: end
+        }];
+      } else {
+        var outExp = parseText(text, delimiters);
+        tockens = outExp.tockens;
+        needMerge = outExp.needMerge;
+      }
 
       // 文本内容中包含指令
-
-
       if (tockens) {
         var _ret = function () {
           // 解析指令表达式转成AST
@@ -595,7 +689,7 @@ function parseTemplate(template, target) {
           // 解析指令ast和字符串，输出最终的翻译表达式
           for (var i = 0, l = textArr.length; i < l; i++) {
             var tocken = textArr[i];
-            if (hasTrans && ((typeof tocken === "undefined" ? "undefined" : (0, _typeof3.default)(tocken)) !== "object" || !tocken.isTrans)) {
+            if (hasTrans && ((typeof tocken === "undefined" ? "undefined" : (0, _typeof3.default)(tocken)) !== "object" || !tocken.isTrans) && !tocken.stringTrans) {
               continue;
             }
             if (typeof tocken === "string") {

package/dist/extractOrigin/extract.js

@@ -20,7 +20,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * 词条提取、翻译基类
  */
 var Extract = function () {
-  function Extract(option) {
+  function Extract(option, words) {
     (0, _classCallCheck3.default)(this, Extract);
 
     this.option = Object.assign({}, {
@@ -29,45 +29,43 @@ var Extract = function () {
       ignoreCode: /<!--\s*hide|-->/g,
       // 将对应的词条全部修改为'/**<%%>**/window.MS'
       // templateExp: /(\=|\+|\-|\*|\/|\s|\(|\[|\{)\s*<%.*?%>/g
-      templateExp: /<%([^\n]*?)%>/g,
+      templateExp: /<%\s*multilang\(([^\n]*?)\);*\s*%>/g ///<%([^\n]*?)%>/g,只能存在一个捕获组
       // 自定义不提词条规则，可以是正则也可以是function
-      customRules: []
+      // customRules: []
     }, option);
-    this.init();
+    this.init(words);
   }
 
-  Extract.prototype.init = function init() {
-    var _this = this;
-
+  Extract.prototype.init = function init(words) {
+    this.words = words;
     // 记录当前的文件路径
     this.curFilePath = "";
-    // 提取的词条，去除了重复项，当为翻译模式时间，只存储未被翻译的词条
-    this.words = [];
     // 是否正在处理文件
     this.isWorking = false;
     // 待处理文件列表
     this.handleList = [];
     this.ignoreRE = _config.IGNORE_REGEXP.slice(0);
     this.ignoreFuns = _config.IGNORE_FUNCTIONS.slice(0);
-
-    var customRules = this.option.customRules;
-    if (Array.isArray(customRules)) {
-      customRules.forEach(function (item) {
-        if (typeof item === "function") {
-          _this.ignoreFuns.push(item);
-        } else {
-          _this.ignoreRE.push(item);
-        }
-      });
-    } else if (typeof customRules === "function") {
-      this.ignoreFuns.push(customRules);
-    } else if (customRules) {
-      this.ignoreRE.push((0, _index.string2Regexp)(customRules));
-    }
+    this.suspectLine = [];
+
+    // let customRules = this.option.customRules;
+    // if (Array.isArray(customRules)) {
+    //   customRules.forEach(item => {
+    //     if (typeof item === "function") {
+    //       this.ignoreFuns.push(item);
+    //     } else {
+    //       this.ignoreRE.push(item);
+    //     }
+    //   });
+    // } else if (typeof customRules === "function") {
+    //   this.ignoreFuns.push(customRules);
+    // } else if (customRules) {
+    //   this.ignoreRE.push(string2Regexp(customRules));
+    // }
   };
 
   Extract.prototype.handleFile = function handleFile(filePath) {
-    var _this2 = this;
+    var _this = this;
 
     // log(`开始提取文件-${filePath}`);
     this.isWorking = true;
@@ -75,17 +73,31 @@ var Extract = function () {
     return (0, _index.loadFile)(filePath).then(function (data) {
       // 写入文件
       (0, _index.log)("\u6DFB\u52A0\u7FFB\u8BD1\u51FD\u6570-" + filePath);
-      return _this2.transNode(data);
+      return _this.transNode(data);
     }).then(function (AST) {
-      return _this2.scanNode(AST);
+      return _this.scanNode(AST);
     }).then(function (fileData) {
-      (0, _index.writeTextFile)(_path2.default.resolve(_this2.option.baseWritePath, _path2.default.relative(_this2.option.baseReadPath, _this2.curFilePath)), fileData);
-      _this2.complete();
-      return _this2.startTrans();
+      (0, _index.writeTextFile)(_path2.default.resolve(_this.option.baseWritePath, _path2.default.relative(_this.option.baseReadPath, _this.curFilePath)), fileData);
+      _this.complete();
+      // 记录可能需要人工二次审核的词条
+      var matchs = fileData.match(/(alert|confirm)\(.*?\)/gi);
+      if (matchs) {
+        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;
+
+          (_suspectLine = _this.suspectLine).push.apply(_suspectLine, ["#--#--#--#--#--# " + _this.curFilePath + " #--#--#--#--#--#"].concat(matchs));
+        }
+      }
+
+      return _this.startTrans();
     }).catch(function (error) {
-      _this2.copyFile(filePath);
-      (0, _index.log)("\u6587\u4EF6[" + filePath + "]\u5904\u7406\u51FA\u9519- " + error.message, _index.LOG_TYPE.ERROR);
-      return _this2.startTrans();
+      _this.copyFile(filePath);
+      (0, _index.log)("\u6587\u4EF6[" + filePath + "]\u5904\u7406\u51FA\u9519", _index.LOG_TYPE.ERROR);
+      (0, _index.log)(error, _index.LOG_TYPE.ERROR);
+      return _this.startTrans();
     });
   };
 
@@ -98,92 +110,25 @@ var Extract = function () {
     return Promise.resolve(data);
   };
 
-  Extract.prototype.setAttr = function setAttr(attr, value) {
-    if (Object.prototype.toString.call(attr) === "[object Object]") {
-      for (var key in attr) {
-        this.setSingleAttr(key, attr[key]);
-      }
-    } else {
-      this.setSingleAttr(attr, value);
-    }
-  };
-
-  Extract.prototype.setSingleAttr = function setSingleAttr(attr, value) {
-    this.option[attr] = value;
-  };
-
   Extract.prototype.startTrans = function startTrans() {
     // 当一个文件执行完成，立即执行下一个指令
     if (this.handleList.length > 0) {
       return this.handleFile(this.handleList.shift());
     }
-    return Promise.resolve("done");
+    return Promise.resolve(this.suspectLine);
   };
 
   Extract.prototype.addTask = function addTask(filePath) {
     this.handleList.push(filePath);
   };
 
-  Extract.prototype.addWord = function addWord(word) {
-    if (!this.words.includes(word)) {
-      this.words.push(word);
-    }
-  };
-
-  Extract.prototype.addWords = function addWords(words) {
-    var _this3 = this;
-
-    words.forEach(function (word) {
-      _this3.addWord(word);
-    });
-  };
-
-  Extract.prototype.getWord = function getWord(val) {
-    if (!val || /^\s*$/.test(val)) {
-      return "";
-    }
-
-    // 经过处理的字符串
-    if (/\{%s\}/i.test(val)) {
-      return val;
-    }
-
-    var skip = this.ignoreRE.some(function (item) {
-      return item.test(val);
-    });
-    if (skip) {
-      return "";
-    }
-
-    for (var i = 0, l = this.ignoreFuns.length; i < l; i++) {
-      var fun = this.ignoreFuns[i],
-          str = val.replace(/(^\s+)|(\s+$)/g, "");
-
-      if (typeof fun === "function") {
-        if (skip = fun(str)) {
-          break;
-        }
-      }
-    }
-    if (skip) {
-      return "";
-    }
-
-    var addValue = "";
-
-    //中英文都提取
-    if (/[a-z]/i.test(val) || /[\u4e00-\u9fa5]/.test(val)) {
-      addValue = val;
-    }
-
-    return addValue;
+  Extract.prototype.transWord = function transWord(val) {
+    return this.words[val];
   };
 
   Extract.prototype.complete = function complete() {
     this.isWorking = false;
     this.option.onComplete && this.option.onComplete(this.curFilePath, this.words);
-    // 重置提取的词条
-    this.words = [];
   };
 
   return Extract;

package/dist/extractOrigin/extract_html_ori.js

@@ -35,20 +35,23 @@ var JSDOM = jsdom.JSDOM;
 var ExtractHTML = function (_Extract) {
   (0, _inherits3.default)(ExtractHTML, _Extract);
 
-  function ExtractHTML(option) {
+  function ExtractHTML(option, words) {
     (0, _classCallCheck3.default)(this, ExtractHTML);
 
-    var _this = (0, _possibleConstructorReturn3.default)(this, _Extract.call(this, option));
+    var _this = (0, _possibleConstructorReturn3.default)(this, _Extract.call(this, option, words));
 
     _this.extractJS = new _extract_js_ori2.default({
       ignoreCode: _this.option.ignoreCode,
       templateExp: _this.option.templateExp
-    });
+    }, words);
     _this.jsHandleList = [];
     return _this;
   }
 
   ExtractHTML.prototype.transNode = function transNode(html) {
+    var _this2 = this;
+
+    html = html.replace(/\s*<!--\s*<(\/?)script>\s*-->/ig, '');
     this.oldHtml = html;
     this.scripts = [];
     this.getHeaderTag(html);
@@ -59,7 +62,7 @@ var ExtractHTML = function (_Extract) {
         var dom = new JSDOM(html, {
           virtualConsole: virtualConsole
         });
-        var document = dom.window.document;
+        var document = _this2.document = dom.window.document;
         resolve(document);
       } catch (err) {
         reject(err);
@@ -76,7 +79,7 @@ var ExtractHTML = function (_Extract) {
 
 
   ExtractHTML.prototype.scanNode = function scanNode(document) {
-    var _this2 = this;
+    var _this3 = this;
 
     // 遍历各节点
     this.listNode(document.documentElement);
@@ -84,26 +87,46 @@ var ExtractHTML = function (_Extract) {
     return this.nextJsTask().then(function () {
       // ͨ通过正则替换，为了规避jsdom对html中的特殊字符串进行编码
       var outHtml = document.documentElement.innerHTML;
-      var match = outHtml.match(/<script\b[^>]*>[\s\S]*?<\/script>/g);
-      outHtml = _this2.oldHtml.replace(/<script\b[^>]*>[\s\S]*?<\/script>/g, function () {
-        return match.shift();
-      });
+      return _this3.handleHtml(outHtml);
+    });
+  };
+
+  ExtractHTML.prototype.handleHtml = function handleHtml(htmlCode) {
+    var _this4 = this;
 
-      return outHtml;
+    var oldHtml = this.oldHtml;
+    var match = htmlCode.match(/<script\b[^>]*>[\s\S]*?<\/script>/gi);
+    htmlCode = oldHtml.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, function () {
+      return match.shift();
+    });
+
+    var templateExp = this.option.templateExp;
+
+    return htmlCode.replace(templateExp, function (match, p1, index) {
+      var reg = (0, _index.escapeRegExp)(match);
+      var tempReg = templateExp.toString();
+      reg += templateExp.source;
+      reg = new RegExp(reg, tempReg.slice(tempReg.lastIndexOf("/") + 1));
+      var word = _this4.transWord(p1);
+      if (reg.test(htmlCode) && word && !/\s/.test(htmlCode[index + match.length])) {
+        return "word ";
+      }
+      return word || match;
     });
   };
 
   ExtractHTML.prototype.handleJsTask = function handleJsTask(child) {
-    var _this3 = this;
+    var _this5 = this;
 
-    return this.extractJS.transNode(child.nodeValue, true).then(function (AST) {
-      return _this3.extractJS.scanNode(AST);
+    return this.extractJS.transNode(child.innerHTML, true).then(function (AST) {
+      return _this5.extractJS.scanNode(AST);
     }).then(function (fileData) {
       // 写入文件
-      child.nodeValue = fileData;
-      return _this3.nextJsTask();
-    }).catch(function () {
-      return _this3.nextJsTask();
+      child.innerHTML = fileData;
+      return _this5.nextJsTask();
+    }).catch(function (e) {
+      (0, _index.log)(e, _index.LOG_TYPE.ERROR);
+      return _this5.nextJsTask();
     });
   };
 
@@ -126,25 +149,24 @@ var ExtractHTML = function (_Extract) {
 
     var firstChild = element.firstChild,
         nextSibling = element.nextSibling,
-        nodeType = element.nodeType,
         nodeName = element.nodeName.toLowerCase();
-    // 处理html节点
-    // nodeType: 1-元素 2-属性 3-文本内容 8-代表注释
-    if (nodeType === 1 && nodeName == "script") {
-      if (firstChild && firstChild.nodeValue && (0, _index.trim)(firstChild.nodeValue)) {
-        this.addJsTask(firstChild);
-      }
-    } else {
-      // 处理子节点
-      if (firstChild) {
-        this.listNode(firstChild);
-      }
+
+    if (nodeName == "script") {
+      this.addJsTask(element);
+      nextSibling && this.listNode(nextSibling);
+      return;
     }
 
-    // 处理兄弟节点
-    if (nextSibling) {
-      this.listNode(nextSibling);
+    // noscript内的文本不处理
+    if (nodeName === "noscript" || nodeName == "style") {
+      nextSibling && this.listNode(nextSibling);
+      return;
     }
+    // 处理子节点
+    firstChild && this.listNode(firstChild);
+
+    // 处理兄弟节点
+    nextSibling && this.listNode(nextSibling);
   };
 
   return ExtractHTML;