cidr-tools 11.0.9 → 11.0.10

package/dist/index.js

@@ -1,10 +1,8 @@
-import { ipVersion, parseIp, stringifyIp, normalizeIp } from "ip-bigint";
+import { parseIp, stringifyIp, normalizeIp } from "ip-bigint";
 const bits = { 4: 32, 6: 128 };
 function uniq(arr) {
-  return Array.from(new Set(arr));
-}
-function cidrVersion(cidr) {
-  return cidr.includes("/") ? ipVersion(cidr) : 0;
+  const set = new Set(arr);
+  return set.size === arr.length ? arr : Array.from(set);
 }
 function doNormalize(cidr, { compress = true, hexify = false } = {}) {
   const { start, end, prefix, version, prefixPresent } = parseCidr(cidr);
@@ -23,61 +21,65 @@ function normalizeCidr(cidr, opts) {
   }
 }
 function parseCidr(str) {
-  const cidrVer = cidrVersion(str);
   const parsed = /* @__PURE__ */ Object.create(null);
-  let cidr;
-  if (cidrVer) {
-    cidr = str;
-    parsed.version = cidrVer;
-  } else {
-    const version2 = ipVersion(str);
-    if (version2) {
-      cidr = `${str}/${bits[version2]}`;
-      parsed.version = version2;
-    } else {
+  const slashIndex = str.indexOf("/");
+  let ipPart;
+  let prefix;
+  if (slashIndex !== -1) {
+    ipPart = str.substring(0, slashIndex);
+    prefix = str.substring(slashIndex + 1);
+    if (!/^[0-9]+$/.test(prefix)) {
       throw new Error(`Network is not a CIDR or IP: "${str}"`);
     }
+    parsed.prefixPresent = true;
+  } else {
+    ipPart = str;
+    parsed.prefixPresent = false;
+    prefix = "";
   }
-  const [ipAndMisc, prefix] = cidr.split("/");
-  if (!/^[0-9]+$/.test(prefix)) {
+  const { number, version, ipv4mapped, scopeid } = parseIp(ipPart);
+  if (!version) {
     throw new Error(`Network is not a CIDR or IP: "${str}"`);
   }
-  const { number, version, ipv4mapped, scopeid } = parseIp(ipAndMisc);
+  if (!parsed.prefixPresent) {
+    prefix = String(bits[version]);
+  }
+  parsed.version = version;
   parsed.ip = stringifyIp({ number, version, ipv4mapped, scopeid });
   parsed.cidr = `${parsed.ip}/${prefix}`;
   parsed.prefix = prefix;
-  parsed.prefixPresent = Boolean(cidrVer);
   const numBits = bits[version];
-  const hostBits = BigInt(numBits - Number(prefix));
-  const mask = hostBits > 0n ? (1n << hostBits) - 1n : 0n;
+  const hostBits = numBits - Number(prefix);
+  const mask = hostBits > 0 ? (1n << BigInt(hostBits)) - 1n : 0n;
   parsed.start = number & ~mask;
   parsed.end = number | mask;
   return parsed;
 }
 function parseCidrLean(str) {
-  const cidrVer = cidrVersion(str);
-  let version;
-  let cidr;
-  if (cidrVer) {
-    cidr = str;
-    version = cidrVer;
-  } else {
-    const v = ipVersion(str);
-    if (v) {
-      version = v;
-      cidr = `${str}/${bits[version]}`;
-    } else {
+  const slashIndex = str.indexOf("/");
+  let ipPart;
+  let prefixNum;
+  if (slashIndex !== -1) {
+    ipPart = str.substring(0, slashIndex);
+    const prefixStr = str.substring(slashIndex + 1);
+    if (!/^[0-9]+$/.test(prefixStr)) {
       throw new Error(`Network is not a CIDR or IP: "${str}"`);
     }
+    prefixNum = Number(prefixStr);
+  } else {
+    ipPart = str;
+    prefixNum = -1;
   }
-  const [ipAndMisc, prefix] = cidr.split("/");
-  if (!/^[0-9]+$/.test(prefix)) {
+  const { number, version } = parseIp(ipPart);
+  if (!version) {
     throw new Error(`Network is not a CIDR or IP: "${str}"`);
   }
-  const { number, version: parsedVersion } = parseIp(ipAndMisc);
-  const numBits = bits[parsedVersion];
-  const hostBits = BigInt(numBits - Number(prefix));
-  const mask = hostBits > 0n ? (1n << hostBits) - 1n : 0n;
+  if (prefixNum === -1) {
+    prefixNum = bits[version];
+  }
+  const numBits = bits[version];
+  const hostBits = numBits - prefixNum;
+  const mask = hostBits > 0 ? (1n << BigInt(hostBits)) - 1n : 0n;
   return {
     start: number & ~mask,
     end: number | mask,
@@ -144,7 +146,7 @@ function subparts(part, output) {
   let biggest = biggestPowerOfTwo(size);
   let start;
   let end;
-  if (size === biggest && part.start + size === part.end) {
+  if (size === biggest && part.start % biggest === 0n) {
     output.push(part);
     return output;
   } else if (part.start % biggest === 0n) {
@@ -233,11 +235,13 @@ function doMerge(maps) {
 function mergeCidr(nets) {
   const arr = uniq(Array.isArray(nets) ? nets : [nets]).map(parseCidrLean);
   const maps = mapNets(arr);
-  const merged = { 4: [], 6: [] };
+  const merged = [];
   for (const v of [4, 6]) {
-    merged[v] = doMerge(maps[v]).map((part) => formatPart(part, v));
+    for (const part of doMerge(maps[v])) {
+      merged.push(formatPart(part, v));
+    }
   }
-  return [...merged[4], ...merged[6]];
+  return merged;
 }
 function excludeCidr(base, excl) {
   const baseArr = uniq(Array.isArray(base) ? base : [base]).map(parseCidrLean);
@@ -254,7 +258,9 @@ function excludeCidr(base, excl) {
     for (const exclPart of excls[v]) {
       const newBases = [];
       for (const basePart of bases[v]) {
-        newBases.push(...excludeNetsParts(basePart, exclPart));
+        for (const part of excludeNetsParts(basePart, exclPart)) {
+          newBases.push(part);
+        }
       }
       bases[v] = newBases;
     }
@@ -279,9 +285,13 @@ function* expandCidr(nets) {
 function overlapCidr(a, b) {
   const aNets = uniq(Array.isArray(a) ? a : [a]).map(parseCidrLean);
   const bNets = uniq(Array.isArray(b) ? b : [b]).map(parseCidrLean);
+  const aByVersion = { 4: [], 6: [] };
+  const bByVersion = { 4: [], 6: [] };
+  for (const n of aNets) aByVersion[n.version].push(n);
+  for (const n of bNets) bByVersion[n.version].push(n);
   for (const v of [4, 6]) {
-    const aVer = aNets.filter((n) => n.version === v).sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
-    const bVer = bNets.filter((n) => n.version === v).sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
+    const aVer = aByVersion[v].sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
+    const bVer = bByVersion[v].sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
     let i = 0, j = 0;
     while (i < aVer.length && j < bVer.length) {
       const aNet = aVer[i];
@@ -296,9 +306,13 @@ function overlapCidr(a, b) {
 function containsCidr(a, b) {
   const aNets = uniq(Array.isArray(a) ? a : [a]).map(parseCidrLean);
   const bNets = uniq(Array.isArray(b) ? b : [b]).map(parseCidrLean);
+  const aByVersion = { 4: [], 6: [] };
+  const bByVersion = { 4: [], 6: [] };
+  for (const n of aNets) aByVersion[n.version].push(n);
+  for (const n of bNets) bByVersion[n.version].push(n);
   for (const v of [4, 6]) {
-    const containers = aNets.filter((n) => n.version === v).sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
-    const targets = bNets.filter((n) => n.version === v);
+    const containers = aByVersion[v].sort((x, y) => x.start > y.start ? 1 : x.start < y.start ? -1 : 0);
+    const targets = bByVersion[v];
     if (targets.length === 0) continue;
     if (containers.length === 0) return false;
     const maxEnd = new Array(containers.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "11.0.9",
+  "version": "11.0.10",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",