cidr-tools 11.3.5 → 12.0.1

package/README.md

@@ -26,7 +26,7 @@ normalizeCidr("::ffff/64");
 //=> "::/64"
 
 parseCidr("::/64");
-// => {cidr: "::/64", version: 6, prefix: "64", start: 0n, end: 18446744073709551615n}
+//=> {cidr: "::/64", version: 6, prefix: "64", start: 0n, end: 18446744073709551615n}
 ```
 
 ## API

package/dist/index.js

@@ -8,6 +8,7 @@ const bits = {
 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;
@@ -104,7 +105,7 @@ function parseCidr(str) {
 	if (v4num !== -1) {
 		const prefixNum = prefixPresent ? parsePrefixNum(str, slashIndex) : 32;
 		const ip = formatIPv4Fast(v4num);
-		const prefix = String(prefixNum);
+		const prefix = prefixNumStrings[prefixNum] ?? String(prefixNum);
 		const hostBits = 32 - prefixNum;
 		let startNum, endNum;
 		if (hostBits >= 32) {
@@ -130,7 +131,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 = String(prefixNum);
+	const prefix = prefixNumStrings[prefixNum] ?? String(prefixNum);
 	const ip = stringifyIp({
 		number,
 		version,
@@ -238,24 +239,18 @@ function subparts4(pStart, pEnd, output) {
 	}
 	let biggest = biggestPowerOfTwo4(size);
 	let start;
-	let end;
-	if (pStart % biggest === 0) {
-		start = pStart;
-		end = start + biggest - 1;
-	} else {
+	if (pStart % biggest === 0) start = pStart;
+	else {
 		start = Math.floor(pEnd / biggest) * biggest;
 		if (start + biggest - 1 > pEnd) {
-			start = (Math.floor(pEnd / biggest) - 1) * biggest;
+			start -= biggest;
 			while (start < pStart) {
 				biggest /= 2;
 				start = (Math.floor(pEnd / biggest) - 1) * biggest;
 			}
-			end = start + biggest - 1;
-		} else {
-			start = Math.floor(pEnd / biggest) * biggest;
-			end = start + biggest - 1;
 		}
 	}
+	const end = start + biggest - 1;
 	if (start !== pStart) subparts4(pStart, start - 1, output);
 	output.push({
 		start,
@@ -296,24 +291,18 @@ function subparts6(pStart, pEnd, output) {
 	}
 	let biggest = biggestPowerOfTwo(size);
 	let start;
-	let end;
-	if ((pStart & biggest - 1n) === 0n) {
-		start = pStart;
-		end = start + biggest - 1n;
-	} else {
+	if ((pStart & biggest - 1n) === 0n) start = pStart;
+	else {
 		start = pEnd & -biggest;
 		if (start + biggest - 1n > pEnd) {
-			start = (pEnd & -biggest) - biggest;
+			start -= biggest;
 			while (start < pStart) {
 				biggest >>= 1n;
 				start = (pEnd & -biggest) - biggest;
 			}
-			end = start + biggest - 1n;
-		} else {
-			start = pEnd & -biggest;
-			end = start + biggest - 1n;
 		}
 	}
+	const end = start + biggest - 1n;
 	if (start !== pStart) subparts6(pStart, start - 1n, output);
 	output.push({
 		start,
@@ -524,6 +513,9 @@ function overlapCidr(a, b) {
 		if (parseIPv4Range(a)) {
 			const startA = rangeV4Start, endA = rangeV4End;
 			if (parseIPv4Range(b)) return startA <= rangeV4End && rangeV4Start <= endA;
+			const pb = parseCidrLean(b);
+			if (pb.version !== 4) return false;
+			return startA <= pb.end && pb.start <= endA;
 		}
 		const pa = parseCidrLean(a);
 		const pb = parseCidrLean(b);
@@ -584,6 +576,9 @@ function containsCidr(a, b) {
 		if (parseIPv4Range(a)) {
 			const startA = rangeV4Start, endA = rangeV4End;
 			if (parseIPv4Range(b)) return startA <= rangeV4Start && endA >= rangeV4End;
+			const pb = parseCidrLean(b);
+			if (pb.version !== 4) return false;
+			return startA <= pb.start && endA >= pb.end;
 		}
 		const pa = parseCidrLean(a);
 		const pb = parseCidrLean(b);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.3.5",
+  "version": "12.0.1",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "keywords": [
@@ -22,27 +22,27 @@
     "dist"
   ],
   "engines": {
-    "node": ">=18",
+    "node": ">=22",
     "bun": "*"
   },
   "dependencies": {
-    "ip-bigint": "^8.3.6"
+    "ip-bigint": "^9.0.3"
   },
   "devDependencies": {
-    "@types/node": "25.6.0",
-    "@typescript/native-preview": "7.0.0-dev.20260427.1",
-    "@vitest/coverage-v8": "4.1.5",
-    "eslint": "10.2.1",
-    "eslint-config-silverwind": "132.0.0",
+    "@types/node": "25.8.0",
+    "@typescript/native-preview": "7.0.0-dev.20260516.1",
+    "@vitest/coverage-v8": "4.1.6",
+    "eslint": "10.4.0",
+    "eslint-config-silverwind": "133.0.3",
     "jest-extended": "7.0.0",
-    "tsdown": "0.21.10",
-    "tsdown-config-silverwind": "2.1.1",
+    "tsdown": "0.22.0",
+    "tsdown-config-silverwind": "3.0.1",
     "typescript": "6.0.3",
     "typescript-config-silverwind": "18.0.0",
-    "updates": "17.16.4",
-    "updates-config-silverwind": "2.1.1",
-    "versions": "15.0.1",
-    "vitest": "4.1.5",
-    "vitest-config-silverwind": "11.3.1"
+    "updates": "17.16.12",
+    "updates-config-silverwind": "3.0.2",
+    "versions": "15.0.4",
+    "vitest": "4.1.6",
+    "vitest-config-silverwind": "11.3.5"
   }
 }