pmcf 4.24.3 → 4.24.5

package/README.md

@@ -73,11 +73,11 @@ generates config packages for:
     *   [Parameters](#parameters-12)
     *   [port](#port-1)
 *   [id](#id)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-13)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-13)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -263,14 +263,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**
@@ -283,6 +275,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.24.3",
+  "version": "4.24.5",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -265,6 +265,25 @@ export class Base {
     return Object.fromEntries(this.propertyIterator(filter));
   }
 
+  get properties() {
+    return this._properties;
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns {any}
+   */
+  property(name) {
+    for (const node of this.walkDirections(["this", "extends", "owner"])) {
+      const value = node._properties?.[name];
+
+      if (value !== undefined) {
+        return this.expand(value);
+      }
+    }
+  }
+
   get root() {
     return this.owner.root;
   }
@@ -459,24 +478,6 @@ export class Base {
     return globals[name];
   }
 
-  get properties() {
-    return this._properties;
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns {any}
-   */
-  property(name) {
-    for (const node of this.walkDirections(["this", "extends", "owner"])) {
-      const value = node._properties?.[name];
-      if (value !== undefined) {
-        return this.expand(value);
-      }
-    }
-  }
-
   /**
    *
    * @param {any} object

package/src/services/systemd-journal-upload.mjs

@@ -69,6 +69,7 @@ export class SystemdJournalUploadService extends Service {
    * @returns {Object}
    */
   systemdConfigs(name) {
+    console.log("PROPS",this.expand(this.getProperties(filterConfigurable)));
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,

package/src/utils.mjs

@@ -119,10 +119,9 @@ export function asIterator(value) {
 }
 
 export const filterConfigurable = (name, attribute) =>
-  !attribute.private & attribute.configurable;
+  !attribute.private && attribute.configurable;
 
-
-export function union(value, present= new Set()) {
+export function union(value, present = new Set()) {
   if (value instanceof Set) {
     return present.union(value);
   } else if (value instanceof Array) {