mm_eslint 1.4.2 → 1.4.3

package/config.js

@@ -318,6 +318,8 @@ Config.prototype.getForbiddenWords = function (name_type) {
       'processor',
       'controller',
       'service',
+      'middleware',
+      'component',
       'provider'
     ],
     'constant-name': [
@@ -418,7 +420,6 @@ Config.prototype.getRecommendedWords = function (name_type) {
       'Proc': ['Processor'],
       'Dcr': ['Decorator'],
       'Prov': ['Provider'],
-      'Facade': ['Facade'],
       'Obs': ['Observer'],
       'Strat': ['Strategy'],
       'Mnt': ['Memento'],
@@ -546,6 +547,7 @@ Config.prototype.getIgnoredWords = function (name_type) {
       'middleware',
       'component',
       'controller',
+      'service',
       'repository',
       'interface',
       'transformer',

package/detector.js

@@ -1029,6 +1029,15 @@ Detector.prototype._checkForbiddenWords = function (name, name_type) {
   var name_type_desc = this.config.name_type_map[name_type] || "名称";
   var name_lower = name.toLowerCase();
 
+  // 对于私有变量/方法（以_开头），如果是单个单词（移除_后没有其他分隔符），则跳过禁止词汇检查
+  if (name_lower.startsWith("_") && name.length > 2) {
+    // 移除前缀_后检查是否包含分隔符
+    var name_without_prefix = name.substring(1);
+    if (!name_without_prefix.includes("_") && !name_without_prefix.includes("-") && !/[A-Z]/.test(name_without_prefix)) {
+      return null; // 单个单词的私有变量，跳过检查
+    }
+  }
+
   // 如果名称本身就是禁止词汇（即单个单词），则允许使用
   for (var i = 0; i < forbidden_words.length; i++) {
     var forbidden_word = forbidden_words[i].toLowerCase();
@@ -1037,14 +1046,22 @@ Detector.prototype._checkForbiddenWords = function (name, name_type) {
     }
   }
 
-  // 按单词边界分割名称
-  var words = this._splitNameIntoWords(name_lower);
+  // 按单词边界分割名称（使用原始名称进行拆分，保持大小写信息）
+  var words = this._splitNameIntoWords(name);
+  
+  // 将拆分后的单词转换为小写进行比较
+  var words_lower = words.map(function(word) {
+    return word.toLowerCase();
+  });
 
   // 检查每个单词是否在禁止词汇列表中
   var found_forbidden_words = [];
   
-  for (var i = 0; i < words.length; i++) {
-    var word = words[i];
+  // 对于私有变量（以_开头），跳过第一个单词（即_）
+  var start_index = name_lower.startsWith("_") ? 1 : 0;
+  
+  for (var i = start_index; i < words_lower.length; i++) {
+    var word = words_lower[i];
     // 跳过空字符串和单个字符
     if (!word || word.length <= 1) {
       continue;
@@ -1101,6 +1118,11 @@ Detector.prototype._splitNameIntoWords = function (name) {
     processed_name = name.substring(1); // 去掉开头的下划线
   }
 
+  // 如果移除_后为空，说明只有_，直接返回
+  if (!processed_name) {
+    return ["_"];
+  }
+
   // 根据命名风格分割单词
   if (processed_name.includes("_")) {
     words = processed_name.split("_");
@@ -1527,30 +1549,34 @@ Detector.prototype._checkPropertyName = function (
     }
 
     // 检查单词长度
-    var word_err = this._checkWordLength(
-      prop_name,
-      rule.single_word_len,
-      rule_type,
-    );
-    if (word_err) {
-      // 检查错误消息是否已经包含建议
-      var error_message = word_err;
-      if (!word_err.includes("建议使用")) {
-        // 如果错误消息中不包含建议，则添加建议
-        var smart_abbreviation = this._getSmartAbbreviation(
-          prop_name,
-          rule_type,
-        );
-        if (smart_abbreviation && smart_abbreviation !== prop_name) {
-          error_message = word_err + "，建议使用: " + smart_abbreviation;
+    // 对于私有属性值名（以_开头且长度>2），跳过单词长度检查，视为单个单词
+    var is_private_property = prop_name.startsWith("_");
+    if (!(is_private_property && prop_name.length > 2)) {
+      var word_err = this._checkWordLength(
+        prop_name,
+        rule.single_word_len,
+        rule_type,
+      );
+      if (word_err) {
+        // 检查错误消息是否已经包含建议
+        var error_message = word_err;
+        if (!word_err.includes("建议使用")) {
+          // 如果错误消息中不包含建议，则添加建议
+          var smart_abbreviation = this._getSmartAbbreviation(
+            prop_name,
+            rule_type,
+          );
+          if (smart_abbreviation && smart_abbreviation !== prop_name) {
+            error_message = word_err + "，建议使用: " + smart_abbreviation;
+          }
         }
-      }
 
-      return {
-        node: node,
-        message: error_message,
-        rule_type: rule_type, // 添加规则类型信息
-      };
+        return {
+          node: node,
+          message: error_message,
+          rule_type: rule_type, // 添加规则类型信息
+        };
+      }
     }
 
     // 检查禁止词汇
@@ -2959,7 +2985,7 @@ Detector.prototype._checkPropertyValueStyle = function (
 ) {
   try {
     // 首先检查禁止拼接词
-    var forbid_err = this._checkForbiddenWords(prop_name, "variable-name");
+    var forbid_err = this._checkForbiddenWords(prop_name, rule_type);
     if (forbid_err) {
       return forbid_err;
     }

package/package.json

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