pmcf 4.23.2 → 4.24.1

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.23.2",
+  "version": "4.24.1",
   "publishConfig": {
     "access": "public"
   },

package/src/host.mjs

@@ -100,6 +100,7 @@ export class Host extends ServiceOwner {
   _provides = new Set();
   _replaces = new Set();
   _depends = new Set();
+  _optional = new Set();
   _os;
   _distribution;
   _deployment;
@@ -116,7 +117,7 @@ export class Host extends ServiceOwner {
       for (const [name, service] of host.services) {
         const present = this._services.get(name);
         if (present) {
-         /* console.log(
+          /* console.log(
             "LINK",
             present.fullName,
             service.fullName,
@@ -268,6 +269,16 @@ export class Host extends ServiceOwner {
     );
   }
 
+  set optional(value) {
+    this._optional = union(value, this._optional);
+  }
+
+  get optional() {
+    return this.expand(
+      this.unionFromDirections(["this", "extends"], "_optional")
+    );
+  }
+
   set os(value) {
     this._os = value;
   }
@@ -461,6 +472,7 @@ export class Host extends ServiceOwner {
       provides: [...this.provides],
       replaces: [...this.replaces],
       depends: [...this.depends],
+      optional: [...this.optional],
       backup: "root/.ssh/known_hosts"
     });
 
@@ -477,13 +489,13 @@ export class Host extends ServiceOwner {
 
     //console.log([...this.walkDirections(["extends"])].map(e => e.fullName));
 
-    for (const service of this.services) {
-      //console.log("SERVICE",service.name);
-
+    for (const [name, service] of this.services) {
       if (service.systemdConfigs) {
         for (const { serviceName, configFileName, content } of asArray(
           service.expand(service.systemdConfigs(this.name))
         )) {
+          console.log("SERVICE", service.fullName, configFileName);
+
           await writeLines(dir, configFileName, content);
 
           addHook(

package/src/network-interfaces/wlan.mjs

@@ -94,6 +94,6 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
       ]
     );
 
-    packageData.properties.depends.push("iwd", "impala");
+    packageData.properties.optional.push("iwd", "impala");
   }
 }