mm_eslint 1.1.7 → 1.1.9

package/index.js

@@ -205,6 +205,10 @@ class Detector {
       function: [
         "middleware", "controller", "component", "repository", "validator",
         "transformer", "serializer", "interceptor", "decorator", "provider"
+      ],
+      variable: [
+        "middleware", "controller", "component", "repository", "validator",
+        "transformer", "serializer", "interceptor", "decorator", "provider"
       ]
     },
     
@@ -230,8 +234,8 @@ class Detector {
         "data", "result", "output", "input", "param", "params", "parameter", "parameters",
         "value", "values", "item", "items",
         // 通用处理词汇（动词已经表达了处理，这些名词是冗余的）
-        "process", "handler", "processor", "manager", "controller", "service", "provider",
-        "factory", "builder", "adapter", "decorator", "proxy", "facade", "mediator",
+        "process", "processor", "provider",
+        "builder", "adapter", "decorator", "proxy", "facade", "mediator",
         "observer", "strategy", "command", "visitor", "iterator", "template",
         "flyweight", "memento", "interpreter",
         // 临时缓存词汇（动词已经表达了操作，这些名词是冗余的）
@@ -407,7 +411,7 @@ class Detector {
       Object.keys(config).forEach((key) => {
         if (merged_cfg[key] && typeof merged_cfg[key] === "object" && !Array.isArray(merged_cfg[key])) {
           // 如果是对象配置（如规则配置），则深度合并
-          merged_cfg[key] = { ...merged_cfg[key], ...config[key] };
+          merged_cfg[key] = this._deepMerge(merged_cfg[key], config[key]);
 
           // 处理字符串形式的正则表达式
           if (typeof merged_cfg[key].regex === "string") {
@@ -438,6 +442,37 @@ class Detector {
     this.config = merged_cfg;
     this._initRule();
   }
+
+  /**
+   * 深度合并两个对象
+   * @param {Object} target 目标对象
+   * @param {Object} source 源对象
+   * @returns {Object} 合并后的对象
+   * @private
+   */
+  _deepMerge(target, source) {
+    const result = { ...target };
+    
+    Object.keys(source).forEach((key) => {
+      const source_val = source[key];
+      const target_val = target[key];
+      
+      if (Array.isArray(source_val) && Array.isArray(target_val)) {
+        // 如果是数组，则合并数组（去重）
+        result[key] = [...new Set([...target_val, ...source_val])];
+      } else if (typeof source_val === 'object' && source_val !== null && 
+                 typeof target_val === 'object' && target_val !== null && 
+                 !Array.isArray(source_val) && !Array.isArray(target_val)) {
+        // 如果是对象，则递归深度合并
+        result[key] = this._deepMerge(target_val, source_val);
+      } else {
+        // 其他情况直接覆盖
+        result[key] = source_val;
+      }
+    });
+    
+    return result;
+  }
 }
 
 /**
@@ -1555,6 +1590,8 @@ Detector.prototype._isIgnoreWord = function (name, rule_type) {
     ignore_list = ignore_words_config.method || [];
   } else if (rule_type === "function-name") {
     ignore_list = ignore_words_config.function || [];
+  } else if (rule_type === "variable-name") {
+    ignore_list = ignore_words_config.variable || [];
   }
 
   // 检查名称是否完全匹配忽略词列表中的任何一个词
@@ -1727,6 +1764,15 @@ const class_name_rule = {
           single_word: { type: "boolean" },
           single_word_len: { type: "number" },
           styles: { type: "array", items: { type: "string" } },
+          ignore_words: {
+            type: "object",
+            properties: {
+              class: { type: "array", items: { type: "string" } },
+              method: { type: "array", items: { type: "string" } },
+              function: { type: "array", items: { type: "string" } }
+            },
+            additionalProperties: false
+          }
         },
         additionalProperties: false,
       },
@@ -1775,6 +1821,15 @@ const function_name_rule = {
           single_word: { type: "boolean" },
           single_word_len: { type: "number" },
           styles: { type: "array", items: { type: "string" } },
+          ignore_words: {
+            type: "object",
+            properties: {
+              class: { type: "array", items: { type: "string" } },
+              method: { type: "array", items: { type: "string" } },
+              function: { type: "array", items: { type: "string" } }
+            },
+            additionalProperties: false
+          }
         },
         additionalProperties: false,
       },
@@ -1842,6 +1897,15 @@ const method_name_rule = {
           single_word: { type: "boolean" },
           single_word_len: { type: "number" },
           styles: { type: "array", items: { type: "string" } },
+          ignore_words: {
+            type: "object",
+            properties: {
+              class: { type: "array", items: { type: "string" } },
+              method: { type: "array", items: { type: "string" } },
+              function: { type: "array", items: { type: "string" } }
+            },
+            additionalProperties: false
+          }
         },
         additionalProperties: false,
       },
@@ -1926,6 +1990,13 @@ const variable_name_rule = {
           single_word: { type: "boolean" },
           single_word_len: { type: "number" },
           styles: { type: "array", items: { type: "string" } },
+          ignore_words: {
+            type: "object",
+            properties: {
+              variable: { type: "array", items: { type: "string" } }
+            },
+            additionalProperties: false
+          }
         },
         additionalProperties: false,
       },
@@ -2534,9 +2605,9 @@ const instance_property_rule = {
           !node.left.property.name.startsWith("_")
         ) {
           const prop_name = node.left.property.name;
-          // 实例属性应该符合方法命名规范（小驼峰）
-          const detector = new Detector({ "method-name": options });
-          const result = detector.checkName(prop_name, "method-name");
+          // 实例属性应该符合变量命名规范（小写蛇形）
+          const detector = new Detector({ "variable-name": options });
+          const result = detector.checkName(prop_name, "variable-name");
 
           if (!result.valid) {
             result.errors.forEach((error) => {

package/package.json

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