cidr-tools 6.4.2 → 7.0.0

package/README.md

@@ -20,6 +20,8 @@ parse("::/64"); // => {cidr: "::/64", version: 6, prefix: "64", start: 0n, end:
 
 All functions take CIDR addresses or single IP addresses. On single addresses, a prefix of `/32` or `/128` is assumed. Function that return networks will return a merged and sorted set of networks with IPv4 sorted before IPv6.
 
+It is expected that the passed CIDRs and IPs are validated as the module's own input validation is rudimentary. You are encouraged to use modules like [is-cidr](https://github.com/silverwind/is-cidr) and [is-ip](https://github.com/sindresorhus/is-ip) to validate before passing to this module.
+
 This module requires [BigInt](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt#browser_compatibility) support in your environment.
 
 ### merge(networks)

package/index.js

@@ -1,7 +1,5 @@
-import ipRegex from "ip-regex";
-import cidrRegex from "cidr-regex";
+import {parseIp, stringifyIp, normalizeIp, ipVersion} from "ip-bigint";
 import naturalCompare from "string-natural-compare";
-import {parseIp, stringifyIp, normalizeIp} from "ip-bigint";
 
 const bits = {
   4: 32,
@@ -9,18 +7,7 @@ const bits = {
 };
 
 const uniq = arr => Array.from(new Set(arr));
-
-export function isIP(ip) {
-  if (ipRegex.v4({exact: true}).test(ip)) return 4;
-  if (ipRegex.v6({exact: true}).test(ip)) return 6;
-  return 0;
-}
-
-function isCidr(ip) {
-  if (cidrRegex.v4({exact: true}).test(ip)) return 4;
-  if (cidrRegex.v6({exact: true}).test(ip)) return 6;
-  return 0;
-}
+const cidrVersion = cidr => cidr.includes("/") ? ipVersion(cidr) : 0;
 
 function doNormalize(cidr, {compress = true, hexify = false} = {}) {
   const {start, prefix, single, version} = parse(cidr);
@@ -42,15 +29,15 @@ export function normalize(cidr, {compress = true, hexify = false} = {}) {
 }
 
 export function parse(str) {
-  const cidrVersion = isCidr(str);
+  const cidrVer = cidrVersion(str);
   const parsed = Object.create(null);
   parsed.single = false;
 
-  if (cidrVersion) {
+  if (cidrVer) {
     parsed.cidr = str;
-    parsed.version = cidrVersion;
+    parsed.version = cidrVer;
   } else {
-    const version = isIP(str);
+    const version = ipVersion(str);
     if (version) {
       parsed.cidr = `${str}/${bits[version]}`;
       parsed.version = version;
@@ -310,11 +297,11 @@ export function exclude(basenets, exclnets) {
   const excls = {4: [], 6: []};
 
   for (const basenet of basenets) {
-    bases[isCidr(basenet)].push(basenet);
+    bases[cidrVersion(basenet)].push(basenet);
   }
 
   for (const exclnet of exclnets) {
-    excls[isCidr(exclnet)].push(exclnet);
+    excls[cidrVersion(exclnet)].push(exclnet);
   }
 
   for (const v of [4, 6]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "6.4.2",
+  "version": "7.0.0",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -11,21 +11,19 @@
   "types": "./index.d.ts",
   "sideEffects": false,
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "files": [
     "./index.js",
     "./index.d.ts"
   ],
   "dependencies": {
-    "cidr-regex": "4.0.3",
     "ip-bigint": "7.3.0",
-    "ip-regex": "5.0.0",
     "string-natural-compare": "3.0.1"
   },
   "devDependencies": {
     "eslint": "8.49.0",
-    "eslint-config-silverwind": "74.1.4",
+    "eslint-config-silverwind": "75.0.6",
     "tsd": "0.29.0",
     "updates": "15.0.2",
     "versions": "11.1.0",