cidr-tools 6.0.1 → 6.2.0

package/README.md

@@ -60,10 +60,14 @@ Returns a boolean that indicates if `networksA` overlap (intersect) with `networ
 
 Returns a boolean that indicates whether `networksA` fully contain all `networksB`.
 
-### normalize(networks)
+### normalize(networks, [opts])
 
 - `networks` *String* or *Array*: One or more CIDR or IP address.
 
-Returns a string or array (depending on input) with a normalized representation of IPs or CIDRs. Will not include a prefix on single IPs.
+Returns a string or array (depending on input) with a normalized representation. Will not include a prefix on single IPs.
+
+`opts`: Options `Object`
+  - `compress`: Whether to compress the IP. For IPv6, this means the "best representation" all-lowercase shortest possible form. Default: `true`.
+  - `hexify`: Whether to convert IPv4-Mapped IPv6 addresses to hex. Default: `false`.
 
 © [silverwind](https://github.com/silverwind), distributed under BSD licence.

package/index.js

@@ -22,18 +22,23 @@ function isCidr(ip) {
   return 0;
 }
 
-function doNormalize(cidr) {
+function doNormalize(cidr, {compress = true, hexify = false} = {}) {
   const {start, prefix, single, version} = parse(cidr);
   if (!single) { // cidr
     // set network address to first address
-    return `${normalizeIp(stringifyIp({number: start, version}))}/${prefix}`;
+    const ip = normalizeIp(stringifyIp({number: start, version}), {compress, hexify});
+    return `${ip}/${prefix}`;
   } else { // single ip
-    return normalizeIp(cidr);
+    return normalizeIp(cidr, {compress, hexify});
   }
 }
 
-export function normalize(cidr) {
-  return Array.isArray(cidr) ? cidr.map(doNormalize) : doNormalize(cidr);
+export function normalize(cidr, {compress = true, hexify = false} = {}) {
+  if (Array.isArray(cidr)) {
+    return cidr.map(entry => normalize(entry, {compress, hexify}));
+  } else {
+    return doNormalize(cidr, {compress, hexify});
+  }
 }
 
 function parse(str) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "6.0.1",
+  "version": "6.2.0",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR network lists",
   "repository": "silverwind/cidr-tools",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "cidr-regex": "4.0.3",
-    "ip-bigint": "7.0.2",
+    "ip-bigint": "7.2.0",
     "ip-regex": "5.0.0",
     "string-natural-compare": "3.0.1"
   },
@@ -28,6 +28,6 @@
     "eslint-config-silverwind": "73.0.0",
     "updates": "14.1.1",
     "versions": "11.0.1",
-    "vitest": "0.31.3"
+    "vitest": "0.31.4"
   }
 }