cidr-tools 12.1.1 → 12.1.3

package/dist/index.js

@@ -38,6 +38,7 @@ function parseIPv4Fast(s, end) {
 	if (dots !== 3 || digits === 0 || octet > 255) return -1;
 	return (num << 8 | octet) >>> 0;
 }
+const hostMasks4 = Int32Array.from({ length: 33 }, (_, i) => i === 32 ? -1 : (1 << i) - 1);
 function formatIPv4Fast(n) {
 	return octetDotStrings[n >>> 24 & 255] + octetDotStrings[n >>> 16 & 255] + octetDotStrings[n >>> 8 & 255] + octetStrings[n & 255];
 }
@@ -61,15 +62,9 @@ function parseIPv4Range(str) {
 	const v4num = parseIPv4Fast(str, rangeSlashIndex !== -1 ? rangeSlashIndex : str.length);
 	if (v4num === -1) return false;
 	rangeV4Prefix = rangeSlashIndex !== -1 ? parsePrefixNum(str, rangeSlashIndex) : 32;
-	const hostBits = 32 - rangeV4Prefix;
-	if (hostBits >= 32) {
-		rangeV4Start = 0;
-		rangeV4End = 4294967295;
-	} else {
-		const mask = hostBits > 0 ? (1 << hostBits >>> 0) - 1 : 0;
-		rangeV4Start = (v4num & ~mask) >>> 0;
-		rangeV4End = (v4num | mask) >>> 0;
-	}
+	const mask = hostMasks4[Math.max(32 - rangeV4Prefix, 0)];
+	rangeV4Start = (v4num & ~mask) >>> 0;
+	rangeV4End = (v4num | mask) >>> 0;
 	return true;
 }
 function doNormalize(cidr, opts) {
@@ -80,14 +75,12 @@ function doNormalize(cidr, opts) {
 	const slashIndex = rangeSlashIndex;
 	const prefixPresent = slashIndex !== -1;
 	let prefixNum = prefixPresent ? parsePrefixNum(cidr, slashIndex) : -1;
-	const { number, version } = parseIp(prefixPresent ? cidr.substring(0, slashIndex) : cidr);
+	const { number, version, ipv4mapped, scopeid } = parseIp(prefixPresent ? cidr.substring(0, slashIndex) : cidr);
 	if (prefixNum === -1) prefixNum = bits[version];
 	if (version === 4) {
 		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);
+		const mask = hostMasks4[Math.max(hostBits, 0)];
+		const ip = formatIPv4Fast((Number(number) & ~mask) >>> 0);
 		return hostBits > 0 || prefixPresent ? ip + prefixStrings[prefixNum] : ip;
 	}
 	const { compress = true, hexify = false } = opts || {};
@@ -96,10 +89,13 @@ function doNormalize(cidr, opts) {
 		compress,
 		hexify
 	});
