cidr-tools 12.0.0 → 12.0.2

package/dist/index.d.ts

@@ -23,6 +23,7 @@ declare function parseCidr(str: Network): ParsedCidr;
 declare function mergeCidr(nets: Networks): Array<Network>;
 /** Returns an array of merged remaining networks of the subtraction of `excludeNetworks` from `baseNetworks`. */
 declare function excludeCidr(base: Networks, excl: Networks): Array<Network>;
+/** Returns a generator for individual IPs contained in the networks. */
 declare function expandCidr(nets: Networks): Generator<Network>;
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */
 declare function overlapCidr(a: Networks, b: Networks): boolean;

package/dist/index.js

@@ -8,6 +8,7 @@ const bits = {
 const octetStrings = Array.from({ length: 256 }, (_, i) => String(i));
 const octetDotStrings = Array.from({ length: 256 }, (_, i) => `${i}.`);
 const prefixStrings = Array.from({ length: 129 }, (_, i) => `/${i}`);
+const prefixNumStrings = Array.from({ length: 129 }, (_, i) => String(i));
 const cmpV4StartEnd = (a, b) => a.start - b.start || a.end - b.end;
 const cmpV4Start = (a, b) => a.start - b.start;
 const cmpV6StartEnd = (a, b) => a.start > b.start ? 1 : a.start < b.start ? -1 : a.end > b.end ? 1 : a.end < b.end ? -1 : 0;
@@ -92,8 +93,7 @@ function doNormalize(cidr, opts) {
 }
 /** Returns a string or array (depending on input) with a normalized representation. Will not include a prefix on single IPs. Will set network address to the start of the network. */
 function normalizeCidr(cidr, opts) {
-	if (Array.isArray(cidr)) return cidr.map((entry) => normalizeCidr(entry, opts));
-	else return doNormalize(cidr, opts);
+	return Array.isArray(cidr) ? cidr.map((entry) => doNormalize(entry, opts)) : doNormalize(cidr, opts);
 }
 /** Returns a `parsed` Object which is used internally by this module. It can be used to test whether the passed network is IPv4 or IPv6 or to work with the BigInts directly. */
 function parseCidr(str) {
@@ -104,7 +104,7 @@ function parseCidr(str) {
 	if (v4num !== -1) {
 		const prefixNum = prefixPresent ? parsePrefixNum(str, slashIndex) : 32;
 		const ip = formatIPv4Fast(v4num);
-		const prefix = String(prefixNum);
+		const prefix = prefixNumStrings[prefixNum] ?? String(prefixNum);
 		const hostBits = 32 - prefixNum;
 		let startNum, endNum;
 		if (hostBits >= 32) {
@@ -130,7 +130,7 @@ function parseCidr(str) {
 	const { number, version, ipv4mapped, scopeid } = parseIp(ipPart);
 	if (!version) throw new Error(`Network is not a CIDR or IP: "${str}"`);
 	if (prefixNum === -1) prefixNum = bits[version];
-	const prefix = String(prefixNum);
+	const prefix = prefixNumStrings[prefixNum] ?? String(prefixNum);
 	const ip = stringifyIp({
 		number,
 		version,
@@ -206,120 +206,37 @@ function biggestPowerOfTwo4(num) {
 	return 1 << 31 - Math.clz32(num) >>> 0;
 }
 function subparts4(pStart, pEnd, output) {
-	if (pEnd < pStart) return;
-	if (pEnd === pStart) {
+	let start = pStart;
+	while (start <= pEnd) {
+		const size = pEnd - start + 1;
+		const lowBit = (start & -start) >>> 0;
+		const blockSize = lowBit !== 0 && lowBit <= size ? lowBit : biggestPowerOfTwo4(size);
 		output.push({
-			start: pStart,
-			end: pEnd
-		});
-		return;
-	}
-	if (pEnd - pStart === 1) {
-		if (pEnd % 2 === 0) output.push({
-			start: pStart,
-			end: pStart
-		}, {
-			start: pEnd,
-			end: pEnd
-		});
-		else output.push({
-			start: pStart,
-			end: pEnd
+			start,
+			end: start + blockSize - 1
 		});
-		return;
+		start += blockSize;
 	}
-	const size = pEnd - pStart + 1;
-	if ((size & size - 1) === 0 && pStart % size === 0) {
-		output.push({
-			start: pStart,
-			end: pEnd
-		});
-		return;
-	}
-	let biggest = biggestPowerOfTwo4(size);
-	let start;
-	let end;
-	if (pStart % biggest === 0) {
-		start = pStart;
-		end = start + biggest - 1;
-	} else {
-		start = Math.floor(pEnd / biggest) * biggest;
-		if (start + biggest - 1 > pEnd) {
-			start = (Math.floor(pEnd / biggest) - 1) * biggest;
-			while (start < pStart) {
-				biggest /= 2;
-				start = (Math.floor(pEnd / biggest) - 1) * biggest;
-			}
-			end = start + biggest - 1;
-		} else {
-			start = Math.floor(pEnd / biggest) * biggest;
-			end = start + biggest - 1;
-		}
-	}
-	if (start !== pStart) subparts4(pStart, start - 1, output);
-	output.push({
-		start,
-		end
-	});
-	if (end !== pEnd) subparts4(end + 1, pEnd, output);
 }
 function subparts6(pStart, pEnd, output) {
-	if (pEnd < pStart) return;
-	if (pEnd === pStart) {
-		output.push({
-			start: pStart,
-			end: pEnd
-		});
-		return;
-	}
-	if (pEnd - pStart === 1n) {
-		if (pEnd % 2n === 0n) output.push({
-			start: pStart,
-			end: pStart
-		}, {
-			start: pEnd,
-			end: pEnd
-		});
-		else output.push({
-			start: pStart,
-			end: pEnd
-		});
-		return;
-	}
-	const size = pEnd - pStart + 1n;
-	if ((size & size - 1n) === 0n && (pStart & size - 1n) === 0n) {
+	let start = pStart;
+	while (start <= pEnd) {
+		const size = pEnd - start + 1n;
+		const lowBit = start & -start;
+		if ((size & size - 1n) === 0n && (lowBit === 0n || lowBit >= size)) {
+			output.push({
+				start,
+				end: pEnd
+			});
+			return;
+		}
+		const blockSize = lowBit !== 0n && lowBit <= size ? lowBit : biggestPowerOfTwo(size);
 		output.push({
-			start: pStart,
-			end: pEnd
+			start,
+			end: start + blockSize - 1n
 		});
-		return;
-	}
-	let biggest = biggestPowerOfTwo(size);
-	let start;
-	let end;
-	if ((pStart & biggest - 1n) === 0n) {
-		start = pStart;
-		end = start + biggest - 1n;
-	} else {
-		start = pEnd & -biggest;
-		if (start + biggest - 1n > pEnd) {
-			start = (pEnd & -biggest) - biggest;
-			while (start < pStart) {
-				biggest >>= 1n;
-				start = (pEnd & -biggest) - biggest;
-			}
-			end = start + biggest - 1n;
-		} else {
-			start = pEnd & -biggest;
-			end = start + biggest - 1n;
-		}
+		start += blockSize;
 	}
-	if (start !== pStart) subparts6(pStart, start - 1n, output);
-	output.push({
-		start,
-		end
-	});
-	if (end !== pEnd) subparts6(end + 1n, pEnd, output);
 }
 function formatPart4(part) {
 	return formatIPv4Fast(part.start) + prefixStrings[Math.clz32(part.end - part.start)];
@@ -486,6 +403,7 @@ function excludeCidr(base, excl) {
 	}
 	return result;
 }
+/** Returns a generator for individual IPs contained in the networks. */
 function* expandCidr(nets) {
 	const arr = Array.isArray(nets) ? nets : [nets];
 	const v4 = [];
@@ -498,13 +416,13 @@ function* expandCidr(nets) {
 	if (v4.length > 0) for (const part of mergeIntervalsRaw4(v4)) {
 		let prevHigh = -1;
 		let prefix = "";
-		for (let n = part.start; n <= part.end; n++) {
-			const high = n >>> 8;
+		for (let num = part.start; num <= part.end; num++) {
+			const high = num >>> 8;
 			if (high !== prevHigh) {
-				prefix = octetDotStrings[n >>> 24 & 255] + octetDotStrings[n >>> 16 & 255] + octetDotStrings[n >>> 8 & 255];
+				prefix = octetDotStrings[num >>> 24 & 255] + octetDotStrings[num >>> 16 & 255] + octetDotStrings[num >>> 8 & 255];
 				prevHigh = high;
 			}
-			yield prefix + octetStrings[n & 255];
+			yield prefix + octetStrings[num & 255];
 		}
 	}
 	if (v6.length > 0) {
@@ -524,6 +442,9 @@ function overlapCidr(a, b) {
 		if (parseIPv4Range(a)) {
 			const startA = rangeV4Start, endA = rangeV4End;
 			if (parseIPv4Range(b)) return startA <= rangeV4End && rangeV4Start <= endA;
+			const pb = parseCidrLean(b);
+			if (pb.version !== 4) return false;
+			return startA <= pb.end && pb.start <= endA;
 		}
 		const pa = parseCidrLean(a);
 		const pb = parseCidrLean(b);
@@ -584,6 +505,9 @@ function containsCidr(a, b) {
 		if (parseIPv4Range(a)) {
 			const startA = rangeV4Start, endA = rangeV4End;
 			if (parseIPv4Range(b)) return startA <= rangeV4Start && endA >= rangeV4End;
+			const pb = parseCidrLean(b);
+			if (pb.version !== 4) return false;
+			return startA <= pb.start && endA >= pb.end;
 		}
 		const pa = parseCidrLean(a);
 		const pb = parseCidrLean(b);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "12.0.0",
+  "version": "12.0.2",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "keywords": [
@@ -26,23 +26,23 @@
     "bun": "*"
   },
   "dependencies": {
-    "ip-bigint": "^9.0.0"
+    "ip-bigint": "^9.0.5"
   },
   "devDependencies": {
-    "@types/node": "25.6.0",
-    "@typescript/native-preview": "7.0.0-dev.20260505.1",
-    "@vitest/coverage-v8": "4.1.5",
-    "eslint": "10.3.0",
-    "eslint-config-silverwind": "133.0.0",
+    "@types/node": "25.9.1",
+    "@typescript/native-preview": "7.0.0-dev.20260527.2",
+    "@vitest/coverage-v8": "4.1.7",
+    "eslint": "10.4.0",
+    "eslint-config-silverwind": "133.0.5",
     "jest-extended": "7.0.0",
-    "tsdown": "0.21.10",
-    "tsdown-config-silverwind": "3.0.0",
+    "tsdown": "0.22.1",
+    "tsdown-config-silverwind": "3.0.2",
     "typescript": "6.0.3",
     "typescript-config-silverwind": "18.0.0",
-    "updates": "17.16.9",
-    "updates-config-silverwind": "3.0.0",
-    "versions": "15.0.3",
-    "vitest": "4.1.5",
-    "vitest-config-silverwind": "11.3.3"
+    "updates": "17.17.3",
+    "updates-config-silverwind": "3.0.2",
+    "versions": "15.1.0",
+    "vitest": "4.1.7",
+    "vitest-config-silverwind": "11.3.5"
   }
 }