@kununu/eslint-config 5.2.3-beta-2 → 5.2.3-beta-4

package/customRules/prefer-early-return.js

@@ -0,0 +1,38 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Prefer early returns over logical expressions in return statements',
+      category: 'Best Practices',
+      recommended: true,
+    },
+    fixable: 'code',
+  },
+  create(context) {
+    return {
+      ReturnStatement(node) {
+        const argument = node.argument?.type === 'ParenthesizedExpression' 
+          ? node.argument.expression 
+          : node.argument;
+
+        // Only handle && operators
+        if (argument?.type === 'LogicalExpression' && argument.operator === '&&') {
+          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 ${returnValue};`
+              );
+            }
+          });
+        }
+      }
+    };
+  }
+};

package/index.js

@@ -1,77 +1,22 @@
-// Define the rule separately
-const preferEarlyReturnRule = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Prefer early returns over logical expressions in return statements',
-      category: 'Best Practices',
-      recommended: true,
-    },
-    fixable: 'code',
-  },
-  create(context) {
-    return {
-      ReturnStatement(node) {
-        const argument = node.argument?.type === 'ParenthesizedExpression' 
-          ? node.argument.expression 
-          : node.argument;
-
-        // Check if it's a sequence expression (comma-separated expressions)
-        if (argument?.type === 'SequenceExpression') {
-          const expressions = argument.expressions;
-          
-          // Check if we have logical expressions with && in the sequence
-          const logicalExpressions = expressions.filter(expr => 
-            expr.type === 'LogicalExpression' && expr.operator === '&&'
-          );
-          
-          if (logicalExpressions.length > 0) {
-            context.report({
-              node,
-              message: 'Prefer early returns over comma-separated logical expressions',
-              fix(fixer) {
-                const sourceCode = context.getSourceCode();
-                
-                // Create a replacement string for the entire return
-                let replacement = '';
-                
-                expressions.forEach((expr, index) => {
-                  const isLast = index === expressions.length - 1;
-                  
-                  if (expr.type === 'LogicalExpression' && expr.operator === '&&') {
-                    const condition = sourceCode.getText(expr.left);
-                    const value = sourceCode.getText(expr.right);
-                    
-                    if (isLast && expressions.length > 1) {
-                      // Last expression gets a simple return
-                      replacement += `return ${value};`;
-                    } else {
-                      // Others get a conditional return
-                      replacement += `if (${condition}) return ${value};\n`;
-                    }
-                  } else if (isLast) {
-                    // Last non-logical expression gets a simple return
-                    replacement += `return ${sourceCode.getText(expr)};`;
-                  }
-                });
-                
-                return fixer.replaceText(node, replacement);
-              }
-            });
-          }
-        }
-      }
-    };
-  }
-};
-
-// Create and register our custom plugin inline
-const customPlugin = {
-  rules: {
-    'prefer-early-return': preferEarlyReturnRule
+const customPlugin = require('./customRules');
+
+// Register the custom plugin
+try {
+  // This is the path in ESLint v8+
+  require('eslint/use-at-your-own-risk').builtinPlugins.define('kununu-custom', customPlugin);
+} catch (e) {
+  try {
+    // This is the path in ESLint v7
+    require('eslint/lib/cli-engine/plugins').define('kununu-custom', customPlugin);
+  } catch (e) {
+    // Fallback for ESLint v6
+    try {
+      require('eslint/lib/util/plugins').define('kununu-custom', customPlugin);
+    } catch (e) {
+      console.warn('Failed to register custom ESLint plugin:', e.message);
+    }
   }
-};
-require('eslint/lib/cli-engine/config/plugins').define('custom', customPlugin);
+}
 
 // we need to have the baseRules to have the same on the typescript override
 // because it has extends the eslint does not take into consideration the ones from the base
@@ -279,7 +224,7 @@ const baseRules = {
   // https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-proptypes-and-defaultprops
   'react/require-default-props': 0,
 
-  'custom/prefer-early-return': preferEarlyReturnRule,
+  "kununu-custom/prefer-early-return": 'error',
 };
 
 module.exports = {
@@ -299,7 +244,7 @@ module.exports = {
     '@babel',
     'lodash',
     'sort-destructure-keys',
-    'custom'
+    'kununu-custom'
   ],
 
   env: {

package/package.json

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