pmcf 1.38.3 → 1.40.0

package/bin/pmcf-named-defs

@@ -58,7 +58,17 @@ async function generateNamedDefs(owner, targetDir) {
       );
     }
 
-    console.log(owner.name, domain, nameserver?.hostName, rname);
+    const subnets = [
+      ...new Set([...owner.networks()].map(n => [...n.subnets()]).flat())
+    ];
+
+    console.log(
+      owner.fullName,
+      domain,
+      nameserver?.hostName,
+      rname,
+      subnets.map(s => `${s.owner.name}/${s.name}`)
+    );
 
     const SOARecord = createRecord(
       "@",
@@ -87,7 +97,7 @@ async function generateNamedDefs(owner, targetDir) {
     };
     zones.push(zone);
 
-    for (const subnet of owner.subnets()) {
+    for (const subnet of subnets) {
       if (!subnet.isLinkLocal && subnet.prefix) {
         const reverseArpa = reverseArpaAddress(subnet.prefix);
         const reverseZone = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.38.3",
+  "version": "1.40.0",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
     "pacc": "^3.3.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.2",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/model.mjs

@@ -32,6 +32,17 @@ export class Location extends Owner {
   get network() {
     return [...this.typeList("network")][0] || super.network;
   }
+
+  /*
+  *subnets() {
+   // yield* super.subnets();
+    
+    for(const network of this.networks()) {
+     // console.log(network.toString());
+      yield* network.typeList("subnet");
+    }
+  }
+  */
 }
 
 export class Root extends Location {

package/src/owner.mjs

@@ -105,7 +105,6 @@ export class Owner extends Base {
   }
 
   addObject(object) {
-    this.owner?.addObject(object);
     this._addObject(object.typeName, object.fullName, object);
   }
 
@@ -153,34 +152,17 @@ export class Owner extends Base {
   }
 
   subnetNamed(name) {
-    return this.typeNamed("subnet", name) || this.owner?.subnetNamed(name);
+    return this.typeNamed("subnet", name);
   }
 
-  *_subnets() {
+  *subnets() {
     if (this.owner) {
       yield* this.owner.subnets();
-    } else {
-      yield* this.typeList("subnet");
     }
-  }
-
-  subnets() {
-    if (this !== this.location) {
-      return this.location.subnets();
-    }
-
-    return this.typeList("subnet");
+    yield* this.typeList("subnet");
   }
 
   addSubnet(address) {
-    if (address instanceof Subnet) {
-      return address;
-    }
-
-    if (this !== this.location) {
-      return this.location.addSubnet(address);
-    }
-
     const { cidr } = normalizeCIDR(address);
 
     if (cidr) {
@@ -302,8 +284,8 @@ export class Network extends Owner {
   kind;
   scope;
   metric;
-  bridge;
   gateway;
+  #bridge;
 
   static get typeName() {
     return "network";
@@ -317,9 +299,8 @@ export class Network extends Owner {
       delete data.subnets;
     }
 
-    let bridge;
     if (data.bridge) {
-      bridge = data.bridge;
+      this.bridge = owner.addBridge(this, data.bridge);
       delete data.bridge;
     }
 
@@ -328,8 +309,6 @@ export class Network extends Owner {
     if (typeof this.gateway === "string") {
       this.finalize(() => (this.gateway = this.owner.hostNamed(this.gateway)));
     }
-
-    this.bridge = owner.addBridge(this, bridge);
   }
 
   get network() {
@@ -350,6 +329,40 @@ export class Network extends Owner {
     }
   }
 
+  get bridge() {
+    return this.#bridge;
+  }
+
+  set bridge(bridge) {
+    for (const network of bridge) {
+      if (network instanceof Network && network !== this) {
+        for (const subnet of this.subnets()) {
+          for (const otherSubnet of network.subnets()) {
+            if (
+              subnet !== otherSubnet &&
+              subnet.address === otherSubnet.address
+            ) {
+              /*console.log(
+                "SHARE SUBNETS",
+                subnet.owner.toString(),
+                otherSubnet.owner.toString()
+              );*/
+
+              otherSubnet.owner.addObject(subnet);
+              for (const n of otherSubnet.networks) {
+                subnet.networks.add(n);
+              }
+
+              //console.log(subnet.toString(),[...subnet.networks].map(n=>n.toString()));
+            }
+          }
+        }
+      }
+    }
+
+    this.#bridge = bridge;
+  }
+
   get propertyNames() {
     return [
       ...super.propertyNames,
@@ -387,6 +400,10 @@ export class Subnet extends Base {
     owner.addObject(this);
   }
 
+  get fullName() {
+    return this.name;
+  }
+
   matchesAddress(address) {
     return address.startsWith(this.prefix);
   }

package/types/owner.d.mts

@@ -20,8 +20,7 @@ export class Owner extends Base {
     networkNamed(name: any): any;
     networks(): any;
     subnetNamed(name: any): any;
-    _subnets(): Generator<any, void, any>;
-    subnets(): any;
+    subnets(): Generator<any, void, any>;
     addSubnet(address: any): any;
     subnetForAddress(address: any): any;
     clusterNamed(name: any): any;
@@ -37,10 +36,12 @@ export class Network extends Owner {
     kind: any;
     scope: any;
     metric: any;
-    bridge: any;
     gateway: any;
+    set bridge(bridge: any);
+    get bridge(): any;
     get network(): this;
     addSubnets(value: any): void;
+    #private;
 }
 export class Subnet extends Base {
     networks: Set<any>;