cidr-tools 11.0.3 → 11.0.5

package/README.md

@@ -1,5 +1,5 @@
 # cidr-tools
-[![](https://img.shields.io/npm/v/cidr-tools.svg?style=flat)](https://www.npmjs.org/package/cidr-tools) [![](https://img.shields.io/npm/dm/cidr-tools.svg)](https://www.npmjs.org/package/cidr-tools) [![](https://img.shields.io/bundlephobia/minzip/cidr-tools.svg)](https://bundlephobia.com/package/cidr-tools) [![](https://packagephobia.com/badge?p=cidr-tools)](https://packagephobia.com/result?p=cidr-tools)
+[![](https://img.shields.io/npm/v/cidr-tools.svg?style=flat)](https://www.npmjs.org/package/cidr-tools) [![](https://img.shields.io/npm/dm/cidr-tools.svg)](https://www.npmjs.org/package/cidr-tools) [![](https://img.shields.io/bundlephobia/minzip/cidr-tools.svg)](https://bundlephobia.com/package/cidr-tools) [![](https://packagephobia.com/badge?p=cidr-tools)](https://packagephobia.com/result?p=cidr-tools) [![](https://depx.co/api/badge/cidr-tools)](https://depx.co/pkg/cidr-tools)
 > Tools to work with IPv4 and IPv6 CIDR
 
 ## Usage

package/dist/index.d.ts

@@ -3,7 +3,7 @@ type IPv6Address = string;
 type IPv4CIDR = string;
 type IPv6CIDR = string;
 type Network = IPv4Address | IPv4CIDR | IPv6Address | IPv6CIDR;
-type Networks = Network | Network[];
+type Networks = Network | Array<Network>;
 type ValidIpVersion = 4 | 6;
 type ParsedCidr = {
     cidr: string;
@@ -19,13 +19,13 @@ 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. */
-export declare function normalizeCidr<T extends Network | Network[]>(cidr: T, opts?: NormalizeOpts): T;
+export declare function normalizeCidr<T extends Network | Array<Network>>(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. */
 export declare function parseCidr(str: Network): ParsedCidr;
 /** Returns an array of merged networks */
-export declare function mergeCidr(nets: Networks): Network[];
+export declare function mergeCidr(nets: Networks): Array<Network>;
 /** Returns an array of merged remaining networks of the subtraction of `excludeNetworks` from `baseNetworks`. */
-export declare function excludeCidr(base: Networks, excl: Networks): Network[];
+export declare function excludeCidr(base: Networks, excl: Networks): Array<Network>;
 export declare function expandCidr(nets: Networks): Generator<Network>;
 /** Returns a boolean that indicates if `networksA` overlap (intersect) with `networksB`. */
 export declare function overlapCidr(a: Networks, b: Networks): boolean;
@@ -41,4 +41,3 @@ declare const _default: {
     parseCidr: typeof parseCidr;
 };
 export default _default;
-//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,5 +1,4 @@
-import { ipVersion, parseIp, stringifyIp, normalizeIp } from 'ip-bigint';
-
+import { ipVersion, parseIp, stringifyIp, normalizeIp } from "ip-bigint";
 const bits = { 4: 32, 6: 128 };
 function uniq(arr) {
   return Array.from(new Set(arr));
@@ -45,12 +44,12 @@ function parseCidr(str) {
       cidr = `${str}/${bits[version2]}`;
       parsed.version = version2;
     } else {
-      throw new Error(`Network is not a CIDR or IP: ${str}`);
+      throw new Error(`Network is not a CIDR or IP: "${str}"`);
     }
   }
   const [ipAndMisc, prefix] = cidr.split("/");
   if (!/^[0-9]+$/.test(prefix)) {
-    throw new Error(`Network is not a CIDR or IP: ${str}`);
+    throw new Error(`Network is not a CIDR or IP: "${str}"`);
   }
   const { number, version, ipv4mapped, scopeid } = parseIp(ipAndMisc);
   parsed.ip = stringifyIp({ number, version, ipv4mapped, scopeid });
@@ -111,6 +110,12 @@ function biggestPowerOfTwo(num) {
   return 2n ** BigInt(String(num.toString(2).length - 1));
 }
 function subparts(part) {
+  if (part.end < part.start) {
+    return [];
+  }
+  if (part.end === part.start) {
+    return [part];
+  }
   if (part.end - part.start === 1n) {
     if (part.end % 2n === 0n) {
       return [{ start: part.start, end: part.start }, { start: part.end, end: part.end }];
@@ -172,24 +177,28 @@ function mapNets(nets) {
 function doMerge(maps) {
   let start = null;
   let end = null;
-  const numbers = Object.keys(maps);
+  const numbers = Object.keys(maps).sort((a, b) => {
+    const aBig = BigInt(a);
+    const bBig = BigInt(b);
+    return aBig > bBig ? 1 : aBig < bBig ? -1 : 0;
+  });
   let depth = 0;
   const merged = [];
-  for (const [index, number] of numbers.entries()) {
+  for (const [index2, number] of numbers.entries()) {
     const marker = maps[String(number)];
     if (start === null && marker.start) start = BigInt(number);
     if (marker.end) end = BigInt(number);
     if (start === null) continue;
     if (marker.start) depth += marker.start;
     if (marker.end) depth -= marker.end;
-    const next = numbers[index + 1];
+    const next = numbers[index2 + 1];
     if (marker.end && depth === 0 && next && BigInt(next) - BigInt(number) > 1) {
       for (const sub of subparts({ start, end })) {
         merged.push(sub);
       }
       start = null;
       end = null;
-    } else if (index === numbers.length - 1) {
+    } else if (index2 === numbers.length - 1) {
       for (const sub of subparts({ start, end })) {
         merged.push(sub);
       }
@@ -198,7 +207,7 @@ function doMerge(maps) {
   return merged;
 }
 function mergeCidr(nets) {
-  const arr = uniq((Array.isArray(nets) ? nets : [nets]).sort(compare).map(parseCidr));
+  const arr = uniq((Array.isArray(nets) ? nets : [nets]).map(parseCidr));
   const maps = mapNets(arr);
   const merged = { 4: [], 6: [] };
   for (const v of [4, 6]) {
@@ -221,13 +230,13 @@ function excludeCidr(base, excl) {
   }
   for (const v of [4, 6]) {
     for (const exclcidr of excls[v]) {
-      for (const [index, basecidr] of bases[v].entries()) {
+      for (const [index2, basecidr] of bases[v].entries()) {
         const base2 = parseCidr(basecidr);
         const excl2 = parseCidr(exclcidr);
         const remainders = excludeNets(base2, excl2, v);
         if (base2.cidr !== remainders.toString()) {
           bases[v] = bases[v].concat(remainders);
-          bases[v].splice(index, 1);
+          bases[v].splice(index2, 1);
         }
       }
     }
@@ -289,5 +298,13 @@ const index = {
   normalizeCidr,
   parseCidr
 };
-
-export { containsCidr, index as default, excludeCidr, expandCidr, mergeCidr, normalizeCidr, overlapCidr, parseCidr };
+export {
+  containsCidr,
+  index as default,
+  excludeCidr,
+  expandCidr,
+  mergeCidr,
+  normalizeCidr,
+  overlapCidr,
+  parseCidr
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.0.3",
+  "version": "11.0.5",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -17,19 +17,19 @@
     "node": ">=18"
   },
   "dependencies": {
-    "ip-bigint": "^8.2.1"
+    "ip-bigint": "^8.2.3"
   },
   "devDependencies": {
-    "eslint": "8.57.0",
-    "eslint-config-silverwind": "99.0.0",
-    "eslint-config-silverwind-typescript": "9.2.2",
-    "typescript": "5.7.3",
-    "typescript-config-silverwind": "7.0.0",
-    "updates": "16.4.2",
-    "versions": "12.1.3",
-    "vite": "6.1.0",
-    "vite-config-silverwind": "4.0.0",
-    "vitest": "3.0.5",
-    "vitest-config-silverwind": "10.0.0"
+    "@typescript/native-preview": "7.0.0-dev.20260128.1",
+    "eslint": "9.39.2",
+    "eslint-config-silverwind": "118.0.1",
+    "typescript": "5.9.3",
+    "typescript-config-silverwind": "14.0.0",
+    "updates": "17.0.9",
+    "versions": "14.0.3",
+    "vite": "7.3.1",
+    "vite-config-silverwind": "6.0.9",
+    "vitest": "4.0.18",
+    "vitest-config-silverwind": "10.6.1"
   }
 }

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAIA,KAAK,WAAW,GAAG,MAAM,CAAC;AAC1B,KAAK,WAAW,GAAG,MAAM,CAAC;AAC1B,KAAK,QAAQ,GAAG,MAAM,CAAC;AACvB,KAAK,QAAQ,GAAG,MAAM,CAAC;AAEvB,KAAK,OAAO,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,CAAC;AAC/D,KAAK,QAAQ,GAAG,OAAO,GAAG,OAAO,EAAE,CAAC;AAEpC,KAAK,cAAc,GAAG,CAAC,GAAG,CAAC,CAAC;AAE5B,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAqCF,sLAAsL;AACtL,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,CAAC,CAQ7F;AAED,iLAAiL;AACjL,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAqClD;AAkOD,0CAA0C;AAC1C,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,EAAE,CAWnD;AAED,iHAAiH;AACjH,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,EAAE,CAgCrE;AAGD,wBAAiB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,CAS9D;AAED,4FAA4F;AAC5F,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAqB7D;AAED,0FAA0F;AAC1F,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAwB9D;;;;;;;;;;AAED,wBAQE"}