chore: updates to ajel-require-error-handling

Handfish · Jan 13, 2024 · 7705935 · 7705935
1 parent 422e7e9
commit 7705935
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 23 deletions.
diff --git a/packages/ajel-core/package.json b/packages/ajel-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ajel",
   "description": "Ajel allows you to handle errors similarly to Golang.",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

diff --git a/packages/eslint-plugin-ajel/package.json b/packages/eslint-plugin-ajel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-ajel",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Eslint rules for Ajel, the library that allows you to handle errors similarly to Golang",
   "engines": {
     "node": ">=8.10.0"

diff --git a/packages/eslint-plugin-ajel/src/rules/ajel-require-error-handling.ts b/packages/eslint-plugin-ajel/src/rules/ajel-require-error-handling.ts
@@ -6,7 +6,7 @@ import { isUsedVariable } from '../utils/isUsed';
 type Options = [
   {
     ajelAlias?: string;
-  }
+  },
 ];
 type MessageIds = 'requireErrorHandling';
 
@@ -42,6 +42,28 @@ const rule = createRule<Options, MessageIds>({
   create: (context, [{ ajelAlias }]) => {
     let errorVariable: TSESTree.Identifier | null = null;
 
+    function reportIfErrorVariableUnused() {
+      if (errorVariable) {
+        // Get the scope of the identifier
+        const scope = context.getScope();
+
+        // Get the variable associated with the identifier
+        const variable = scope.variables.find((v) =>
+          v.identifiers.includes(errorVariable as TSESTree.Identifier)
+        );
+
+        if (variable && !isUsedVariable(variable)) {
+          context.report({
+            node: errorVariable,
+            messageId: 'requireErrorHandling',
+            data: {
+              ajelAlias,
+            },
+          });
+        }
+      }
+    }
+
     return {
       VariableDeclaration(node: TSESTree.VariableDeclaration): void {
         if (hasAjelCallExpressionChild(node, ajelAlias)) {
@@ -54,26 +76,11 @@ const rule = createRule<Options, MessageIds>({
           }
         }
       },
+      'FunctionDeclaration:exit'(): void {
+        reportIfErrorVariableUnused();
+      },
       'Program:exit'(): void {
-        if (errorVariable) {
-          // Get the scope of the identifier
-          const scope = context.getScope();
-
-          // Get the variable associated with the identifier
-          const variable = scope.variables.find((v) =>
-            v.identifiers.includes(errorVariable as TSESTree.Identifier)
-          );
-
-          if (variable && !isUsedVariable(variable)) {
-            context.report({
-              node: errorVariable,
-              messageId: 'requireErrorHandling',
-              data: {
-                ajelAlias,
-              },
-            });
-          }
-        }
+        reportIfErrorVariableUnused();
       },
     };
   },

diff --git a/packages/eslint-plugin-ajel/tests/rules/ajel-require-error-handling.ts b/packages/eslint-plugin-ajel/tests/rules/ajel-require-error-handling.ts
@@ -16,11 +16,21 @@ tester.run('ajel-require-error-handling', rule, {
     {
       code: `
       const [res, _err] = await ajel(Promise.resolve(1));
-       if (_err) {
+       if (err) {
          return _err;
        }
       `,
     },
+    {
+      code: `
+      async function test() {
+        const [res, _err] = await ajel(Promise.resolve(1));
+         if (err) {
+           return _err;
+         }
+      }
+      `,
+    },
     {
       code: `
       const [res, err] = await blimpy(Promise.resolve(1));
@@ -37,5 +47,18 @@ tester.run('ajel-require-error-handling', rule, {
       `,
       errors: [{ messageId: 'requireErrorHandling' }],
     },
+    {
+      code: `
+      async function test() {
+        const [res, _err] = await ajel(Promise.resolve(1));
+      }
+      `,
+      errors: [{ messageId: 'requireErrorHandling' }],
+    },
+    {
+      code: `let [res, _err] = await ajel(Promise.resolve(1));
+      `,
+      errors: [{ messageId: 'requireErrorHandling' }],
+    },
   ],
 });