crabatool 1.0.337 → 1.0.340

package/index.js

@@ -39,12 +39,16 @@ function checkFast(args) {
 
   if (args.includes('-checkjs')) {
     start.bindConfigByArgv('-ignoreFiles','array');
+    start.bindConfigByArgv('-cssFiles','array');
+
     start.checkAllJs();
     return false;
   }
 
   if (args.includes('-checkiconfont')) {
     start.bindConfigByArgv('-ignoreFiles','array');
+    start.bindConfigByArgv('-cssFiles','array');
+
     start.checkIconfont();
     return false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.337",
+  "version": "1.0.340",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -12,9 +12,9 @@
     "run": "node ./test/test.js -run",
     "export": "node ./test/test.js -exportgspx -webPath F:\\Beefun\\srcs",
     "checkjs": "node ./test/test.js -checkjs",
-    "checkiconfont": "node ./test/test.js -checkiconfont -webPath F:\\crabaevery\\www -modName crabaevery -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont\\iconfont.js,iconfont\\iconfont.js",
+    "checkiconfont": "node ./test/test.js -checkiconfont -webPath F:\\crabaevery\\www -modName crabaevery -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont\\iconfont.js,iconfont\\iconfont.js -cssFiles skins\\retail\\skin.css",
     "checkiconfontBf": "node ./test/test.js -checkiconfont -webPath F:\\Beefun\\srcs -modName beefun -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont\\iconfont.js,iconfont\\iconfont.js",
-    "checkiconfontCraba": "node ./test/test.js -checkiconfont -webPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js -modName craba -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont\\iconfont.js,iconfont\\iconfont.js",
+    "checkiconfontCraba": "node ./test/test.js -checkiconfont -webPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js -modName craba -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont\\iconfont.js,iconfont\\iconfont.js -cssFiles ../skins/craba.min.css",
     "beefun": "node ./test/beefun.js -checkjs",
     "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",

package/tool/checkiconfont.js

@@ -10,10 +10,14 @@ module.exports.start = async function() {
   var ignores = config.ignoreFiles;
   var files = utils.getFiles({ source: config.webPath, exts: ['.js', '.gspx'], ignores: ignores });
 
+  // js和gspx文件检测
   var list = {};
   var counts = {};
   for (var i = 0; i < files.length; i++) {
     var filePath = files[i];
+    if (!fs.existsSync(filePath)) {
+      continue;
+    }
     var byte = fs.readFileSync(filePath);
     var content = byte.toString();
 
@@ -32,6 +36,44 @@ module.exports.start = async function() {
       });
     }
   }
+
+  // 特定css文件检测
+  var cssFiles = [];
+  if (config.cssFiles) {
+    config.cssFiles.forEach(function(src) {
+      cssFiles.push(utils.join(config.webPath, src));
+    });
+  }
+
+  for (var i = 0; i < cssFiles.length; i++) {
+    var filePath = cssFiles[i];
+    if (!fs.existsSync(filePath)) {
+      continue;
+    }
+
+    var byte = fs.readFileSync(filePath);
+    var content = byte.toString();
+
+    console.log('cssFiles', filePath);
+    var reg = /content:\s*['"]\\([0-9a-fA-F]{4})['"]/g;
+    if (reg.test(content)) {
+      var icons = [...content.matchAll(reg)];
+      icons = icons.map(function(match) {
+        return 'content-' + match[1]
+      });
+      var key = path.basename(filePath);
+      list[key] = icons;
+
+      icons.forEach(function(icon) {
+        if (counts[icon] === undefined) {
+          counts[icon] = 1;
+        } else {
+          counts[icon]++;
+        }
+      });
+    }
+  }
+
   // 用项目名+分支名确定唯一性
 
   var reportData = {

package/tool/checkjs.js

@@ -217,6 +217,7 @@ module.exports.start = async function() {
   info.push(`| 共检查 | ${jsFiles.length}个js文件 |`);
   info.push(`| 共检查 | ${gspxData.count}个gspx文件 |`);
   info.push(`| 忽略目录和文件 | ${config.ignoreCheck ? config.ignoreCheck.join('、') : '无' + ' |'}`);
+  info.push(`| 忽略全局变量 | ${config.globals ? config.globals.join('、') : '无' + ' |'}`);
 
   info.push("# 检测结果汇总");
   info.push("| 类型 | 数量 | 占比 |");