pmcf 2.10.3 → 2.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "publishConfig": {
     "access": "public"
   },

package/src/subnet.mjs

@@ -2,7 +2,8 @@ import {
   normalizeCIDR,
   isLinkLocal,
   isIPv4Address,
-  isIPv6Address
+  isIPv6Address,
+  addressWithPrefixLength
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
@@ -62,23 +63,14 @@ export class Subnet extends Base {
   }
 
   get addressRange() {
-    const l = this.prefixLength;
-    return l === 24
-      ? [this.prefix + ".0", this.prefix + ".255"]
-      : [this.prefix + ".0.0", this.prefix + ".255.255"];
+    return [
+      addressWithPrefixLength(this.prefix, this.prefixLength),
+      this.prefix + ".255".repeat((32 - this.prefixLength) / 8)
+    ];
   }
 
   get longPrefix() {
-    const prefix = this.prefix;
-
-    switch (this.prefixLength) {
-      case 24:
-        return prefix + ".0";
-      case 16:
-        return prefix + ".0.0";
-    }
-
-    return prefix;
+    return addressWithPrefixLength(this.prefix, this.prefixLength);
   }
 
   get prefix() {

package/src/utils.mjs

@@ -143,6 +143,15 @@ const ipv6 = {
   base: 16
 };
 
+export function addressWithPrefixLength(address, prefixLength) {
+  const definition = ipv4;
+
+  return (
+    address +
+    ".0".repeat((definition.length - prefixLength) / definition.segmentLength)
+  );
+}
+
 function _decode(definition, address, length = definition.length) {
   if (typeof address === "string") {
     return address;

package/types/utils.d.mts

@@ -11,6 +11,7 @@ export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): boolean;
 export function isLocalhost(address: any): boolean;
 export function normalizeIPAddress(address: any): any;
+export function addressWithPrefixLength(address: any, prefixLength: any): string;
 export function _encode(definition: any, address: any): any;
 export function decodeIPv6(address: any, length: any): string;
 export function encodeIPv6(address: any): any;