cidr-tools 12.0.2 → 12.0.3

package/dist/index.js

@@ -9,6 +9,10 @@ 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 hexStrings = Array.from({ length: 256 }, (_, i) => i.toString(16));
+const hexPadStrings = Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, "0"));
+const hostMasks = Array.from({ length: 129 }, (_, i) => (1n << BigInt(i)) - 1n);
+const hostNotMasks = hostMasks.map((mask) => ~mask);
 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;
@@ -73,23 +77,33 @@ function doNormalize(cidr, opts) {
 		const ip = formatIPv4Fast(rangeV4Start);
 		return rangeSlashIndex !== -1 ? ip + prefixStrings[rangeV4Prefix] : ip;
 	}
-	const { start, end, prefix, version, prefixPresent } = parseCidr(cidr);
+	const slashIndex = rangeSlashIndex;
+	const prefixPresent = slashIndex !== -1;
+	let prefixNum = prefixPresent ? parsePrefixNum(cidr, slashIndex) : -1;
+	const { number, version } = parseIp(prefixPresent ? cidr.substring(0, slashIndex) : cidr);
+	if (prefixNum === -1) prefixNum = bits[version];
 	if (version === 4) {
-		const ip = formatIPv4Fast(Number(start));
-		return start !== end || prefixPresent ? ip + prefixStrings[Number(prefix)] : ip;
+		const hostBits = 32 - prefixNum;
+		let startNum = Number(number);
+		if (hostBits >= 32) startNum = 0;
+		else if (hostBits > 0) startNum = (startNum & ~((1 << hostBits >>> 0) - 1)) >>> 0;
+		const ip = formatIPv4Fast(startNum);
+		return hostBits > 0 || prefixPresent ? ip + prefixStrings[prefixNum] : ip;
 	}
 	const { compress = true, hexify = false } = opts || {};
