cidr-tools 7.0.3 → 7.0.5

package/README.md

@@ -71,15 +71,15 @@ Returns a string or array (depending on input) with a normalized representation.
 
 - `network` *String*: A CIDR or IP address.
 
-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 work with the BigInts directly.
+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.
 
 `parsed`: `Object`
   - `cidr` String: The CIDR of the network.
-  - `version` Number: Either `4` or `6`.
+  - `version` Number: IP protocol version. Either `4` or `6`.
   - `prefix` String: The network prefix, e.g. `/64`.
   - `start` BigInt: Start of the network.
   - `end` BigInt: Start of the network.
-  - `single` Boolean: `true` when is a single IP.
+  - `single` Boolean: `true` when the network is a single IP.
 
 ## Related
 

package/index.js

@@ -1,10 +1,6 @@
 import {parseIp, stringifyIp, normalizeIp, ipVersion} from "ip-bigint";
 
-const bits = {
-  4: 32,
-  6: 128,
-};
-
+const bits = {4: 32, 6: 128};
 const uniq = arr => Array.from(new Set(arr));
 const cidrVersion = cidr => cidr.includes("/") ? ipVersion(cidr) : 0;
 
@@ -41,7 +37,6 @@ export function normalize(cidr, {compress = true, hexify = false} = {}) {
 export function parse(str) {
   const cidrVer = cidrVersion(str);
   const parsed = Object.create(null);
-  parsed.single = false;
 
   if (cidrVer) {
     parsed.cidr = str;
@@ -51,7 +46,6 @@ export function parse(str) {
     if (version) {
       parsed.cidr = `${str}/${bits[version]}`;
       parsed.version = version;
-      parsed.single = true;
     } else {
       throw new Error(`Network is not a CIDR or IP: ${str}`);
     }
@@ -59,6 +53,7 @@ export function parse(str) {
 
   const [ip, prefix] = parsed.cidr.split("/");
   parsed.prefix = prefix;
+  parsed.single = prefix === String(bits[parsed.version]);
   const {number, version} = parseIp(ip);
   const numBits = bits[version];
   const ipBits = number.toString(2).padStart(numBits, "0");
@@ -223,32 +218,29 @@ function diff(a, b) {
   return a - b;
 }
 
-function formatPart(part, v) {
-  const ip = normalize(stringifyIp({
-    number: BigInt(part.start.toString()),
-    version: v,
-  }));
+function formatPart(part, version) {
+  const ip = normalize(stringifyIp({number: BigInt(part.start.toString()), version}));
   const zeroes = diff(part.end, part.start).toString(2);
-  const prefix = bits[v] - (zeroes.match(/0/g) || []).length;
+  const prefix = bits[version] - (zeroes.match(/0/g) || []).length;
   return `${ip}/${prefix}`;
 }
 
 function mapNets(nets) {
   const maps = {4: {}, 6: {}};
-  for (const {start, end, version: v} of nets) {
-    if (!maps[v][start]) maps[v][start] = {};
-    if (!maps[v][end]) maps[v][end] = {};
+  for (const {start, end, version} of nets) {
+    if (!maps[version][start]) maps[version][start] = {};
+    if (!maps[version][end]) maps[version][end] = {};
 
-    if (maps[v][start].start) {
-      maps[v][start].start += 1;
+    if (maps[version][start].start) {
+      maps[version][start].start += 1;
     } else {
-      maps[v][start].start = 1;
+      maps[version][start].start = 1;
     }
 
-    if (maps[v][end].end) {
-      maps[v][end].end += 1;
+    if (maps[version][end].end) {
+      maps[version][end].end += 1;
     } else {
-      maps[v][end].end = 1;
+      maps[version][end].end = 1;
     }
   }
   return maps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "7.0.3",
+  "version": "7.0.5",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -18,15 +18,15 @@
     "./index.d.ts"
   ],
   "dependencies": {
-    "ip-bigint": "8.0.0"
+    "ip-bigint": "^8.0.2"
   },
   "devDependencies": {
-    "eslint": "8.52.0",
-    "eslint-config-silverwind": "79.0.4",
-    "tsd": "0.29.0",
-    "updates": "15.0.3",
-    "versions": "12.0.0",
-    "vitest": "0.34.6",
-    "vitest-config-silverwind": "3.0.0"
+    "eslint": "8.56.0",
+    "eslint-config-silverwind": "80.0.3",
+    "tsd": "0.30.4",
+    "updates": "15.1.2",
+    "versions": "12.0.1",
+    "vitest": "1.2.2",
+    "vitest-config-silverwind": "5.1.1"
   }
 }