cidr-tools 7.0.0 → 7.0.1

package/index.js

@@ -1,5 +1,4 @@
 import {parseIp, stringifyIp, normalizeIp, ipVersion} from "ip-bigint";
-import naturalCompare from "string-natural-compare";
 
 const bits = {
   4: 32,
@@ -9,6 +8,17 @@ const bits = {
 const uniq = arr => Array.from(new Set(arr));
 const cidrVersion = cidr => cidr.includes("/") ? ipVersion(cidr) : 0;
 
+// TODO: pass parsed objects in here
+function compare(a, b) {
+  const {number: aNum, version: aVersion} = parseIp(a.replace(/\/.+/, ""));
+  const {number: bNum, version: bVersion} = parseIp(b.replace(/\/.+/, ""));
+  if (aVersion === bVersion) {
+    return aNum - bNum > 0n ? 1 : aNum - bNum < 0n ? -1 : 0;
+  } else {
+    return aVersion > bVersion;
+  }
+}
+
 function doNormalize(cidr, {compress = true, hexify = false} = {}) {
   const {start, prefix, single, version} = parse(cidr);
   if (!single) { // cidr
@@ -253,7 +263,7 @@ export function merge(nets) {
   const end = {4: null, 6: null};
 
   for (const v of [4, 6]) {
-    const numbers = Object.keys(maps[v]).sort(naturalCompare);
+    const numbers = Object.keys(maps[v]);
     let depth = 0;
 
     for (const [index, number] of numbers.entries()) {
@@ -283,7 +293,7 @@ export function merge(nets) {
     }
   }
 
-  return [...merged[4].sort(naturalCompare), ...merged[6].sort(naturalCompare)];
+  return [...merged[4].sort(compare), ...merged[6].sort(compare)];
 }
 
 export function exclude(basenets, exclnets) {
@@ -318,7 +328,7 @@ export function exclude(basenets, exclnets) {
     }
   }
 
-  return bases[4].concat(bases[6]);
+  return bases[4].concat(bases[6]).sort(compare);
 }
 
 export function expand(nets) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-tools",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "author": "silverwind <me@silverwind.io>",
   "description": "Tools to work with IPv4 and IPv6 CIDR",
   "repository": "silverwind/cidr-tools",
@@ -18,16 +18,15 @@
     "./index.d.ts"
   ],
   "dependencies": {
-    "ip-bigint": "7.3.0",
-    "string-natural-compare": "3.0.1"
+    "ip-bigint": "7.3.0"
   },
   "devDependencies": {
-    "eslint": "8.49.0",
-    "eslint-config-silverwind": "75.0.6",
+    "eslint": "8.50.0",
+    "eslint-config-silverwind": "76.0.2",
     "tsd": "0.29.0",
     "updates": "15.0.2",
     "versions": "11.1.0",
-    "vitest": "0.34.4",
+    "vitest": "0.34.5",
     "vitest-config-silverwind": "3.0.0"
   }
 }