-	if (start !== end || prefixPresent) return normalizeIp(stringifyIp({
-		number: start,
-		version
-	}), {
+	const hostBits = 128 - prefixNum;
+	if (hostBits <= 0 && !prefixPresent) return normalizeIp(cidr, {
 		compress,
 		hexify
-	}) + prefixStrings[Number(prefix)];
-	else return normalizeIp(cidr, {
+	});
+	const ip = stringifyIp({
+		number: hostBits > 0 ? number & hostNotMasks[hostBits] : number,
+		version
+	});
+	return (compress ? ip : normalizeIp(ip, {
 		compress,
 		hexify
-	});
+	})) + prefixStrings[prefixNum];
 }
 /** 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) {
@@ -129,7 +143,8 @@ function parseCidr(str) {
 	let prefixNum = prefixPresent ? parsePrefixNum(str, slashIndex) : -1;
 	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 numBits = bits[version];
+	if (prefixNum === -1) prefixNum = numBits;
 	const prefix = prefixNumStrings[prefixNum] ?? String(prefixNum);
 	const ip = stringifyIp({
 		number,
@@ -137,16 +152,21 @@ function parseCidr(str) {
 		ipv4mapped,
 		scopeid
 	});
-	const hostBits = bits[version] - prefixNum;
-	const mask = hostBits > 0 ? (1n << BigInt(hostBits)) - 1n : 0n;
+	const hostBits = numBits - prefixNum;
+	let start = number;
+	let end = number;
+	if (hostBits > 0) {
+		start = number & hostNotMasks[hostBits];
+		end = number | hostMasks[hostBits];
+	}
 	return {
 		cidr: ip + prefixStrings[prefixNum],
 		ip,
 		version,
 		prefix,
 		prefixPresent,
-		start: number & ~mask,
-		end: number | mask
+		start,
+		end
 	};
 }
 function parseCidrLean(str) {
@@ -160,8 +180,9 @@ function parseCidrLean(str) {
 	let prefixNum = slashIndex !== -1 ? parsePrefixNum(str, slashIndex) : -1;
 	const { number, version } = parseIp(ipPart);
 	if (!version) throw new Error(`Network is not a CIDR or IP: "${str}"`);
-	if (prefixNum === -1) prefixNum = bits[version];
-	const hostBits = bits[version] - prefixNum;
+	const numBits = bits[version];
+	if (prefixNum === -1) prefixNum = numBits;
+	const hostBits = numBits - prefixNum;
 	if (version === 4) {
 		const num = Number(number);
 		if (hostBits >= 32) return {
@@ -176,10 +197,14 @@ function parseCidrLean(str) {
 			version: 4
 		};
 	}
-	const mask = hostBits > 0 ? (1n << BigInt(hostBits)) - 1n : 0n;
+	if (hostBits <= 0) return {
+		start: number,
+		end: number,
+		version: 6
+	};
 	return {
-		start: number & ~mask,
-		end: number | mask,
+		start: number & hostNotMasks[hostBits],
+		end: number | hostMasks[hostBits],
 		version: 6
 	};
 }
@@ -211,10 +236,7 @@ function subparts4(pStart, pEnd, output) {
 		const size = pEnd - start + 1;
 		const lowBit = (start & -start) >>> 0;
 		const blockSize = lowBit !== 0 && lowBit <= size ? lowBit : biggestPowerOfTwo4(size);
-		output.push({
-			start,
-			end: start + blockSize - 1
-		});
+		output.push(formatIPv4Fast(start) + prefixStrings[Math.clz32(blockSize - 1)]);
 		start += blockSize;
 	}
 }
@@ -224,29 +246,20 @@ function subparts6(pStart, pEnd, output) {
 		const size = pEnd - start + 1n;
 		const lowBit = start & -start;
 		if ((size & size - 1n) === 0n && (lowBit === 0n || lowBit >= size)) {
-			output.push({
-				start,
-				end: pEnd
-			});
+			output.push(stringifyIp({
+				number: start,
+				version: 6
+			}) + prefixStrings[129 - bigintBitLength(size)]);
 			return;
 		}
 		const blockSize = lowBit !== 0n && lowBit <= size ? lowBit : biggestPowerOfTwo(size);
-		output.push({
-			start,
-			end: start + blockSize - 1n
-		});
+		output.push(stringifyIp({
+			number: start,
+			version: 6
+		}) + prefixStrings[129 - bigintBitLength(blockSize)]);
 		start += blockSize;
 	}
 }
-function formatPart4(part) {
-	return formatIPv4Fast(part.start) + prefixStrings[Math.clz32(part.end - part.start)];
-}
-function formatPart6(part) {
-	return stringifyIp({
-		number: part.start,
-		version: 6
-	}) + prefixStrings[128 - bigintBitLength(part.end - part.start)];
-}
 function mergeIntervalsRaw4(nets) {
 	if (nets.length === 0) return [];
 	nets.sort(cmpV4StartEnd);
@@ -297,16 +310,6 @@ function mergeIntervalsRaw6(nets) {
 	});
 	return merged;
 }
-function mergeIntervals4(nets) {
-	const merged = [];
-	for (const part of mergeIntervalsRaw4(nets)) subparts4(part.start, part.end, merged);
-	return merged;
-}
-function mergeIntervals6(nets) {
-	const merged = [];
-	for (const part of mergeIntervalsRaw6(nets)) subparts6(part.start, part.end, merged);
-	return merged;
-}
 function subtractSorted4(bases, excls) {
 	if (excls.length === 0) return bases;
 	if (bases.length === 0) return [];
@@ -368,8 +371,8 @@ function mergeCidr(nets) {
 		else v6.push(n);
 	}
 	const merged = [];
-	for (const part of mergeIntervals4(v4)) merged.push(formatPart4(part));
-	for (const part of mergeIntervals6(v6)) merged.push(formatPart6(part));
+	for (const part of mergeIntervalsRaw4(v4)) subparts4(part.start, part.end, merged);
+	for (const part of mergeIntervalsRaw6(v6)) subparts6(part.start, part.end, merged);
 	return merged;
 }
 /** Returns an array of merged remaining networks of the subtraction of `excludeNetworks` from `baseNetworks`. */
