eslint-plugin-hex-under 0.2.6 → 0.3.0

package/eslint-plugin-hex-under.js

@@ -1,3 +1,9 @@
 const hexUnderRule = require("./hex-under");
-const plugin = { rules: { "hex-under": hexUnderRule } };
+const hexUnderBigintRule = require("./hex-under-bigint");
+const plugin = {
+  rules: {
+    "hex-under": hexUnderRule,
+    "hex-under-bigint": hexUnderBigintRule,
+  },
+};
 module.exports = plugin;

package/hex-under-bigint.js

@@ -0,0 +1,60 @@
+module.exports = {
+  meta: {
+    type: "suggestion",
+    version: "0.0.1",
+    defaultOptions: [
+      {
+        limit: 255,
+      },
+    ],
+    docs: {
+      description:
+        "Proves that a hexadecimal bigint must be less than a specified value. Default is 255.",
+    },
+    fixable: "code",
+    schema: [
+      {
+        type: "object",
+        properties: {
+          limit: {
+            type: "integer",
+            minimum: 1,
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+    messages: {
+      valueOverGeneralBigInt:
+        "This bigint must be less than or equal {{ limit }}. {{ overValue }} ({{ over255Raw }}) is greater than {{ limit }}.",
+    },
+  },
+  create(context) {
+    const limit = context.options[0]?.limit;
+    return {
+      onCodePathEnd: function (_codePath, node) {
+        const tokens =
+          node.tokens?.filter(
+            (token) =>
+              ["Numeric", "Identifier"].some((el) => el === token.type) &&
+              token.value.startsWith("0x") &&
+              token.value.endsWith("n"),
+          ) || [];
+        for (const token of tokens) {
+          const value = parseInt(token.value);
+          if (value > limit) {
+            context.report({
+              node: token,
+              messageId: "valueOverGeneralBigInt",
+              data: {
+                limit: limit,
+                over255Raw: token.value,
+                overValue: value,
+              },
+            });
+          }
+        }
+      },
+    };
+  },
+};

package/hex-under.js

@@ -27,8 +27,6 @@ module.exports = {
     messages: {
       valueOverGeneral:
         "This number must be less than or equal {{ limit }}. {{ overValue }} ({{ over255Raw }}) is greater than {{ limit }}.",
-      valueOverGeneralBigInt:
-        "This bigint must be less than or equal {{ limit }}. {{ overValue }} ({{ over255Raw }}) is greater than {{ limit }}.",
     },
   },
   create(context) {
@@ -39,35 +37,24 @@ module.exports = {
           node.tokens?.filter(
             (token) =>
               ["Numeric", "Identifier"].some((el) => el === token.type) &&
-              token.value.startsWith("0x"),
+              token.value.startsWith("0x") &&
+              !token.value.endsWith("n"),
           ) || [];
         for (const token of tokens) {
           const value = parseInt(token.value);
           if (value > limit) {
-            if (token.value.endsWith("n")) {
-              context.report({
-                node: token,
-                messageId: "valueOverGeneralBigInt",
-                data: {
-                  limit: limit,
-                  over255Raw: token.value,
-                  overValue: value,
-                },
-              });
-            } else {
-              context.report({
-                node: token,
-                messageId: "valueOverGeneral",
-                data: {
-                  limit: limit,
-                  over255Raw: token.value,
-                  overValue: value,
-                },
-                fix(fixer) {
-                  return fixer.replaceText(token, value);
-                },
-              });
-            }
+            context.report({
+              node: token,
+              messageId: "valueOverGeneral",
+              data: {
+                limit: limit,
+                over255Raw: token.value,
+                overValue: value,
+              },
+              fix(fixer) {
+                return fixer.replaceText(token, value);
+              },
+            });
           }
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-hex-under",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "main": "eslint-plugin-hex-under.js",
   "scripts": {
     "lint": "prettier . --check && eslint .",