cidr-tools 11.0.11 → 11.0.12

package/dist/index.js

@@ -5,9 +5,29 @@ const bits = {
 	4: 32,
 	6: 128
 };
-function uniq(arr) {
-	const set = new Set(arr);
-	return set.size === arr.length ? arr : Array.from(set);
+function parseIPv4Fast(s) {
+	let num = 0;
+	let octet = 0;
+	let dots = 0;
+	let digits = 0;
+	for (let i = 0; i < s.length; i++) {
+		const c = s.charCodeAt(i);
+		if (c === 46) {
+			if (digits === 0 || octet > 255) return -1;
+			num = (num << 8 | octet) >>> 0;
+			octet = 0;
+			dots++;
+			digits = 0;
+		} else if (c >= 48 && c <= 57) {
+			octet = octet * 10 + (c - 48);
+			digits++;
+		} else return -1;
+	}
+	if (dots !== 3 || digits === 0 || octet > 255) return -1;
+	return (num << 8 | octet) >>> 0;
+}
+function formatIPv4Fast(n) {
+	return `${n >>> 24 & 255}.${n >>> 16 & 255}.${n >>> 8 & 255}.${n & 255}`;
 }
 function doNormalize(cidr, { compress = true, hexify = false } = {}) {
 	const { start, end, prefix, version, prefixPresent } = parseCidr(cidr);
@@ -75,6 +95,20 @@ function parseCidrLean(str) {
 		ipPart = str;
 		prefixNum = -1;
 	}
+	if (!ipPart.includes(":")) {
+		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;
+			return {
+				start: bigNum & ~mask,
+				end: bigNum | mask,
+				version: 4
+			};
+		}
+	}
 	const { number, version } = parseIp(ipPart);
 	if (!version) throw new Error(`Network is not a CIDR or IP: "${str}"`);
 	if (prefixNum === -1) prefixNum = bits[version];
@@ -153,6 +187,11 @@ function diff(a, b) {
 	return a + 1n - b;
 }
 function formatPart(part, version) {
+	if (version === 4) {
+		const ip = formatIPv4Fast(Number(part.start));
+		const sizeNum = Number(part.end - part.start) + 1;
+		return `${ip}/${32 - (sizeNum <= 1 ? 0 : sizeNum >= 4294967296 ? 32 : 31 - Math.clz32(sizeNum))}`;
+	}
 	const ip = stringifyIp({
 		number: part.start,
 		version
@@ -218,7 +257,7 @@ function subtractSorted(bases, excls) {
 }
 /** Returns an array of merged networks */
 function mergeCidr(nets) {
-	const arr = uniq(Array.isArray(nets) ? nets : [nets]).map(parseCidrLean);
+	const arr = (Array.isArray(nets) ? nets : [nets]).map(parseCidrLean);
 	const byVersion = {
 		4: [],
 		6: []
@@ -230,8 +269,8 @@ function mergeCidr(nets) {
 }
 /** Returns an array of merged remaining networks of the subtraction of `excludeNetworks` from `baseNetworks`. */
 function excludeCidr(base, excl) {
-	const baseArr = uniq(Array.isArray(base) ? base : [base]).map(parseCidrLean);
-	const exclArr = uniq(Array.isArray(excl) ? excl : [excl]).map(parseCidrLean);
+	const baseArr = (Array.isArray(base) ? base : [base]).map(parseCidrLean);
+	const exclArr = (Array.isArray(excl) ? excl : [excl]).map(parseCidrLean);
 	const baseByVersion = {
 		4: [],
 		6: []
@@ -253,7 +292,7 @@ function excludeCidr(base, excl) {
 	return result;
 }
 function* expandCidr(nets) {
-	const arr = uniq(Array.isArray(nets) ? nets : [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({
@@ -264,8 +303,8 @@ function* expandCidr(nets) {
 }
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */
 function overlapCidr(a, b) {
-	const aNets = uniq(Array.isArray(a) ? a : [a]).map(parseCidrLean);
-	const bNets = uniq(Array.isArray(b) ? b : [b]).map(parseCidrLean);
+	const aNets = (Array.isArray(a) ? a : [a]).map(parseCidrLean);
+	const bNets = (Array.isArray(b) ? b : [b]).map(parseCidrLean);
 	const aByVersion = {
 		4: [],
 		6: []
@@ -292,8 +331,8 @@ function overlapCidr(a, b) {
 }
 /** Returns a boolean that indicates whether `networksA` fully contain all `networksB`. */
 function containsCidr(a, b) {
-	const aNets = uniq(Array.isArray(a) ? a : [a]).map(parseCidrLean);
-	const bNets = uniq(Array.isArray(b) ? b : [b]).map(parseCidrLean);
+	const aNets = (Array.isArray(a) ? a : [a]).map(parseCidrLean);
+	const bNets = (Array.isArray(b) ? b : [b]).map(parseCidrLean);
 	const aByVersion = {
 		4: [],
 		6: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.0.11",
+  "version": "11.0.12",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -17,21 +17,21 @@
     "node": ">=18"
   },
   "dependencies": {
-    "ip-bigint": "^8.2.7"
+    "ip-bigint": "^8.2.8"
   },
   "devDependencies": {
-    "@types/node": "25.3.0",
-    "@typescript/native-preview": "7.0.0-dev.20260224.1",
+    "@types/node": "25.3.3",
+    "@typescript/native-preview": "7.0.0-dev.20260305.1",
     "eslint": "9.39.3",
-    "eslint-config-silverwind": "121.1.3",
+    "eslint-config-silverwind": "121.2.0",
     "jest-extended": "7.0.0",
-    "tsdown": "0.20.3",
-    "tsdown-config-silverwind": "1.7.5",
+    "tsdown": "0.21.0",
+    "tsdown-config-silverwind": "2.0.0",
     "typescript": "5.9.3",
     "typescript-config-silverwind": "15.0.0",
-    "updates": "17.6.2",
+    "updates": "17.8.1",
     "updates-config-silverwind": "1.0.3",
-    "versions": "14.2.0",
+    "versions": "14.2.1",
     "vitest": "4.0.18",
     "vitest-config-silverwind": "10.6.3"
   }