cidr-tools 13.0.1 → 13.0.2

package/dist/index.d.ts

@@ -22,19 +22,19 @@ type NormalizeOpts = {
   hexify?: boolean;
 };
 /** 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. */
-declare function normalizeCidr<T extends Networks>(cidr: T, opts?: NormalizeOpts): T;
+export declare function normalizeCidr<T extends Networks>(cidr: T, opts?: NormalizeOpts): T;
 /** Returns a `parsed` Object which is used internally by this module. It can be used to test whether the passed network is IPv4 or IPv6 or to work with the BigInts directly. */
-declare function parseCidr(str: Network, opts?: CidrOpts): ParsedCidr;
+export declare function parseCidr(str: Network, opts?: CidrOpts): ParsedCidr;
 /** Returns an array of merged networks */
-declare function mergeCidr(nets: Networks, opts?: CidrOpts): Array<Network>;
+export declare function mergeCidr(nets: Networks, opts?: CidrOpts): Array<Network>;
 /** Returns an array of merged remaining networks of the subtraction of `excludeNetworks` from `baseNetworks`. */
-declare function excludeCidr(base: Networks, excl: Networks, opts?: CidrOpts): Array<Network>;
+export declare function excludeCidr(base: Networks, excl: Networks, opts?: CidrOpts): Array<Network>;
 /** Returns a generator for individual IPs contained in the networks. */
-declare function expandCidr(nets: Networks, opts?: CidrOpts): Generator<Network>;
+export declare function expandCidr(nets: Networks, opts?: CidrOpts): Generator<Network>;
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */
-declare function overlapCidr(a: Networks, b: Networks, opts?: CidrOpts): boolean;
+export declare function overlapCidr(a: Networks, b: Networks, opts?: CidrOpts): boolean;
 /** Returns a boolean that indicates whether `networksA` fully contain all `networksB`. */
-declare function containsCidr(a: Networks, b: Networks, opts?: CidrOpts): boolean;
+export declare function containsCidr(a: Networks, b: Networks, opts?: CidrOpts): boolean;
 declare const _default: {
   mergeCidr: typeof mergeCidr;
   excludeCidr: typeof excludeCidr;
@@ -45,4 +45,4 @@ declare const _default: {
   parseCidr: typeof parseCidr;
 };
 //#endregion
-export { containsCidr, _default as default, excludeCidr, expandCidr, mergeCidr, normalizeCidr, overlapCidr, parseCidr };
+export { _default as default };

package/dist/index.js

@@ -135,10 +135,11 @@ function doNormalize(cidr, opts) {
 		hexify
 	});
 	const start = hostBits > 0 ? number & hostNotMasks[hostBits] : number;
+	const startMapped = ipv4mapped && start >> 32n === 65535n;
 	return stringifyIp({
 		number: start,
 		version,
-		ipv4mapped: ipv4mapped && start >> 32n === 65535n,
+		ipv4mapped: startMapped,
 		scopeid
 	}, {
 		compress,
@@ -487,32 +488,36 @@ function overlapCidr(a, b, opts) {
 		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);
-		let i = 0, j = 0;
-		while (i < v4a.length && j < v4b.length) {
-			if (v4a[i].start <= v4b[j].end && v4b[j].start <= v4a[i].end) return true;
-			if (v4a[i].end < v4b[j].end) i++;
-			else j++;
+	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);
+			let i = 0, j = 0;
+			while (i < v4a.length && j < v4b.length) {
+				if (v4a[i].start <= v4b[j].end && v4b[j].start <= v4a[i].end) return true;
+				if (v4a[i].end < v4b[j].end) i++;
+				else j++;
+			}
 		}
 	}
-	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);
-		let i = 0, j = 0;
-		while (i < v6a.length && j < v6b.length) {
-			if (v6a[i].start <= v6b[j].end && v6b[j].start <= v6a[i].end) return true;
-			if (v6a[i].end < v6b[j].end) i++;
-			else j++;
+	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);
+			let i = 0, j = 0;
+			while (i < v6a.length && j < v6b.length) {
+				if (v6a[i].start <= v6b[j].end && v6b[j].start <= v6a[i].end) return true;
+				if (v6a[i].end < v6b[j].end) i++;
+				else j++;
+			}
 		}
 	}
 	return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "13.0.1",
+  "version": "13.0.2",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "keywords": [
@@ -13,7 +13,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "silverwind/cidr-tools"
+    "url": "git+https://github.com/silverwind/cidr-tools.git"
   },
   "license": "BSD-2-Clause",
   "type": "module",
@@ -29,24 +29,24 @@
     "bun": "*"
   },
   "dependencies": {
-    "cidr-regex": "^7.1.0",
+    "cidr-regex": "^7.1.1",
     "ip-bigint": "^10.0.1"
   },
   "devDependencies": {
-    "@types/node": "26.1.2",
+    "@types/node": "26.6.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",
+    "@vitest/coverage-v8": "5.0.2",
+    "eslint": "10.11.0",
+    "eslint-config-silverwind": "151.0.1",
     "jest-extended": "7.0.0",
-    "tsdown": "0.22.14",
-    "tsdown-config-silverwind": "4.0.3",
+    "tsdown": "0.23.0",
+    "tsdown-config-silverwind": "4.1.2",
     "typescript": "6.0.3",
-    "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"
+    "typescript-config-silverwind": "21.0.1",
+    "updates": "19.0.0",
+    "updates-config-silverwind": "4.0.7",
+    "versions": "15.5.1",
+    "vitest": "5.0.2",
+    "vitest-config-silverwind": "12.0.4"
   }
 }