pmcf 6.21.4 → 6.21.6

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-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)
@@ -296,6 +296,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>
@@ -392,18 +404,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.21.4",
+  "version": "6.21.6",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.10.1",
     "npm-pkgbuild": "^20.8.13",
-    "pacc": "^11.0.3",
+    "pacc": "^11.1.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

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,

package/src/services/bind.mjs

@@ -555,7 +555,7 @@ class bind_group extends Base {
  * @param {any} objects
  * @param {boolean|string} empty
  * @param {string} indent
- * @returns {string[]}
+ * @returns {(string|string[])[]}
  */
 function addressesStatement(prefix, objects, empty = false, indent = "") {
   const body = asArray(objects).map(