crabatool 1.0.116 → 1.0.123

package/package.json

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

package/tool/checkjs.js

@@ -175,15 +175,15 @@ module.exports.start = async function() {
   info.push(`| 忽略目录和文件 | ${config.ignoreCheck ? config.ignoreCheck.join('、') : '无' + ' |'}`);
 
   info.push("# 检测结果汇总");
-  info.push("| 类型 | 数量 |");
-  info.push("| ------ | ------ |");
-  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("| 类型 | 数量 | 占比 |");
+  info.push("| ------ | ------ | ----- |");
+  info.push(`| 语法异常文件数Error | ${errKeys.length}个 |${calc(errKeys.length, jsFiles.length)}|`);
+  info.push(`| 语法警告文件数Warn | ${warnKeys.length}个 |${calc(warnKeys.length, jsFiles.length)}|`);
+  info.push(`| 语法提示文件数Info | ${infoKeys.length}个 |${calc(infoKeys.length, jsFiles.length)}|`);
+  info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |${calc(notUtf8List.length, jsFiles.length)}|`);
+  info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |${calc(bigList.length, jsFiles.length)}|`);
+  info.push(`| gspx建议优化数 | ${warnGspxCount}个 |${calc(warnGspxCount, gspxData.count)}|`);
+  info.push(`| gspx语法错误数 | ${gspxData.errorList.length}个 |${calc(gspxData.errorList.length, gspxData.count)}|`);
 
 
   webhookList.push(`1. 助手版本: ${config.Version} `);
@@ -196,7 +196,7 @@ module.exports.start = async function() {
 
   // 输出到钉钉的简易报告
   //if (errKeys.length > 0) {
-  webhookList.push(`1. 语法异常文件数Error：${errKeys.length}个`);
+  webhookList.push(`1. 语法异常文件数Error：${errKeys.length}个，占比${calc(errKeys.length, jsFiles.length)}`);
 
   // 随机显示5个异常文件到钉钉消息
   var errCount = errKeys.length;
@@ -209,7 +209,7 @@ module.exports.start = async function() {
       list0.push(fileName);
     }
 
-    webhookList.push(`1. 语法异常文件清单随机5个  \r\n${list0.join('  \r\n')}`);
+    webhookList.push(`1. 随机显示部分异常文件清单  \r\n${list0.join(';  \r\n')}`);
     var reportUrl1 = getReportUrl(id, 2);
     if (reportUrl1) {
       webhookList.push(`[更多异常...](${reportUrl1})`);
@@ -218,20 +218,20 @@ module.exports.start = async function() {
 
   //}
   //if (warnKeys.length > 0) {
-  webhookList.push(`7. 语法警告文件数Warn：${warnKeys.length}个`);
+  webhookList.push(`7. 语法警告文件数Warn：${warnKeys.length}个，占比${calc(warnKeys.length, jsFiles.length)}`);
   //}
-  webhookList.push(`8. 语法提示文件数Info：${infoKeys.length}个`);
+  webhookList.push(`8. 语法提示文件数Info：${infoKeys.length}个，占比${calc(infoKeys.length, jsFiles.length)}`);
   if (notUtf8List.length > 0) {
-    webhookList.push(`1. 非utf8文件数：${notUtf8List.length}个`);
+    webhookList.push(`1. 非utf8文件数：${notUtf8List.length}个，占比${calc(notUtf8List.length, jsFiles.length)}`);
   }
   if (bigList.length > 0) {
-    webhookList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个`);
+    webhookList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个，占比${calc(bigList.length, jsFiles.length)}`);
   }
   //if (warnGspxCount > 0) {
-  webhookList.push(`9. gspx建议优化数：${warnGspxCount}个`);
+  webhookList.push(`9. gspx建议优化数：${warnGspxCount}个，占比${calc(warnGspxCount, gspxData.count)}`);
   //}
   if (gspxData.errorList.length > 0) {
-    webhookList.push(`10. gspx语法错误数：${gspxData.errorList.length}个`);
+    webhookList.push(`10. gspx语法错误数：${gspxData.errorList.length}个，占比${calc(gspxData.errorList.length, gspxData.count)}`);
   }
 
   // 代码质量管理需要格式
@@ -385,6 +385,10 @@ async function eslintCheck(content) {
   return res;
 }
 
+function calc(a, b) {
+  return Math.ceil(a / b * 100) + '%';
+}
+
 function getMathReuslts(content, nreg, filterFun) {
   var all = content.matchAll(nreg);
   var list = [];

package/tool/ngptool.js

@@ -16,10 +16,7 @@ function mergeBiz(childPath) {
   }
   utils.log('biz.js打包启动:' + bizPath);
 
-  var watcher = chokidar.watch([bizPath], {
-    persistent: true,
-    usePolling: true
-  });
+
 
   var watchAction = function() {
     utils.debug('打包中');
@@ -33,6 +30,11 @@ function mergeBiz(childPath) {
 
   // 只打包的情况就不监视文件
   if (!config.mergeinitjs) {
+    var watcher = chokidar.watch([bizPath], {
+      persistent: true,
+      usePolling: true
+    });
+
     watcher
       .on('ready', () => utils.debug(`${bizPath}，Initial scan complete. Ready for changes.`))
       //.on('add', path => log(`File ${path} has been added`))