eslint-plugin-hex-under 0.1.2 → 0.2.1

package/hex-under.js

@@ -2,7 +2,8 @@ module.exports = {
   meta: {
     type: "problem",
     docs: {
-      description: "Proves that a hexadecimal number must be less than a specified value. Default is 255.",
+      description:
+        "Proves that a hexadecimal number must be less than a specified value. Default is 255.",
     },
     fixable: "code",
     schema: [
@@ -18,38 +19,32 @@ module.exports = {
       },
     ],
     messages: {
-      valueOver:
-        "Value of '{{ variableName }}' must be less than or equal {{ limit }}. {{ overValue }} ({{ over255Raw }}) is greater than {{ limit }}.",
+      valueOverGeneral:
+        "This number must be less than or equal {{ limit }}. {{ overValue }} ({{ over255Raw }}) is greater than {{ limit }}.",
     },
   },
   create(context) {
     const limit = context.options[0]?.limit || 255;
     return {
-      VariableDeclarator(node) {
-        if (["const", "let", "var"].some((el) => el === node.parent.kind)) {
-          if (
-            node.init &&
-            node.init.type === "Literal" &&
-            node.init.raw.startsWith("0x")
-          ) {
-            if (parseInt(node.init.value) > limit) {
-              context.report({
-                node,
-                messageId: "valueOver",
-                data: {
-                  limit: limit,
-                  over255Raw: node.init.raw,
-                  overValue: node.init.value,
-                  variableName: node.id.name,
-                },
-                fix(fixer) {
-                  return fixer.replaceText(
-                    node.init,
-                    parseInt(node.init.value),
-                  );
-                },
-              });
-            }
+      onCodePathEnd: function (_codePath, node) {
+        const tokens =
+          node.tokens?.filter(
+            (token) => token.type === "Numeric" && token.value.startsWith("0x"),
+          ) || [];
+        for (const token of tokens) {
+          if (token.value > limit) {
+            context.report({
+              node: token,
+              messageId: "valueOverGeneral",
+              data: {
+                limit: limit,
+                over255Raw: token.value,
+                overValue: parseInt(token.value),
+              },
+              fix(fixer) {
+                return fixer.replaceText(token, parseInt(token.value));
+              },
+            });
           }
         }
       },

package/hex-under.test.js

@@ -15,6 +15,23 @@ ruleTester.run("hex-under", hexUnderRule, {
       options: [{ limit: 256 }],
       code: "const foo = 0x100;",
     },
+    {
+      options: [{ limit: 255 }],
+      code: "let foo = 0xff;",
+    },
+    {
+      options: [{ limit: 256 }],
+      code: "var foo = 0xff;",
+    },
+    {
+      code: "function func() {\n  return 0xff;\n}",
+    },
+    {
+      code: "functionA(0xef);",
+    },
+    {
+      code: "const func = () => 0xab;",
+    },
   ],
   invalid: [
     {
@@ -22,38 +39,31 @@ ruleTester.run("hex-under", hexUnderRule, {
       output: "const foo = 256;",
       errors: 1,
     },
-  ],
-});
-
-ruleTester.run("hex-under", hexUnderRule, {
-  valid: [
-    {
-      options: [{ limit: 255 }],
-      code: "let foo = 0xff;",
-    },
-  ],
-  invalid: [
     {
       code: "let foo = 0x100;",
       output: "let foo = 256;",
       errors: 1,
     },
-  ],
-});
-
-ruleTester.run("hex-under", hexUnderRule, {
-  valid: [
-    {
-      options: [{ limit: 256 }],
-      code: "var foo = 0xff;",
-    },
-  ],
-  invalid: [
     {
       code: "var foo = 0x100;",
       output: "var foo = 256;",
       errors: 1,
     },
+    {
+      code: "function func() {\n  return 0x100;\n}",
+      output: "function func() {\n  return 256;\n}",
+      errors: 1,
+    },
+    {
+      code: "functionA(0x1234);",
+      output: "functionA(4660);",
+      errors: 1,
+    },
+    {
+      code: "const func = () => 0xabc;",
+      output: "const func = () => 2748;",
+      errors: 1,
+    },
   ],
 });
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "eslint-plugin-hex-under",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "main": "eslint-plugin-hex-under.js",
   "scripts": {
     "lint": "prettier . --check && eslint .",
-    "test": "node hex-under-256.test.js"
+    "test": "node hex-under.test.js"
   },
   "repository": {
     "type": "git",