crabatool 1.0.345 → 1.0.346

package/lib/utils.js

@@ -118,13 +118,13 @@ class Utils {
     }
 
     removeUrlParams(url) {
-		if (!url) return url;
-		var index = url.indexOf("?");
-		if (index > 1) {
-			url = url.substring(0, index); // 去掉url后面的参数，包括问号
-		}
-		return url;
-	}
+        if (!url) return url;
+        var index = url.indexOf("?");
+        if (index > 1) {
+            url = url.substring(0, index); // 去掉url后面的参数，包括问号
+        }
+        return url;
+    }
 
     getHashCode(str) {
         // 获取字符串的hash值
@@ -580,6 +580,19 @@ class Utils {
         return content.replace(reg1, '').replace(reg2, '');
     }
 
+    stripComments(code) {
+        // 移除多行注释 /* ... */
+        code = code.replace(/\/\*[\s\S]*?\*\//g, '');
+
+        // 移除单行注释 // ...
+        code = code.replace(/\/\/.*?(\n|$)/g, '\n');
+
+        // 去除多余的空白行
+        code = code.replace(/^\s*[\r\n]/gm, '');
+        
+        return code;
+    }
+
     joinPath(p1, temp) {
         if (!p1 || !temp) return temp;
         var s = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.345",
+  "version": "1.0.346",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -19,7 +19,7 @@
     "checkUpdate": "node run.js -checkUpdate -version master -webPath F:\\crabaevery\\www",
     "upload": "node run.js -upload -version master -Debug true -host http://127.0.0.1:9998 -hidejspath true -targetPath F:\\CarpaNET_NEW",
     "crabaNgp": "node run.js -mergejs -hidejspath true -targetPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\crabaNgp -inNames initMs.js,businessControl.js -outName F:\\CarpaMS\\src\\js\\crabaNgp.js",
-    "webPath": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabaevery",
+    "webPath": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabaevery -Debug true",
     "biconfont": "node ./test/test.js -iconfont -zipPath F:\\crabaevery\\www\\biconfont -fontPath F:\\crabaevery\\www\\skins\\bicon -prefix .bicon- -fontName biconfont",
     "aiconfont": "node ./test/test.js -iconfont -zipPath F:\\crabaevery\\www\\iconfont -fontPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\skins -prefix .aicon- -fontName iconfont",
     "makeHash": "node run.js -makeHash -webPath ./test/ -modName craba  -files http://crabadoc.ca.com/js/utils/utils.js,F:/newcrabadoc/www/js/utils/utils.js,./test/test.js,./test/beefun.js,https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js?a=1 -outJson ./hash.json -hashName sha384",

package/tool/checkjs.js

@@ -115,7 +115,9 @@ module.exports.start = async function() {
       var res = eslintResults[0];
       res.messages.forEach((item) => {
         var reg = new RegExp(/'\$\w+'\sis\snot\sdefined\./);
-        if (reg.test(item.message)) return; // $字符开头的全局变量不输出
+        if (reg.test(item.message)) {
+          return; // $字符开头的全局变量不输出
+        }
 
         var list = warnList;
         if (!item.ruleId) {
@@ -145,31 +147,30 @@ module.exports.start = async function() {
 
     // ------检查语法1--------
     var reg = new RegExp(dangerousJs.join('|'));
-    if (reg.test(content)) { // 先检查是否有危险字符
-      var noComment = utils.clearComment(content);// 去掉注释的代码再查一遍；因为js里面有些危险字符是被注释了的
-
-      // 二次检查
-      if (reg.test(noComment)) {
-        var nreg = new RegExp(dangerousJs.join('|'), 'ig');
-        var infoList = getMathReuslts(noComment, nreg, null, '兼容性字符，不推荐使用');
-        var list = errDatas[filePath];
-        if (list) errDatas[filePath] = list.concat(infoList); // 记录该js有异常
-        else errDatas[filePath] = infoList;
-      }
+    var noComment = utils.clearComment(content);// 去掉注释的代码再查一遍；因为js里面有些危险字符是被注释了的
+
+    // 二次检查
+    if (reg.test(noComment)) {
+      reg.lastIndex = 0;
+
+      var nreg = new RegExp(dangerousJs.join('|'), 'ig');
+      var infoList = getMathReuslts(noComment, nreg, null, '兼容性字符，不推荐使用');
+      var list = errDatas[filePath];
+      if (list) errDatas[filePath] = list.concat(infoList); // 记录该js有异常
+      else errDatas[filePath] = infoList;
     }
 
+
     // trimEnd检查
-    var tstr = /\.trim\(\s*['"]([^'"]){1}['"]\s*\)|\.trimStart\(\s*['"]([^'"]){1}['"]\s*\)|\.trimEnd\(\s*['"]([^'"]){1}['"]\s*\)/g;
-    if (tstr.test(content)) {
-      var noComment = utils.clearComment(content);// 去掉注释的代码再查一遍；因为js里面有些危险字符是被注释了的
-
-      // 二次检查
-      if (tstr.test(noComment)) {
-        var infoList = getMathReuslts(noComment, tstr, null, 'trim(x)或trimEnd(x)或trimStart(x)使用不规范，不支持参数替换；请调整为trimChar(x)或trimEndChar(xx)或trimStartChar(xx)');
-        var list = trimErrDatas[filePath];
-        if (list) trimErrDatas[filePath] = list.concat(infoList); // 记录该js有异常
-        else trimErrDatas[filePath] = infoList;
-      }
+    //var tstr = /\.trim\(['"]([^'"]){1}['"]\)|\.trimStart\(['"]([^'"]){1}['"]\)|\.trimEnd\(['"]([^'"]){1}['"]\)/gm;
+    var tstr = /(\.trim|\.trimStart|\.trimEnd)\(['"]([^'"]+)['"]\)/gm;
+    // 二次检查
+    if (tstr.test(noComment)) {
+      tstr.lastIndex = 0;
+      var infoList = getMathReuslts(noComment, tstr, null, 'trim(x)或trimEnd(x)或trimStart(x)使用不规范，不支持参数替换；请调整为trimChar(x)或trimEndChar(xx)或trimStartChar(xx)');
+      var list = trimErrDatas[filePath];
+      if (list) trimErrDatas[filePath] = list.concat(infoList); // 记录该js有异常
+      else trimErrDatas[filePath] = infoList;
     }
   }
   pb.clear('检验完成');
@@ -223,7 +224,7 @@ module.exports.start = async function() {
   info.push("| 类型 | 数量 | 占比 |");
   info.push("| ------ | ------ | ----- |");
   info.push(`| 语法异常文件数Error | ${errKeys.length}个 |${calc(errKeys.length, jsFiles.length)}|`);
-  info.push(`| trimEnd或trimStart异常数 | ${trimErrKeys.length}个 |${calc(trimErrKeys.length, jsFiles.length)}|`);
+  info.push(`| trim、trimEnd或trimStart异常数 | ${trimErrKeys.length}个 |${calc(trimErrKeys.length, jsFiles.length)}|`);
   info.push(`| 语法警告文件数Warn | ${warnKeys.length}个 |${calc(warnKeys.length, jsFiles.length)}|`);
   info.push(`| 语法提示文件数Info | ${infoKeys.length}个 |${calc(infoKeys.length, jsFiles.length)}|`);
 
@@ -290,7 +291,7 @@ module.exports.start = async function() {
   }*/
 
 
-  webhookList.push(`7. trimStart(x)和trimEnd(x)使用数：${trimErrKeys.length}个，占比${calc(trimErrKeys.length, jsFiles.length)}`);
+  webhookList.push(`7. trim(x)、trimStart(x)和trimEnd(x)使用数：${trimErrKeys.length}个，占比${calc(trimErrKeys.length, jsFiles.length)}`);
   //}
   //if (warnKeys.length > 0) {
   webhookList.push(`7. js语法警告数Warn：${warnKeys.length}个，占比${calc(warnKeys.length, jsFiles.length)}`);
@@ -528,6 +529,18 @@ function calc(a, b) {
 }
 
 function getMathReuslts(content, nreg, filterFun, msg) {
+  var matches = [...content.matchAll(nreg)];
+  var list = [];
+  matches.forEach(match => {
+    var value = match[0];
+    if (!filterFun || filterFun(value)) {
+      list.push({ "char": value, "column": match.index, 'msg': msg });
+    }
+  });
+
+  return list;
+
+  /*
   var all = content.matchAll(nreg);
   var list = [];
   var v = all.next()
@@ -539,6 +552,7 @@ function getMathReuslts(content, nreg, filterFun, msg) {
     v = all.next();
   }
   return list;
+  */
 }
 
 function getSonarEntity(type, modName, ruleId, message, filePath, line, column, endLine) {