b28-cli 1.7.1 → 1.7.2

package/test.js

@@ -1,182 +1,182 @@
-var s = `{
-  content: '邮箱地址格式错误',
-  content: _('邮箱地址格式错误1'),
-  position: 'right-center',
-  trigger: 'manual',
-  value: !isAddrCheckPassed
-}`;
-
-const MSG = {
-  "邮箱地址格式错误": "Mail Addr Error"
-};
-
-function transStr(content) {
-  console.log(111)
-  //替换js中的翻译不会自动加上翻译函数，需要手动根据输出的日志文件进行添加
-  // var res = content.replace(/(_\(")(.*?)(]\))|(")(.*?)([^\\]")|(_\(")(.*?)("\))/g, function(key) {
-  return content.replace(
-    /(_\(".*?[^\\]",.*?]?\)|_\('.*?[^\\]',.*?]?\)|_\(".*?[^\\]"\)|_\('.*?[^\\]'\))/g,
-    function (key) {
-      var quote = '"',
-        singleQuote = "'";
-
-      //解决key翻译中带有\"导致未翻译的问题
-      // key = key.replace(/(\\")/g, '"');
-      //解决key翻译中带有\\导致未翻译的问题
-      // key = key.replace(/(\\\\)/g, "\\");
-      //_("",[])  || _("",xxx)情况
-      if (/(_\(")(.*?)(",)/g.test(key)) {
-        //翻译中参数带翻译
-        key = "_(" + transStr(key.slice(2, -1)) + ")";
-        key = key.replace(/(")(.*?)("),/, function (keyRep) {
-          keyRep = keyRep.slice(1, -2).replace(/(^\s*)|(\s*$)/g, "");
-
-          if (MSG[keyRep]) {
-            // return quote + MSG[keyRep].replace(/"/g, '\\"') + quote + ",";
-            return quote + MSG[keyRep] + quote + ",";
-          } else {
-            // untranswords.push(key);
-            return quote + keyRep + quote + ",";
-          }
-        });
-
-        return key;
-      } else if (/(_\(')(.*?)(',)/g.test(key)) {
-        //_('',xxx) || _('',[])情况
-        key = "_(" + transStr(key.slice(2, -1)) + ")";
-
-        key = key.replace(/(')(.*?)('),/, function (keyRep) {
-          keyRep = keyRep.slice(1, -2).replace(/(^\s*)|(\s*$)/g, "");
-
-          if (MSG[keyRep]) {
-            return (
-              // singleQuote + MSG[keyRep].replace(/'/g, "\\'") + singleQuote + ","
-              singleQuote + MSG[keyRep] + singleQuote + ","
-            );
-          } else {
-            // untranswords.push(key);
-            return singleQuote + keyRep + singleQuote + ",";
-          }
-        });
-        return key;
-      } else if (/(_\(")(.*?)("\))/g.test(key)) {
-        //下划线翻译处理
-        if (key !== "") {
-          key = key.slice(3, -2).replace(/(^\s*)|(\s*$)/g, "");
-
-          if (MSG[key]) {
-            // return "_(" + quote + MSG[key].replace(/"/g, '\\"') + quote + ")";
-            return "_(" + quote + MSG[key] + quote + ")";
-          } else {
-            // untranswords.push(key);
-            return "_(" + quote + key + quote + ")";
-          }
-        } else {
-          return;
-        }
-      } else if (/(_\(')(.*?)('\))/g.test(key)) {
-        //下划线翻译处理
-        if (key !== "") {
-          key = key.slice(3, -2).replace(/(^\s*)|(\s*$)/g, "");
-
-          if (MSG[key]) {
-            return (
-              "_(" +
-              singleQuote +
-              // MSG[key].replace(/"/g, '\\"') +
-              MSG[key] +
-              singleQuote +
-              ")"
-            );
-          } else {
-            // untranswords.push(key);
-            return "_(" + quote + key + quote + ")";
-          }
-        } else {
-          return;
-        }
-      } else {
-        key = key.slice(1, -1).replace(/(^\s*)|(\s*$)/g, "");
-      }
-
-      if (/[\u4e00-\u9fa5]/.test(key) || /[a-zA-Z]/.test(key)) {
-        // untranswords.push(key);
-      }
-
-      // return quote + key.replace(/"/g, '\\"') + quote;
-      return quote + key + quote;
-    }
-  );
-}
-
-function filter(keys, key, index) {
-  return keys.some(function (v) {
-    //added by zy   考虑如下情况   import "xxx"  key.lastIndexOf(v) === index-v.length //true   所有要先判断是否为-1
-    if (
-      v === key ||
-      (key.lastIndexOf(v) !== -1 && key.lastIndexOf(v) === index - v.length)
-    )
-      return true;
-  });
-}
-
-function getWords(content) {
-  pageRemark = [];
-  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) {
-    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];
-        }
-        ret.push(matchString);
-      } 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(trim(matchString)))
-          ) {
-            //回溯查找
-            ret.push(matchString);
-          }
-        }
-      }
-    }
-  });
-
-  return ret;
-}
-
-console.log(getWords(s));
-console.log(transStr(s));
+var s = `{
+  content: '邮箱地址格式错误',
+  content: _('邮箱地址格式错误1'),
+  position: 'right-center',
+  trigger: 'manual',
+  value: !isAddrCheckPassed
+}`;
+
+const MSG = {
+  "邮箱地址格式错误": "Mail Addr Error"
+};
+
+function transStr(content) {
+  console.log(111)
+  //替换js中的翻译不会自动加上翻译函数，需要手动根据输出的日志文件进行添加
+  // var res = content.replace(/(_\(")(.*?)(]\))|(")(.*?)([^\\]")|(_\(")(.*?)("\))/g, function(key) {
+  return content.replace(
+    /(_\(".*?[^\\]",.*?]?\)|_\('.*?[^\\]',.*?]?\)|_\(".*?[^\\]"\)|_\('.*?[^\\]'\))/g,
+    function (key) {
+      var quote = '"',
+        singleQuote = "'";
+
+      //解决key翻译中带有\"导致未翻译的问题
+      // key = key.replace(/(\\")/g, '"');
+      //解决key翻译中带有\\导致未翻译的问题
+      // key = key.replace(/(\\\\)/g, "\\");
+      //_("",[])  || _("",xxx)情况
+      if (/(_\(")(.*?)(",)/g.test(key)) {
+        //翻译中参数带翻译
+        key = "_(" + transStr(key.slice(2, -1)) + ")";
+        key = key.replace(/(")(.*?)("),/, function (keyRep) {
+          keyRep = keyRep.slice(1, -2).replace(/(^\s*)|(\s*$)/g, "");
+
+          if (MSG[keyRep]) {
+            // return quote + MSG[keyRep].replace(/"/g, '\\"') + quote + ",";
+            return quote + MSG[keyRep] + quote + ",";
+          } else {
+            // untranswords.push(key);
+            return quote + keyRep + quote + ",";
+          }
+        });
+
+        return key;
+      } else if (/(_\(')(.*?)(',)/g.test(key)) {
+        //_('',xxx) || _('',[])情况
+        key = "_(" + transStr(key.slice(2, -1)) + ")";
+
+        key = key.replace(/(')(.*?)('),/, function (keyRep) {
+          keyRep = keyRep.slice(1, -2).replace(/(^\s*)|(\s*$)/g, "");
+
+          if (MSG[keyRep]) {
+            return (
+              // singleQuote + MSG[keyRep].replace(/'/g, "\\'") + singleQuote + ","
+              singleQuote + MSG[keyRep] + singleQuote + ","
+            );
+          } else {
+            // untranswords.push(key);
+            return singleQuote + keyRep + singleQuote + ",";
+          }
+        });
+        return key;
+      } else if (/(_\(")(.*?)("\))/g.test(key)) {
+        //下划线翻译处理
+        if (key !== "") {
+          key = key.slice(3, -2).replace(/(^\s*)|(\s*$)/g, "");
+
+          if (MSG[key]) {
+            // return "_(" + quote + MSG[key].replace(/"/g, '\\"') + quote + ")";
+            return "_(" + quote + MSG[key] + quote + ")";
+          } else {
+            // untranswords.push(key);
+            return "_(" + quote + key + quote + ")";
+          }
+        } else {
+          return;
+        }
+      } else if (/(_\(')(.*?)('\))/g.test(key)) {
+        //下划线翻译处理
+        if (key !== "") {
+          key = key.slice(3, -2).replace(/(^\s*)|(\s*$)/g, "");
+
+          if (MSG[key]) {
+            return (
+              "_(" +
+              singleQuote +
+              // MSG[key].replace(/"/g, '\\"') +
+              MSG[key] +
+              singleQuote +
+              ")"
+            );
+          } else {
+            // untranswords.push(key);
+            return "_(" + quote + key + quote + ")";
+          }
+        } else {
+          return;
+        }
+      } else {
+        key = key.slice(1, -1).replace(/(^\s*)|(\s*$)/g, "");
+      }
+
+      if (/[\u4e00-\u9fa5]/.test(key) || /[a-zA-Z]/.test(key)) {
+        // untranswords.push(key);
+      }
+
+      // return quote + key.replace(/"/g, '\\"') + quote;
+      return quote + key + quote;
+    }
+  );
+}
+
+function filter(keys, key, index) {
+  return keys.some(function (v) {
+    //added by zy   考虑如下情况   import "xxx"  key.lastIndexOf(v) === index-v.length //true   所有要先判断是否为-1
+    if (
+      v === key ||
+      (key.lastIndexOf(v) !== -1 && key.lastIndexOf(v) === index - v.length)
+    )
+      return true;
+  });
+}
+
+function getWords(content) {
+  pageRemark = [];
+  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) {
+    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];
+        }
+        ret.push(matchString);
+      } 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(trim(matchString)))
+          ) {
+            //回溯查找
+            ret.push(matchString);
+          }
+        }
+      }
+    }
+  });
+
+  return ret;
+}
+
+console.log(getWords(s));
+console.log(transStr(s));