crabatool 1.0.27 → 1.0.30

package/.vscode/launch.json

@@ -4,6 +4,7 @@
   // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+  
     {
       "type": "pwa-node",
       "request": "launch",

package/index.js

@@ -41,8 +41,14 @@ function bindConfigByArgv(key) {
 }
 function checkConfig() {
   bindConfigByArgv('-webPath');
+  bindConfigByArgv('-port');
   bindConfigByArgv('-modName');
   bindConfigByArgv('-ignoreCheck');
+  bindConfigByArgv('-webhooks');
+
+  if (config.ignoreCheck && typeof config.ignoreCheck == 'string') {
+    config.ignoreCheck = config.ignoreCheck.split(',');
+  }
 
   if (!config.webPath) {
     throw new Error('请检查craba.js，必须告诉工具当前项目的前端路径地址，填绝对路径哦');

package/lib/config.js

@@ -3,6 +3,9 @@ var os = require('os');
 
 class Config {
   constructor() {
+    this.reportHost = "http://crabadoc.ca.com"; // 用于接收检测报告的服务器，可配置的。由于产品没有提供服务，目前统一放到平台的文档服务器
+    this.webhooks = "https://oapi.dingtalk.com/robot/send?access_token=ce27b1b1540881540d44c0bd05ba738d865363758892ede137dc1020bd36bd5a";
+
     this.Debug = false;
     this.Host = "http://crabadoc.mygjp.com.cn";
     this.TempPath = path.join(os.tmpdir(), '_crabatemp');

package/lib/utils.js

@@ -359,18 +359,17 @@ class Utils {
     }
 
     getFiles(options, fileList) {
-        var ignores = options.ignores;
         var exts = options.exts;
         var source = options.source;
-        if (ignores && !fileList) {
-            ignores = ignores.map((item) => { return path.join(source, item) });
+        if (options.ignores && !fileList) {
+            options.ignores = options.ignores.map((item) => { return path.join(source, item) });
         }
 
         if (!fileList) fileList = [];
         var files = fs.readdirSync(source);
         files.forEach(function(fileName) {
             var filePath = path.join(source, fileName);
-            if (ignores && ignores.includes(filePath)) {
+            if (options.ignores && options.ignores.includes(filePath)) {
                 return;
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.27",
+  "version": "1.0.30",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "node ./test/test.js",
     "run": "node ./test/test.js -run",
     "checkjs": "node ./test/test.js -checkjs",
-    "webPath": "node ./test/test.js -checkjs -webPath F:、\newcrabadoc\\www"
+    "webPath": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabademo -ignoreCheck ueditor,iconfont,biconfont,js\\math.min.js,js\\es6-promise.auto.min.js,js\\craba.rollup.min.js"
   },
   "author": "wssf",
   "dependencies": {

package/test/test.js

@@ -33,6 +33,9 @@ var config = {
   // 上一步中打包后的文件是否压缩, true为忽略【不压缩】，false为【要压缩】，各组按需修改
   ignoreCompress: true,
 
+  // 用于保存检查报告的api
+  reportHost: 'http://127.0.0.1:9998',
+
   // 配置js语法检测报告推送地址
   webhooks: 'https://oapi.dingtalk.com/robot/send?access_token=ce27b1b1540881540d44c0bd05ba738d865363758892ede137dc1020bd36bd5a' //'https://oapi.dingtalk.com/robot/send?access_token=37279df60e03ebf25e8eb71230ddb93fe74de99951a8d635d0458e60bfcd44d8'
 }

package/tool/checkjs.js

@@ -1,5 +1,4 @@
 var utils = require('../lib/utils.js');
-var StringBuilder = require("../lib/stringBuilder.js");
 var config = require('../lib/config.js');
 var fs = require('fs');
 var ProgressBar = require('./progressbar.js');
@@ -8,7 +7,7 @@ var path = require('path');
 var axios = require('axios');
 
 module.exports.start = function() {
-  var jsFiles = utils.getFiles({ source: config.webPath, exts: '.js', ignores: config.ignoresCheck });
+  var jsFiles = utils.getFiles({ source: config.webPath, exts: '.js', ignores: config.ignoreCheck });
 
   var fileSize = 300;
   var errList = [];
@@ -67,68 +66,102 @@ module.exports.start = function() {
   });
   pb.clear('检验完成');
 
-  //var sb = new StringBuilder();
-  var info = new StringBuilder();
-  info.push(`# ${config.modName}代码检测报告`);
-  info.push("");
-
+  var modName = config.modName || 'noname';
+  var info = [];
+  info.push(`# ${modName}代码检测报告`);
+  info.push("| 名称 | 结果 |");
+  info.push("| ------ | ------ |");
+  info.push('|生成报告时间|' + new Date().toString() + '|');
+  info.push(`|共检查|${jsFiles.length}个js文件|`);
+  if (config.ignoreCheck) {
+    info.push(`|忽略目录和文件|${config.ignoreCheck.join('、') + '|'}`);
+  }
 
-  info.push(`**一共检查${jsFiles.length}个js文件**`);
-  info.push("| 类型 | 数量 |");
-  info.push("| ----- | ------ |");
+  info.push("# 异常报表");
+  info.push("| 异常类型 | 数量 |");
+  info.push("| ------ | ------ |");
   info.push(`| 语法异常文件数 | ${errList.length}个 |`);
   if (notUtf8List.length > 0) info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |`);
+  if (bigList.length > 0) info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |`);
 
 
+  var detail = [];
   if (errList.length > 0) {
-    info.push("");
-    info.push('**语法异常文件清单如下**');
+    detail.push("");
+    detail.push('# 语法异常文件清单如下');
     errList.forEach((s, index) => {
 
-      info.push(`# ${s}`);
+      detail.push(`## ${index + 1}. ${s}`);
 
       var err = errRegList[index];
-      info.push("| 异常字符 | 位置 |");
-      info.push("| ----- | ------ |");
+      detail.push("| 异常字符 | 位置 |");
+      detail.push("| ----- | ------ |");
       err.list.forEach((item) => {
-        info.push(`| ${item.char} | ${item.index} |`);
+        detail.push(`| ${item.char} | ${item.index} |`);
       });
     });
   }
 
   if (notUtf8List.length > 0) {
-    info.push("");
-    info.push('**非utf8文件清单如下**');
+    detail.push("");
+    detail.push('# 非utf8文件清单如下');
     notUtf8List.forEach((s, index) => {
-      info.push(`# ${s}`);
+      detail.push(`## ${index + 1}. ${s}`);
     });
   }
 
   if (bigList.length > 0) {
-    info.push("");
-    info.push(`**超过${fileSize}kb的文件清单如下**`);
+    detail.push("");
+    detail.push(`# 超过${fileSize}kb的文件清单如下`);
     bigList.forEach((s, index) => {
-      info.push(`# ${s}`);
+      detail.push(`## ${index + 1}. ${s}`);
     });
   }
 
-  //console.log(info.join('\r\n'));
-
-  if (!config.webhooks) {
-    config.log("::: craba.js里面配置config.webhooks，用于语法检测报告推送地址");
-    return;
-  }
+  //console.log(detail.join('\r\n'));
+  var id = modName + '_' + new Date().getTime();
+  var content = info.concat(detail).join('  \n');
+  console.log(content);
 
   var data = {
     "msgtype": "markdown",
     "markdown": {
-      "title": "代码检测报告",
-      "text": info.join('  \n')
+      "title": modName + " 代码检测报告",
+      "id": id,
+      "text": content
     }
   };
-  console.log(info.join('  \n'));
-  //data.markdown.text = data.markdown.text.replaceAll('\\n', '\n');
-  //console.log(data);
+
+  var reportUrl = "";
+  console.log(config.reportHost);
+  if (config.reportHost) {
+    axios({
+      method: 'post',
+      url: config.reportHost + '/apis/saveJsReport',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    }).then(function(response) {
+      console.log("保存代码检测状态");
+      //console.log(response.data);
+    }).catch(function(error) {
+      console.log("保存代码检测失败");
+      //console.log(error);
+    });
+    reportUrl = config.reportHost + "/index.html#%2FPages%2FReport%2FJsReport.gspx?id=" + id;
+  }
+
+  console.log(reportUrl);
+  //utils.openProcess(reportUrl);
+
+  //return;
+  if (!config.webhooks) {
+    config.log("::: craba.js里面配置config.webhooks，用于语法检测报告推送地址");
+    return;
+  }
+
+  // 推送到钉钉只推送详情
+  info.push(`[报告详情](${reportUrl})`);
+  data.markdown.text = info.join('  \n');
 
   axios({
     method: 'post',