pmcf 1.41.1 → 1.42.1

package/package.json

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

package/src/base.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { getAttribute } from "pacc";
+import { typesByName } from "./types.mjs";
 
 export class Base {
   owner;
@@ -10,6 +11,12 @@ export class Base {
     return "base";
   }
 
+  static get typeDefinition() {
+    return {
+      //      name: { type: "string", collection: false }
+    };
+  }
+
   static get pluralTypeName() {
     return this.typeName + "s";
   }
@@ -47,6 +54,25 @@ export class Base {
     }
   }
 
+  read(data) {
+    for (const [slotName, typeDef] of Object.entries(
+      this.constructor.typeDefinition
+    )) {
+      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);
+        }
+      }
+    }
+  }
+
   forOwner(owner) {
     if (this.owner !== owner) {
       // @ts-ignore

package/src/host.mjs

@@ -1,6 +1,5 @@
 import { Base } from "./base.mjs";
 import { Network } from "./network.mjs";
-import { Service } from "./service.mjs";
 import {
   asArray,
   isIPv4Address,
@@ -32,6 +31,13 @@ export class Host extends Base {
     return "host";
   }
 
+  static get typeDefinition() {
+    return {
+      networkInterfaces: { type: "network_interface", collection: true },
+      services: { type: "service", collection: true }
+    };
+  }
+
   static async prepareData(root, data) {
     if (data.extends) {
       data.extends = await Promise.all(
@@ -86,32 +92,14 @@ export class Host extends Base {
       delete data.provides;
     }
 
-    if (data.services) {
-      for (const [name, sd] of Object.entries(data.services)) {
-        sd.name = name;
-        new Service(this, sd);
-      }
-      delete data.services;
-    }
-
-    if (data.networkInterfaces) {
-      for (const [name, iface] of Object.entries(data.networkInterfaces)) {
-        iface.name = name;
-        new NetworkInterface(this, iface);
-      }
-      delete data.networkInterfaces;
-    }
-
     for (const host of this.extends) {
       for (const service of host.services()) {
         service.forOwner(this);
       }
-
-      /*for (const ni of host.networkInterfaces.values()) {
-        ni.forOwner(this);
-      }*/
     }
 
+    this.read(data);
+
     Object.assign(this, data);
 
     owner.addObject(this);

package/src/owner.mjs

@@ -1,7 +1,7 @@
 import { asArray, normalizeCIDR } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet } from "./subnet.mjs";
-import { addType, typesByName } from "./types.mjs";
+import { addType } from "./types.mjs";
 
 export class Owner extends Base {
   #membersByType = new Map();
@@ -18,9 +18,12 @@ export class Owner extends Base {
     return "owner";
   }
 
-  static get ownedTypes() {
+  static get typeDefinition() {
     return {
       networks: { type: "network", collection: true },
+      hosts: { type: "host", collection: true },
+      clusters: { type: "cluster", collection: true },
+      /*  subnets: { type: "subnet", collection: true },*/
       dns: { type: "dns", collection: false }
     };
   }
@@ -43,22 +46,7 @@ export class Owner extends Base {
       delete data.ntp;
     }
 
-    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);
-        }
-      }
-    }
+    this.read(data);
 
     owner?.addObject(this);
   }
@@ -118,9 +106,9 @@ export class Owner extends Base {
     this._addObject(object.typeName, object.fullName, object);
   }
 
-  async service(filter) {
+  service(filter) {
     let best;
-    for await (const service of this.services(filter)) {
+    for (const service of this.services(filter)) {
       if (!best || service.priority < best.priority) {
         best = service;
       }
@@ -129,9 +117,9 @@ export class Owner extends Base {
     return best;
   }
 
-  async *services(filter) {
-    for await (const host of this.hosts()) {
-      for await (const service of host.services(filter)) {
+  *services(filter) {
+    for (const host of this.hosts()) {
+      for (const service of host.services(filter)) {
         yield service;
       }
     }
@@ -257,8 +245,8 @@ export class Owner extends Base {
     }
   }
 
-  async *networkAddresses() {
-    for await (const host of this.hosts()) {
+  *networkAddresses() {
+    for (const host of this.hosts()) {
       for (const networkAddresses of host.networkAddresses()) {
         yield networkAddresses;
       }

package/types/base.d.mts

@@ -1,6 +1,7 @@
 export function extractFrom(object: any): {};
 export class Base {
     static get typeName(): string;
+    static get typeDefinition(): {};
     static get pluralTypeName(): string;
     static get nameLookupName(): string;
     static get typeFileName(): string;
@@ -11,6 +12,7 @@ export class Base {
     owner: any;
     name: any;
     description: any;
+    read(data: any): void;
     forOwner(owner: any): any;
     get typeName(): any;
     get root(): any;

package/types/host.d.mts

@@ -1,4 +1,14 @@
 export class Host extends Base {
+    static get typeDefinition(): {
+        networkInterfaces: {
+            type: string;
+            collection: boolean;
+        };
+        services: {
+            type: string;
+            collection: boolean;
+        };
+    };
     static prepareData(root: any, data: any): Promise<typeof Host>;
     postinstall: any[];
     _traverse(...args: any[]): boolean;

package/types/owner.d.mts

@@ -1,9 +1,17 @@
 export class Owner extends Base {
-    static get ownedTypes(): {
+    static get typeDefinition(): {
         networks: {
             type: string;
             collection: boolean;
         };
+        hosts: {
+            type: string;
+            collection: boolean;
+        };
+        clusters: {
+            type: string;
+            collection: boolean;
+        };
         dns: {
             type: string;
             collection: boolean;
@@ -21,8 +29,8 @@ export class Owner extends Base {
     typeList(typeName: any): any;
     _addObject(typeName: any, fullName: any, object: any): void;
     addObject(object: any): void;
-    service(filter: any): Promise<any>;
-    services(filter: any): AsyncGenerator<any, void, unknown>;
+    service(filter: any): any;
+    services(filter: any): Generator<any, void, unknown>;
     locationNamed(name: any): any;
     locations(): any;
     hostNamed(name: any): any;
@@ -37,7 +45,7 @@ export class Owner extends Base {
     clusters(): any;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
-    networkAddresses(): AsyncGenerator<any, void, unknown>;
+    networkAddresses(): Generator<any, void, unknown>;
     domains(): Generator<any, void, unknown>;
     #private;
 }