pmcf 4.22.5 → 4.23.0

package/README.md

@@ -71,11 +71,11 @@ generates config packages for:
     *   [Parameters](#parameters-11)
     *   [port](#port-1)
 *   [id](#id)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-12)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-13)
+        *   [Parameters](#parameters-12)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-13)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -250,14 +250,6 @@ Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
-## InitializationContext
-
-Keeps track of all in flight object creations and loose ends during config initialization.
-
-### Parameters
-
-*   `directory`   (optional, default `"/"`)
-
 ## SkeletonNetworkInterface
 
 **Extends ServiceOwner**
@@ -270,6 +262,14 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
 
+## InitializationContext
+
+Keeps track of all in flight object creations and loose ends during config initialization.
+
+### Parameters
+
+*   `directory`   (optional, default `"/"`)
+
 ## SystemdJournalRemoteService
 
 **Extends Service**

package/package.json

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

package/src/base.mjs

@@ -24,6 +24,7 @@ import {
   description_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
+import { AggregatedMap } from "aggregated-map";
 import { union } from "./utils.mjs";
 
 /**
@@ -36,15 +37,15 @@ export class Base {
   static key = "name";
   static priority = 0;
   static attributes = {
-    owner: { ...default_attribute, type: "base" },
-    type: string_attribute,
     name: name_attribute_writable,
     description: description_attribute_writable,
     priority: number_attribute_writable,
     directory: string_attribute_writable,
     packaging: string_attribute_writable,
     disabled: boolean_attribute_writable,
-    tags: string_set_attribute_writable
+    tags: string_set_attribute_writable,
+    owner: { ...default_attribute, type: "base" },
+    type: string_attribute
   };
 
   static typeDefinition = this;
@@ -127,6 +128,18 @@ export class Base {
     return this.owner.addObject(object);
   }
 
+  /**
+   * Deliver AggregatedMap of all property Maps.
+   * @param {string[]} directions
+   * @param {string} property
+   * @returns {Map<any,any>}
+   */
+  mapFromDirections(directions, property) {
+    return new AggregatedMap(
+      [...this.walkDirections(directions)].map(node => node[property])
+    );
+  }
+
   /**
    * Deliver union set of all property values.
    * @param {string[]} directions
@@ -142,6 +155,11 @@ export class Base {
     return collected;
   }
 
+  /*get this()
+  {
+    return [this];
+  }*/
+
   /**
    * Walk the object graph in some directions and deliver seen nodes.
    * @param {string[]} directions
@@ -168,10 +186,12 @@ export class Base {
         if (value) {
           if (value[Symbol.iterator]) {
             for (const node of value) {
-              yield* node._walkDirections(directions, true, seen);
+              yield node;
+              yield* node._walkDirections(directions, false, seen);
             }
           } else {
-            yield* value._walkDirections(directions, true, seen);
+            yield value;
+            yield* value._walkDirections(directions, false, seen);
           }
         }
       }
@@ -329,11 +349,6 @@ export class Base {
     return this.owner?.services || [];
   }
 
-  // TODO get rid of
-  get aggregatedServices() {
-    return this.services;
-  }
-
   set directory(directory) {
     this._directory = directory;
   }

package/src/cluster.mjs

@@ -178,7 +178,7 @@ export class Cluster extends Host {
           for (const member of this.members) {
             const memberService = Array.from(
               member.expression(
-                `aggregatedServices[types[${endpoint.type}]][0]`
+                `services[types[${endpoint.type}]][0]`
               )
             );
 

package/src/host.mjs

@@ -113,6 +113,21 @@ export class Host extends ServiceOwner {
     super.materializeExtends();
 
     for (const host of this.walkDirections(["extends"])) {
+      for (const [name, service] of host.services) {
+        const present = this._services.get(name);
+        if (present) {
+         /* console.log(
+            "LINK",
+            present.fullName,
+            service.fullName,
+            present.extends
+          );*/
+          present.extends.add(service);
+        } else {
+          this._services.set(name, service.forOwner(this));
+        }
+      }
+
       for (const [name, ni] of host.networkInterfaces) {
         const present = this._networkInterfaces.get(name);
 

package/src/initialization-context.mjs

@@ -191,6 +191,19 @@ export class InitializationContext {
       Object.assign(object._properties, data.properties);
     }
 
+    this._read(object, data, type);
+
+    if (data.extends) {
+      console.log("EXTENDS", type.name, object.fullName); // data.extends);
+      object.materializeExtends();
+    }
+  }
+
+  _read(object, data, type = object.constructor.typeDefinition) {
+    if (type.extends) {
+      this._read(object, data, type.extends);
+    }
+
     for (const [path, attribute] of attributeIterator(type.attributes)) {
       if (attribute.writable) {
         const name = path.join(".");
@@ -224,20 +237,10 @@ export class InitializationContext {
           }
         }
         this.instantiateAndAssign(object, name, attribute, value);
-      }
-    }
-
-    if (object.name === undefined && data.name) {
-      // TODO
-      object.name = data.name;
-    }
 
-    if (type.extends) {
-      this.read(object, data, type.extends);
-
-      if (data.extends) {
-        //console.log("EXTENDS", type.name, object.fullName, data.extends);
-        object.materializeExtends();
+        /*if (name === "alias" && value) {
+          console.log("READ ALIAS", object.fullName, object.alias, value);
+        }*/
       }
     }
   }
@@ -266,10 +269,6 @@ export class InitializationContext {
     const object = this.typeFactory(type, owner, data);
     this.root.addTypeObject(type.clazz.typeName, name, object);
 
-    /*if(object.name === undefined || object.name.length === 0) {
-      throw "NO name";
-    }*/
-
     return object;
   }
 

package/src/network-interfaces/skeleton.mjs

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { AggregatedMap } from "aggregated-map";
 import { writeLines, sectionLines } from "../utils.mjs";
 import { NetworkAddress, Host, cidrAddresses } from "pmcf";
 import { ServiceOwner } from "../service-owner.mjs";
@@ -23,10 +24,9 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     }
   }
 
