cidr-tools 12.1.0 → 12.1.2

package/dist/index.js

@@ -80,7 +80,7 @@ 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;
@@ -96,10 +96,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
@@ -241,17 +244,19 @@ function subparts4(pStart, pEnd, output) {
 	}
 }
 function subparts6(pStart, pEnd, output) {
+	const fullSize = pEnd - pStart + 1n;
+	const startLowBit = pStart & -pStart;
+	if ((fullSize & fullSize - 1n) === 0n && (startLowBit === 0n || startLowBit >= fullSize)) {
+		output.push(stringifyIp({
+			number: pStart,
+			version: 6
+		}) + prefixStrings[129 - bigintBitLength(fullSize)]);
+		return;
+	}
 	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(stringifyIp({
-				number: start,
-				version: 6
-			}) + prefixStrings[129 - bigintBitLength(size)]);
-			return;
-		}
 		const blockSize = lowBit !== 0n && lowBit <= size ? lowBit : biggestPowerOfTwo(size);
 		output.push(stringifyIp({
 			number: start,
@@ -547,60 +552,62 @@ function containsCidr(a, b) {
 	}
 	if (v4b.length > 0) {
 		if (v4a.length === 0) return false;
-		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;
+		let sorted = false;
+		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) continue;
+				covered = 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 (covered) continue;
+			if (!sorted) {
+				v4a.sort(cmpV4Start);
+				sorted = true;
+			}
+			let cur = ts;
+			for (const iv of v4a) {
+				if (iv.start > cur) break;
+				if (iv.end >= cur) {
+					if (iv.end >= te) {
+						covered = true;
+						break;
+					}
+					cur = iv.end + 1;
 				}
-				if (idx < 0 || maxEnd[idx] < target.end) return false;
 			}
+			if (!covered) return false;
 		}
 	}
 	if (v6b.length > 0) {
 		if (v6a.length === 0) return false;
-		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;
+		let sorted = false;
+		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) continue;
+				covered = 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 (covered) continue;
+			if (!sorted) {
+				v6a.sort(cmpV6Start);
+				sorted = true;
+			}
+			let cur = ts;
+			for (const iv of v6a) {
+				if (iv.start > cur) break;
+				if (iv.end >= cur) {
+					if (iv.end >= te) {
+						covered = true;
+						break;
+					}
+					cur = iv.end + 1n;
 				}
-				if (idx < 0 || maxEnd[idx] < target.end) return false;
 			}
+			if (!covered) return false;
 		}
 	}
 	return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "12.1.0",
+  "version": "12.1.2",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "keywords": [
@@ -32,14 +32,14 @@
     "ip-bigint": "^9.0.6"
   },
   "devDependencies": {
-    "@types/node": "25.9.3",
-    "@typescript/native-preview": "7.0.0-dev.20260616.1",
+    "@types/node": "26.0.1",
+    "@typescript/native-preview": "7.0.0-dev.20260627.2",
     "@vitest/coverage-v8": "4.1.9",
-    "eslint": "10.5.0",
-    "eslint-config-silverwind": "136.0.10",
+    "eslint": "10.6.0",
+    "eslint-config-silverwind": "138.0.0",
     "jest-extended": "7.0.0",
     "tsdown": "0.22.3",
-    "tsdown-config-silverwind": "3.0.3",
+    "tsdown-config-silverwind": "3.0.4",
     "typescript": "6.0.3",
     "typescript-config-silverwind": "20.0.0",
     "updates": "17.18.0",