+	const start = hostBits > 0 ? number & hostNotMasks[hostBits] : number;
 	const ip = stringifyIp({
-		number: hostBits > 0 ? number & hostNotMasks[hostBits] : number,
-		version
-	});
+		number: start,
+		version,
+		ipv4mapped: ipv4mapped && start >> 32n === 65535n,
+		scopeid
+	}, { hexify });
 	return (compress ? ip : normalizeIp(ip, {
 		compress,
 		hexify
@@ -119,24 +115,15 @@ function parseCidr(str) {
 		const prefixNum = prefixPresent ? parsePrefixNum(str, slashIndex) : 32;
 		const ip = formatIPv4Fast(v4num);
 		const prefix = prefixNumStrings[prefixNum] ?? 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;
-		}
+		const mask = hostMasks4[Math.max(32 - prefixNum, 0)];
 		return {
 			cidr: ip + prefixStrings[prefixNum],
 			ip,
 			version: 4,
 			prefix,
 			prefixPresent,
-			start: BigInt(startNum),
-			end: BigInt(endNum)
+			start: BigInt((v4num & ~mask) >>> 0),
+			end: BigInt((v4num | mask) >>> 0)
 		};
 	}
 	const ipPart = prefixPresent ? str.substring(0, slashIndex) : str;
@@ -185,12 +172,7 @@ function parseCidrLean(str) {
 	const hostBits = numBits - prefixNum;
 	if (version === 4) {
 		const num = Number(number);
-		if (hostBits >= 32) return {
-			start: 0,
-			end: 4294967295,
-			version: 4
-		};
-		const mask = hostBits > 0 ? (1 << hostBits >>> 0) - 1 : 0;
+		const mask = hostMasks4[Math.max(hostBits, 0)];
 		return {
 			start: (num & ~mask) >>> 0,
 			end: (num | mask) >>> 0,
@@ -364,13 +346,11 @@ function subtractSorted6(bases, excls) {
 }
 /** Returns an array of merged networks */
 function mergeCidr(nets) {
-	const arr = typeof nets === "string" ? [nets] : nets;
-	const v4 = [];
-	const v6 = [];
-	for (const s of arr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4.push(n);
-		else v6.push(n);
+	const v4 = [], v6 = [];
+	for (const str of typeof nets === "string" ? [nets] : nets) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4.push(net);
+		else v6.push(net);
 	}
 	const merged = [];
 	for (const part of mergeIntervalsRaw4(v4)) subparts4(part.start, part.end, merged);
@@ -379,42 +359,30 @@ function mergeCidr(nets) {
 }
 /** Returns an array of merged remaining networks of the subtraction of `excludeNetworks` from `baseNetworks`. */
 function excludeCidr(base, excl) {
-	const baseArr = typeof base === "string" ? [base] : base;
-	const exclArr = typeof excl === "string" ? [excl] : excl;
 	const v4base = [], v6base = [];
 	const v4excl = [], v6excl = [];
-	for (const s of baseArr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4base.push(n);
-		else v6base.push(n);
+	for (const str of typeof base === "string" ? [base] : base) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4base.push(net);
+		else v6base.push(net);
 	}
-	for (const s of exclArr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4excl.push(n);
-		else v6excl.push(n);
+	for (const str of typeof excl === "string" ? [excl] : excl) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4excl.push(net);
+		else v6excl.push(net);
 	}
 	const result = [];
-	{
-		const baseParts = mergeIntervalsRaw4(v4base);
-		const exclParts = mergeIntervalsRaw4(v4excl);
-		for (const part of subtractSorted4(baseParts, exclParts)) subparts4(part.start, part.end, result);
-	}
-	{
-		const baseParts = mergeIntervalsRaw6(v6base);
-		const exclParts = mergeIntervalsRaw6(v6excl);
-		for (const part of subtractSorted6(baseParts, exclParts)) subparts6(part.start, part.end, result);
-	}
+	if (v4base.length > 0) for (const part of subtractSorted4(mergeIntervalsRaw4(v4base), mergeIntervalsRaw4(v4excl))) subparts4(part.start, part.end, result);
+	if (v6base.length > 0) for (const part of subtractSorted6(mergeIntervalsRaw6(v6base), mergeIntervalsRaw6(v6excl))) subparts6(part.start, part.end, result);
 	return result;
 }
 /** Returns a generator for individual IPs contained in the networks. */
 function* expandCidr(nets) {
-	const arr = typeof nets === "string" ? [nets] : nets;
-	const v4 = [];
-	const v6 = [];
-	for (const s of arr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4.push(n);
-		else v6.push(n);
+	const v4 = [], v6 = [];
+	for (const str of typeof nets === "string" ? [nets] : nets) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4.push(net);
+		else v6.push(net);
 	}
 	if (v4.length > 0) for (const part of mergeIntervalsRaw4(v4)) {
 		let prevHigh = -1;
@@ -470,26 +438,22 @@ function overlapCidr(a, b) {
 		if (pa.version !== pb.version) return false;
 		return pa.start <= pb.end && pb.start <= pa.end;
 	}
-	const aArr = typeof a === "string" ? [a] : a;
-	const bArr = typeof b === "string" ? [b] : b;
 	const v4a = [], v6a = [];
 	const v4b = [], v6b = [];
-	for (const s of aArr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4a.push(n);
-		else v6a.push(n);
-	}
-	for (const s of bArr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4b.push(n);
-		else v6b.push(n);
-	}
-	if (v4a.length > 0 && v4b.length > 0) if (v4b.length === 1) {
-		const bs = v4b[0].start, be = v4b[0].end;
-		for (const el of v4a) if (el.start <= be && bs <= el.end) return true;
-	} else if (v4a.length === 1) {
-		const as = v4a[0].start, ae = v4a[0].end;
-		for (const el of v4b) if (as <= el.end && el.start <= ae) return true;
+	for (const str of typeof a === "string" ? [a] : a) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4a.push(net);
+		else v6a.push(net);
+	}
+	for (const str of typeof b === "string" ? [b] : b) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4b.push(net);
+		else v6b.push(net);
+	}
+	if (v4a.length > 0 && v4b.length > 0) if (v4a.length === 1 || v4b.length === 1) {
+		const bIsSingle = v4b.length === 1;
+		const one = bIsSingle ? v4b[0] : v4a[0];
+		for (const el of bIsSingle ? v4a : v4b) if (one.start <= el.end && el.start <= one.end) return true;
 	} else {
 		v4a.sort(cmpV4Start);
 		v4b.sort(cmpV4Start);
@@ -500,12 +464,10 @@ function overlapCidr(a, b) {
 			else j++;
 		}
 	}
-	if (v6a.length > 0 && v6b.length > 0) if (v6b.length === 1) {
-		const bs = v6b[0].start, be = v6b[0].end;
-		for (const el of v6a) if (el.start <= be && bs <= el.end) return true;
-	} else if (v6a.length === 1) {
-		const as = v6a[0].start, ae = v6a[0].end;
-		for (const el of v6b) if (as <= el.end && el.start <= ae) return true;
+	if (v6a.length > 0 && v6b.length > 0) if (v6a.length === 1 || v6b.length === 1) {
+		const bIsSingle = v6b.length === 1;
+		const one = bIsSingle ? v6b[0] : v6a[0];
+		for (const el of bIsSingle ? v6a : v6b) if (one.start <= el.end && el.start <= one.end) return true;
 	} else {
 		v6a.sort(cmpV6Start);
 		v6b.sort(cmpV6Start);
@@ -533,19 +495,17 @@ function containsCidr(a, b) {
 		if (pa.version !== pb.version) return false;
 		return pa.start <= pb.start && pa.end >= pb.end;
 	}
-	const aArr = typeof a === "string" ? [a] : a;
-	const bArr = typeof b === "string" ? [b] : b;
 	const v4a = [], v6a = [];
 	const v4b = [], v6b = [];
-	for (const s of aArr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4a.push(n);
-		else v6a.push(n);
+	for (const str of typeof a === "string" ? [a] : a) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4a.push(net);
+		else v6a.push(net);
 	}
-	for (const s of bArr) {
-		const n = parseCidrLean(s);
-		if (n.version === 4) v4b.push(n);
-		else v6b.push(n);
+	for (const str of typeof b === "string" ? [b] : b) {
+		const net = parseCidrLean(str);
+		if (net.version === 4) v4b.push(net);
+		else v6b.push(net);
 	}
 	if (v4b.length > 0) {
 		if (v4a.length === 0) return false;
@@ -553,7 +513,8 @@ function containsCidr(a, b) {
 		for (const target of v4b) {
 			const ts = target.start, te = target.end;
 			let covered = false;
-			for (const iv of v4a) if (iv.start <= ts && iv.end >= te) {
+			for (const iv of v4a) {
+				if (iv.start > ts || iv.end < te) continue;
 				covered = true;
 				break;
 			}
@@ -582,7 +543,8 @@ function containsCidr(a, b) {
 		for (const target of v6b) {
 			const ts = target.start, te = target.end;
 			let covered = false;
-			for (const iv of v6a) if (iv.start <= ts && iv.end >= te) {
+			for (const iv of v6a) {
+				if (iv.start > ts || iv.end < te) continue;
 				covered = true;
 				break;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "12.1.1",
+  "version": "12.1.3",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "keywords": [
@@ -29,23 +29,23 @@
     "bun": "*"
   },
   "dependencies": {
-    "ip-bigint": "^9.0.6"
+    "ip-bigint": "^9.0.7"
   },
   "devDependencies": {
-    "@types/node": "25.9.3",
-    "@typescript/native-preview": "7.0.0-dev.20260616.1",
-    "@vitest/coverage-v8": "4.1.9",
-    "eslint": "10.5.0",
-    "eslint-config-silverwind": "136.0.10",
+    "@types/node": "26.1.2",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "@vitest/coverage-v8": "4.1.10",
+    "eslint": "10.8.0",
+    "eslint-config-silverwind": "143.0.0",
     "jest-extended": "7.0.0",
-    "tsdown": "0.22.3",
-    "tsdown-config-silverwind": "3.0.3",
+    "tsdown": "0.22.14",
+    "tsdown-config-silverwind": "4.0.3",
     "typescript": "6.0.3",
-    "typescript-config-silverwind": "20.0.0",
-    "updates": "17.18.0",
-    "updates-config-silverwind": "4.0.0",
-    "versions": "15.1.1",
-    "vitest": "4.1.9",
-    "vitest-config-silverwind": "11.3.6"
+    "typescript-config-silverwind": "20.0.3",
+    "updates": "17.19.2",
+    "updates-config-silverwind": "4.0.4",
+    "versions": "15.1.4",
+    "vitest": "4.1.10",
+    "vitest-config-silverwind": "11.4.0"
   }
 }