@@ -390,16 +393,14 @@ function excludeCidr(base, excl) {
 	}
 	const result = [];
 	{
-		const remaining = subtractSorted4(mergeIntervalsRaw4(v4base), mergeIntervalsRaw4(v4excl));
-		const aligned = [];
-		for (const part of remaining) subparts4(part.start, part.end, aligned);
-		for (const p of aligned) result.push(formatPart4(p));
+		const baseParts = mergeIntervalsRaw4(v4base);
+		const exclParts = mergeIntervalsRaw4(v4excl);
+		for (const part of subtractSorted4(baseParts, exclParts)) subparts4(part.start, part.end, result);
 	}
 	{
-		const remaining = subtractSorted6(mergeIntervalsRaw6(v6base), mergeIntervalsRaw6(v6excl));
-		const aligned = [];
-		for (const part of remaining) subparts6(part.start, part.end, aligned);
-		for (const p of aligned) result.push(formatPart6(p));
+		const baseParts = mergeIntervalsRaw6(v6base);
+		const exclParts = mergeIntervalsRaw6(v6excl);
+		for (const part of subtractSorted6(baseParts, exclParts)) subparts6(part.start, part.end, result);
 	}
 	return result;
 }
@@ -430,9 +431,25 @@ function* expandCidr(nets) {
 			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);
+		for (const part of mergeIntervalsRaw6(v6)) {
+			let num = part.start;
+			while (num <= part.end) {
+				const blockStart = num & -65536n;
+				const blockEnd = blockStart | 65535n;
+				let group = Number(num & 65535n);
+				const groupEnd = part.end < blockEnd ? Number(part.end & 65535n) : 65535;
+				if (group === 0) {
+					ipObj.number = blockStart;
+					yield stringifyIp(ipObj);
+					group = 1;
+				}
+				if (group <= groupEnd) {
+					ipObj.number = blockStart | 1n;
+					const prefix = stringifyIp(ipObj).slice(0, -1);
+					for (; group <= groupEnd; group++) yield group < 256 ? prefix + hexStrings[group] : prefix + hexStrings[group >>> 8] + hexPadStrings[group & 255];
+				}
+				num = blockEnd + 1n;
+			}
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "12.0.2",
+  "version": "12.0.3",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "keywords": [
@@ -11,7 +11,10 @@
     "subnet",
     "network"
   ],
-  "repository": "silverwind/cidr-tools",
+  "repository": {
+    "type": "git",
+    "url": "silverwind/cidr-tools"
+  },
   "license": "BSD-2-Clause",
   "type": "module",
   "sideEffects": false,
@@ -26,23 +29,23 @@
     "bun": "*"
   },
   "dependencies": {
-    "ip-bigint": "^9.0.5"
+    "ip-bigint": "^9.0.6"
   },
   "devDependencies": {
-    "@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",
+    "@types/node": "25.9.2",
+    "@typescript/native-preview": "7.0.0-dev.20260609.1",
+    "@vitest/coverage-v8": "4.1.8",
+    "eslint": "10.4.1",
+    "eslint-config-silverwind": "135.0.1",
     "jest-extended": "7.0.0",
-    "tsdown": "0.22.1",
-    "tsdown-config-silverwind": "3.0.2",
+    "tsdown": "0.22.2",
+    "tsdown-config-silverwind": "3.0.3",
     "typescript": "6.0.3",
-    "typescript-config-silverwind": "18.0.0",
-    "updates": "17.17.3",
-    "updates-config-silverwind": "3.0.2",
-    "versions": "15.1.0",
-    "vitest": "4.1.7",
-    "vitest-config-silverwind": "11.3.5"
+    "typescript-config-silverwind": "20.0.0",
+    "updates": "17.18.0",
+    "updates-config-silverwind": "4.0.0",
+    "versions": "15.1.1",
+    "vitest": "4.1.8",
+    "vitest-config-silverwind": "11.3.6"
   }
 }