crabatool 1.0.307 → 1.0.318

package/lib/config.js

@@ -5,6 +5,7 @@ var pg = require('../package.json');
 class Config {
   constructor() {
     this.reportHost = "http://crabadoc.ca.com"; // 用于接收检测报告的服务器，可配置的。由于产品没有提供服务，目前统一放到平台的文档服务器
+    //this.reportHost = "http://127.0.0.1:9998";
     this.webhooks = "https://oapi.dingtalk.com/robot/send?access_token=ce27b1b1540881540d44c0bd05ba738d865363758892ede137dc1020bd36bd5a";
     this.crabaHooks = "https://oapi.dingtalk.com/robot/send?access_token=ce27b1b1540881540d44c0bd05ba738d865363758892ede137dc1020bd36bd5a";
     //this.webhooks = "https://oapi.dingtalk.com/robot/send?access_token=37279df60e03ebf25e8eb71230ddb93fe74de99951a8d635d0458e60bfcd44d8";

package/lib/utils.js

@@ -289,7 +289,9 @@ class Utils {
 
     // 删除文件夹，清空文件夹，删除目录，清空目录，清空整个目录，包括子目录和文件
     cleardirsSync(dirname) {
-        if (!fs.existsSync(dirname)) return;
+        if (!fs.existsSync(dirname)) {
+            return;
+        }
 
         fs.readdirSync(dirname).forEach(function(file) {
             var filePath = utils.join(dirname, file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.307",
+  "version": "1.0.318",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -16,7 +16,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 -webhooks 0 -webPath F:\\crabaevery\\www -modName crabaevery",
+    "webPath": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabaevery",
     "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/test/test.js

@@ -40,7 +40,7 @@ var config = {
   ignoreCompress: true,
 
   // 用于保存检查报告的api
-  reportHost: 'http://crabadoc.ca.com',
+  //reportHost: 'http://crabadoc.ca.com',
 
   Debug: false,
 

package/tool/checkjs.js

@@ -52,6 +52,7 @@ module.exports.start = async function() {
   }
 
   var errDatas = {};
+  var trimErrDatas = {};
   var warnDatas = {};
   var infoDatas = {};
   var bigList = [];
@@ -147,12 +148,28 @@ module.exports.start = async function() {
       // 二次检查
       if (reg.test(noComment)) {
         var nreg = new RegExp(dangerousJs.join('|'), 'ig');
-        var infoList = getMathReuslts(noComment, nreg);
+        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 = `\.trimEnd\(([^,)]+)\)|\.trimEnd\(['"],['"]\)`;
+    var reg1 = new RegExp(tstr);
+    if (reg1.test(content)) {
+      var noComment = utils.clearComment(content);// 去掉注释的代码再查一遍；因为js里面有些危险字符是被注释了的
+
+      // 二次检查
+      if (reg1.test(noComment)) {
+        var nreg = new RegExp(tstr);
+        var infoList = getMathReuslts(noComment, nreg, null, 'trimEnd(xx)使用不规范，不支持参数替换；请调整为trimEndChar(xx)');
+        var list = trimErrDatas[filePath];
+        if (list) trimErrDatas[filePath] = list.concat(infoList); // 记录该js有异常
+        else trimErrDatas[filePath] = infoList;
+      }
+    }
   }
   pb.clear('检验完成');
 
@@ -162,6 +179,7 @@ module.exports.start = async function() {
   // 生成检测报告 markdown语法
   var warnGspxCount = Object.keys(gspxData.warnList).length;
   var status = '无异常';
+  var trimErrKeys = Object.keys(trimErrDatas);
   var errKeys = Object.keys(errDatas);
   var warnKeys = Object.keys(warnDatas);
   var infoKeys = Object.keys(infoDatas);
@@ -169,7 +187,7 @@ module.exports.start = async function() {
     projectName: getModName(),
     branchName: getBranchName(),
   }
-  if (errKeys.length > 0 || warnKeys.length > 0 || notUtf8List.length > 0 || warnGspxCount > 0 || gspxData.errorList.length > 0) {
+  if (errKeys.length > 0 || trimErrKeys.length > 0 || warnKeys.length > 0 || notUtf8List.length > 0 || warnGspxCount > 0 || gspxData.errorList.length > 0) {
     status = '有异常';
   }
 
@@ -203,6 +221,7 @@ module.exports.start = async function() {
   info.push("| 类型 | 数量 | 占比 |");
   info.push("| ------ | ------ | ----- |");
   info.push(`| 语法异常文件数Error | ${errKeys.length}个 |${calc(errKeys.length, jsFiles.length)}|`);
+  info.push(`| trimEnd异常数 | ${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)}|`);
 
@@ -221,8 +240,8 @@ module.exports.start = async function() {
 
   reportData.data = {
     errorCount: errKeys.length,
-    warnCount: errKeys.length,
-    tipCount: errKeys.length,
+    warnCount: warnKeys.length,
+    tipCount: infoKeys.length,
     fileSize: fileSize,
     fileSizeCount: bigList.length,
     gspxWarnCount: warnGspxCount.length,
@@ -266,7 +285,7 @@ module.exports.start = async function() {
       webhookList.push(`[更多异常...](${reportUrl1})`);
     }
   }
-
+  webhookList.push(`7. trimEnd(xx)使用数：${trimErrKeys.length}个，占比${calc(trimErrKeys.length, jsFiles.length)}`);
   //}
   //if (warnKeys.length > 0) {
   webhookList.push(`7. js语法警告数Warn：${warnKeys.length}个，占比${calc(warnKeys.length, jsFiles.length)}`);
@@ -303,11 +322,28 @@ module.exports.start = async function() {
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
+      //sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
     });
   });
   //}
 
+  if (trimErrKeys.length > 0) {
+    detail.push("");
+    detail.push(`# ${trimErrKeys.length}个必须修复trimEnd清单`);
+    trimErrKeys.forEach((fileName, index) => {
+
+      detail.push(`${index + 1}. ${fileName}`);
+
+      var infoList = trimErrDatas[fileName];
+      detail.push("| 类型 | 行号 | 列号 | 说明 |");
+      detail.push("| ----- | ------ | ---- | ---- |");
+      infoList.forEach((item) => {
+        detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
+        //sonar.issues.push(getSonarEntity('trimEnd异常', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
+      });
+    });
+  }
+
   //if (warnKeys.length > 0) {
   detail.push("");
   detail.push(`# ${warnKeys.length}个建议修复警告清单`);
@@ -320,7 +356,7 @@ module.exports.start = async function() {
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法警告', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
+      //sonar.issues.push(getSonarEntity('语法警告', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -338,7 +374,7 @@ module.exports.start = async function() {
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法提示', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
+      //sonar.issues.push(getSonarEntity('语法提示', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -349,7 +385,7 @@ module.exports.start = async function() {
     notUtf8List.forEach((s, index) => {
       detail.push(`${index + 1}. ${s}`);
 
-      sonar.issues.push(getSonarEntity('非utf8', modName, '', '', s, -1, -1, -1));
+      //sonar.issues.push(getSonarEntity('非utf8', modName, '', '', s, -1, -1, -1));
     });
   }
 
@@ -359,7 +395,7 @@ module.exports.start = async function() {
     bigList.forEach((s, index) => {
       detail.push(`${index + 1}. ${s}`);
       var arr = s.split(' ');
-      sonar.issues.push(getSonarEntity(`超${fileSize}kb文件`, modName, arr[1], '', arr[0], -1, -1));
+      //sonar.issues.push(getSonarEntity(`超${fileSize}kb文件`, modName, arr[1], '', arr[0], -1, -1));
     });
   }
 
@@ -475,20 +511,20 @@ function calc(a, b) {
   return Math.ceil(a / b * 100) + '%';
 }
 
-function getMathReuslts(content, nreg, filterFun) {
+function getMathReuslts(content, nreg, filterFun, msg) {
   var all = content.matchAll(nreg);
   var list = [];
   var v = all.next()
   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': msg });
     }
     v = all.next();
   }
   return list;
 }
-
+/*
 function getSonarEntity(type, modName, ruleId, message, filePath, line, column, endLine) {
   var entity = {
     "engineId": modName,
@@ -507,7 +543,7 @@ function getSonarEntity(type, modName, ruleId, message, filePath, line, column,
   }
   return entity;
 }
-
+*/
 function getReportUrl(id, anchor) {
   if (!config.reportHost) {
     return '';
@@ -538,8 +574,8 @@ function postReport(id, reportUrl, content, sonar) {
       "title": getModName() + " 代码检测报告",
       "id": id,
       "text": content
-    },
-    sonar: sonar // 代码质量管理系统需要，一起提交到文档保存到文档服务器
+    }
+    //sonar: sonar // 代码质量管理系统需要，一起提交到文档保存到文档服务器
   };
 
   axios({

package/tool/compress.js

@@ -72,7 +72,7 @@ function doCompress() {
   compressCrabaJs(inNames, 'agency.js', updateAgencyVersion);
 
   // craba.min.js
-  inNames = ['type.js', 'craba.js', 'common.js', 'es6.js', 'controls.js', 'required.js', 'drag.js', 'listView.js', 'crabaEx.js', 'crabaFC.js', 'crabaMS.js'];
+  inNames = ['type.js', 'craba.js', 'common.js', 'es6.js', 'controls.js', 'required.js', 'drag.js', 'listView.js', 'crabaEx.js', 'crabaFC.js', 'crabaMS.js', 'biz.js'];
   compressCrabaJs(inNames, 'craba.min.js', updateCrabaVersion);
 
   // crabaEx.min.js

package/tool/iconfont.js

@@ -73,7 +73,7 @@ function zipOk(zipUrl) {
   utils.cleardirsSync(target);
   fs.unlinkSync(zipUrl);
 
-  var ignores = ["run.bat", "读我.txt", "font.zip", "iconfont.css", "demo_index.html", "demo.css", "iconfont.json", "iconfont.woff2", "iconfont.js"];
+  var ignores = ["run.bat", "readme.txt", "font.zip", "iconfont.css", "demo_index.html", "demo.css", "iconfont.json", "iconfont.woff2", "iconfont.js"];
   // 从bicon下面拷贝文件到skins\bicon下面
   utils.copyFiles(config.zipPath, config.fontPath, ignores, utils.createDelegate(this, function(fileName) {
     utils.debug('拷贝文件', fileName);

package/tool/upgrade.js

@@ -64,6 +64,7 @@ class Upgrade {
     var host = config.host || config.SourceHost;
     var apis = utils.joinPath(host, '/apis/publish/checkUpdate');
     var that = this;
+    console.log(version + '检测标记:' + apis);
 
     var data = {
       version: version
@@ -287,6 +288,12 @@ class Upgrade {
       this.pb.render({ value: ++this.pb.value, text: fileName });
     }));
 
+    // 新结构
+    var eotPath = path.join(source, 'skins', 'iconfont.eot');
+    if (fs.existsSync(eotPath)) {
+      utils.cleardirsSync(path.join(dest, 'skins', 'font'));
+    }
+
     if (this.done) {
       this.done();
     }