crabatool 1.0.803 → 1.0.808

package/index.js

@@ -164,6 +164,8 @@ async function checkFast(args) {
   // crabatool -autoId -webPath 项目路径
   if (args.includes('-autoId')) {
     start.bindAndCheckConfig('-webPath');
+    start.bindConfigByArgv('-ignoreAutoId', 'array');
+    start.bindConfigByArgv('-ignoreFiles', 'array');
     require('./tool/addNodeId.js').start();
     return false;
   }
@@ -287,4 +289,4 @@ async function checkFast(args) {
 
 
   return true;
-}
+}

package/lib/config.js

@@ -18,10 +18,13 @@ class Config {
 
     this.webhooks = "https://oapi.dingtalk.com/robot/send?access_token=ce27b1b1540881540d44c0bd05ba738d865363758892ede137dc1020bd36bd5a";
     this.crabaHooks = "https://oapi.dingtalk.com/robot/send?access_token=ce27b1b1540881540d44c0bd05ba738d865363758892ede137dc1020bd36bd5a";
+    this.crabaErrorHooks = 'https://oapi.dingtalk.com/robot/send?access_token=35ac432f7f0741e2a44624f82cef011eaf012f7764b1e977cb6119e4e133b961';
     //this.webhooks = "https://oapi.dingtalk.com/robot/send?access_token=37279df60e03ebf25e8eb71230ddb93fe74de99951a8d635d0458e60bfcd44d8";
     this.checkgspx = true; // 检查gspx
     this.hidejspath = false;
     this.ignoreCheck = [];
+    this.ignoreFiles = [];
+    this.ignoreAutoId = [];
     this.Version = pg.version;
     this.Debug = false;
     this.version = 'master';
@@ -46,4 +49,4 @@ class Config {
   }
 }
 
-module.exports = new Config();
+module.exports = new Config();

package/lib/utils.js

@@ -522,7 +522,7 @@ class Utils {
     next();
   }
 
