cidr-regex 5.0.2 → 5.0.4

package/dist/index.d.ts

@@ -1,16 +1,27 @@
+//#region index.d.ts
 type CidrRegexOptions = {
-    /**
-    Only match an exact string. Useful with `RegExp#test()` to check if a string is an IP address. *(`false` matches any IP address in a string)*
-  
-    @defaultValue false
-    */
-    readonly exact?: boolean;
+  /**
+  Only match an exact string. Useful with `RegExp#test()` to check if a string is an IP address. *(`false` matches any IP address in a string)*
+     @defaultValue false
+  */
+  readonly exact?: boolean;
 };
 declare const cidrRegex: {
-    ({ exact }?: CidrRegexOptions): RegExp;
-    v4({ exact }?: CidrRegexOptions): RegExp;
-    v6({ exact }?: CidrRegexOptions): RegExp;
+  ({
+    exact
+  }?: CidrRegexOptions): RegExp;
+  v4: ({
+    exact
+  }?: CidrRegexOptions) => RegExp;
+  v6: ({
+    exact
+  }?: CidrRegexOptions) => RegExp;
 };
-export declare const v4: ({ exact }?: CidrRegexOptions) => RegExp;
-export declare const v6: ({ exact }?: CidrRegexOptions) => RegExp;
-export default cidrRegex;
+declare const v4: ({
+  exact
+}?: CidrRegexOptions) => RegExp;
+declare const v6: ({
+  exact
+}?: CidrRegexOptions) => RegExp;
+//#endregion
+export { cidrRegex as default, v4, v6 };

package/dist/index.js

@@ -1,15 +1,21 @@
-import ipRegex from "ip-regex";
+//#region index.ts
 const defaultOpts = { exact: false };
-const v4str = `${ipRegex.v4().source}\\/(3[0-2]|[12]?[0-9])`;
-const v6str = `${ipRegex.v6().source}\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])`;
-const v4exact = new RegExp(`^${v4str}$`);
-const v6exact = new RegExp(`^${v6str}$`);
-const v46exact = new RegExp(`(?:^${v4str}$)|(?:^${v6str}$)`);
-const cidrRegex = ({ exact } = defaultOpts) => exact ? v46exact : new RegExp(`(?:${v4str})|(?:${v6str})`, "g");
-const v4 = cidrRegex.v4 = ({ exact } = defaultOpts) => exact ? v4exact : new RegExp(v4str, "g");
-const v6 = cidrRegex.v6 = ({ exact } = defaultOpts) => exact ? v6exact : new RegExp(v6str, "g");
-export {
-  cidrRegex as default,
-  v4,
-  v6
-};
+const v4src = "(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}\\/(3[0-2]|[12]?[0-9])";
+const v6src = "(?:(?:[a-fA-F\\d]{1,4}:){7}(?:[a-fA-F\\d]{1,4}|:)|(?:[a-fA-F\\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|:[a-fA-F\\d]{1,4}|:)|(?:[a-fA-F\\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,2}|:)|(?:[a-fA-F\\d]{1,4}:){4}(?:(?::[a-fA-F\\d]{1,4})?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,3}|:)|(?:[a-fA-F\\d]{1,4}:){3}(?:(?::[a-fA-F\\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,4}|:)|(?:[a-fA-F\\d]{1,4}:){2}(?:(?::[a-fA-F\\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,5}|:)|[a-fA-F\\d]{1,4}:(?:(?::[a-fA-F\\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,6}|:)|:(?:(?::[a-fA-F\\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,7}|:))(?:%[0-9a-zA-Z]+)?\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])";
+const v46src = `${v4src}|${v6src}`;
+const v4exact = new RegExp(`^${v4src}$`);
+const v6exact = new RegExp(`^${v6src}$`);
+const v46exact = new RegExp(`^${v4src}$|^${v6src}$`);
+const v4global = new RegExp(v4src, "g");
+const v6global = new RegExp(v6src, "g");
+const v46global = new RegExp(v46src, "g");
+function resetRegex(re) {
+	re.lastIndex = 0;
+	return re;
+}
+const cidrRegex = ({ exact } = defaultOpts) => exact ? v46exact : resetRegex(v46global);
+const v4 = cidrRegex.v4 = ({ exact } = defaultOpts) => exact ? v4exact : resetRegex(v4global);
+const v6 = cidrRegex.v6 = ({ exact } = defaultOpts) => exact ? v6exact : resetRegex(v6global);
+
+//#endregion
+export { cidrRegex as default, v4, v6 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-regex",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Regular expression for matching IP addresses in CIDR notation",
   "author": "silverwind <me@silverwind.io>",
   "contributors": [
@@ -19,21 +19,20 @@
   "engines": {
     "node": ">=20"
   },
-  "dependencies": {
-    "ip-regex": "5.0.0"
-  },
   "devDependencies": {
-    "@types/node": "25.0.10",
-    "eslint": "9.39.2",
-    "eslint-config-silverwind": "120.1.2",
+    "@types/node": "25.6.0",
+    "@typescript/native-preview": "7.0.0-dev.20260420.1",
+    "eslint": "10.2.1",
+    "eslint-config-silverwind": "131.0.5",
     "jest-extended": "7.0.0",
-    "typescript": "5.9.3",
-    "typescript-config-silverwind": "14.0.0",
-    "updates": "17.0.8",
-    "versions": "14.0.3",
-    "vite": "7.3.1",
-    "vite-config-silverwind": "6.0.9",
-    "vitest": "4.0.18",
-    "vitest-config-silverwind": "10.6.1"
+    "tsdown": "0.21.9",
+    "tsdown-config-silverwind": "2.1.0",
+    "typescript": "6.0.3",
+    "typescript-config-silverwind": "18.0.0",
+    "updates": "17.15.5",
+    "updates-config-silverwind": "2.1.0",
+    "versions": "15.0.0",
+    "vitest": "4.1.4",
+    "vitest-config-silverwind": "11.3.0"
   }
 }