ip-utilties 1.0.1 → 1.0.3

package/package.json

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

package/src/ip.mjs

@@ -9,7 +9,6 @@ const ipv4 = {
   segments: 4,
   segmentLength: 8,
   segmentMask: 0xffn,
-  mask: 0xffffffffn,
   base: 10
 };
 
@@ -30,7 +29,6 @@ const ipv6 = {
   segments: 8,
   segmentLength: 16,
   segmentMask: 0xffffn,
-  mask: 0xffffffffffffffffffffffffffffffffn,
   base: 16
 };
 
@@ -183,7 +181,7 @@ function _is(definition, address) {
 }
 
 export function asBigInt(address) {
-  return _asBigInt(isIPv4(address) ? ipv4 : ipv6, address);
+  return _asBigInt(_definition(address), address);
 }
 
 function _asBigInt(definition, address) {
@@ -191,16 +189,10 @@ function _asBigInt(definition, address) {
     return address;
   }
 
-  const ea = _encode(definition, address);
-
-  let result = 0n;
-
-  for (let i = 0; i < ea.length; i++) {
-    result = result << BigInt(definition.segmentLength);
-    result += BigInt(ea[i]);
-  }
-
-  return result;
+  return _encode(definition, address).reduce(
+    (a, c) => (a << BigInt(definition.segmentLength)) + BigInt(c),
+    0n
+  );
 }
 
 function _encodeBigInt(definition, address) {
@@ -215,24 +207,25 @@ function _encodeBigInt(definition, address) {
 }
 
 export function prefixIP(address, length) {
-  const definition = isIPv4(address) ? ipv4 : ipv6;
+  const definition = _definition(address);
   return _decode(definition, _prefix(definition, address, length));
 }
 
 function _prefix(definition, address, length) {
   return (
     _asBigInt(definition, address) &
-    (definition.mask << BigInt(definition.bitLength - length))
+    (-1n << BigInt(definition.bitLength - length))
   );
 }
 
 export function rangeIP(address, prefix, lowerAdd = 0, upperReduce = 0) {
-  const definition = isIPv4(address) ? ipv4 : ipv6;
-
+  const definition = _definition(address);
   const from = _prefix(definition, address, prefix);
   const to = from | ((1n << BigInt(definition.bitLength - prefix)) - 1n);
-
-  return [_encode(definition, from + BigInt(lowerAdd)), _encode(definition, to - BigInt(upperReduce))];
+  return [
+    _encode(definition, from + BigInt(lowerAdd)),
+    _encode(definition, to - BigInt(upperReduce))
+  ];
 }
 
 export function normalizeCIDR(address) {

package/types/ip.d.mts

@@ -8,7 +8,7 @@ export function decodeIPv4(address: any, length: any): string;
 export function decodeIP(address: any, length: any): string;
 export function isIPv4(address: any): boolean;
 export function isIPv6(address: any): boolean;
-export function asBigInt(address: any): bigint;
+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 normalizeCIDR(address: any): {