pmcf 6.4.1 → 6.6.0

package/README.md

@@ -77,26 +77,26 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-15)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-17)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-17)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-18)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-19)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,6 +286,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;
+
 ## SystemdJournalRemoteService
 
 **Extends CoreService**
@@ -361,18 +373,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.4.1",
+  "version": "6.6.0",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -91,7 +91,29 @@ export class Base {
     return this;
   }
 
-  materializeExtends() {}
+  materializeExtends() {
+    for (const [path, attribute] of extendingAttributeIterator(
+      this.constructor,
+      attribute => attribute.collection && !attribute.type.primitive
+    )) {
+      const collection = this[path];
+      if (typeof collection?.get === "function") {
+        for (const [name, extending] of this.mapFromDirections(
+          ["extends"],
+          path
+        )) {
+          const present = collection.get(extending.name);
+
+          if (present) {
+            present.extends.add(extending);
+            present.materializeExtends();
+          } else {
+            collection.set(extending.name, extending.forOwner(this));
+          }
+        }
+      }
+    }
+  }
 
   named(name) {
     if (name[0] === "/") {
@@ -190,7 +212,7 @@ export class Base {
   *walkDirections(directions = ["this", "extends", "owner"]) {
     if (directions.indexOf("this") >= 0) {
       yield this;
-      directions = directions.filter(d => d != "this");
+      directions = directions.filter(d => d !== "this");
     }
 
     yield* this._walkDirections(directions, new Set());
@@ -268,7 +290,12 @@ export class Base {
       const value = this.attribute(name);
 
       if (value !== undefined) {
-        yield [attribute.externalName ?? name, toExternal(value, attribute), path, attribute];
+        yield [
+          attribute.externalName ?? name,
+          toExternal(value, attribute),
+          path,
+          attribute
+        ];
       }
     }
   }
@@ -414,6 +441,23 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
+  get packageContentPermissions() {
+    const owner = this.constructor.name;
+    const group = owner;
+    return [
+      {
+        mode: 0o644,
+        owner,
+        group
+      },
+      {
+        mode: 0o755,
+        owner,
+        group
+      }
+    ];
+  }
+
   get packageData() {
     const nameParts = [this.typeName, this.owner?.name, this.name];
     return {

package/src/host.mjs

@@ -106,23 +106,6 @@ export class Host extends ServiceOwner {
   _serial;
   _keymap;
 
-  materializeExtends() {
-    super.materializeExtends();
-
-    for (const host of this.walkDirections(["extends"])) {
-      for (const ni of host.networkInterfaces.values()) {
-        const present = this.networkInterfaces.get(ni.name);
-
-        if (present) {
-          present.extends.add(ni);
-          present.materializeExtends();
-        } else {
-          this.networkInterfaces.set(ni.name, ni.forOwner(this));
-        }
-      }
-    }
-  }
-
   set serial(value) {
     this._serial = value;
   }

package/src/initialization-context.mjs

@@ -25,13 +25,11 @@ export class InitializationContext {
       .outstandingResolves) {
       value = object.expand(value);
 
-      for (const type of attribute.type.members || [attribute.type]) {
-        for (const node of object.walkDirections(["this", "owner"])) {
-          const resolved = this.named(value, node);
-          if (resolved) {
-            assign(attribute, object, resolved);
-            continue nextOutstanding;
-          }
+      for (const node of object.walkDirections(["this", "owner"])) {
+        const resolved = this.named(value, node);
+        if (resolved) {
+          assign(attribute, object, resolved);
+          continue nextOutstanding;
         }
       }
 

package/src/service-owner.mjs

@@ -28,22 +28,4 @@ export class ServiceOwner extends Base {
   get services() {
     return this._services;
   }
-
-  materializeExtends() {
-    super.materializeExtends();
-
-    for (const [name, service] of this.mapFromDirections(
-      ["extends"],
-      "services"
-    )) {
-      const present = this.services.get(service.name);
-
-      if (present) {
-        present.extends.add(service);
-        present.materializeExtends();
-      } else {
-        this.services.set(service.name, service.forOwner(this));
-      }
-    }
-  }
 }

package/src/services/mosquitto.mjs

@@ -45,32 +45,33 @@ export class mosquitto extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const owner = "mosquitto";
-    const group = "mosquitto";
+    const pm = this.root.named("/services/primary-SW/mosquitto");
 
+    console.log(
+      "MOSQUITTO",
+      pm.fullName,
+      this.fullName,
+      [...this.extends].map(n => n.fullName),
+      [...this.walkDirections(["this", "extends"])].map(n => this.fullName)
+    );
+
+    const permissions = this.packageContentPermissions;
     const packageData = this.packageData;
+
     packageData.sources = await Array.fromAsync(
-      this.templateContent(
-        {
-          mode: 0o644,
-          owner,
-          group
-        },
-        {
-          mode: 0o755,
-          owner,
-          group
-        }
-      )
+      this.templateContent(...permissions)
     );
 
-    packageData.sources.push(new FileContentProvider(dir + "/"));
+    packageData.sources.push(
+      new FileContentProvider(dir + "/", ...permissions)
+    );
 
     await writeLines(
       join(dir, "etc", "mosquitto"),
       "mosquitto.conf",
       setionLinesFromAttributeIterator(
-        this.attributeIterator(filterConfigurable), " "
+        this.attributeIterator(filterConfigurable),
+        " "
       )
     );
 

package/src/services/openldap.mjs

@@ -34,24 +34,11 @@ export class openldap extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const owner = "ldap";
-    const group = "ldap";
-
+    const permissions = this.packageContentPermissions;
     const packageData = this.packageData;
 
     packageData.sources = await Array.fromAsync(
-      this.templateContent(
-        {
-          mode: 0o644,
-          owner,
-          group
-        },
-        {
-          mode: 0o755,
-          owner,
-          group
-        }
-      )
+      this.templateContent(...permissions)
     );
 
     yield packageData;

package/src/services/systemd-resolved.mjs

@@ -6,7 +6,7 @@ import {
   boolean_attribute_writable,
   yesno_attribute_writable
 } from "pacc";
-import { ExtraSourceService, serviceEndpoints, addType } from "pmcf";
+import { ExtraSourceService, serviceEndpoints, addType, FAMILY_DNS } from "pmcf";
 import {
   filterConfigurable,
   yesno,
@@ -100,7 +100,7 @@ export class SystemdResolvedService extends ExtraSourceService {
           e.family == FAMILY_IPV4 &&
           e.networkInterface &&
           e.networkInterface.kind !== "loopback",
-        //e.family !== "dns",
+        //e.family !== FAMILY_DNS,
         select: endpoint => endpoint.address,
         join: " ",
         limit