@dineroregnskab/eslint-plugin-custom-rules 2.0.3 → 2.0.5

package/README.md

@@ -1,4 +1,4 @@
-# Dinero custom ESLint rules
+# Dinero Custom ESLint Rules
 
 Custom extended rules for various Dinero specific standards & conventions.
 
@@ -15,11 +15,11 @@ npm install @dineroregnskab/eslint-plugin-eslint-custom-rules@latest --save-dev
 
 Add the rule here:
 
-`dinero-web-2.0/Dinero.Packages/Dinero.eslintCustomRules/rules`
+`dinero-web-2.0/Dinero.Packages/Dinero.EslintCustomRules/rules`
 
 You can test the rule by adding some code to test it on here.
 
-`dinero-web-2.0/Dinero.Packages/Dinero.eslintCustomRules/example`
+`dinero-web-2.0/Dinero.Packages/Dinero.EslintCustomRules/example`
 
 And run:
 

package/eslint-plugin-custom-rules.js

@@ -1,11 +1,11 @@
 const returnReducerRule = require('./rules/reducers-should-always-return');
 const camelCaseRule = require('./rules/camel-case-attributes');
 
-const customRulesplugin = {
+const customRulesPlugin = {
     rules: {
         'reducers-should-always-return': returnReducerRule,
         'attr-camel-case-rule': camelCaseRule,
     },
 };
 
-module.exports = customRulesplugin;
+module.exports = customRulesPlugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dineroregnskab/eslint-plugin-custom-rules",
-  "version": "2.0.3",
-  "description": "ESLint plugin with custom rules for Dineroregnskab",
+  "version": "2.0.5",
+  "description": "ESLint plugin with custom rules for Dinero Regnskab",
   "main": "eslint-plugin-custom-rules.js",
   "scripts": {
     "test": ""

package/rules/reducers-should-always-return.js

@@ -1,3 +1,22 @@
+function hasReturnStatement(node) {
+    if (node.type === 'ReturnStatement') {
+        return true;
+    }
+
+    if (node.type === 'BlockStatement') {
+        return node.body.some(hasReturnStatement);
+    }
+
+    if (node.type === 'IfStatement') {
+        return (
+            hasReturnStatement(node.consequent) &&
+            (node.alternate !== null ? hasReturnStatement(node.alternate) : false)
+        );
+    }
+
+    return false;
+}
+
 module.exports = {
     meta: {
         type: 'problem',
@@ -25,10 +44,7 @@ module.exports = {
                                 handler?.body?.type === 'BlockStatement';
                             const hasNoReturn =
                                 isBlockStatement &&
-                                !handler?.body?.body.some(
-                                    (statement) =>
-                                        statement.type === 'ReturnStatement',
-                                );
+                                !hasReturnStatement(handler.body);
 
                             if (isFunction && isBlockStatement && hasNoReturn) {
                                 context.report({