crabatool 1.0.97 → 1.0.101

package/.eslintrc.json

@@ -14,7 +14,7 @@
     "rules": {
         "semi": "off",
         "no-redeclare": "off",
-        "no-unused-vars": "off",
+        //"no-unused-vars": "off",
         "missingSemi": "off"
     },
     "globals": {
@@ -60,6 +60,7 @@
         "getClientBounds": "readonly",
         "echarts": "readonly",
         "SysConsts": "readonly",
-        "math": "readonly"
+        "math": "readonly",
+        "createIterator": "readonly"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.97",
+  "version": "1.0.101",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {

package/test/test.js

@@ -39,7 +39,7 @@ var config = {
   // 用于保存检查报告的api
   reportHost: 'http://crabadoc.ca.com',
 
-  Debug: true,
+  Debug: false,
 
   // 告诉助手项目有哪些是全局变量，不然会提示未定义
   globals: ['crabadoc', 'Type', 'CrabaMarkdown', '$doc', 'www', 'crabaJs'],

package/tool/checkjs.js

@@ -40,8 +40,9 @@ module.exports.start = async function() {
   utils.copyFile(path.join(__dirname, '../.eslintrc.json'), path.join(process.cwd(), '.eslintrc.json'));
   var jsFiles = utils.getFiles({ source: config.webPath, exts: '.js', ignores: config.ignoreCheck });
 
-  var errList = [];
-  var errRegList = [];
+  var errDatas = {};
+  var warnDatas = {};
+  var infoDatas = {};
   var bigList = [];
   var notUtf8List = [];
   var utf8List = [];
@@ -86,18 +87,35 @@ module.exports.start = async function() {
       bigList.push(`${filePath} ${parseInt(stats.size / 1024)}kb`);
     }
 
-    var errInfo = { list: [] };
     if (eslintResults.length > 0 && eslintResults[0].errorCount > 0) {
+      var warnList = [];
+      var infoList = [];
+      var ieList = [];
       var res = eslintResults[0];
       res.messages.forEach((item) => {
         var reg = new RegExp(/'\$\w+'\sis\snot\sdefined\./);
         if (reg.test(item.message)) return; // $字符开头的全局变量不输出
-        errInfo.list.push({ char: item.ruleId + '，' + item.messageId, line: item.line, endLine: item.endLine, column: item.column, msg: item.message });
+
+        var list = warnList;
+        if (!item.ruleId) {
+          list = ieList;
+          item.ruleId = '此文件有严重异常，解析失败';
+        } else if (item.ruleId.indexOf('native-ie') > -1 || item.ruleId.indexOf('no-dupe-keys') > -1) {
+          list = ieList;
+        } else if (item.ruleId.indexOf('no-unused-vars') > -1) {
+          list = infoList;
+        }
+        list.push({ char: item.ruleId + '，' + item.messageId, line: item.line, endLine: item.endLine, column: item.column, msg: item.message });
       });
 
-      if (errInfo.list.length > 0) {
-        errList.push(filePath);
-        errRegList.push(errInfo);
+      if (warnList.length > 0) {
+        warnDatas[filePath] = warnList;
+      }
+      if (ieList.length > 0) {
+        errDatas[filePath] = ieList;
+      }
+      if (infoList.length > 0) {
+        infoDatas[filePath] = infoList;
       }
     }
 
@@ -108,14 +126,11 @@ module.exports.start = async function() {
 
       // 二次检查
       if (reg.test(noComment)) {
-        if (errInfo.list.length == 0) {
-          errList.push(filePath); // 记录该js有异常
-          errRegList.push(errInfo);
-        }
-
         var nreg = new RegExp(dangerousJs.join('|'), 'ig');
-        var elist = getMathReuslts(noComment, nreg);
-        errInfo.list = errInfo.list.concat(elist);
+        var infoList = getMathReuslts(noComment, nreg);
+        var list = errDatas[filePath];
+        if (list) errDatas[filePath] = list.concat(infoList); // 记录该js有异常
+        else errDatas[filePath] = infoList;
       }
     }
   }
@@ -127,7 +142,10 @@ module.exports.start = async function() {
   // 生成检测报告 markdown语法
   var warnGspxCount = Object.keys(gspxData.warnList).length;
   var status = '无异常';
-  if (errList.length > 0 || notUtf8List.length > 0 || warnGspxCount > 0 || gspxData.errorList.length > 0) {
+  var errKeys = Object.keys(errDatas);
+  var warnKeys = Object.keys(warnDatas);
+  var infoKeys = Object.keys(infoDatas);
+  if (errKeys.length > 0 || warnKeys.length > 0 || notUtf8List.length > 0 || warnGspxCount > 0 || gspxData.errorList.length > 0) {
     status = '有异常';
   }
 
@@ -135,7 +153,7 @@ module.exports.start = async function() {
   var modName = getModName();
   var webhookList = [];
   var info = [];
-  info.push(`# ${modName}代码检测报告——${status}`);
+  info.push(`# ${modName}代码检测报告`);
   webhookList.push(info[0]);
 
   info.push("| 名称 | 结果 |");
@@ -150,28 +168,38 @@ module.exports.start = async function() {
   info.push("# 检测结果汇总");
   info.push("| 类型 | 数量 |");
   info.push("| ------ | ------ |");
-  info.push(`| 语法异常文件数 | ${errList.length}个 |`);
+  info.push(`| 语法异常文件数Error | ${errKeys.length}个 |`);
+  info.push(`| 语法警告文件数Warn | ${warnKeys.length}个 |`);
+  info.push(`| 语法提示文件数Info | ${warnKeys.length}个 |`);
   info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |`);
   info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |`);
   info.push(`| gspx建议优化数 | ${warnGspxCount}个 |`);
-  info.push(`| gspx错误数 | ${gspxData.errorList.length}个 |`);
+  info.push(`| gspx语法错误数 | ${gspxData.errorList.length}个 |`);
 
 
+  webhookList.push(`1. 助手版本: ${config.Version} `);
+  webhookList.push(`1. 共检测 ${jsFiles.length}个js文件 `);
+  webhookList.push(`1. 共检测 ${gspxData.count}个gspx文件 `);
+
   // 输出到钉钉的简易报告
-  if (errList.length > 0) {
-    webhookList.push(`1. 语法异常文件数：${errList.length}个`);
-  }
+  //if (errKeys.length > 0) {
+  webhookList.push(`1. 语法异常文件数Error：${errKeys.length}个`);
+  //}
+  //if (warnKeys.length > 0) {
+  webhookList.push(`1. 语法警告文件数Warn：${warnKeys.length}个`);
+  //}
+  webhookList.push(`1. 语法提示文件数Info：${infoKeys.length}个`);
   if (notUtf8List.length > 0) {
     webhookList.push(`1. 非utf8文件数：${notUtf8List.length}个`);
   }
   if (bigList.length > 0) {
     webhookList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个`);
   }
-  if (warnGspxCount > 0) {
-    webhookList.push(`1. gspx建议优化数：${warnGspxCount}个`);
-  }
+  //if (warnGspxCount > 0) {
+  webhookList.push(`1. gspx建议优化数：${warnGspxCount}个`);
+  //}
   if (gspxData.errorList.length > 0) {
-    webhookList.push(`1. gspx出错数：${gspxData.errorList.length}个`);
+    webhookList.push(`1. gspx语法错误数：${gspxData.errorList.length}个`);
   }
 
   // 代码质量管理需要格式
@@ -180,22 +208,57 @@ module.exports.start = async function() {
   };
 
   var detail = [];
-  if (errList.length > 0) {
-    detail.push("");
-    detail.push('# js语法异常清单如下');
-    errList.forEach((s, index) => {
+  //if (errKeys.length > 0) {
+  detail.push("");
+  detail.push(`# ${errKeys.length}个必须修复异常清单`);
+  errKeys.forEach((fileName, index) => {
+
+    detail.push(`${index + 1}. ${fileName}`);
+
+    var infoList = errDatas[fileName];
+    detail.push("| 异常字符 | 行号 | 列号 | 说明 |");
+    detail.push("| ----- | ------ | ---- | ---- |");
+    infoList.forEach((item) => {
+      detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
+      sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+    });
+  });
+  //}
 
-      detail.push(`${index + 1}. ${s}`);
+  //if (warnKeys.length > 0) {
+  detail.push("");
+  detail.push(`# ${warnKeys.length}个建议修复警告清单`);
+  warnKeys.forEach((fileName, index) => {
 
-      var err = errRegList[index];
-      detail.push("| 异常字符 | 行号 | 列号 | 说明 |");
-      detail.push("| ----- | ------ | ---- | ---- |");
-      err.list.forEach((item) => {
-        detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-        sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), s, -1, item.line, item.column, item.endLine));
-      });
+    detail.push(`${index + 1}. ${fileName}`);
+
+    var infoList = warnDatas[fileName];
+    detail.push("| 警告字符 | 行号 | 列号 | 说明 |");
+    detail.push("| ----- | ------ | ---- | ---- |");
+    infoList.forEach((item) => {
+      detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
+      sonar.issues.push(getSonarEntity('语法警告', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
     });
-  }
+  });
+  //}
+
+
+  //if (infoKeys.length > 0) {
+  detail.push("");
+  detail.push(`# ${infoKeys.length}个可选修复清单`);
+  infoKeys.forEach((fileName, index) => {
+
+    detail.push(`${index + 1}. ${fileName}`);
+
+    var infoList = infoDatas[fileName];
+    detail.push("| 提示字符 | 行号 | 列号 | 说明 |");
+    detail.push("| ----- | ------ | ---- | ---- |");
+    infoList.forEach((item) => {
+      detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
+      sonar.issues.push(getSonarEntity('语法提示', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+    });
+  });
+  //}
 
   if (notUtf8List.length > 0) {
     detail.push("");
@@ -218,7 +281,7 @@ module.exports.start = async function() {
   }
 
   if (gspxData.errorList.length > 0) {
-    detail.push(`# 出错误页面清单如下`);
+    detail.push(`# 出错页面清单如下`);
     gspxData.errorList.forEach((info, index) => {
       detail.push(`${index + 1}. ${info.name}`);
       detail.push(`> 错误标签: ${info.tag}`);
@@ -298,7 +361,7 @@ function getMathReuslts(content, nreg, filterFun) {
   while (!v.done) {
     var value = v.value[0];
     if (!filterFun || filterFun(value)) {
-      list.push({ "char": value, "column": v.value.index, 'msg': '兼容性问题，不推荐使用' });
+      list.push({ "char": value, "column": v.value.index, 'msg': '兼容性字符，不推荐使用' });
     }
     v = all.next();
   }