ip-utilties 3.7.1 → 3.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip-utilties",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -42,17 +42,12 @@
   },
   "devDependencies": {
     "ava": "^8.0.1",
-    "browser-ava": "^2.3.67",
-    "c8": "^11.0.0",
+    "browser-ava": "^2.3.69",
+    "c8": "^12.0.0",
     "documentation": "^14.0.3",
-    "semantic-release": "^25.0.7",
+    "semantic-release": "^25.0.8",
     "typescript": "^7.0.2"
   },
-  "overrides": {
-    "c8": {
-      "yargs": "^18.0.0"
-    }
-  },
   "engines": {
     "node": ">=26.4.0"
   },

package/src/ip.mjs

@@ -19,7 +19,6 @@ const ipv4 = {
   segmentMask: 0xffn,
   base: 10,
   localHost: new Uint8Array([127, 0, 0, 1]),
-  localHostPrefixLenth: 8,
 
   // https://www.geeksforgeeks.org/computer-networks/subnet-cheat-sheet/
   wellKnownAddresses: [
@@ -63,7 +62,6 @@ const ipv6 = {
   segmentMask: 0xffffn,
   base: 16,
   localHost: new Uint16Array([0, 0, 0, 0, 0, 0, 0, 1]),
-  localHostPrefixLenth: 128,
   wellKnownAddresses: [
     [new Uint16Array([0xfe80, 0, 0, 0, 0, 0, 0, 0]), 64, 64, true],
     [new Uint16Array([0xfd00, 0, 0, 0, 0, 0, 0, 0]), 8, 64, false, true],
@@ -298,8 +296,9 @@ export function normalizeCIDR(address) {
   let encoded = _encode(family, prefix);
   const wns = _wellKnownSubnet(family, encoded);
 
-  if (wns && !prefixLength) {
-    prefixLength = wns[2];
+  if (wns) {
+    prefixLength = prefixLength === undefined ? wns[2] : parseInt(prefixLength);
+
     prefix = _decode(
       family,
       _prefix(family, encoded, prefixLength),
@@ -307,31 +306,13 @@ export function normalizeCIDR(address) {
     );
     longPrefix = _decode(family, wns[0]);
   } else {
-    if (_isUniqueLocal(encoded) || _isLinkLocal(family, encoded)) {
-      prefixLength = family.wellKnownAddresses[0][1]; // TODO
-      const n = _prefix(family, address, prefixLength);
-      prefix = _decode(family, n, prefixLength);
-
-      if (family === ipv6) {
-        if (!prefix.endsWith("::")) {
-          // TODO
-          prefix += prefix.endsWith(":") ? ":" : "::";
-        }
-      }
-      longPrefix = prefix;
-    } else {
-      prefixLength = prefixLength === undefined ? 0 : parseInt(prefixLength);
-
-      if (prefixLength) {
-        encoded = _prefix(family, prefix, prefixLength);
-      } else {
-        if (_isLocalhost(family, encoded)) {
-          prefixLength = family.localHostPrefixLenth;
-        }
-      }
-      prefix = _decode(family, encoded, prefixLength);
-      longPrefix = _decode(family, encoded);
+    prefixLength = prefixLength === undefined ? 0 : parseInt(prefixLength);
+
+    if (prefixLength) {
+      encoded = _prefix(family, prefix, prefixLength);
     }
+    prefix = _decode(family, encoded, prefixLength);
+    longPrefix = _decode(family, encoded);
   }
 
   return {

package/types/ip.d.mts

@@ -41,7 +41,7 @@ export declare function prefixOnlyIP(address: any, length: any): string;
 export declare function rangeIP(address: any, prefix: any, lowerAdd?: number, upperReduce?: number): any[];
 export declare function matchPrefixIP(prefix: any, length: any, address: any): boolean;
 export declare function normalizeCIDR(address: any): {
-    longPrefix: any;
+    longPrefix: string;
     prefix: any;
     prefixLength: any;
     cidr: string;