mm_eslint 1.3.7 → 1.3.8

package/config.js

@@ -500,20 +500,23 @@ Config.prototype.getIgnoredWords = function (name_type) {
       'Middleware', 'Component', 'Controller', 'Repository', 'Interface', 'Transform', 'Template'
     ],
     'variable-name': [
-      'i', 'k', 'x', 'y', 'z', 'n', 'm', 'o', 'middleware', 'component', 'controller', 'repository', 'interface', 'transformer', 'template', '$'
+      'i', 'k', 'x', 'y', 'z', 'n', 'm', 'o', 'middleware', 'component', 'controller', 'repository', 'interface', 'transformer', 'template', '$',
+      'timestamp', 'extensions'
     ],
     'param-name': [
-      'middleware', 'component', 'controller', 'repository', 'interface', 'transformer', 'template'
+      'middleware', 'component', 'controller', 'repository', 'interface', 'transformer', 'template',
+      'timestamp', 'extensions'
     ],
     'value-name': [
       '$', // 忽略$符号的属性值名
-      'middleware', // 忽略middleware属性值名
-      'component', // 忽略component属性值名
-      'controller', // 忽略controller属性值名
-      'repository', // 忽略repository属性值名
-      'interface', // 忽略interface属性值名
-      'transformer', // 忽略transformer属性值名
-      'template' // 忽略template属性值名
+      'middleware',
+      'component',
+      'controller',
+      'repository',
+      'interface',
+      'transformer',
+      'template',
+      'timestamp', 'extensions'
     ]
   };
 

package/detector.js

@@ -627,17 +627,71 @@ Detector.prototype._checkForbiddenWords = function (name, name_type) {
     }
   }
 
-  // 检查名称是否包含禁止词汇作为拼接词（即名称由多个单词组成）
-  for (var i = 0; i < forbidden_words.length; i++) {
-    var forbidden_word = forbidden_words[i].toLowerCase();
-    if (name_lower.includes(forbidden_word) && name_lower !== forbidden_word) {
-      return name_type_desc + '\'' + name + '\'包含禁止拼接词\'' + forbidden_word + '\'';
+  // 按单词边界分割名称
+  var words = this._splitNameIntoWords(name_lower);
+  
+  // 检查每个单词是否在禁止词汇列表中
+  for (var i = 0; i < words.length; i++) {
+    var word = words[i];
+    // 跳过空字符串和单个字符
+    if (!word || word.length <= 1) {
+      continue;
+    }
+    
+    for (var j = 0; j < forbidden_words.length; j++) {
+      var forbidden_word = forbidden_words[j].toLowerCase();
+      if (word === forbidden_word) {
+        return name_type_desc + '\'' + name + '\'包含禁止拼接词\'' + forbidden_word + '\'';
+      }
     }
   }
 
   return null;
 };
 
+/**
+ * 按单词边界分割名称
+ * @param {string} name 名称
+ * @returns {Array} 单词数组
+ */
+Detector.prototype._splitNameIntoWords = function (name) {
+  if (!name) {
+    return [];
+  }
+  
+  var words = [];
+  var processed_name = name;
+  var has_private_prefix = false;
+
+  // 处理私有标识符（开头的下划线）
+  if (name.startsWith('_')) {
+    has_private_prefix = true;
+    processed_name = name.substring(1); // 去掉开头的下划线
+  }
+
+  // 根据命名风格分割单词
+  if (processed_name.includes('_')) {
+    words = processed_name.split('_');
+  } else if (processed_name.includes('-')) {
+    words = processed_name.split('-');
+  } else {
+    // 驼峰命名法分割（保持原词大小写）
+    words = processed_name.split(/(?=[A-Z])/);
+  }
+
+  // 如果存在私有标识符，添加下划线作为第一个单词
+  if (has_private_prefix) {
+    words.unshift('_');
+  }
+
+  // 过滤空字符串
+  words = words.filter(function(word) {
+    return word && word.length > 0;
+  });
+
+  return words;
+};
+
 /**
  * 获取属性类型
  * @param {object} val_node 属性值节点

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_eslint",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "ESLint plugin for naming conventions - PascalCase, camelCase, snake_case, and UPPER_SNAKE_CASE naming rules",
   "main": "index.js",
   "keywords": [