ip-utilties 1.0.0 → 1.0.2

package/README.md

@@ -18,9 +18,9 @@ ip v4/v6 utility functions
 
 With [npm](http://npmjs.org) do:
 
-    ```shell
+```shell
 npm install ip-utilties
-    ```
+```
 
 # license
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip-utilties",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "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
 };
 
@@ -62,7 +60,7 @@ export function encodeIPv4(address) {
   return _encode(ipv4, address);
 }
 
-export function _encode(definition, address) {
+function _encode(definition, address) {
   switch (typeof address) {
     case "string":
       const res = new definition.factory(definition.segments);
@@ -167,7 +165,7 @@ function _definition(address) {
   }
 }
 
-export function _is(definition, address) {
+function _is(definition, address) {
   switch (typeof address) {
     case "string":
       return address.indexOf(definition.separator) >= 0;
@@ -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) {
@@ -219,10 +211,10 @@ export function prefixIP(address, length) {
   return _decode(definition, _prefix(definition, address, length));
 }
 
-export function _prefix(definition, address, length) {
+function _prefix(definition, address, length) {
   return (
     _asBigInt(definition, address) &
-    (definition.mask << BigInt(definition.bitLength - length))
+    (-1n << BigInt(definition.bitLength - length))
   );
 }
 
@@ -232,7 +224,10 @@ export function rangeIP(address, prefix, lowerAdd = 0, upperReduce = 0) {
   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) {
@@ -283,7 +278,7 @@ export function normalizeIP(address) {
 export function reverseArpa(address) {
   if (isIPv6(address)) {
     const ea = encodeIPv6(address);
-    let result = [];
+    const result = [];
     for (let i = 0; i < ea.length; i++) {
       const v = ea[i];
       for (let i = 0; i < 4; i++) {

package/types/ip.d.mts

@@ -3,16 +3,13 @@ export function IPV6(...args: any[]): any;
 export function encodeIP(address: any): any;
 export function encodeIPv6(address: any): any;
 export function encodeIPv4(address: any): any;
-export function _encode(definition: any, address: any): any;
 export function decodeIPv6(address: any, length: any): string;
 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 _is(definition: any, 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 _prefix(definition: any, address: any, length: any): bigint;
 export function rangeIP(address: any, prefix: any, lowerAdd?: number, upperReduce?: number): any[];
 export function normalizeCIDR(address: any): {
     longPrefix?: undefined;