cidr-tools 10.0.1 → 10.1.1

package/README.md

@@ -78,6 +78,7 @@ Returns a `parsed` Object which is used internally by this module. It can be use
   - `ip` String: The IP address inside the CIDR, including any `%scopeid` if present.
   - `version` Number: IP protocol version. Either `4` or `6`.
   - `prefix` String: The network prefix, e.g. `64`.
+  - `prefixPresent` Boolean: Whether the passed string has a network prefix.
   - `start` BigInt: Start number of the network.
   - `end` BigInt: End number of the network.
 

package/dist/index.d.ts

@@ -10,6 +10,7 @@ type ParsedCidr = {
     ip: string;
     version: ValidIpVersion;
     prefix: string;
+    prefixPresent: boolean;
     start: bigint;
     end: bigint;
 };
@@ -21,8 +22,8 @@ export declare function normalizeCidr(cidr: Network, opts?: NormalizeOpts): Netw
 export declare function normalizeCidr(cidr: Network[], opts?: NormalizeOpts): Network[];
 export declare function parseCidr(str: Network): ParsedCidr;
 export declare function mergeCidr(nets: Networks): Network[];
-export declare function excludeCidr(base: Networks, excl: Networks): string[];
-export declare function expandCidr(nets: Networks): string[];
+export declare function excludeCidr(base: Networks, excl: Networks): Network[];
+export declare function expandCidr(nets: Networks): Network[];
 export declare function overlapCidr(a: Networks, b: Networks): boolean;
 export declare function containsCidr(a: Networks, b: Networks): boolean;
 declare const _default: {
@@ -35,3 +36,4 @@ declare const _default: {
     parseCidr: typeof parseCidr;
 };
 export default _default;
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"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,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC;AAC5E,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,EAAE,CAAC;AAShF,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAqClD;AAkOD,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,EAAE,CAWnD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,EAAE,CAgCrE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,EAAE,CAWpD;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAqB7D;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAwB9D;;;;;;;;;;AAED,wBAQE"}

package/dist/index.js

@@ -17,8 +17,8 @@ function compare(a, b) {
   }
 }
 function doNormalize(cidr, { compress = true, hexify = false } = {}) {
-  const { start, end, prefix, version } = parseCidr(cidr);
-  if (start !== end) {
+  const { start, end, prefix, version, prefixPresent } = parseCidr(cidr);
+  if (start !== end || prefixPresent) {
     const ip = normalizeIp(stringifyIp({ number: start, version }), { compress, hexify });
     return `${ip}/${prefix}`;
   } else {
@@ -56,6 +56,7 @@ function parseCidr(str) {
   parsed.ip = stringifyIp({ number, version, ipv4mapped, scopeid });
   parsed.cidr = `${parsed.ip}/${prefix}`;
   parsed.prefix = prefix;
+  parsed.prefixPresent = Boolean(cidrVer);
   const numBits = bits[version];
   const ipBits = number.toString(2).padStart(numBits, "0");
   const prefixLen = Number(numBits - Number(prefix));
@@ -65,17 +66,13 @@ function parseCidr(str) {
   return parsed;
 }
 function doNetsOverlap(a, b) {
-  if (a.start > b.end)
-    return false;
-  if (b.start > a.end)
-    return false;
+  if (a.start > b.end) return false;
+  if (b.start > a.end) return false;
   return true;
 }
 function netContains(a, b) {
-  if (b.start < a.start)
-    return false;
-  if (b.end > a.end)
-    return false;
+  if (b.start < a.start) return false;
+  if (b.end > a.end) return false;
   return true;
 }
 function excludeNets(a, b, v) {
@@ -110,8 +107,7 @@ function excludeNets(a, b, v) {
   return mergeCidr(remaining);
 }
 function biggestPowerOfTwo(num) {
-  if (num === 0n)
-    return 0n;
+  if (num === 0n) return 0n;
   return 2n ** BigInt(String(num.toString(2).length - 1));
 }
 function subparts(part) {
@@ -155,8 +151,7 @@ function subparts(part) {
   return parts;
 }
 function diff(a, b) {
-  a += 1n;
-  return a - b;
+  return a + 1n - b;
 }
 function formatPart(part, version) {
   const ip = normalizeCidr(stringifyIp({ number: BigInt(part.start.toString()), version }));
@@ -167,20 +162,10 @@ function formatPart(part, version) {
 function mapNets(nets) {
   const maps = { 4: {}, 6: {} };
   for (const { start, end, version } of nets) {
-    if (!maps[version][String(start)])
-      maps[version][String(start)] = {};
-    if (!maps[version][String(end)])
-      maps[version][String(end)] = {};
-    if (maps[version][String(start)].start) {
-      maps[version][String(start)].start += 1;
-    } else {
-      maps[version][String(start)].start = 1;
-    }
-    if (maps[version][String(end)].end) {
-      maps[version][String(end)].end += 1;
-    } else {
-      maps[version][String(end)].end = 1;
-    }
+    if (!maps[version][String(start)]) maps[version][String(start)] = { start: 0, end: 0 };
+    if (!maps[version][String(end)]) maps[version][String(end)] = { start: 0, end: 0 };
+    maps[version][String(start)].start += 1;
+    maps[version][String(end)].end += 1;
   }
   return maps;
 }
@@ -192,16 +177,11 @@ function doMerge(maps) {
   const merged = [];
   for (const [index, number] of numbers.entries()) {
     const marker = maps[String(number)];
-    if (start === null && marker.start) {
-      start = BigInt(number);
-    }
-    if (marker.end) {
-      end = BigInt(number);
-    }
-    if (marker.start)
-      depth += marker.start;
-    if (marker.end)
-      depth -= marker.end;
+    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];
     if (marker.end && depth === 0 && next && BigInt(next) - BigInt(number) > 1) {
       for (const sub of subparts({ start, end })) {
@@ -233,13 +213,11 @@ function excludeCidr(base, excl) {
   const excls = { 4: [], 6: [] };
   for (const basenet of basenets) {
     const version = cidrVersion(basenet);
-    if (version)
-      bases[version].push(basenet);
+    if (version) bases[version].push(basenet);
   }
   for (const exclnet of exclnets) {
     const version = cidrVersion(exclnet);
-    if (version)
-      excls[version].push(exclnet);
+    if (version) excls[version].push(exclnet);
   }
   for (const v of [4, 6]) {
     for (const exclcidr of excls[v]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "10.0.1",
+  "version": "10.1.1",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -17,19 +17,18 @@
     "node": ">=18"
   },
   "dependencies": {
-    "ip-bigint": "^8.1.0"
+    "ip-bigint": "^8.2.0"
   },
   "devDependencies": {
-    "@types/node": "20.12.12",
     "eslint": "8.57.0",
-    "eslint-config-silverwind": "85.1.5",
-    "eslint-config-silverwind-typescript": "3.2.8",
-    "typescript-config-silverwind": "4.4.0",
-    "updates": "16.1.1",
+    "eslint-config-silverwind": "89.0.1",
+    "eslint-config-silverwind-typescript": "6.0.4",
+    "typescript-config-silverwind": "5.1.3",
+    "updates": "16.2.1",
     "versions": "12.1.2",
-    "vite": "5.2.12",
-    "vite-config-silverwind": "2.1.4",
-    "vitest": "1.6.0",
-    "vitest-config-silverwind": "9.0.6"
+    "vite": "5.3.4",
+    "vite-config-silverwind": "3.0.0",
+    "vitest": "2.0.4",
+    "vitest-config-silverwind": "9.1.0"
   }
 }