-  postWeebhooks(msg) {
+  postWeebhooks(msg, isError) {
     var data = {
       msgtype: 'markdown',
       markdown: {
@@ -533,7 +533,7 @@ class Utils {
 
     axios({
       method: 'post',
-      url: config.crabaHooks,
+      url: isError ? config.crabaErrorHooks : config.crabaHooks,
       timeout: config.timeout,
       data: data,
       headers: { 'Content-Type': 'application/json' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.803",
+  "version": "1.0.808",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/addNodeId.js

@@ -14,6 +14,9 @@ const config = require('../lib/config.js');
 const webPath = config.webPath;
 // const webPath = "/Users/yj/Desktop/carpaevery/www/View";
 
+let normalizedIgnoreEntries = [];
+let shouldIgnoreRelativePath = () => false;
+
 const blacklistDirs = [
   'node_modules',
   '.git',
@@ -24,16 +27,167 @@ const blacklistDirs = [
   'temp',
   'tmp',
   '.idea',
-  '__pycache__'
+  '__pycache__',
+  '_Sys'
 ];
 
-const blacklistTags = [
+const notParseTags = [
   '?xml',
   '#text',
   'Style',
-  'Script'
+  'Script',
+  'Meta'
+]
+
+const blacklistTags = [
+  'ListTemplate',
+  'HiddenField',
+  'InnerBlock',
+  'ListBox',
+  'Pager',
+  'HintBlock',
+  'VerificationCode',
+  'FileUpload',
+  'ToolBar',
+  'ToolButton',
+  'ToolImage',
+  'BarScale',
+  'EScanAction',
+  'PosPrint',
+  'BarcodePrint',
+  'ExpressPrint',
+  'ReportAction',
+  'DataBlock',
+  'HPanel',
+  'VPanel',
+  'NavGroup',
+  'NavBar',
+  'PopupBlock',
+  'PopupMenu',
+  'TabContainer',
+  'Block',
+  'VBlock',
+  'HBlock',
+  'FlexColumn',
+  'FlexBlock',
+  'FlowPanel',
+  'Image',
+  'PrintButton',
+  'DataIndex',
+  'DataCheckBox',
+  'DataImage',
+  'DataNumber',
+  'DataNumberEdit',
+  'DataText',
+  'DataTextEdit',
+  'HSpacer',
+  'VSpacer',
+  'DetailFields',
+  'MasterFields',
+  'Field',
+  'ServerStatus',
+  'StatusBar',
+  'ListItem'
 ];
 
+// 需要保留其内部结构，不为内部组件生成自动 ID 的标签
+const skipDescendantTags = new Set([
+  'CustomControl',
+]);
+
+// 忽略规则相关工具函数
+function normalizePathFragment(value) {
+  if (typeof value !== 'string') {
+    return '';
+  }
+
+  let normalized = value.trim();
+  if (!normalized) {
+    return '';
+  }
+
+  normalized = path.normalize(normalized).replace(/\\/g, '/');
+  normalized = normalized.replace(/^(\.\/)+/, '');
+  normalized = normalized.replace(/^\/+/, '');
+  normalized = normalized.replace(/\/+$/, '');
+
+  if (!normalized || normalized === '.') {
+    return '';
+  }
+
+  return normalized.toLowerCase();
+}
+
+function collectIgnoreEntries(entries, basePath) {
+  if (!Array.isArray(entries) || entries.length === 0) {
+    return [];
+  }
+
+  const resolvedBase = typeof basePath === 'string' ? path.resolve(basePath) : '';
+  const baseRoot = resolvedBase ? path.parse(resolvedBase).root : '';
+  const payload = new Set();
+
+  entries.forEach(item => {
+    if (typeof item !== 'string') {
+      return;
+    }
+
+    let candidate = item.trim();
+    if (!candidate) {
+      return;
+    }
+
+    if (path.isAbsolute(candidate)) {
+      if (!resolvedBase) {
+        return;
+      }
+
+      const resolvedCandidate = path.resolve(candidate);
+      const candidateRoot = path.parse(resolvedCandidate).root;
+      if (baseRoot && candidateRoot && baseRoot.toLowerCase() !== candidateRoot.toLowerCase()) {
+        return;
+      }
+
+      candidate = path.relative(resolvedBase, resolvedCandidate);
+    }
+
+    const normalized = normalizePathFragment(candidate);
+    if (!normalized || normalized.startsWith('..')) {
+      return;
+    }
+
+    payload.add(normalized);
+  });
+
+  return Array.from(payload);
+}
+
+function createIgnoreMatcher(patterns = []) {
+  if (!patterns.length) {
+    return () => false;
+  }
+
+  return function matcher(relativePath) {
+    const normalized = normalizePathFragment(relativePath);
+    if (!normalized) {
+      return false;
+    }
+
+    return patterns.some(pattern => normalized === pattern || normalized.startsWith(`${pattern}/`));
+  };
+}
+
+function formatDisplayPath(relativePath, fileName, isDirectory) {
+  const source = relativePath && relativePath !== '.' ? relativePath : fileName;
+  const normalized = (source || '').replace(/\\/g, '/');
+  if (!normalized) {
+    return isDirectory ? './' : '.';
+  }
+
+  const sanitized = normalized.endsWith('/') ? normalized.slice(0, -1) : normalized;
+  return isDirectory ? `${sanitized}/` : sanitized;
+}
+
 /**
  * 将首字母转换为小写
  * @param {string} text
@@ -119,15 +273,19 @@ function createIdGenerator(existingIds = new Set()) {
  * @param {Array} nodes
  * @param {(node: import('domhandler').Element) => void} visitor
  */
-function walkNodes(nodes = [], visitor) {
+function walkNodes(nodes = [], visitor, options = {}) {
+  const { shouldSkipChildren = () => false } = options;
+
   nodes.forEach(node => {
-    if (node.type === 'tag' && Array.isArray(node.children) && node.children.length) {
-      walkNodes(node.children, visitor);
-    } else if (node.children && node.children.length) {
-      walkNodes(node.children, visitor);
+    const isTag = node.type === 'tag';
+    const hasChildren = Array.isArray(node.children) && node.children.length;
+    const skipChildren = isTag && shouldSkipChildren(node);
+
+    if (hasChildren && (!isTag || !skipChildren)) {
+      walkNodes(node.children, visitor, options);
     }
 
-    if (node.type === 'tag') {
+    if (isTag) {
       visitor(node);
     }
   });
@@ -156,7 +314,7 @@ function isUpperCase(char) {
 
 function shouldSkipTag(tagName) {
   if (!tagName) return true;
-  if (blacklistTags.includes(tagName)) return true;
+  if (notParseTags.includes(tagName)) return true;
   if (!isUpperCase(tagName[0])) return true;
   return false;
 }
@@ -170,6 +328,11 @@ function shouldSkipTag(tagName) {
 function addNodeId($, filter, generateId, body) {
   const roots = $.root().children().toArray();
   const insertions = [];
+  const options = {
+    shouldSkipChildren(node) {
+      return skipDescendantTags.has(node.name);
+    }
+  };
 
   walkNodes(roots, node => {
     const tagName = node.name;
@@ -186,7 +349,7 @@ function addNodeId($, filter, generateId, body) {
     attrs[attrKey] = newId;
     node.attribs = attrs;
     insertions.push(insertion);
-  });
+  }, options);
 
   return insertions;
 }
@@ -340,6 +503,38 @@ function getIndentationForInsert(source, lineBreakIndex) {
   return match[0];
 }
 
+/**
+ * 寻找起始标签对应的闭合符号，忽略属性值内的'>'
+ * @param {string} source
+ * @param {number} tagStart
+ * @returns {number}
+ */
+function findTagCloseIndex(source, tagStart) {
+  let quote = null;
+
+  for (let i = tagStart; i < source.length; i += 1) {
+    const char = source[i];
+
+    if (quote) {
+      if (char === quote && source[i - 1] !== '\\') {
+        quote = null;
+      }
+      continue;
+    }
+
+    if (char === '"' || char === "'") {
+      quote = char;
+      continue;
+    }
+
+    if (char === '>') {
+      return i;
+    }
+  }
+
+  return -1;
+}
+
 /**
  * 基于节点位置信息生成插入操作
  * @param {string} body
@@ -353,7 +548,7 @@ function createAttributeInsertion(body, node, newId) {
   }
 
   const tagStart = node.startIndex;
-  const closeIndex = body.indexOf('>', tagStart);
+  const closeIndex = findTagCloseIndex(body, tagStart);
   if (closeIndex === -1) {
     return null;
   }
@@ -420,6 +615,10 @@ const filter = (attrs, tagName) => {
     return true;
   }
 
+  if (blacklistTags.includes(tagName)) {
+    return true;
+  }
+
   if (tagName.endsWith('Column') && tagName !== 'FlexColumn') {
     return !!attrs.Name || !!attrs.DataField;;
   }
@@ -434,12 +633,23 @@ function readGspxFile(filePath, basePath = webPath) {
     const fullPath = path.join(filePath, file);
     const relativePath = path.relative(basePath, fullPath);
 
-    if (fs.lstatSync(fullPath).isDirectory()) {
+    const stat = fs.lstatSync(fullPath);
+    const isDirectory = stat.isDirectory();
+    const displayPath = formatDisplayPath(relativePath, file, isDirectory);
+
+    if (isDirectory) {
       if (blacklistDirs.includes(file)) {
-        console.log(chalk.yellow(`跳过黑名单目录: ${relativePath}/`));
+        console.log(chalk.yellow(`跳过黑名单目录: ${displayPath}`));
         return;
       }
+    }
 
+    if (shouldIgnoreRelativePath(relativePath)) {
+      console.log(chalk.cyan(`忽略路径: ${displayPath}`));
+      return;
+    }
+
+    if (isDirectory) {
       readGspxFile(fullPath, basePath);
     } else if (file.endsWith('.gspx')) {
       const { $, xmlDeclaration, singleQuotedAttrs, body } = parseGspx(fullPath);
@@ -462,6 +672,18 @@ function readGspxFile(filePath, basePath = webPath) {
 }
 
 function start() {
+  const ignoreCandidates = Array.isArray(config.ignoreAutoId) && config.ignoreAutoId.length
+    ? config.ignoreAutoId
+    : Array.isArray(config.ignoreFiles)
+      ? config.ignoreFiles
+      : [];
+
+  normalizedIgnoreEntries = collectIgnoreEntries(ignoreCandidates, webPath);
+  shouldIgnoreRelativePath = createIgnoreMatcher(normalizedIgnoreEntries);
+
+  if (normalizedIgnoreEntries.length) {
+    console.log(chalk.cyan(`忽略规则: ${normalizedIgnoreEntries.join(', ')}`));
+  }
   readGspxFile(webPath);
 }
 

package/tool/checkjs.js

@@ -1,3 +1,4 @@
+var os = require('os');
 var utils = require('../lib/utils.js');
 var config = require('../lib/config.js');
 var fs = require('fs');
@@ -197,7 +198,6 @@ 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 undefKeys = Object.keys(undefDatas);
@@ -208,9 +208,6 @@ module.exports.start = async function() {
     projectName: getModName(),
     branchName: getBranchName(),
   }
-  if (errKeys.length > 0 || undefKeys.length > 0 || trimErrKeys.length > 0 || warnKeys.length > 0 || notUtf8List.length > 0 || warnGspxCount > 0 || gspxData.errorList.length > 0) {
-    status = '有异常';
-  }
 
   var branchName = getBranchName();
   var modName = getModName();
@@ -297,7 +294,7 @@ module.exports.start = async function() {
   webhookList.push(`1. for..in语法：${forinKeys.length}个，占比${calc(forinKeys.length, jsFiles.length)}`);
 
   // 随机显示5个异常文件到钉钉消息
-  var errCount = reportData.data.errCount + reportData.data.undefCount;
+  var errCount = reportData.data.errorCount + reportData.data.undefCount;
   /*
   if (errCount > 0) {
     var list0 = [];
@@ -527,19 +524,16 @@ module.exports.start = async function() {
   postBaseData(reportData, gspxData); // 推送业务组件清单到基础数据
 
   // 推送到钉钉
-  if (status != '无异常') { // 检查结果检查就不发到钉钉了； ps:健康也发到钉钉，鼓励开发继续保持；
-    postWebhooks(id, reportUrl, webhookList);
-  }
+  postWebhooks(id, reportUrl, webhookList);
 
-  writeAbortFile(errCount);
+  writeAbortFile(errCount, reportUrl);
 }
 
-function writeAbortFile(errCount) {
-  var os = require('os');
+function writeAbortFile(errCount, reportUrl) {
   var s = path.join(os.tmpdir(), 'checkjsAbort');
   if (errCount > 0 && config.abortUrl) {
-    var tips = '警告！！！代码检测发现异常，已终止当前构建任务。请修复代码后重新构建。';
-    utils.postWeebhooks(tips);
+    var tips = `警告！！！代码检测发现异常，已终止当前构建任务。请修复代码后重新构建。[报告详情](${reportUrl})`;
+    utils.postWeebhooks(tips, true);
 
     console.log(tips);
     fs.writeFileSync(s, 'err');

package/tool/compress.js

@@ -74,7 +74,7 @@ function checkJsHasZ(jsName) {
   console.log('检查压缩后的js里面是否有黑名单替换', crabaJs);
   if (contentJs.indexOf('_Z_') < 0) {
     var tips = '发版警告！！！upload craba失败！！！' + jsName + '文件的黑名单类名(_Z_)替换失败，终止打包和上传任务；请重试打包。';
-    utils.postWeebhooks(tips);
+    utils.postWeebhooks(tips, true);
     return false;
   }
   return true;

package/tool/crabapublish.js

@@ -90,7 +90,7 @@ function doUploadCraba(version) {
     console.log(response.data);
     if (version) doAutoTest();
   }).catch(function(err) {
-    utils.postWeebhooks(config.modName + '上传资源失败');
+    utils.postWeebhooks(config.modName + '上传资源失败',true);
     console.log(err.message);
   });
 }
@@ -127,7 +127,7 @@ function doAutoTest() {
   }).then(function(response) {
 
   }).catch(function(err) {
-    utils.postWeebhooks('调用自动化测试失败');
+    utils.postWeebhooks('调用自动化测试失败',true);
     console.log(err);
   });
   */

package/tool/ngpSkinUtils.js

@@ -50,7 +50,7 @@ function doUpload() {
     console.log(response.data);
     doEnd();
   }).catch(function(err) {
-    utils.postWeebhooks('shell皮肤发布失败');
+    utils.postWeebhooks('shell皮肤发布失败',true);
     console.log(err);
   });
 }

package/tool/start.js

@@ -133,6 +133,7 @@ class Start {
       { name: '-localLogin', type: 'boolean' },
 
       { name: '-ignoreCheck', type: 'array' },
+      { name: '-ignoreAutoId', type: 'array' },
       { name: '-childModList', type: 'array' },
       { name: '-globals', type: 'array' },
 
@@ -431,4 +432,3 @@ async function waitFolder(question) {
   }
   return projectPath;
 }
-