pmcf 6.3.7 → 6.3.9

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

package/src/owner.mjs

@@ -172,7 +172,7 @@ export class Owner extends ServiceOwner {
   }
 
   *networkAddresses(filter) {
-    for (const host of this.hosts.hosts()) {
+    for (const host of this.hosts) {
       yield* host.networkAddresses(filter);
     }
   }

package/src/services/kea.mjs

@@ -9,7 +9,8 @@ import {
 import {
   string_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_writable_true
+  boolean_attribute_writable_true,
+  extendingAttributeIterator
 } from "pacc";
 import {
   addType,
@@ -22,8 +23,6 @@ import {
 } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
-const keaVersion = "3.0.1";
-
 export class kea extends CoreService {
   static attributes = {
     "ddns-send-updates": {
@@ -262,10 +261,14 @@ export class kea extends CoreService {
         ]
       };
 
-      for (const [key] of Object.entries(KeaService.attributes).filter(
-        ([key, attribute]) => attribute.configurable && this[key] !== undefined
+      for (const [path, attribute] of extendingAttributeIterator(
+        this.constructor,
+        attribute =>
+          attribute.configurable && this[attribute.name] !== undefined
       )) {
-        cfg[key] = this[key];
+        const name = path.join(".");
+
+        cfg[name] = this[name];
       }
 
       return cfg;