@dineroregnskab/eslint-plugin-custom-rules 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dineroregnskab/eslint-plugin-custom-rules",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "ESLint plugin with custom rules for Dineroregnskab",
   "main": "eslint-plugin-custom-rules.js",
   "scripts": {
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "^8.53.0"
+    "eslint": "^8.54.0"
   },
   "peerDependencies": {
     "eslint": ">=8.0.0"

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

@@ -1,35 +1,46 @@
 module.exports = {
     meta: {
-        type: "problem",
+        type: 'problem',
         docs: {
-            description: "Enforce that a ngrx reducer always returns a value, so the store state remains intact.",
+            description:
+                'Enforce that a ngrx reducer always returns a value, so the store state remains intact.',
         },
-        fixable: "code",
-        schema: []
+        fixable: 'code',
+        schema: [],
     },
 
-    create(context) {
+    create: function (context) {
         return {
-            FunctionDeclaration(node) {
-                if (node.id.name.endsWith('Reducer')) {
-                    let hasReturnStatement = false;
+            'CallExpression[callee.name="createReducer"]': function (node) {
+                node.arguments.forEach(function (arg) {
+                    if (
+                        arg.type === 'CallExpression' &&
+                        arg.callee.name === 'on'
+                    ) {
+                        arg.arguments.slice(1).forEach(function (handler) {
+                            const isFunction =
+                                handler.type === 'FunctionExpression' ||
+                                handler.type === 'ArrowFunctionExpression';
+                            const isBlockStatement =
+                                handler.body.type === 'BlockStatement';
+                            const hasNoReturn =
+                                isBlockStatement &&
+                                !handler.body.body.some(
+                                    (statement) =>
+                                        statement.type === 'ReturnStatement',
+                                );
 
-                    node.body.body.forEach(statement => {
-                        if (statement.type === 'ReturnStatement') {
-                            hasReturnStatement = true;
-                        }
-                    });
-
-                    if (!hasReturnStatement) {
-                        context.report({
-                            node,
-                            message: 'Reducer function must return a value to avoid undefined state.',
+                            if (isFunction && isBlockStatement && hasNoReturn) {
+                                context.report({
+                                    node: handler,
+                                    message:
+                                        'Reducer function must return a value to avoid undefined state.',
+                                });
+                            }
                         });
                     }
-                }
+                });
             },
-          };
-    }
+        };
+    },
 };
-
-// tilføj fixer?

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

@@ -1,42 +0,0 @@
-const returnReducerRule = require('./reducers-should-always-return');
-const { RuleTester } = require('eslint');
-
-const ruleTester = new RuleTester({
-    parserOptions: { ecmaVersion: 2019 },
-});
-
-ruleTester.run('reducers-should-always-return', returnReducerRule, {
-    valid: [
-        // This reducer returns a value in all code paths
-        {
-            code:
-            `function myReducer(state, action) {
-                if (action.type === 'ACTION_TYPE') {
-                    return { ...state, data: action.data };
-                }
-                return state;
-            }`,
-        },
-    ],
-
-    invalid: [
-        // This reducer doesn't return a value if action.type is not 'ACTION_TYPE'
-        {
-            code:
-                `function badReducer(state, action) {
-                    if (action.type === 'ACTION_TYPE') {
-                        return { ...state, data: action.data };
-                    }
-                }`,
-            errors: [
-                {
-                    message:
-                        'Reducer function must return a value to avoid undefined state.',
-                    type: 'FunctionDeclaration',
-                },
-            ],
-        },
-    ],
-});
-
-console.log('All tests passed!');