pmcf 4.21.1 → 4.22.0

package/README.md

@@ -69,11 +69,11 @@ generates config packages for:
     *   [Parameters](#parameters-10)
     *   [port](#port-1)
 *   [id](#id)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-11)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-12)
+        *   [Parameters](#parameters-11)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-12)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -237,14 +237,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**
@@ -257,6 +249,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.21.1",
+  "version": "4.22.0",
   "publishConfig": {
     "access": "public"
   },

package/src/host.mjs

@@ -459,9 +459,9 @@ export class Host extends ServiceOwner {
 
     await generateKnownHosts(this.owner.hosts, join(dir, "root", ".ssh"));
 
-    console.log([...this.walkDirections(["extends"])].map(e => e.fullName));
+    //console.log([...this.walkDirections(["extends"])].map(e => e.fullName));
 
-    for (const service of this.services) {
+    for (const service of this.allServices) {
       //console.log("SERVICE",service.name);
 
       if (service.systemdConfigs) {

package/src/initialization-context.mjs

@@ -234,11 +234,11 @@ export class InitializationContext {
 
     if (type.extends) {
       this.read(object, data, type.extends);
-    }
 
-    if (data.extends) {
-      //console.log("EXTENDS", object.fullName, data.extends);
-      object.materializeExtends();
+      if (data.extends) {
+        //console.log("EXTENDS", type.name, object.fullName, data.extends);
+        object.materializeExtends();
+      }
     }
   }
 

package/src/service-owner.mjs

@@ -3,6 +3,17 @@ import { Base, Service } from "pmcf";
 export class ServiceOwner extends Base {
   services = [];
 
+  get allServices()
+  {
+    return this._allServices();
+  }
+
+  *_allServices() {
+    for (const node of this.walkDirections(["this", "extends"])) {
+      yield* node.services;
+    }
+  }
+
   materializeExtends() {
     super.materializeExtends();
 
@@ -17,9 +28,10 @@ export class ServiceOwner extends Base {
         const present = this.services.find(s => s.name === service.name);
 
         if (present) {
-          //console.log("LINK", present.fullName, service.fullName);
+          //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));
         }
       }