pmcf 6.3.8 → 6.3.10

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.3.8",
+  "version": "6.3.10",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,8 @@
     "ip-utilties": "^3.4.0",
     "npm-pkgbuild": "^20.8.1",
     "pacc": "^10.4.1",
-    "package-directory": "^8.2.0"
+    "package-directory": "^8.2.0",
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@types/node": "^26.1.1",

package/src/base.mjs

@@ -260,7 +260,7 @@ export class Base {
    * @return {Iterable<[string,any]>} values
    */
   *attributeIterator(filter) {
-    for (const [path, def] of extendingAttributeIterator(
+    for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
       filter
     )) {
@@ -268,7 +268,7 @@ export class Base {
       const value = this.attribute(name);
 
       if (value !== undefined) {
-        yield [def.externalName ?? name, toExternal(value, def), path, def];
+        yield [attribute.externalName ?? name, toExternal(value, attribute), path, attribute];
       }
     }
   }

package/src/services/influxdb.mjs

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { stringify } from "yaml";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
 import { boolean_attribute_writable_true } from "pacc";
@@ -49,8 +50,12 @@ export class influxdb extends CoreService {
     await writeLines(
       join(dir, "etc", "influxdb"),
       "config.yml",
-      setionLinesFromPropertyIterator(
-        this.attributeIterator(filterConfigurable)
+      stringify(
+        Object.fromEntries(
+          [...this.attributeIterator(filterConfigurable)].map(
+            ([name, value, path, attribute]) => [attribute.externalName, value]
+          )
+        )
       )
     );
 

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;