@kununu/eslint-config 5.2.2-beta-1 → 5.2.2-beta-2

package/index.js

@@ -205,49 +205,43 @@ const baseRules = {
   'react/require-default-props': 0,
   // Enforce early return over nested return blocks
   'prefer-early-return': {
-      meta: {
-        type: 'suggestion',
-        docs: {
-          description: 'Prefer early returns over nested return blocks',
-          category: 'Best Practices',
-          recommended: true,
-        },
-        fixable: 'code',
+    meta: {
+      type: 'suggestion',
+      docs: {
+        description: 'Prefer early returns over nested returns with logical expressions',
+        category: 'Best Practices',
+        recommended: true,
       },
-      create(context) {
-        return {
-          ReturnStatement(node) {
-            if (node.argument && 
-                node.argument.type === 'ObjectExpression' && 
-                node.argument.properties.some(p => p.type === 'LogicalExpression' || p.value?.type === 'LogicalExpression')) {
-              
-              context.report({
-                node,
-                message: 'Prefer early returns over nested return blocks',
-                fix(fixer) {
-                  const sourceCode = context.getSourceCode();
-                  const properties = node.argument.properties;
-                  
-                  // Convert logical expressions to if-returns
-                  const fixes = properties.map(prop => {
-                    if (prop.type === 'LogicalExpression' || prop.value?.type === 'LogicalExpression') {
-                      const logicalExp = prop.type === 'LogicalExpression' ? prop : prop.value;
-                      const condition = sourceCode.getText(logicalExp.left);
-                      const returnValue = sourceCode.getText(logicalExp.right);
-                      return `if (${condition}) return ${returnValue};`;
-                    }
-                    // If it's the last non-logical property, it becomes the default return
-                    return `return ${sourceCode.getText(prop)};`;
-                  });
-                  
-                  return fixer.replaceText(node, fixes.join('\n'));
-                }
-              });
-            }
+      fixable: 'code',
+    },
+    create(context) {
+      return {
+        ReturnStatement(node) {
+          // Handle both direct LogicalExpression and ParenthesizedExpression
+          const argument = node.argument?.type === 'ParenthesizedExpression' 
+            ? node.argument.expression 
+            : node.argument;
+
+          if (argument?.type === 'LogicalExpression') {
+            context.report({
+              node,
+              message: 'Prefer early returns over logical expressions in return statements',
+              fix(fixer) {
+                const sourceCode = context.getSourceCode();
+                const condition = sourceCode.getText(argument.left);
+                const returnValue = sourceCode.getText(argument.right);
+                
+                return fixer.replaceText(
+                  node, 
+                  `if (!${condition}) return null;\nreturn ${returnValue};`
+                );
+              }
+            });
           }
-        };
-      }
+        }
+      };
     }
+  }
 };
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kununu/eslint-config",
-  "version": "5.2.2-beta-1",
+  "version": "5.2.2-beta-2",
   "description": "kununu's ESLint config",
   "main": "index.js",
   "repository": "kununu/eslint-config",