pmcf 4.21.2 → 4.22.1

package/README.md

@@ -43,70 +43,72 @@ generates config packages for:
 
 *   [Base](#base)
     *   [Parameters](#parameters)
-    *   [walkDirections](#walkdirections)
+    *   [unionFromDirections](#unionfromdirections)
         *   [Parameters](#parameters-1)
-    *   [extendedAttribute](#extendedattribute)
+    *   [walkDirections](#walkdirections)
         *   [Parameters](#parameters-2)
-    *   [propertyIterator](#propertyiterator)
+    *   [extendedAttribute](#extendedattribute)
         *   [Parameters](#parameters-3)
-    *   [getProperties](#getproperties)
+    *   [propertyIterator](#propertyiterator)
         *   [Parameters](#parameters-4)
+    *   [getProperties](#getproperties)
+        *   [Parameters](#parameters-5)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-5)
-    *   [templateContent](#templatecontent)
         *   [Parameters](#parameters-6)
+    *   [templateContent](#templatecontent)
+        *   [Parameters](#parameters-7)
     *   [isTemplate](#istemplate)
     *   [property](#property)
-        *   [Parameters](#parameters-7)
-    *   [expand](#expand)
         *   [Parameters](#parameters-8)
+    *   [expand](#expand)
+        *   [Parameters](#parameters-9)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-10)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-10)
+    *   [Parameters](#parameters-11)
     *   [port](#port-1)
 *   [id](#id)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-11)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
         *   [Parameters](#parameters-12)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-13)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-13)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-15)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-16)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-16)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-17)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-18)
 *   [secretName](#secretname)
 *   [isTemplate](#istemplate-1)
 *   [named](#named)
-    *   [Parameters](#parameters-18)
-*   [serviceEndpoints](#serviceendpoints)
     *   [Parameters](#parameters-19)
-*   [domainName](#domainname)
+*   [serviceEndpoints](#serviceendpoints)
     *   [Parameters](#parameters-20)
-*   [domainFromDominName](#domainfromdominname)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-21)
-*   [sectionLines](#sectionlines)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-22)
-*   [asArray](#asarray)
+*   [sectionLines](#sectionlines)
     *   [Parameters](#parameters-23)
-*   [asIterator](#asiterator)
+*   [asArray](#asarray)
     *   [Parameters](#parameters-24)
+*   [asIterator](#asiterator)
+    *   [Parameters](#parameters-25)
 
 ## Base
 
@@ -118,6 +120,17 @@ properties: use defined values to support attribute value definitions
 *   `owner` **[Base](#base)** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
 
+### unionFromDirections
+
+Deliver union set of all property values.
+
+#### Parameters
+
+*   `directions` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**  (optional, default `["this","extends","owner"]`)
+*   `property` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)\<any>**&#x20;
+
 ### walkDirections
 
 Walk the object graph in some directions and deliver seen nodes.
@@ -237,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)**&#x20;
 
-## InitializationContext
-
-Keeps track of all in flight object creations and loose ends during config initialization.
-
-### Parameters
-
-*   `directory`   (optional, default `"/"`)
-
 ## SkeletonNetworkInterface
 
 **Extends ServiceOwner**
@@ -257,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.21.2",
+  "version": "4.22.1",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -127,7 +127,13 @@ export class Base {
     return this.owner.addObject(object);
   }
 
-  collectFromDirections(directions = ["this", "extends", "owner"], property) {
+  /**
+   * Deliver union set of all property values.
+   * @param {string[]} directions
+   * @param {string} property
+   * @returns {Set<any>}
+   */
+  unionFromDirections(directions, property) {
     let collected = new Set();
     for (const node of this.walkDirections(directions)) {
       collected = collected.union(node[property]);
@@ -423,7 +429,7 @@ export class Base {
   }
 
   get tags() {
-    return this.collectFromDirections(["this", "extends"], "_tags");
+    return this.unionFromDirections(["this", "extends"], "_tags");
   }
 
   set tags(value) {

package/src/host.mjs

@@ -193,7 +193,7 @@ export class Host extends ServiceOwner {
 
   get derivedPackaging() {
     return this.expand(
-      this.collectFromDirections(["this", "extends"], "_packaging")
+      this.unionFromDirections(["this", "extends"], "_packaging")
     );
   }
 
@@ -219,7 +219,7 @@ export class Host extends ServiceOwner {
 
   get aliases() {
     return this.expand(
-      this.collectFromDirections(["this", "extends"], "_aliases")
+      this.unionFromDirections(["this", "extends"], "_aliases")
     );
   }
 
@@ -229,7 +229,7 @@ export class Host extends ServiceOwner {
 
   get provides() {
     return this.expand(
-      this.collectFromDirections(["this", "extends"], "_provides")
+      this.unionFromDirections(["this", "extends"], "_provides")
     );
   }
 
@@ -239,7 +239,7 @@ export class Host extends ServiceOwner {
 
   get replaces() {
     return this.expand(
-      this.collectFromDirections(["this", "extends"], "_replaces")
+      this.unionFromDirections(["this", "extends"], "_replaces")
     );
   }
 
@@ -249,7 +249,7 @@ export class Host extends ServiceOwner {
 
   get depends() {
     return this.expand(
-      this.collectFromDirections(["this", "extends"], "_depends")
+      this.unionFromDirections(["this", "extends"], "_depends")
     );
   }
 
@@ -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/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));
         }
       }