mm_eslint 1.2.4 → 1.2.6

package/index.js

@@ -897,23 +897,26 @@ Detector.prototype._checkFuncProp = function (name, config, errors) {
  * @private
  */
 Detector.prototype._checkClassProp = function (name, config, errors, val_node) {
-  // 根据值节点类型判断是类定义还是类实例
-  const is_class_definition = val_node && val_node.type === "CallExpression" && 
-                             val_node.callee && val_node.callee.name === "require";
+  // 根据值节点类型和属性名模式判断是类定义还是类实例
+  // 1. 如果值节点是require调用，则是类定义
+  // 2. 如果属性名符合PascalCase命名规范，优先认为是类定义
+  const is_class_definition = (val_node && val_node.type === "CallExpression" && 
+                             val_node.callee && val_node.callee.name === "require") ||
+                             (name && /^[A-Z][a-zA-Z0-9]*$/.test(name));
   const is_class_instance = !is_class_definition;
   
-  if (is_class_instance) {
-    // 类实例允许使用小驼峰命名
-    const func_res = this._checkName("function-name", name);
-    if (!func_res.valid) {
-      errors.push(`${config.name}（类实例）${func_res.errors.join(", ")}`);
-    }
-  } else {
+  if (is_class_definition) {
     // 类定义要求使用PascalCase
     const cls_res = this._checkName("class-name", name);
     if (!cls_res.valid) {
       errors.push(`${config.name}（类）${cls_res.errors.join(", ")}`);
     }
+  } else {
+    // 类实例允许使用小驼峰命名
+    const func_res = this._checkName("function-name", name);
+    if (!func_res.valid) {
+      errors.push(`${config.name}（类实例）${func_res.errors.join(", ")}`);
+    }
   }
 };
 
@@ -1793,27 +1796,39 @@ Detector.prototype._checkRecommen = function (name, rule_type, config, recommend
 
       if (should_recommend) {
         // 生成推荐建议：将目标词替换为推荐类别词
-        const suggestions = category_words.map((word) => {
-          // 智能替换：保持原始大小写格式
-          const regex = new RegExp(word, 'gi');
-          return name.replace(regex, (match) => {
-            // 保持原始大小写格式
-            if (match === match.toUpperCase()) {
-              return category.toUpperCase();
-            } else if (match[0] === match[0].toUpperCase()) {
-              return category[0].toUpperCase() + category.slice(1);
-            } else {
-              return category;
+        const suggestions = [];
+        
+        // 为每个检测到的目标词生成一个推荐
+        words.forEach((word) => {
+          if (category_words.includes(word)) {
+            // 只生成使用类别词替换的推荐，不包含原始词
+            const regex = new RegExp(word, 'gi');
+            const suggestion = name.replace(regex, (match) => {
+              // 保持原始大小写格式
+              if (match === match.toUpperCase()) {
+                return category.toUpperCase();
+              } else if (match[0] === match[0].toUpperCase()) {
+                return category[0].toUpperCase() + category.slice(1);
+              } else {
+                return category;
+              }
+            });
+            
+            // 只有当推荐结果与原始名称不同时才添加
+            if (suggestion !== name) {
+              suggestions.push(suggestion);
             }
-          });
+          }
         });
 
-        recommendations.push({
-          original: name,
-          category: category,
-          suggestions: suggestions,
-          message: `检测到"${category_words.join('、')}"，推荐使用: ${suggestions.join(', ')}`
-        });
+        if (suggestions.length > 0) {
+          recommendations.push({
+            original: name,
+            category: category,
+            suggestions: suggestions,
+            message: `检测到"${category_words.join('、')}"，推荐使用: ${suggestions.join(', ')}`
+          });
+        }
       }
     }
   });

package/package.json

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