pmcf 6.21.3 → 6.21.5

package/README.md

@@ -78,30 +78,30 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [type](#type)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -296,18 +296,6 @@ 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>
@@ -404,6 +392,18 @@ 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.21.3",
+  "version": "6.21.5",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -112,14 +112,14 @@ export class Base {
       this.constructor,
       attribute => attribute.collection && !attribute.type.primitive
     )) {
-      const collection = this[path];
+      const collection = this[attribute.name];
       if (typeof collection?.get === "function") {
         for (const [name, extending] of this.mapFromDirections(
           ["extends"],
-          path
+          attribute.name
         )) {
           const present = collection.get(extending.name);
-
+//console.log("ME",this.fullName,attribute.name,extending.name);
           if (present) {
             present.extends.add(extending);
             present.materializeExtends();
@@ -128,6 +128,25 @@ export class Base {
           }
         }
       }
+      /*
+      else {
+        if (collection instanceof Set) {
+          for (const all of this.unionFromDirections(["extends"], attribute.name)) {
+            if (all instanceof Set) {
+              const d = collection.difference(all);
+
+              // if (d.size) {
+              console.log("ME", this.fullName, attribute.name, d);
+              //    }
+            }
+            else {
+            //  console.error("NO SET",this.fullName, attribute.name, typeof all, all.constructor.name);
+            }
+          }
+        } else {
+          //console.log("NO MAP OR SET", this.fullName, name);
+        }
+      }*/
     }
   }
 

package/src/core-service.mjs

@@ -20,7 +20,7 @@ import {
   FAMILY_UNIX,
   FAMILY_DNS
 } from "pmcf";
-import { asArray, union } from "./utils.mjs";
+import { asArray } from "./utils.mjs";
 import { networkAddressAttributes } from "./common-attributes.mjs";
 import {
   serviceTypeEndpoints,
@@ -282,7 +282,10 @@ export class CoreService extends Base {
 
   async *preparePackages(dir) {
     const pd = this.packageData;
-    pd.sources = await Array.fromAsync(this.templateContent());
+
+    pd.sources = await Array.fromAsync(
+      this.templateContent(...this.packageContentPermissions)
+    );
     if (pd.sources.length) {
       yield pd;
     }

package/src/services/openldap.mjs

@@ -8,6 +8,8 @@ export class openldap extends CoreService {
   };
   static service = {
     systemdService: "slapd.service",
+    systemUserName: "ldap",
+    systemGroupName: "ldap",
     extends: ["ldap", "ldapi"]
   };
 
@@ -32,23 +34,4 @@ export class openldap extends CoreService {
   set uri(value) {
     this._uri = value;
   }
-
-  get systemUserName() {
-    return "ldap";
-  }
-
-  get systemGroupName() {
-    return "ldap";
-  }
-
-  async *preparePackages(dir) {
-    const permissions = this.packageContentPermissions;
-    const packageData = this.packageData;
-
-    packageData.sources = await Array.fromAsync(
-      this.templateContent(...permissions)
-    );
-
-    yield packageData;
-  }
 }