crabatool 1.0.706 → 1.0.707

package/.eslintrc.json

@@ -11,11 +11,19 @@
         "ecmaVersion": "latest",
         "sourceType": "script"
     },
+    "plugins": [],
     "rules": {
         "semi": "off",
         "no-redeclare": "off",
         //"no-unused-vars": "off",
         "missingSemi": "off",
+        "no-restricted-syntax": [
+            "error",
+            {
+                "selector": "ForInStatement",
+                "message": "1. 如果当前是数组，不建议使用for..in循环，会遍历出原型链的方法容易出现意外问题，可以改用forEach和普通for循环；2. 如果是对象，就可以用for..in；3.for of有兼容性不能用"
+            }
+        ],
         "comma-dangle": [
             "error",
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.706",
+  "version": "1.0.707",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -62,6 +62,7 @@
     "eslint-plugin-native-ie": "0.1.2",
     "express": "^4.17.3",
     "express-session": "^1.17.1",
+    "fast-xml-parser": "^5.2.5",
     "fs": "^0.0.1-security",
     "htmlparser2": "^8.0.1",
     "http-proxy-middleware": "^2.0.6",

package/tool/addNodeId.js

@@ -0,0 +1,154 @@
+const { XMLParser, XMLBuilder } = require('fast-xml-parser');
+const fs = require('fs');
+const path = require('path');
+
+var config = require('../lib/config.js');
+
+// const webPath = config.webPath
+const webPath = "/Users/yj/Desktop/carpaevery/www"
+const propKey = ':@';
+const parseConfig = {
+  alwaysCreateTextNode: true,
+  attributeNamePrefix: '',
+  // attributesGroupName: 'properties',
+  textNodeName: '#text',
+  ignoreAttributes: false,
+  removeNSPrefix: true,
+  parseNodeValue: true,
+  parseAttributeValue: false,
+  allowBooleanAttributes: true,
+  trimValues: true,
+  cdataTagName: '#cdata',
+  preserveOrder: true,
+  numberParseOptions: {
+    hex: false,
+    leadingZeros: true,
+  }
+}
+// 黑名单目录列表
+const blacklistDirs = [
+  'node_modules',
+  '.git',
+  '.svn',
+  '.vscode',
+  'dist',
+  'build',
+  'temp',
+  'tmp',
+  '.idea',
+  '__pycache__'
+];
+
+//黑名单标签列表
+const blacklistTags = [
+  '?xml',
+  '#text',
+  'Style'
+];
+
+const parser = new XMLParser(parseConfig);
+const builder = new XMLBuilder();
+
+function parseGspx(filePath) {
+  const xml = fs.readFileSync(filePath, 'utf8');
+  const json = parser.parse(xml);
+  return json;
+}
+
+// [
+//   { '?xml': [ [Object] ], ':@': { version: '1.0', encoding: 'UTF-8' } },
+//   {
+//     Page: [ [Object], [Object], [Object] ],
+//     ':@': {
+//       Title: '订单处理',
+//       ActiveControl: 'null',
+//       CssClass: 'pd0 shglPage',
+//       ActionType: 'www.demo.ddclAction, /demo/ddcl.js'
+//     }
+//   }
+// ]
+
+// 1.遍历config.webPath下的所有gspx文件
+// 2.读取.gspx文件，转换为json
+// 3.遍历json，找到所有节点
+// 3.1 找到所有节点后，判断节点是否包含ID或DataField属性
+// 3.2 如果包含，不用管
+// 3.3 如果不包含，则给节点添加ID
+// 4.给每个节点添加id
+// 5.保存gspx文件
+function addNodeId(json, filter) {
+  if (!json.length) return;
+
+  for (const item of json) {
+    const tagName = getTagName(item);
+    if (blacklistTags.includes(tagName)) continue; // 如果标签名在黑名单中，则跳过
+    if (!isUpperCase(tagName[0])) continue; // 如果标签名第一个字符不是大写字母，则跳过
+    
+    const childNodes = item[tagName];
+    let properties = item[propKey]
+    if (!properties) {
+      properties = item[propKey] = {};
+    }
+
+    if (childNodes.length) { // 如果节点有子节点，则递归处理子节点
+      addNodeId(childNodes, filter);
+    }
+
+    if (!filter(properties, tagName)) { // 如果节点不包含ID或DataField属性，则给节点添加ID
+    }
+  }
+}
+
+function getTagName(json) {
+  return Object.keys(json).find(key => Array.isArray(json[key]));
+}
+
+function isUpperCase(char) {
+  if (char >= 'A' && char <= 'Z') {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function saveGspx(filePath, json) {
+  const xml = builder.build(json);
+  fs.writeFileSync(filePath, xml);
+}
+
+const filter = (item, tagName) => (tagName === 'Page' || item.ID || item.DataField);
+
+function readGspxFile(filePath, basePath = webPath) {
+  const files = fs.readdirSync(filePath);
+  files.forEach(file => {
+    const fullPath = path.join(filePath, file);
+    const relativePath = path.relative(basePath, fullPath);
+    
+    if (fs.lstatSync(fullPath).isDirectory()) {
+      // 检查是否在黑名单中
+      if (blacklistDirs.includes(file)) {
+        console.log(`跳过黑名单目录: ${relativePath}/`);
+        return;
+      }
+      // 如果是目录，递归处理
+      // console.log(`目录: ${relativePath}/`);
+      readGspxFile(fullPath, basePath);
+    } else if (file.endsWith('.gspx')) {
+      // 如果是gspx文件，处理文件
+      // console.log(`处理文件: ${relativePath}`);
+      const json = parseGspx(fullPath);
+      addNodeId(json, filter);
+      // saveGspx(fullPath, json);
+    }
+  });
+}
+
+function start() {
+  readGspxFile(webPath);
+}
+
+start();
+
+
+
+

package/tool/checkjs.js

@@ -18,7 +18,7 @@ var fileSize = 300;
 var blackList = ['agency.js', 'jquery.js', 'craba.min.js', 'crabaEx.min.js', 'crabaNgp.js', 'echarts-all.js', 'echarts.min.js', 'math.min.js', 'craba.rollup.min.js'];
 
 // 语法规则，不能包含这些关键词
-var dangerousJs = ['\\slet\\s', '\\sconst\\s', '\=\>\\s?\\(?\\{', '\\sawait\\s', '\\.then\\(', '\\sdebugger\\s'];// 'for\\s*\\(\\s*var\\s*\\w+\\s*in'];
+var dangerousJs = ['\=\>\\s?\\(?\\{', '\\sawait\\s', '\\.then\\(', '\\sdebugger\\s'];// 'for\\s*\\(\\s*var\\s*\\w+\\s*in'];
 
 // gspx无用标签的修改建议
 var warnTagsInfo = {
@@ -58,6 +58,7 @@ module.exports.start = async function() {
   var errDatas = {};
   var undefDatas = {};
   var trimErrDatas = {};
+  var forinDatas = {};
   var warnDatas = {};
   var infoDatas = {};
   var bigList = [];
@@ -115,6 +116,7 @@ module.exports.start = async function() {
       var infoList = [];
       var ieList = [];
       var undefList = [];
+      var forinList = [];
       var res = eslintResults[0];
       res.messages.forEach((item) => {
         var reg = new RegExp(/'\$\w+'\sis\snot\sdefined\./);
@@ -133,6 +135,8 @@ module.exports.start = async function() {
         } else if (item.ruleId.includes('comma-dangle')) {
           list = ieList;
           item.message += '多余的逗号';
+        } else if (item.ruleId.includes('no-restricted-syntax')) {
+          list = forinList;
         } else if (item.ruleId.indexOf('no-unused-vars') > -1) {
           if (item.message && (item.message.includes("'sender'") || item.message.includes("'eventArgs'")) || item.message.includes("'args'")) {
             return;
@@ -150,6 +154,9 @@ module.exports.start = async function() {
       if (ieList.length > 0) {
         errDatas[filePath] = ieList;
       }
+      if (forinList.length > 0) {
+        forinDatas[filePath] = forinList;
+      }
       if (infoList.length > 0) {
         infoDatas[filePath] = infoList;
       }
@@ -194,6 +201,7 @@ module.exports.start = async function() {
   var trimErrKeys = Object.keys(trimErrDatas);
   var errKeys = Object.keys(errDatas);
   var undefKeys = Object.keys(undefDatas);
+  var forinKeys = Object.keys(forinDatas);
   var warnKeys = Object.keys(warnDatas);
   var infoKeys = Object.keys(infoDatas);
   var reportData = {
@@ -236,6 +244,7 @@ module.exports.start = async function() {
   info.push("| ------ | ------ | ----- |");
   info.push(`| js语法兼容性 | ${errKeys.length}个 |${calc(errKeys.length, jsFiles.length)}|`);
   info.push(`| js语法undefined | ${undefKeys.length}个 |${calc(undefKeys.length, jsFiles.length)}|`);
+  info.push(`| for..in语法 | ${forinKeys.length}个 |${calc(forinKeys.length, jsFiles.length)}|`);
   info.push(`| trim、trimEnd或trimStart异常数 | ${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)}|`);
@@ -256,6 +265,7 @@ module.exports.start = async function() {
   reportData.data = {
     errorCount: errKeys.length,
     undefCount: undefKeys.length, // 未定义总数
+    forinCount: forinKeys.length,
     warnCount: warnKeys.length,
     tipCount: infoKeys.length,
     fileSize: fileSize,
@@ -284,6 +294,7 @@ module.exports.start = async function() {
   //if (errKeys.length > 0) {
   webhookList.push(`1. js语法兼容性：${errKeys.length}个，占比${calc(errKeys.length, jsFiles.length)}`);
   webhookList.push(`1. js语法undefined：${undefKeys.length}个，占比${calc(undefKeys.length, jsFiles.length)}`);
+  webhookList.push(`1. for..in语法：${forinKeys.length}个，占比${calc(forinKeys.length, jsFiles.length)}`);
 
   // 随机显示5个异常文件到钉钉消息
   var errCount = reportData.data.errCount + reportData.data.undefCount;
@@ -368,6 +379,26 @@ module.exports.start = async function() {
     });
   }
 
+  if (forinKeys.length > 0) {
+    detail.push("");
+    detail.push(`# ${forinKeys.length}个for in（建议修复）`);
+    detail.push(`::: tip`);
+    detail.push(`1. 如果当前是数组，不建议使用for..in循环，会遍历出原型链的方法容易出现意外问题，可以改用forEach和普通for循环；2. 如果是对象，就可以用for..in；3.for of有兼容性不能用`);
+    detail.push(`:::`);
+    forinKeys.forEach((fileName, index) => {
+
+      detail.push(`${index + 1}. ${fileName}`);
+
+      var infoList = forinDatas[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(), item.msg, fileName, item.line, item.column, item.endLine));
+      });
+    });
+  }
+
 
   if (trimErrKeys.length > 0) {
     detail.push("");