pmcf 1.41.0 → 1.41.1

package/package.json

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

package/src/owner.mjs

@@ -1,13 +1,11 @@
 import { asArray, normalizeCIDR } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet } from "./subnet.mjs";
-import { DNSService } from "./dns.mjs";
 import { addType, typesByName } from "./types.mjs";
 
 export class Owner extends Base {
   #membersByType = new Map();
   #bridges = new Set();
-  #dns;
   #administratorEmail;
   domain;
   ntp = { servers: [] };
@@ -20,17 +18,16 @@ export class Owner extends Base {
     return "owner";
   }
 
+  static get ownedTypes() {
+    return {
+      networks: { type: "network", collection: true },
+      dns: { type: "dns", collection: false }
+    };
+  }
+
   constructor(owner, data = {}) {
     super(owner, data);
 
-    let dns;
-    if (data.dns) {
-      dns = data.dns;
-      delete data.dns;
-    }
-
-    this.#dns = new DNSService(this, dns);
-
     if (data.administratorEmail) {
       this.#administratorEmail = data.administratorEmail;
       delete data.administratorEmail;
@@ -46,13 +43,20 @@ export class Owner extends Base {
       delete data.ntp;
     }
 
-    if (data.networks) {
-      const networks = data.networks;
-      delete data.networks;
-
-      for (const [name, data] of Object.entries(networks)) {
-        data.name = name;
-        new typesByName.network(this, data);
+    for (const [slotName, typeDef] of Object.entries(
+      this.constructor.ownedTypes
+    )) {
+      const slot = data[slotName];
+      if (slot) {
+        delete data[slotName];
+        if (typeDef.collection) {
+          for (const [objectName, objectData] of Object.entries(slot)) {
+            objectData.name = objectName;
+            new typesByName[typeDef.type](this, objectData);
+          }
+        } else {
+          this[typeDef.type] = new typesByName[typeDef.type](this, slot);
+        }
       }
     }
 
@@ -73,10 +77,6 @@ export class Owner extends Base {
     return false;
   }
 
-  get dns() {
-    return this.#dns;
-  }
-
   named(name) {
     //console.log("NAMED", this.#membersByType.keys());
     for (const slot of this.#membersByType.values()) {
@@ -92,6 +92,10 @@ export class Owner extends Base {
     return typeSlot?.get(name) || this.owner?.typeNamed(typeName, name);
   }
 
+  typeObject(typeName) {
+    return this.#membersByType.get(typeName);
+  }
+
   typeList(typeName) {
     const typeSlot = this.#membersByType.get(typeName);
     if (typeSlot) {

package/types/owner.d.mts

@@ -1,13 +1,23 @@
 export class Owner extends Base {
+    static get ownedTypes(): {
+        networks: {
+            type: string;
+            collection: boolean;
+        };
+        dns: {
+            type: string;
+            collection: boolean;
+        };
+    };
     constructor(owner: any, data?: {});
     domain: any;
     ntp: {
         servers: any[];
     };
     _traverse(...args: any[]): boolean;
-    get dns(): DNSService;
     named(name: any): any;
     typeNamed(typeName: any, name: any): any;
+    typeObject(typeName: any): any;
     typeList(typeName: any): any;
     _addObject(typeName: any, fullName: any, object: any): void;
     addObject(object: any): void;
@@ -32,4 +42,3 @@ export class Owner extends Base {
     #private;
 }
 import { Base } from "./base.mjs";
-import { DNSService } from "./dns.mjs";