pmcf 1.30.5 → 1.30.7

package/bin/pmcf-host-defs

@@ -55,7 +55,7 @@ async function generateNetworkDefs(host, dir) {
 
     const networkSections = [sectionLines("Match", { Name: ni.name })];
 
-    for (const Address of ni.ipAddressesWithNetmask) {
+    for (const Address of ni.ipAddressesWithPrefixLength) {
       networkSections.push(
         "",
         sectionLines("Address", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.30.5",
+  "version": "1.30.7",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
     "pacc": "^3.3.0"
   },
   "devDependencies": {
-    "@types/node": "^22.12.0",
+    "@types/node": "^22.13.0",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -112,7 +112,7 @@ export class Base {
           return new Set([...object].map(e => this.expand(e)));
         }
 
-        /*return Object.fromEntries(
+      /*return Object.fromEntries(
           Object.entries(object).map(([k, v]) => [k, this.expand(v)])
         );*/
     }
@@ -189,12 +189,17 @@ export function extractFrom(object, propertyNames) {
   for (const p of propertyNames) {
     const value = object[p];
 
-    if (value !== undefined) {
-      if (value instanceof Base && value.name !== undefined) {
-        json[p] = { name: value.name, type: value.typeName };
-      } else {
+    switch (typeof value) {
+      case "undefined":
+        break;
+      case "object":
+        if (value instanceof Base && value.name !== undefined) {
+          json[p] = { name: value.name, type: value.typeName };
+        }
+
+        break;
+      default:
         json[p] = value;
-      }
     }
   }
   return json;

package/src/model.mjs

@@ -464,9 +464,9 @@ export class NetworkInterface extends Base {
     return this.#ipAddresses;
   }
 
-  get ipAddressesWithNetmask() {
+  get ipAddressesWithPrefixLength() {
     return this.#ipAddresses.map(a =>
-      isIPv4Address(a) ? `${a}/${this.network.netmask}` : a
+      isIPv4Address(a) ? `${a}/${this.network.prefixLength}` : a
     );
   }
 

package/src/owner.mjs

@@ -84,8 +84,6 @@ export class Owner extends Base {
       this.#membersByType.set(typeName, typeSlot);
     }
     typeSlot.set(fullName, object);
-
-    //console.log(this.toString(),"ADD", typeName, fullName, object.name, this.named(fullName)?.toString());
   }
 
   addObject(object) {
@@ -190,7 +188,7 @@ export class Owner extends Base {
 
   _resolveBridges() {
     for (const bridge of this.#bridges) {
-      this.info(bridgeToJSON(bridge));
+      //this.info(bridgeToJSON(bridge));
       for (const network of bridge) {
         if (typeof network === "string") {
           const other = this.networkNamed(network);
@@ -287,7 +285,7 @@ export class Network extends Owner {
     return super.networkNamed(name);
   }
 
-  get netmask() {
+  get prefixLength() {
     const m = this.ipv4?.match(/\/(\d+)$/);
     if (m) {
       return parseInt(m[1]);
@@ -307,7 +305,7 @@ export class Network extends Owner {
       ...super.propertyNames,
       "kind",
       "ipv4",
-      "netmask",
+      "prefixLength",
       "scope",
       "metric",
       "bridge"

package/types/model.d.mts

@@ -56,7 +56,7 @@ export class NetworkInterface extends Base {
     set network(networkOrName: any);
     get network(): any;
     get ipAddresses(): any[];
-    get ipAddressesWithNetmask(): any[];
+    get ipAddressesWithPrefixLength(): any[];
     get ipv4Addresses(): any[];
     get ipv6Addresses(): any[];
     get scope(): any;

package/types/owner.d.mts

@@ -35,7 +35,7 @@ export class Network extends Owner {
     ipv4: any;
     subnet: any;
     bridge: any;
-    get netmask(): number;
+    get prefixLength(): number;
     get subnetAddress(): any;
 }
 export class Subnet extends Base {