ip-utilties 1.2.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip-utilties",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -12,6 +12,7 @@
   },
   "description": "ip v4/v6 utility functions",
   "keywords": [
+    "cidr",
     "ip",
     "ipv4",
     "ipv6",

package/src/ip.mjs

@@ -51,9 +51,7 @@ function _encode(family, address) {
       const res = new family.factory(family.segments);
 
       let i = 0;
-      for (const segment of family
-        .normalize(address)
-        .split(family.separator)) {
+      for (const segment of family.normalize(address).split(family.separator)) {
         res[i++] = parseInt(segment, family.base);
       }
 
@@ -148,7 +146,7 @@ export function isIPv6(address) {
  * @return {string|undefined}
  */
 export function familyIP(address) {
-  return _family(address)?.name
+  return _family(address)?.name;
 }
 
 function _family(address) {
@@ -162,8 +160,7 @@ function _is(family, address) {
 
     case "object":
       return (
-        address instanceof family.factory &&
-        address.length === family.segments
+        address instanceof family.factory && address.length === family.segments
       );
   }
 
@@ -203,8 +200,7 @@ export function prefixIP(address, length) {
 
 function _prefix(family, address, length) {
   return (
-    _asBigInt(family, address) &
-    (-1n << BigInt(family.bitLength - length))
+    _asBigInt(family, address) & (-1n << BigInt(family.bitLength - length))
   );
 }
 
@@ -218,18 +214,23 @@ export function rangeIP(address, prefix, lowerAdd = 0, upperReduce = 0) {
   ];
 }
 
+export function matchPrefixIP(prefix, length, address) {
+  const family = _family(address);
+  return _prefix(family, address, length) === _prefix(family, prefix, length);
+}
+
 export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
   let longPrefix;
 
-  if (!prefixLength && isLinkLocal(address)) {
+  prefixLength = prefixLength === undefined ? 0 : parseInt(prefixLength);
+
+  if (isLinkLocal(address)) {
     prefix = "fe80::";
     longPrefix = prefix;
     prefixLength = 64;
   } else {
-    prefixLength = parseInt(prefixLength);
-
-    const family = isIPv6(prefix) ? ipv6 : ipv4;
+    const family = /*_family(prefix); */ isIPv6(prefix) ? ipv6 : ipv4;
     let n;
 
     if (prefixLength) {
@@ -239,8 +240,6 @@ export function normalizeCIDR(address) {
 
       if (isLocalhost(n)) {
         prefixLength = family === ipv6 ? 128 : 8;
-      } else {
-        return {};
       }
     }
     prefix = _decode(family, n, prefixLength);

package/types/ip.d.mts

@@ -15,12 +15,8 @@ export function familyIP(address: string | Uint8Array | Uint16Array): string | u
 export function asBigInt(address: any): any;
 export function prefixIP(address: any, length: any): string;
 export function rangeIP(address: any, prefix: any, lowerAdd?: number, upperReduce?: number): any[];
+export function matchPrefixIP(prefix: any, length: any, address: any): boolean;
 export function normalizeCIDR(address: any): {
-    longPrefix?: undefined;
-    prefix?: undefined;
-    prefixLength?: undefined;
-    cidr?: undefined;
-} | {
     longPrefix: any;
     prefix: any;
     prefixLength: any;