cidr-tools 11.3.1 → 11.3.3

package/dist/index.d.ts

@@ -1,9 +1,5 @@
 //#region index.d.ts
-type IPv4Address = string;
-type IPv6Address = string;
-type IPv4CIDR = string;
-type IPv6CIDR = string;
-type Network = IPv4Address | IPv4CIDR | IPv6Address | IPv6CIDR;
+type Network = string;
 type Networks = Network | Array<Network>;
 type ValidIpVersion = 4 | 6;
 type ParsedCidr = {

package/dist/index.js

@@ -6,8 +6,12 @@ const bits = {
 	6: 128
 };
 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;
+const cmpV6Start = (a, b) => a.start > b.start ? 1 : a.start < b.start ? -1 : 0;
 function parseIPv4Fast(s, end) {
 	let num = 0;
 	let octet = 0;
@@ -17,7 +21,7 @@ function parseIPv4Fast(s, end) {
 		const c = s.charCodeAt(i);
 		if (c === 46) {
 			if (digits === 0 || octet > 255) return -1;
-			num = (num << 8 | octet) >>> 0;
+			num = num << 8 | octet;
 			octet = 0;
 			dots++;
 			digits = 0;
@@ -30,7 +34,7 @@ function parseIPv4Fast(s, end) {
 	return (num << 8 | octet) >>> 0;
 }
 function formatIPv4Fast(n) {
-	return `${octetStrings[n >>> 24 & 255]}.${octetStrings[n >>> 16 & 255]}.${octetStrings[n >>> 8 & 255]}.${octetStrings[n & 255]}`;
+	return octetDotStrings[n >>> 24 & 255] + octetDotStrings[n >>> 16 & 255] + octetDotStrings[n >>> 8 & 255] + octetStrings[n & 255];
 }
 function parsePrefixNum(str, slashIndex) {
 	if (slashIndex === -1) return -1;
@@ -100,7 +104,7 @@ function parseCidr(str) {
 	if (v4num !== -1) {
 		const prefixNum = prefixPresent ? parsePrefixNum(str, slashIndex) : 32;
 		const ip = formatIPv4Fast(v4num);
-		const prefix = prefixNumStrings[prefixNum];
+		const prefix = String(prefixNum);
 		const hostBits = 32 - prefixNum;
 		let startNum, endNum;
 		if (hostBits >= 32) {
@@ -126,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 = prefixNumStrings[prefixNum];
+	const prefix = String(prefixNum);
 	const ip = stringifyIp({
 		number,
 		version,
@@ -235,13 +239,7 @@ function subparts4(pStart, pEnd, output) {
 	let biggest = biggestPowerOfTwo4(size);
 	let start;
 	let end;
-	if (size === biggest && pStart % biggest === 0) {
-		output.push({
-			start: pStart,
-			end: pEnd
-		});
-		return;
-	} else if (pStart % biggest === 0) {
+	if (pStart % biggest === 0) {
 		start = pStart;
 		end = start + biggest - 1;
 	} else {
@@ -299,13 +297,7 @@ function subparts6(pStart, pEnd, output) {
 	let biggest = biggestPowerOfTwo(size);
 	let start;
 	let end;
-	if (size === biggest && (pStart & biggest - 1n) === 0n) {
-		output.push({
-			start: pStart,
-			end: pEnd
-		});
-		return;
-	} else if ((pStart & biggest - 1n) === 0n) {
+	if ((pStart & biggest - 1n) === 0n) {
 		start = pStart;
 		end = start + biggest - 1n;
 	} else {
@@ -330,21 +322,17 @@ function subparts6(pStart, pEnd, output) {
 	if (end !== pEnd) subparts6(end + 1n, pEnd, output);
 }
 function formatPart4(part) {
-	const ip = formatIPv4Fast(part.start);
-	const size = part.end - part.start + 1;
-	return ip + prefixStrings[32 - (size <= 1 ? 0 : size >= 4294967296 ? 32 : 31 - Math.clz32(size))];
+	return formatIPv4Fast(part.start) + prefixStrings[Math.clz32(part.end - part.start)];
 }
 function formatPart6(part) {
-	const ip = stringifyIp({
+	return stringifyIp({
 		number: part.start,
 		version: 6
-	});
-	const size = part.end - part.start + 1n;
-	return ip + prefixStrings[128 - (size <= 1n ? 0 : bigintBitLength(size) - 1)];
+	}) + prefixStrings[128 - bigintBitLength(part.end - part.start)];
 }
 function mergeIntervalsRaw4(nets) {
 	if (nets.length === 0) return [];
-	nets.sort((a, b) => a.start - b.start || a.end - b.end);
+	nets.sort(cmpV4StartEnd);
 	const merged = [];
 	let curStart = nets[0].start;
 	let curEnd = nets[0].end;
@@ -369,7 +357,7 @@ function mergeIntervalsRaw4(nets) {
 }
 function mergeIntervalsRaw6(nets) {
 	if (nets.length === 0) return [];
-	nets.sort((a, b) => a.start > b.start ? 1 : a.start < b.start ? -1 : a.end > b.end ? 1 : a.end < b.end ? -1 : 0);
+	nets.sort(cmpV6StartEnd);
 	const merged = [];
 	let curStart = nets[0].start;
 	let curEnd = nets[0].end;
@@ -507,11 +495,28 @@ function* expandCidr(nets) {
 		if (n.version === 4) v4.push(n);
 		else v6.push(n);
 	}
-	if (v4.length > 0) for (const part of mergeIntervalsRaw4(v4)) for (let n = part.start; n <= part.end; n++) yield formatIPv4Fast(n);
-	if (v6.length > 0) for (const part of mergeIntervalsRaw6(v6)) for (let num = part.start; num <= part.end; num++) yield stringifyIp({
-		number: num,
-		version: 6
-	});
+	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;
+			if (high !== prevHigh) {
+				prefix = octetDotStrings[n >>> 24 & 255] + octetDotStrings[n >>> 16 & 255] + octetDotStrings[n >>> 8 & 255];
+				prevHigh = high;
+			}
+			yield prefix + octetStrings[n & 255];
+		}
+	}
+	if (v6.length > 0) {
+		const ipObj = {
+			number: 0n,
+			version: 6
+		};
+		for (const part of mergeIntervalsRaw6(v6)) for (let num = part.start; num <= part.end; num++) {
+			ipObj.number = num;
+			yield stringifyIp(ipObj);
+		}
+	}
 }
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */
 function overlapCidr(a, b) {
@@ -546,8 +551,8 @@ function overlapCidr(a, b) {
 		const as = v4a[0].start, ae = v4a[0].end;
 		for (const el of v4b) if (as <= el.end && el.start <= ae) return true;
 	} else {
-		v4a.sort((x, y) => x.start - y.start);
-		v4b.sort((x, y) => x.start - y.start);
+		v4a.sort(cmpV4Start);
+		v4b.sort(cmpV4Start);
 		let i = 0, j = 0;
 		while (i < v4a.length && j < v4b.length) {
 			if (v4a[i].start <= v4b[j].end && v4b[j].start <= v4a[i].end) return true;
@@ -562,8 +567,8 @@ function overlapCidr(a, b) {
 		const as = v6a[0].start, ae = v6a[0].end;
 		for (const el of v6b) if (as <= el.end && el.start <= ae) return true;
 	} else {
-		v6a.sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
-		v6b.sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
+		v6a.sort(cmpV6Start);
+		v6b.sort(cmpV6Start);
 		let i = 0, j = 0;
 		while (i < v6a.length && j < v6b.length) {
 			if (v6a[i].start <= v6b[j].end && v6b[j].start <= v6a[i].end) return true;
@@ -601,40 +606,60 @@ function containsCidr(a, b) {
 	}
 	if (v4b.length > 0) {
 		if (v4a.length === 0) return false;
-		v4a.sort((x, y) => x.start - y.start);
-		const maxEnd = new Array(v4a.length);
-		maxEnd[0] = v4a[0].end;
-		for (let i = 1; i < v4a.length; i++) maxEnd[i] = Math.max(v4a[i].end, maxEnd[i - 1]);
-		for (const target of v4b) {
-			let lo = 0, hi = v4a.length - 1;
-			let idx = -1;
-			while (lo <= hi) {
-				const mid = lo + hi >> 1;
-				if (v4a[mid].start <= target.start) {
-					idx = mid;
-					lo = mid + 1;
-				} else hi = mid - 1;
+		if (v4b.length === 1) {
+			const ts = v4b[0].start, te = v4b[0].end;
+			let found = false;
+			for (const a of v4a) if (a.start <= ts && a.end >= te) {
+				found = true;
+				break;
+			}
+			if (!found) return false;
+		} else {
+			v4a.sort(cmpV4Start);
+			const maxEnd = new Array(v4a.length);
+			maxEnd[0] = v4a[0].end;
+			for (let i = 1; i < v4a.length; i++) maxEnd[i] = Math.max(v4a[i].end, maxEnd[i - 1]);
+			for (const target of v4b) {
+				let lo = 0, hi = v4a.length - 1;
+				let idx = -1;
+				while (lo <= hi) {
+					const mid = lo + hi >> 1;
+					if (v4a[mid].start <= target.start) {
+						idx = mid;
+						lo = mid + 1;
+					} else hi = mid - 1;
+				}
+				if (idx < 0 || maxEnd[idx] < target.end) return false;
 			}
-			if (idx < 0 || maxEnd[idx] < target.end) return false;
 		}
 	}
 	if (v6b.length > 0) {
 		if (v6a.length === 0) return false;
-		v6a.sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
-		const maxEnd = new Array(v6a.length);
-		maxEnd[0] = v6a[0].end;
-		for (let i = 1; i < v6a.length; i++) maxEnd[i] = v6a[i].end > maxEnd[i - 1] ? v6a[i].end : maxEnd[i - 1];
-		for (const target of v6b) {
-			let lo = 0, hi = v6a.length - 1;
-			let idx = -1;
-			while (lo <= hi) {
-				const mid = lo + hi >> 1;
-				if (v6a[mid].start <= target.start) {
-					idx = mid;
-					lo = mid + 1;
-				} else hi = mid - 1;
+		if (v6b.length === 1) {
+			const ts = v6b[0].start, te = v6b[0].end;
+			let found = false;
+			for (const a of v6a) if (a.start <= ts && a.end >= te) {
+				found = true;
+				break;
+			}
+			if (!found) return false;
+		} else {
+			v6a.sort(cmpV6Start);
+			const maxEnd = new Array(v6a.length);
+			maxEnd[0] = v6a[0].end;
+			for (let i = 1; i < v6a.length; i++) maxEnd[i] = v6a[i].end > maxEnd[i - 1] ? v6a[i].end : maxEnd[i - 1];
+			for (const target of v6b) {
+				let lo = 0, hi = v6a.length - 1;
+				let idx = -1;
+				while (lo <= hi) {
+					const mid = lo + hi >> 1;
+					if (v6a[mid].start <= target.start) {
+						idx = mid;
+						lo = mid + 1;
+					} else hi = mid - 1;
+				}
+				if (idx < 0 || maxEnd[idx] < target.end) return false;
 			}
-			if (idx < 0 || maxEnd[idx] < target.end) return false;
 		}
 	}
 	return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.3.1",
+  "version": "11.3.3",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -17,22 +17,23 @@
     "node": ">=18"
   },
   "dependencies": {
-    "ip-bigint": "^8.3.1"
+    "ip-bigint": "^8.3.4"
   },
   "devDependencies": {
-    "@types/node": "25.5.0",
-    "@typescript/native-preview": "7.0.0-dev.20260317.1",
-    "eslint": "9.39.4",
-    "eslint-config-silverwind": "125.0.3",
+    "@types/node": "25.5.2",
+    "@typescript/native-preview": "7.0.0-dev.20260409.1",
+    "@vitest/coverage-v8": "4.1.4",
+    "eslint": "10.2.0",
+    "eslint-config-silverwind": "131.0.2",
     "jest-extended": "7.0.0",
-    "tsdown": "0.21.4",
-    "tsdown-config-silverwind": "2.0.2",
+    "tsdown": "0.21.7",
+    "tsdown-config-silverwind": "2.0.5",
     "typescript": "5.9.3",
-    "typescript-config-silverwind": "16.0.0",
-    "updates": "17.9.1",
-    "updates-config-silverwind": "1.0.4",
-    "versions": "14.2.1",
-    "vitest": "4.1.0",
-    "vitest-config-silverwind": "10.6.5"
+    "typescript-config-silverwind": "17.0.0",
+    "updates": "17.14.0",
+    "updates-config-silverwind": "2.0.1",
+    "versions": "14.2.7",
+    "vitest": "4.1.4",
+    "vitest-config-silverwind": "11.1.4"
   }
 }