-  get aggregatedServices() {
-    return this.host
-      ? [...this.services, ...this.host.services]
-      : this.services;
+  get services()
+  {
+    return new AggregatedMap([super.services, this.owner.services]);
   }
 
   get hosts() {

package/src/owner.mjs

@@ -151,7 +151,7 @@ export class Owner extends Base {
 
   get services()
   {
-    return [...this.hosts].map(host=>host.services).flat();
+    return [...this.hosts].map(host=>Array.from(host.services.values())).flat();
   }
 
   get locations() {

package/src/service-owner.mjs

@@ -1,20 +1,26 @@
 import { Base, Service } from "pmcf";
 
 export class ServiceOwner extends Base {
-  services = [];
+  _services = new Map();
 
-  get allServices()
-  {
-    return this._allServices();
+  set services(service) {
+    this._services.set(service.name, service);
+  }
+
+  get services() {
+    return this.mapFromDirections(["this", "extends"], "_services");
   }
 
-  *_allServices() {
-    for (const node of this.walkDirections(["this", "extends"])) {
-      yield* node.services;
+  addObject(object)
+  {
+    if(object instanceof Service) {
+      this._services.set(object.name, object);
     }
+
+    super.addObject(object);
   }
 
-  materializeExtends() {
+  _materializeExtends() {
     super.materializeExtends();
 
     for (const serviceOwner of this.walkDirections(["extends"])) {
@@ -24,27 +30,25 @@ export class ServiceOwner extends Base {
         serviceOwner.fullName
       );*/
 
-      for (const service of serviceOwner.services) {
-        const present = this.services.find(s => s.name === service.name);
+      for (const service of serviceOwner.services.values()) {
+        const present = this.services.get(service.name);
 
         if (present) {
           //console.log("LINK SERVICE", this.fullName, present.fullName, service.fullName);
           present.extends.add(service);
         } else {
           //console.log("ADD  SERVICE", this.fullName, service.fullName);
-          this.services.push(service.forOwner(this));
+
+          const s = service.forOwner(this);
+          this._services.set(s.name, s);
         }
       }
-
-      /*for (const service of this.services) {
-        service.materializeExtends();
-      }*/
     }
   }
 
   _traverse(...args) {
     if (super._traverse(...args)) {
-      for (const service of this.services) {
+      for (const service of this._services.values()) {
         service._traverse(...args);
       }
 
@@ -55,7 +59,7 @@ export class ServiceOwner extends Base {
 
   typeNamed(typeName, name) {
     if (typeName === "service") {
-      const service = this.services.find(s => s.name === name);
+      const service = this.services.get(name);
       if (service) {
         return service;
       }
@@ -73,6 +77,6 @@ export class ServiceOwner extends Base {
    * @returns {Service|undefined}
    */
   named(name) {
-    return this.services.find(s => s.name === name);
+    return this.services.get(name);
   }
 }