cidr-regex 7.0.1 → 7.1.0

package/README.md

@@ -1,7 +1,7 @@
 # cidr-regex
 [![](https://img.shields.io/npm/v/cidr-regex.svg?style=flat)](https://www.npmjs.org/package/cidr-regex) [![](https://img.shields.io/npm/dm/cidr-regex.svg)](https://www.npmjs.org/package/cidr-regex) [![](https://packagephobia.com/badge?p=cidr-regex)](https://packagephobia.com/result?p=cidr-regex) [![](https://depx.co/api/badge/cidr-regex)](https://depx.co/pkg/cidr-regex)
 
-> Regular expression for matching IP addresses in CIDR notation
+> Regular expression for matching IP addresses in CIDR notation and bare IP addresses
 
 ## Usage
 
@@ -26,9 +26,22 @@ cidrRegex.v6({exact: true}).test("1:2:3:4:5:6:7:8/64");
 // Extract CIDRs from string
 "foo 192.168.0.1/24 bar 1:2:3:4:5:6:7:8/64 baz".match(cidrRegex());
 //=> ["192.168.0.1/24", "1:2:3:4:5:6:7:8/64"]
+
+// Is a bare IP address?
+cidrRegex({exact: true, prefix: "none"}).test("192.168.0.1");
+//=> true
+
+// Is either?
+cidrRegex({exact: true, prefix: "optional"}).test("192.168.0.1");
+//=> true
+cidrRegex({exact: true, prefix: "optional"}).test("192.168.0.1/24");
+//=> true
 ```
 
 ## API
+
+All three functions match CIDR notation by default. The `prefix` option switches them to bare IP addresses or to either.
+
 ### cidrRegex(options?: CidrRegexOptions)
 
 Returns a regex for matching both IPv4 and IPv6 CIDR IP addresses.
@@ -46,6 +59,7 @@ Returns a regex for matching IPv6 CIDR IP addresses.
 The options object has the following properties:
 
 - `exact` *boolean*: Only match an exact string. Useful with `RegExp#test()` to check if a string is a CIDR IP address. Default: false.
+- `prefix` *string*: Whether a `/prefix` must follow the address. `"required"` matches only CIDR, `"optional"` matches CIDR and bare IP addresses, `"none"` matches only bare IP addresses. Default: `"required"`.
 
 ## Related
 

package/dist/index.d.ts

@@ -1,27 +1,28 @@
 //#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
-  */
+    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;
+  /**
+    Whether a `/prefix` must follow the address. `"required"` matches only CIDR, `"optional"` matches both,
+    `"none"` matches only bare IP addresses. Combined with `exact: false`, `"none"` matches the address part
+    inside a CIDR, so `1.2.3.4/24` yields `1.2.3.4`.
+  
+    @defaultValue "required"
+    */
+  readonly prefix?: "required" | "optional" | "none";
 };
-declare const cidrRegex: {
-  ({
-    exact
-  }?: CidrRegexOptions): RegExp;
-  v4: ({
-    exact
-  }?: CidrRegexOptions) => RegExp;
-  v6: ({
-    exact
-  }?: CidrRegexOptions) => RegExp;
-};
-declare const v4: ({
-  exact
-}?: CidrRegexOptions) => RegExp;
-declare const v6: ({
-  exact
-}?: CidrRegexOptions) => RegExp;
+declare function cidrRegex(opts?: CidrRegexOptions): RegExp;
+declare namespace cidrRegex {
+  var _a: (opts?: CidrRegexOptions) => RegExp;
+  export { _a as v4 };
+  export var _b: (opts?: CidrRegexOptions) => RegExp;
+  export { _b as v6 };
+}
+declare const v4: (opts?: CidrRegexOptions) => RegExp;
+declare const v6: (opts?: CidrRegexOptions) => RegExp;
 //#endregion
 export { CidrRegexOptions, cidrRegex as default, v4, v6 };

package/dist/index.js

@@ -2,23 +2,41 @@
 const octet = "(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)";
 const v4dotted = `${octet}(?:\\.${octet}){3}`;
 const hex = "[\\dA-Fa-f]{1,4}";
-const scopeIdRe = "(?:%[^\\s%/\\0]+)?";
-const v4src = `${v4dotted}/(?:3[0-2]|[12]?\\d)`;
-const v6src = `(?:(?:${hex}:){7}(?:${hex}|:)|(?:${hex}:){6}(?:${v4dotted}|:${hex}|:)|(?:${hex}:){5}(?::${v4dotted}|(?::${hex}){1,2}|:)|(?:${hex}:){4}(?:(?::${hex})?:${v4dotted}|(?::${hex}){1,3}|:)|(?:${hex}:){3}(?:(?::${hex}){0,2}:${v4dotted}|(?::${hex}){1,4}|:)|(?:${hex}:){2}(?:(?::${hex}){0,3}:${v4dotted}|(?::${hex}){1,5}|:)|${hex}:(?:(?::${hex}){0,4}:${v4dotted}|(?::${hex}){1,6}|:)|:(?:(?::${hex}){0,5}:${v4dotted}|(?::${hex}){1,7}|:))${scopeIdRe}/(?:12[0-8]|1[01]\\d|[1-9]?\\d)`;
-const v6srcFast = `(?=[\\dA-Fa-f:])${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(v6srcFast, "g");
-const v46global = new RegExp(`${v4src}|${v6srcFast}`, "g");
-function resetRegex(re) {
-	re.lastIndex = 0;
+const v6addr = `(?:(?:${hex}:){7}(?:${hex}|:)|(?:${hex}:){6}(?:${v4dotted}|:${hex}|:)|(?:${hex}:){5}(?::${v4dotted}|(?::${hex}){1,2}|:)|(?:${hex}:){4}(?:(?::${hex})?:${v4dotted}|(?::${hex}){1,3}|:)|(?:${hex}:){3}(?:(?::${hex}){0,2}:${v4dotted}|(?::${hex}){1,4}|:)|(?:${hex}:){2}(?:(?::${hex}){0,3}:${v4dotted}|(?::${hex}){1,5}|:)|${hex}:(?:(?::${hex}){0,4}:${v4dotted}|(?::${hex}){1,6}|:)|:(?:(?::${hex}){0,5}:${v4dotted}|(?::${hex}){1,7}|:))(?:%[^\\s%/\\0]+)?`;
+const v6fast = "(?=[\\dA-Fa-f:])";
+const suffixes = (range) => [
+	range,
+	`(?:${range})?`,
+	""
+];
+const v4suffixes = suffixes("/(?:3[0-2]|[12]?\\d)");
+const v6suffixes = suffixes("/(?:12[0-8]|1[01]\\d|[1-9]?\\d)");
+const V4 = 0;
+const V6 = 1;
+const V46 = 2;
+const cache = new Array(18);
+function regexFor(family, { exact, prefix = "required" }) {
+	const mode = prefix === "required" ? 0 : prefix === "optional" ? 1 : 2;
+	const index = family * 6 + mode * 2 + (exact ? 1 : 0);
+	let re = cache[index];
+	if (!re) {
+		const v4src = v4dotted + v4suffixes[mode];
+		const v6src = v6addr + v6suffixes[mode];
+		if (exact) {
+			const body = family === V4 ? v4src : family === V6 ? v6src : `(?:${v4src}|${v6src})`;
+			re = cache[index] = new RegExp(`^${body}$`);
+		} else {
+			const v6fastSrc = v6fast + v6src;
+			const body = family === V4 ? v4src : family === V6 ? v6fastSrc : `${v4src}|${v6fastSrc}`;
+			re = cache[index] = new RegExp(body, "g");
+		}
+	}
+	if (!exact) re.lastIndex = 0;
 	return re;
 }
-const cidrRegex = ({ exact } = {}) => exact ? v46exact : resetRegex(v46global);
-const v4 = cidrRegex.v4 = ({ exact } = {}) => exact ? v4exact : resetRegex(v4global);
-const v6 = cidrRegex.v6 = ({ exact } = {}) => exact ? v6exact : resetRegex(v6global);
+const cidrRegex = (opts = {}) => regexFor(V46, opts);
+const v4 = cidrRegex.v4 = (opts = {}) => regexFor(V4, opts);
+const v6 = cidrRegex.v6 = (opts = {}) => regexFor(V6, opts);
 
 //#endregion
 export { cidrRegex as default, v4, v6 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cidr-regex",
-  "version": "7.0.1",
-  "description": "Regular expression for matching IP addresses in CIDR notation",
+  "version": "7.1.0",
+  "description": "Regular expression for matching IP addresses in CIDR notation and bare IP addresses",
   "author": "silverwind <me@silverwind.io>",
   "contributors": [
     "Felipe Apostol <flipjs.io@gmail.com> (http://flipjs.io/)"
@@ -36,19 +36,19 @@
     "node": ">=22"
   },
   "devDependencies": {
-    "@types/node": "25.7.0",
-    "@typescript/native-preview": "7.0.0-dev.20260512.1",
-    "eslint": "10.3.0",
-    "eslint-config-silverwind": "133.0.1",
+    "@types/node": "26.2.0",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "eslint": "10.8.1",
+    "eslint-config-silverwind": "144.0.2",
     "jest-extended": "7.0.0",
-    "tsdown": "0.22.0",
-    "tsdown-config-silverwind": "3.0.1",
+    "tsdown": "0.22.14",
+    "tsdown-config-silverwind": "4.0.3",
     "typescript": "6.0.3",
-    "typescript-config-silverwind": "18.0.0",
-    "updates": "17.16.10",
-    "updates-config-silverwind": "4.0.0",
-    "versions": "15.0.3",
-    "vitest": "4.1.6",
-    "vitest-config-silverwind": "11.3.4"
+    "typescript-config-silverwind": "20.0.3",
+    "updates": "18.0.1",
+    "updates-config-silverwind": "4.0.5",
+    "versions": "15.3.4",
+    "vitest": "4.1.11",
+    "vitest-config-silverwind": "11.6.0"
   }
 }