cidr-tools 11.2.0 → 11.3.0

package/dist/index.js

@@ -29,8 +29,23 @@ function parseIPv4Fast(s) {
 function formatIPv4Fast(n) {
 	return `${n >>> 24 & 255}.${n >>> 16 & 255}.${n >>> 8 & 255}.${n & 255}`;
 }
+function parsePrefixNum(str, slashIndex) {
+	if (slashIndex === -1) return -1;
+	if (slashIndex + 1 >= str.length) throw new Error(`Network is not a CIDR or IP: "${str}"`);
+	let prefixNum = 0;
+	for (let i = slashIndex + 1; i < str.length; i++) {
+		const c = str.charCodeAt(i);
+		if (c < 48 || c > 57) throw new Error(`Network is not a CIDR or IP: "${str}"`);
+		prefixNum = prefixNum * 10 + (c - 48);
+	}
+	return prefixNum;
+}
 function doNormalize(cidr, { compress = true, hexify = false } = {}) {
 	const { start, end, prefix, version, prefixPresent } = parseCidr(cidr);
+	if (version === 4) {
+		const ip = formatIPv4Fast(Number(start));
+		return start !== end || prefixPresent ? `${ip}/${prefix}` : ip;
+	}
 	if (start !== end || prefixPresent) return `${normalizeIp(stringifyIp({
 		number: start,
 		version
@@ -52,28 +67,55 @@ function normalizeCidr(cidr, opts) {
 function parseCidr(str) {
 	const slashIndex = str.indexOf("/");
 	let ipPart;
-	let prefix;
+	let prefixNum;
 	let prefixPresent;
 	if (slashIndex !== -1) {
 		ipPart = str.substring(0, slashIndex);
-		prefix = str.substring(slashIndex + 1);
-		if (!/^[0-9]+$/.test(prefix)) throw new Error(`Network is not a CIDR or IP: "${str}"`);
+		prefixNum = parsePrefixNum(str, slashIndex);
 		prefixPresent = true;
 	} else {
 		ipPart = str;
+		prefixNum = -1;
 		prefixPresent = false;
-		prefix = "";
+	}
+	if (!ipPart.includes(":")) {
+		const v4num = parseIPv4Fast(ipPart);
+		if (v4num !== -1) {
+			if (prefixNum === -1) prefixNum = 32;
+			const ip = formatIPv4Fast(v4num);
+			const prefix = String(prefixNum);
+			const hostBits = 32 - prefixNum;
+			let startNum, endNum;
+			if (hostBits >= 32) {
+				startNum = 0;
+				endNum = 4294967295;
+			} else {
+				const mask = hostBits > 0 ? (1 << hostBits >>> 0) - 1 : 0;
+				startNum = (v4num & ~mask) >>> 0;
+				endNum = (v4num | mask) >>> 0;
+			}
+			return {
+				cidr: `${ip}/${prefix}`,
+				ip,
+				version: 4,
+				prefix,
+				prefixPresent,
+				start: BigInt(startNum),
+				end: BigInt(endNum)
+			};
+		}
 	}
 	const { number, version, ipv4mapped, scopeid } = parseIp(ipPart);
 	if (!version) throw new Error(`Network is not a CIDR or IP: "${str}"`);
-	if (!prefixPresent) prefix = String(bits[version]);
+	if (prefixNum === -1) prefixNum = bits[version];
+	const prefix = String(prefixNum);
 	const ip = stringifyIp({
 		number,
 		version,
 		ipv4mapped,
 		scopeid
 	});
-	const hostBits = bits[version] - Number(prefix);
+	const hostBits = bits[version] - prefixNum;
 	const mask = hostBits > 0 ? (1n << BigInt(hostBits)) - 1n : 0n;
 	return {
 		cidr: `${ip}/${prefix}`,
@@ -91,13 +133,7 @@ function parseCidrLean(str) {
 	let prefixNum;
 	if (slashIndex !== -1) {
 		ipPart = str.substring(0, slashIndex);
-		if (slashIndex + 1 >= str.length) throw new Error(`Network is not a CIDR or IP: "${str}"`);
-		prefixNum = 0;
-		for (let i = slashIndex + 1; i < str.length; i++) {
-			const c = str.charCodeAt(i);
-			if (c < 48 || c > 57) throw new Error(`Network is not a CIDR or IP: "${str}"`);
-			prefixNum = prefixNum * 10 + (c - 48);
-		}
+		prefixNum = parsePrefixNum(str, slashIndex);
 	} else {
 		ipPart = str;
 		prefixNum = -1;
@@ -481,6 +517,12 @@ function* expandCidr(nets) {
 }
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */
 function overlapCidr(a, b) {
+	if (!Array.isArray(a) && !Array.isArray(b)) {
+		const pa = parseCidrLean(a);
+		const pb = parseCidrLean(b);
+		if (pa.version !== pb.version) return false;
+		return pa.start <= pb.end && pb.start <= pa.end;
+	}
 	const aArr = Array.isArray(a) ? a : [a];
 	const bArr = Array.isArray(b) ? b : [b];
 	const v4a = [], v6a = [];
@@ -519,6 +561,12 @@ function overlapCidr(a, b) {
 }
 /** Returns a boolean that indicates whether `networksA` fully contain all `networksB`. */
 function containsCidr(a, b) {
+	if (!Array.isArray(a) && !Array.isArray(b)) {
+		const pa = parseCidrLean(a);
+		const pb = parseCidrLean(b);
+		if (pa.version !== pb.version) return false;
+		return pa.start <= pb.start && pa.end >= pb.end;
+	}
 	const aArr = Array.isArray(a) ? a : [a];
 	const bArr = Array.isArray(b) ? b : [b];
 	const v4a = [], v6a = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -17,22 +17,22 @@
     "node": ">=18"
   },
   "dependencies": {
-    "ip-bigint": "^8.2.9"
+    "ip-bigint": "^8.2.12"
   },
   "devDependencies": {
-    "@types/node": "25.3.3",
-    "@typescript/native-preview": "7.0.0-dev.20260305.1",
-    "eslint": "9.39.3",
-    "eslint-config-silverwind": "121.2.0",
+    "@types/node": "25.5.0",
+    "@typescript/native-preview": "7.0.0-dev.20260317.1",
+    "eslint": "9.39.4",
+    "eslint-config-silverwind": "125.0.3",
     "jest-extended": "7.0.0",
-    "tsdown": "0.21.0",
-    "tsdown-config-silverwind": "2.0.0",
+    "tsdown": "0.21.4",
+    "tsdown-config-silverwind": "2.0.2",
     "typescript": "5.9.3",
-    "typescript-config-silverwind": "15.0.0",
-    "updates": "17.8.1",
-    "updates-config-silverwind": "1.0.3",
+    "typescript-config-silverwind": "16.0.0",
+    "updates": "17.9.1",
+    "updates-config-silverwind": "1.0.4",
     "versions": "14.2.1",
-    "vitest": "4.0.18",
-    "vitest-config-silverwind": "10.6.3"
+    "vitest": "4.1.0",
+    "vitest-config-silverwind": "10.6.5"
   }
 }