cidr-tools 11.0.5 → 11.0.8

package/dist/index.js

@@ -57,11 +57,10 @@ function parseCidr(str) {
   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));
-  const startBits = ipBits.substring(0, numBits - prefixLen);
-  parsed.start = BigInt(`0b${startBits}${"0".repeat(prefixLen)}`);
-  parsed.end = BigInt(`0b${startBits}${"1".repeat(prefixLen)}`);
+  const hostBits = BigInt(numBits - Number(prefix));
+  const mask = hostBits > 0n ? (1n << hostBits) - 1n : 0n;
+  parsed.start = number & ~mask;
+  parsed.end = number | mask;
   return parsed;
 }
 function doNetsOverlap(a, b) {
@@ -107,7 +106,13 @@ function excludeNets(a, b, v) {
 }
 function biggestPowerOfTwo(num) {
   if (num === 0n) return 0n;
-  return 2n ** BigInt(String(num.toString(2).length - 1));
+  let b = 0n;
+  let n = num >> 1n;
+  while (n > 0n) {
+    b++;
+    n >>= 1n;
+  }
+  return 1n << b;
 }
 function subparts(part) {
   if (part.end < part.start) {
@@ -159,40 +164,50 @@ function diff(a, b) {
   return a + 1n - b;
 }
 function formatPart(part, version) {
-  const ip = normalizeCidr(stringifyIp({ number: BigInt(part.start.toString()), version }));
-  const zeroes = diff(part.end, part.start).toString(2);
-  const prefix = bits[version] - (zeroes.match(/0/g) || []).length;
+  const ip = normalizeIp(stringifyIp({ number: part.start, version }));
+  const size = diff(part.end, part.start);
+  let hostBits = 0;
+  let s = size >> 1n;
+  while (s > 0n) {
+    s >>= 1n;
+    hostBits++;
+  }
+  const prefix = bits[version] - hostBits;
   return `${ip}/${prefix}`;
 }
 function mapNets(nets) {
-  const maps = { 4: {}, 6: {} };
+  const maps = { 4: /* @__PURE__ */ new Map(), 6: /* @__PURE__ */ new Map() };
   for (const { start, end, version } of nets) {
-    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;
+    let startEntry = maps[version].get(start);
+    if (!startEntry) {
+      startEntry = { start: 0, end: 0 };
+      maps[version].set(start, startEntry);
+    }
+    let endEntry = maps[version].get(end);
+    if (!endEntry) {
+      endEntry = { start: 0, end: 0 };
+      maps[version].set(end, endEntry);
+    }
+    startEntry.start += 1;
+    endEntry.end += 1;
   }
   return maps;
 }
 function doMerge(maps) {
   let start = null;
   let end = null;
-  const numbers = Object.keys(maps).sort((a, b) => {
-    const aBig = BigInt(a);
-    const bBig = BigInt(b);
-    return aBig > bBig ? 1 : aBig < bBig ? -1 : 0;
-  });
+  const numbers = Array.from(maps.keys()).sort((a, b) => a > b ? 1 : a < b ? -1 : 0);
   let depth = 0;
   const merged = [];
   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);
+    const marker = maps.get(number);
+    if (start === null && marker.start) start = number;
+    if (marker.end) end = number;
     if (start === null) continue;
     if (marker.start) depth += marker.start;
     if (marker.end) depth -= marker.end;
     const next = numbers[index2 + 1];
-    if (marker.end && depth === 0 && next && BigInt(next) - BigInt(number) > 1) {
+    if (marker.end && depth === 0 && next !== void 0 && next - number > 1n) {
       for (const sub of subparts({ start, end })) {
         merged.push(sub);
       }
@@ -207,7 +222,7 @@ function doMerge(maps) {
   return merged;
 }
 function mergeCidr(nets) {
-  const arr = uniq((Array.isArray(nets) ? nets : [nets]).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]) {
@@ -230,15 +245,12 @@ function excludeCidr(base, excl) {
   }
   for (const v of [4, 6]) {
     for (const exclcidr of excls[v]) {
-      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(index2, 1);
-        }
+      const excl2 = parseCidr(exclcidr);
+      const newBases = [];
+      for (const basecidr of bases[v]) {
+        newBases.push(...excludeNets(parseCidr(basecidr), excl2, v));
       }
+      bases[v] = newBases;
     }
   }
   return bases[4].concat(bases[6]).sort(compare);
@@ -248,39 +260,29 @@ function* expandCidr(nets) {
   for (const net of mergeCidr(arr)) {
     const { start, end, version } = parseCidr(net);
     for (let number = start; number <= end; number++) {
-      yield normalizeCidr(stringifyIp({ number, version }));
+      yield normalizeIp(stringifyIp({ number, version }));
     }
   }
 }
 function overlapCidr(a, b) {
-  const aNets = uniq(Array.isArray(a) ? a : [a]);
-  const bNets = uniq(Array.isArray(b) ? b : [b]);
-  for (const a2 of aNets) {
-    const aParsed = parseCidr(a2);
-    for (const b2 of bNets) {
-      const bParsed = parseCidr(b2);
-      if (aParsed.version !== bParsed.version) {
-        continue;
-      }
-      if (doNetsOverlap(aParsed, bParsed)) {
-        return true;
-      }
+  const aNets = uniq(Array.isArray(a) ? a : [a]).map(parseCidr);
+  const bNets = uniq(Array.isArray(b) ? b : [b]).map(parseCidr);
+  for (const aParsed of aNets) {
+    for (const bParsed of bNets) {
+      if (aParsed.version !== bParsed.version) continue;
+      if (doNetsOverlap(aParsed, bParsed)) return true;
     }
   }
   return false;
 }
 function containsCidr(a, b) {
-  const aNets = uniq(Array.isArray(a) ? a : [a]);
-  const bNets = uniq(Array.isArray(b) ? b : [b]);
+  const aNets = uniq(Array.isArray(a) ? a : [a]).map(parseCidr);
+  const bNets = uniq(Array.isArray(b) ? b : [b]).map(parseCidr);
   const numExpected = bNets.length;
   let numFound = 0;
-  for (const a2 of aNets) {
-    const aParsed = parseCidr(a2);
-    for (const b2 of bNets) {
-      const bParsed = parseCidr(b2);
-      if (aParsed.version !== bParsed.version) {
-        continue;
-      }
+  for (const aParsed of aNets) {
+    for (const bParsed of bNets) {
+      if (aParsed.version !== bParsed.version) continue;
       if (netContains(aParsed, bParsed)) {
         numFound++;
         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.0.5",
+  "version": "11.0.8",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -17,19 +17,20 @@
     "node": ">=18"
   },
   "dependencies": {
-    "ip-bigint": "^8.2.3"
+    "ip-bigint": "^8.2.4"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20260128.1",
+    "@typescript/native-preview": "7.0.0-dev.20260202.1",
     "eslint": "9.39.2",
-    "eslint-config-silverwind": "118.0.1",
+    "eslint-config-silverwind": "120.1.2",
+    "jest-extended": "7.0.0",
     "typescript": "5.9.3",
     "typescript-config-silverwind": "14.0.0",
-    "updates": "17.0.9",
-    "versions": "14.0.3",
+    "updates": "17.1.0",
+    "versions": "14.1.0",
     "vite": "7.3.1",
     "vite-config-silverwind": "6.0.9",
     "vitest": "4.0.18",
     "vitest-config-silverwind": "10.6.1"
   }
-}
+}