pmcf 6.40.2 → 6.40.4

package/README.md

@@ -82,29 +82,29 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-16)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-18)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-19)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-19)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-20)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-21)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -309,6 +309,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -399,18 +411,6 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

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

package/src/base.mjs

@@ -208,15 +208,24 @@ export class base extends core {
     return this.constructor.name;
   }
 
-  get packageData() {
-    if (!this.content) {
+  set content(value) {
+    this._content = value;
+  }
+
+  get content() {
+    if (!this._content) {
       for (const e of this.walkDirections(["extends"])) {
-        if (e.content) {
-          this.content = e.content.forOwner(this);
+        if (e._content) {
+          this._content = e._content.forOwner(this);
           break;
         }
       }
     }
+
+    return this._content;
+  }
+
+  get packageData() {
     return this.content?.packageData();
   }
 

package/src/cluster.mjs

@@ -45,6 +45,11 @@ export class Cluster extends Host {
   routerId = 100;
   checkInterval = 60;
 
+  get content()
+  {
+    return this.masters.map(m=>m.host)[0]?.content;
+  }
+
   get members() {
     return new Set(this.masters).union(new Set(this.backups));
   }

package/src/content.mjs

@@ -154,14 +154,13 @@ export class content extends core {
 
   get packaging() {
     const all = this.unionFromDirections(["this", "extends"], "_packaging");
-    if(all.size) {
-      return all;
-    }
-
-    const content = this.host?.content;
-    if(content && content !== this) {
-      return content.packaging;
+    if (all.size === 0) {
+      const content = this.host.content;
+      if (content && content !== this) {
+        return content.packaging;
+      }
     }
+    return all;
   }
 
   get outputs() {