b28-cli 1.6.7 → 1.6.9

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,44 @@ 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.warnings = [];
+    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 +74,34 @@ 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));
+        });
+        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, ["#--#--#--#--#--# \u6587\u4EF6\u5730\u5740\u3010" + _this.curFilePath + "\u3011 #--#--#--#--#--#"].concat(Array.from(new Set(_this.warnings)), 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 +114,29 @@ 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 "";
+  Extract.prototype.transWord = function transWord(val) {
+    var word = this.words[val];
+    if (word === undefined) {
+      this.warnings.push("  [\u8BCD\u6761\u4E0D\u5B58\u5728]\uFF1A[" + val + "]");
     }
-
-    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;
+    return word;
   };
 
   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,34 +79,58 @@ var ExtractHTML = function (_Extract) {
 
 
   ExtractHTML.prototype.scanNode = function scanNode(document) {
-    var _this2 = this;
+    var _this3 = this;
 
+    this.warnings = [];
     // 遍历各节点
     this.listNode(document.documentElement);
 
     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;
+
+    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 outHtml;
+    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) {
+      var _warnings;
+
       // 写入文件
-      child.nodeValue = fileData;
-      return _this3.nextJsTask();
-    }).catch(function () {
-      return _this3.nextJsTask();
+      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);
+      return _this5.nextJsTask();
     });
   };
 
@@ -126,25 +153,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;