pmcf 1.30.4 → 1.30.6

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.4",
+  "version": "1.30.6",
   "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

@@ -191,7 +191,7 @@ export function extractFrom(object, propertyNames) {
 
     if (value !== undefined) {
       if (value instanceof Base && value.name !== undefined) {
-        json[p] = { name: value.name };
+        json[p] = { name: value.name, type: value.typeName };
       } else {
         json[p] = value;
       }

package/src/model.mjs

@@ -112,6 +112,14 @@ export class Location extends Owner {
   get location() {
     return this;
   }
+
+  locationNamed(name) {
+    if (this.fullName === name) {
+      return this;
+    }
+
+    return super.locationNamed(name);
+  }
 }
 
 export class Host extends Base {
@@ -456,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
     );
   }
 
@@ -529,5 +537,14 @@ export class NetworkInterface extends Base {
   }
 }
 
-const _types = [Location, Network, Subnet, Host, Cluster, Service, DNSService, NetworkInterface];
+const _types = [
+  Location,
+  Network,
+  Subnet,
+  Host,
+  Cluster,
+  Service,
+  DNSService,
+  NetworkInterface
+];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/src/owner.mjs

@@ -280,7 +280,14 @@ export class Network extends Owner {
     this.bridge = owner.addBridge(this, bridge);
   }
 
-  get netmask() {
+  networkNamed(name) {
+    if (this.fullName === name) {
+      return this;
+    }
+    return super.networkNamed(name);
+  }
+
+  get prefixLength() {
     const m = this.ipv4?.match(/\/(\d+)$/);
     if (m) {
       return parseInt(m[1]);
@@ -300,7 +307,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 {