pmcf 1.32.0 → 1.34.0

package/bin/pmcf-named-defs

@@ -79,11 +79,10 @@ async function generateNamedDefs(owner, targetDir) {
 
     for (const subnet of owner.subnets()) {
       if (subnet.address) {
-        const reverse = reverseAddress(subnet.address);
         const reverseArpa = reverseArpaAddress(subnet.address);
         const zone = {
           id: reverseArpa,
-          file: `${reverse}.zone`,
+          file: `${reverseArpa}.zone`,
           records: new Set([SOARecord, NSRecord])
         };
         zones.push(zone);
@@ -98,15 +97,15 @@ async function generateNamedDefs(owner, targetDir) {
       networkInterface
     } of owner.networkAddresses()) {
       const host = networkInterface.host;
-      zone.records.add(
-        createRecord(
-          host.domainName + ".",
-          isIPv4Address(address) ? "A   " : "AAAA",
-          normalizeIPAddress(address)
-        )
-      );
 
       if (!hosts.has(host)) {
+        zone.records.add(
+          createRecord(
+            host.domainName + ".",
+            isIPv4Address(address) ? "A   " : "AAAA",
+            normalizeIPAddress(address)
+          )
+        );
         hosts.add(host);
         for (const service of host.services()) {
           //console.log(service.name);

package/package.json

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

package/src/owner.mjs

@@ -14,7 +14,7 @@ export class Owner extends Base {
     return "owner";
   }
 
-  constructor(owner, data={}) {
+  constructor(owner, data = {}) {
     super(owner, data);
 
     let dns;
@@ -83,7 +83,7 @@ export class Owner extends Base {
 
   typeNamed(typeName, name) {
     const typeSlot = this.#membersByType.get(typeName);
-    return typeSlot?.get(name);
+    return typeSlot?.get(name) || this.owner?.typeNamed(typeName, name);
   }
 
   *typeList(typeName) {
@@ -296,8 +296,6 @@ export class Network extends Owner {
       subnet.networks.add(this);
     }
 
-    //owner.addObject(this);
-
     this.bridge = owner.addBridge(this, bridge);
   }
 
@@ -324,7 +322,7 @@ export class Network extends Owner {
       }
     }
 
-    this.error("no prefixLength",this.#ipAddresses);
+    this.error("no prefixLength", this.#ipAddresses);
   }
 
   get subnetAddress() {
@@ -342,6 +340,7 @@ export class Network extends Owner {
       ...super.propertyNames,
       "kind",
       "ipAddresses",
+      "subnet",
       "prefixLength",
       "scope",
       "metric",
@@ -368,4 +367,19 @@ export class Subnet extends Base {
   get address() {
     return this.name;
   }
+
+  get propertyNames() {
+    return [...super.propertyNames, "networks"];
+  }
+
+  _traverse(...args) {
+    if (super._traverse(...args)) {
+      for (const network of this.networks) {
+        network._traverse(...args);
+      }
+      return true;
+    }
+
+    return false;
+  }
 }

package/types/owner.d.mts

@@ -45,6 +45,7 @@ export class Network extends Owner {
 export class Subnet extends Base {
     networks: Set<any>;
     get address(): any;
+    _traverse(...args: any[]): boolean;
 }
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";