cidr-tools 11.0.12 → 11.1.0

package/dist/index.js

@@ -50,37 +50,40 @@ function normalizeCidr(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) {
-	const parsed = Object.create(null);
 	const slashIndex = str.indexOf("/");
 	let ipPart;
 	let prefix;
+	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}"`);
-		parsed.prefixPresent = true;
+		prefixPresent = true;
 	} else {
 		ipPart = str;
-		parsed.prefixPresent = false;
+		prefixPresent = false;
 		prefix = "";
 	}
 	const { number, version, ipv4mapped, scopeid } = parseIp(ipPart);
 	if (!version) throw new Error(`Network is not a CIDR or IP: "${str}"`);
-	if (!parsed.prefixPresent) prefix = String(bits[version]);
-	parsed.version = version;
-	parsed.ip = stringifyIp({
+	if (!prefixPresent) prefix = String(bits[version]);
+	const ip = stringifyIp({
 		number,
 		version,
 		ipv4mapped,
 		scopeid
 	});
-	parsed.cidr = `${parsed.ip}/${prefix}`;
-	parsed.prefix = prefix;
 	const hostBits = bits[version] - Number(prefix);
 	const mask = hostBits > 0 ? (1n << BigInt(hostBits)) - 1n : 0n;
-	parsed.start = number & ~mask;
-	parsed.end = number | mask;
-	return parsed;
+	return {
+		cidr: `${ip}/${prefix}`,
+		ip,
+		version,
+		prefix,
+		prefixPresent,
+		start: number & ~mask,
+		end: number | mask
+	};
 }
 function parseCidrLean(str) {
 	const slashIndex = str.indexOf("/");
@@ -88,9 +91,13 @@ function parseCidrLean(str) {
 	let prefixNum;
 	if (slashIndex !== -1) {
 		ipPart = str.substring(0, slashIndex);
-		const prefixStr = str.substring(slashIndex + 1);
-		if (!/^[0-9]+$/.test(prefixStr)) throw new Error(`Network is not a CIDR or IP: "${str}"`);
-		prefixNum = Number(prefixStr);
+		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);
+		}
 	} else {
 		ipPart = str;
 		prefixNum = -1;
@@ -99,12 +106,16 @@ function parseCidrLean(str) {
 		const v4num = parseIPv4Fast(ipPart);
 		if (v4num !== -1) {
 			if (prefixNum === -1) prefixNum = 32;
-			const bigNum = BigInt(v4num);
 			const hostBits = 32 - prefixNum;
-			const mask = hostBits > 0 ? (1n << BigInt(hostBits)) - 1n : 0n;
+			if (hostBits >= 32) return {
+				start: 0n,
+				end: 4294967295n,
+				version: 4
+			};
+			const mask = hostBits > 0 ? (1 << hostBits >>> 0) - 1 : 0;
 			return {
-				start: bigNum & ~mask,
-				end: bigNum | mask,
+				start: BigInt((v4num & ~mask) >>> 0),
+				end: BigInt((v4num | mask) >>> 0),
 				version: 4
 			};
 		}
@@ -124,64 +135,62 @@ function biggestPowerOfTwo(num) {
 	if (num === 0n) return 0n;
 	return 1n << BigInt(num.toString(2).length - 1);
 }
-function subparts(part, output) {
-	if (!output) output = [];
-	if (part.end < part.start) return output;
-	if (part.end === part.start) {
-		output.push(part);
-		return output;
+function subparts(pStart, pEnd, output) {
+	if (pEnd < pStart) return;
+	if (pEnd === pStart) {
+		output.push({
+			start: pStart,
+			end: pEnd
+		});
+		return;
 	}
-	if (part.end - part.start === 1n) {
-		if (part.end % 2n === 0n) output.push({
-			start: part.start,
-			end: part.start
+	if (pEnd - pStart === 1n) {
+		if (pEnd % 2n === 0n) output.push({
+			start: pStart,
+			end: pStart
 		}, {
-			start: part.end,
-			end: part.end
+			start: pEnd,
+			end: pEnd
 		});
 		else output.push({
-			start: part.start,
-			end: part.end
+			start: pStart,
+			end: pEnd
 		});
-		return output;
+		return;
 	}
-	const size = diff(part.end, part.start);
+	const size = diff(pEnd, pStart);
 	let biggest = biggestPowerOfTwo(size);
 	let start;
 	let end;
-	if (size === biggest && part.start % biggest === 0n) {
-		output.push(part);
-		return output;
-	} else if (part.start % biggest === 0n) {
-		start = part.start;
+	if (size === biggest && pStart % biggest === 0n) {
+		output.push({
+			start: pStart,
+			end: pEnd
+		});
+		return;
+	} else if (pStart % biggest === 0n) {
+		start = pStart;
 		end = start + biggest - 1n;
 	} else {
-		start = part.end / biggest * biggest;
-		if (start + biggest - 1n > part.end) {
-			start = (part.end / biggest - 1n) * biggest;
-			while (start < part.start) {
+		start = pEnd / biggest * biggest;
+		if (start + biggest - 1n > pEnd) {
+			start = (pEnd / biggest - 1n) * biggest;
+			while (start < pStart) {
 				biggest /= 2n;
-				start = (part.end / biggest - 1n) * biggest;
+				start = (pEnd / biggest - 1n) * biggest;
 			}
 			end = start + biggest - 1n;
 		} else {
-			start = part.end / biggest * biggest;
+			start = pEnd / biggest * biggest;
 			end = start + biggest - 1n;
 		}
 	}
-	if (start !== part.start) subparts({
-		start: part.start,
-		end: start - 1n
-	}, output);
+	if (start !== pStart) subparts(pStart, start - 1n, output);
 	output.push({
 		start,
 		end
 	});
-	if (end !== part.end) subparts({
-		start: end + 1n,
-		end: part.end
-	}, output);
-	return output;
+	if (end !== pEnd) subparts(end + 1n, pEnd, output);
 }
 function diff(a, b) {
 	return a + 1n - b;
@@ -202,12 +211,12 @@ function formatPart(part, version) {
 }
 function mergeIntervalsRaw(nets) {
 	if (nets.length === 0) return [];
-	const sorted = nets.slice().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((a, b) => a.start > b.start ? 1 : a.start < b.start ? -1 : a.end > b.end ? 1 : a.end < b.end ? -1 : 0);
 	const merged = [];
-	let curStart = sorted[0].start;
-	let curEnd = sorted[0].end;
-	for (let i = 1; i < sorted.length; i++) {
-		const { start, end } = sorted[i];
+	let curStart = nets[0].start;
+	let curEnd = nets[0].end;
+	for (let i = 1; i < nets.length; i++) {
+		const { start, end } = nets[i];
 		if (start <= curEnd + 1n) {
 			if (end > curEnd) curEnd = end;
 		} else {
@@ -227,7 +236,7 @@ function mergeIntervalsRaw(nets) {
 }
 function mergeIntervals(nets) {
 	const merged = [];
-	for (const part of mergeIntervalsRaw(nets)) subparts(part, merged);
+	for (const part of mergeIntervalsRaw(nets)) subparts(part.start, part.end, merged);
 	return merged;
 }
 function subtractSorted(bases, excls) {
@@ -284,21 +293,31 @@ function excludeCidr(base, excl) {
 	const result = [];
 	for (const v of [4, 6]) {
 		const remaining = subtractSorted(mergeIntervalsRaw(baseByVersion[v]), mergeIntervalsRaw(exclByVersion[v]));
-		for (const part of remaining) {
-			const aligned = subparts(part);
-			for (const p of aligned) result.push(formatPart(p, v));
-		}
+		const aligned = [];
+		for (const part of remaining) subparts(part.start, part.end, aligned);
+		for (const p of aligned) result.push(formatPart(p, v));
 	}
 	return result;
 }
 function* expandCidr(nets) {
-	const arr = Array.isArray(nets) ? nets : [nets];
-	for (const net of mergeCidr(arr)) {
-		const { start, end, version } = parseCidrLean(net);
-		for (let number = start; number <= end; number++) yield normalizeIp(stringifyIp({
-			number,
-			version
-		}));
+	const parsed = (Array.isArray(nets) ? nets : [nets]).map(parseCidrLean);
+	const byVersion = {
+		4: [],
+		6: []
+	};
+	for (const n of parsed) byVersion[n.version].push(n);
+	for (const v of [4, 6]) {
+		if (byVersion[v].length === 0) continue;
+		const intervals = mergeIntervalsRaw(byVersion[v]);
+		if (v === 4) for (const part of intervals) {
+			const startNum = Number(part.start);
+			const endNum = Number(part.end);
+			for (let n = startNum; n <= endNum; n++) yield formatIPv4Fast(n);
+		}
+		else for (const part of intervals) for (let num = part.start; num <= part.end; num++) yield stringifyIp({
+			number: num,
+			version: 6
+		});
 	}
 }
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.0.12",
+  "version": "11.1.0",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -17,7 +17,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "ip-bigint": "^8.2.8"
+    "ip-bigint": "^8.2.9"
   },
   "devDependencies": {
     "@types/node": "25.3.3",