ip-utilties 3.7.2 → 3.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip-utilties",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "publishConfig": {
     "access": "public",
     "provenance": true

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],
@@ -299,22 +297,19 @@ export function normalizeCIDR(address) {
   const wns = _wellKnownSubnet(family, encoded);
 
   if (wns) {
-    prefixLength ||= wns[2];
+    prefixLength = prefixLength === undefined ? wns[2] : parseInt(prefixLength);
+
     prefix = _decode(
       family,
       _prefix(family, encoded, prefixLength),
       prefixLength
     );
-    longPrefix = _decode(family, wns[0]);
+    longPrefix = _decode(family, encoded);
   } 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);
@@ -324,7 +319,8 @@ export function normalizeCIDR(address) {
     longPrefix,
     prefix,
     prefixLength,
-    cidr: `${prefix}/${prefixLength}`
+    cidr: `${prefix}/${prefixLength}`,
+    family: family.name
   };
 }
 

package/types/ip.d.mts

@@ -45,6 +45,7 @@ export declare function normalizeCIDR(address: any): {
     prefix: any;
     prefixLength: any;
     cidr: string;
+    family: string;
 };
 export declare function formatCIDR(address: any, prefixLength: any): any;
 export declare function normalizeIP(address: any): string | undefined;