cidr-tools 12.0.3 → 12.1.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 //#region index.d.ts
 type Network = string;
-type Networks = Network | Array<Network>;
+type Networks = Network | ReadonlyArray<Network>;
 type ValidIpVersion = 4 | 6;
 type ParsedCidr = {
   cidr: string;
@@ -16,7 +16,7 @@ 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 Network | Array<Network>>(cidr: T, opts?: NormalizeOpts): T;
+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): ParsedCidr;
 /** Returns an array of merged networks */

package/dist/index.js

@@ -107,7 +107,7 @@ function doNormalize(cidr, opts) {
 }
 /** 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. */
 function normalizeCidr(cidr, opts) {
-	return Array.isArray(cidr) ? cidr.map((entry) => doNormalize(entry, opts)) : doNormalize(cidr, opts);
+	return typeof cidr === "string" ? doNormalize(cidr, opts) : cidr.map((entry) => doNormalize(entry, opts));
 }
 /** 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. */
 function parseCidr(str) {
@@ -362,7 +362,7 @@ function subtractSorted6(bases, excls) {
 }
 /** Returns an array of merged networks */
 function mergeCidr(nets) {
-	const arr = Array.isArray(nets) ? nets : [nets];
+	const arr = typeof nets === "string" ? [nets] : nets;
 	const v4 = [];
 	const v6 = [];
 	for (const s of arr) {
@@ -377,8 +377,8 @@ function mergeCidr(nets) {
 }
 /** Returns an array of merged remaining networks of the subtraction of `excludeNetworks` from `baseNetworks`. */
 function excludeCidr(base, excl) {
-	const baseArr = Array.isArray(base) ? base : [base];
-	const exclArr = Array.isArray(excl) ? excl : [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) {
@@ -406,7 +406,7 @@ function excludeCidr(base, excl) {
 }
 /** Returns a generator for individual IPs contained in the networks. */
 function* expandCidr(nets) {
-	const arr = Array.isArray(nets) ? nets : [nets];
+	const arr = typeof nets === "string" ? [nets] : nets;
 	const v4 = [];
 	const v6 = [];
 	for (const s of arr) {
@@ -455,7 +455,7 @@ function* expandCidr(nets) {
 }
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */
 function overlapCidr(a, b) {
-	if (!Array.isArray(a) && !Array.isArray(b)) {
+	if (typeof a === "string" && typeof b === "string") {
 		if (parseIPv4Range(a)) {
 			const startA = rangeV4Start, endA = rangeV4End;
 			if (parseIPv4Range(b)) return startA <= rangeV4End && rangeV4Start <= endA;
@@ -468,8 +468,8 @@ function overlapCidr(a, b) {
 		if (pa.version !== pb.version) return false;
 		return pa.start <= pb.end && pb.start <= pa.end;
 	}
-	const aArr = Array.isArray(a) ? a : [a];
-	const bArr = Array.isArray(b) ? b : [b];
+	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) {
@@ -518,7 +518,7 @@ function overlapCidr(a, b) {
 }
 /** Returns a boolean that indicates whether `networksA` fully contain all `networksB`. */
 function containsCidr(a, b) {
-	if (!Array.isArray(a) && !Array.isArray(b)) {
+	if (typeof a === "string" && typeof b === "string") {
 		if (parseIPv4Range(a)) {
 			const startA = rangeV4Start, endA = rangeV4End;
 			if (parseIPv4Range(b)) return startA <= rangeV4Start && endA >= rangeV4End;
@@ -531,8 +531,8 @@ function containsCidr(a, b) {
 		if (pa.version !== pb.version) return false;
 		return pa.start <= pb.start && pa.end >= pb.end;
 	}
-	const aArr = Array.isArray(a) ? a : [a];
-	const bArr = Array.isArray(b) ? b : [b];
+	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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "12.0.3",
+  "version": "12.1.0",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "keywords": [
@@ -32,20 +32,20 @@
     "ip-bigint": "^9.0.6"
   },
   "devDependencies": {
-    "@types/node": "25.9.2",
-    "@typescript/native-preview": "7.0.0-dev.20260609.1",
-    "@vitest/coverage-v8": "4.1.8",
-    "eslint": "10.4.1",
-    "eslint-config-silverwind": "135.0.1",
+    "@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",
     "jest-extended": "7.0.0",
-    "tsdown": "0.22.2",
+    "tsdown": "0.22.3",
     "tsdown-config-silverwind": "3.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.8",
+    "vitest": "4.1.9",
     "vitest-config-silverwind": "11.3.6"
   }
 }