pmcf 6.21.1 → 6.21.3

package/README.md

@@ -81,39 +81,42 @@ generates config packages for:
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
         *   [Parameters](#parameters-15)
+*   [zones](#zones)
 *   [type](#type)
+*   [addressesStatement](#addressesstatement)
+    *   [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)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
 *   [subnetForAddress](#subnetforaddress)
-    *   [Parameters](#parameters-21)
-*   [domainName](#domainname)
     *   [Parameters](#parameters-22)
-*   [domainFromDominName](#domainfromdominname)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-23)
-*   [sectionLines](#sectionlines)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-24)
-*   [asArray](#asarray)
+*   [sectionLines](#sectionlines)
     *   [Parameters](#parameters-25)
-*   [asIterator](#asiterator)
+*   [asArray](#asarray)
     *   [Parameters](#parameters-26)
+*   [asIterator](#asiterator)
+    *   [Parameters](#parameters-27)
 
 ## Base
 
@@ -305,12 +308,27 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
 
+## zones
+
+Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
+
 ## type
 
 Type of the group.
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** view | unknown
 
+## addressesStatement
+
+### Parameters
+
+*   `prefix` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `objects` **any**&#x20;
+*   `empty` **([boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))**  (optional, default `false`)
+*   `indent` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**  (optional, default `""`)
+
+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;
+
 ## SystemdJournalRemoteService
 
 **Extends CoreService**

package/bin/pmcf-info

@@ -48,7 +48,14 @@ function show(value, indent = 0, short = false) {
         if (attribute.collection) {
           const l = [...v];
           if (l.length) {
-            console.log(`${name(attribute)}${l}`);
+            if (attribute.separator || l.length === 1) {
+              console.log(`${name(attribute)}${l.join(attribute.separator)}`);
+            } else {
+              console.log(`${name(attribute)}`);
+              for (const vv of l) {
+                console.log(prefix(indent + 2) + vv);
+              }
+            }
           }
         } else {
           console.log(`${name(attribute)}${v}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.21.1",
+  "version": "6.21.3",
   "publishConfig": {
     "access": "public"
   },
@@ -59,14 +59,14 @@
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@types/node": "^26.1.2",
+    "@types/node": "^26.2.0",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",
     "semantic-release": "^25.0.9"
   },
   "engines": {
-    "node": ">=26.5.1"
+    "node": ">=26.7.0"
   },
   "repository": {
     "type": "git",

package/src/base.mjs

@@ -25,7 +25,7 @@ import {
 } from "pacc";
 import { union } from "./utils.mjs";
 import { addType } from "pmcf";
-import { owner_attribute } from "./common-attributes.mjs";
+import { owner_attribute, aliases_attribute } from "./common-attributes.mjs";
 
 /**
  *
@@ -39,6 +39,7 @@ export class Base {
   static attributes = {
     owner: owner_attribute,
     name: name_attribute_writable,
+    aliases: aliases_attribute,
     description: description_attribute_writable,
     type: type_attribute,
     directory: { ...string_attribute_writable, name: "directory" },
@@ -62,6 +63,7 @@ export class Base {
   name;
   properties = {};
   extends = new Set();
+  _aliases = new Set();
   _tags = new Set();
   _packaging = new Set();
   _directory;
@@ -551,6 +553,16 @@ export class Base {
     this._tags = union(value, this._tags);
   }
 
+  set aliases(value) {
+    this._aliases = union(value, this._aliases);
+  }
+
+  get aliases() {
+    return this.expand(
+      this.unionFromDirections(["this", "extends"], "_aliases")
+    );
+  }
+
   /**
    * @return {boolean}
    */

package/src/core-service.mjs

@@ -21,10 +21,7 @@ import {
   FAMILY_DNS
 } from "pmcf";
 import { asArray, union } from "./utils.mjs";
-import {
-  networkAddressAttributes,
-  aliases_attribute
-} from "./common-attributes.mjs";
+import { networkAddressAttributes } from "./common-attributes.mjs";
 import {
   serviceTypeEndpoints,
   serviceTypes,
@@ -75,7 +72,6 @@ export class CoreService extends Base {
       name: "extends",
       type: CoreService
     },
-    aliases: aliases_attribute,
     priority: priority_attribute,
     weight: { ...number_attribute_writable, name: "weight" /*default: 1*/ },
     systemdService: { ...string_attribute_writable, name: "systemdService" },
@@ -87,7 +83,6 @@ export class CoreService extends Base {
     addType(this);
   }
 
-  _aliases = new Set();
   _weight;
   _port;
   _systemdService;
@@ -211,16 +206,6 @@ export class CoreService extends Base {
     return options.join !== undefined ? res.join(options.join) : res;
   }
 
-  set aliases(value) {
-    this._aliases = union(value, this._aliases);
-  }
-
-  get aliases() {
-    return this.expand(
-      this.unionFromDirections(["this", "extends"], "_aliases")
-    );
-  }
-
   set port(value) {
     this._port = value;
   }
@@ -308,7 +293,6 @@ export class CoreService extends Base {
 
     if (this.priority >= 390) {
       for (const alias of this.aliases) {
-        console.log("CNAME", alias, dnsFullName(domainName));
         records.push(DNSRecord(alias, "CNAME", dnsFullName(domainName)));
       }
     }

package/src/host.mjs

@@ -14,8 +14,7 @@ import { addresses, addType, assign } from "pmcf";
 import {
   networkAddressAttributes,
   networkInterfaces_attribute,
-  hosts_attribute,
-  aliases_attribute
+  hosts_attribute
 } from "./common-attributes.mjs";
 import { ServiceOwner } from "./service-owner.mjs";
 import { addHook } from "./hooks.mjs";
@@ -35,7 +34,6 @@ export class Host extends ServiceOwner {
   static attributes = {
     ...networkAddressAttributes,
     networkInterfaces: networkInterfaces_attribute,
-    aliases: aliases_attribute,
     os: {
       ...string_attribute_writable,
       name: "os",
@@ -92,7 +90,6 @@ export class Host extends ServiceOwner {
     addType(this);
   }
 
-  _aliases = new Set();
   _networkInterfaces = new Map();
   _provides = new Set();
   _replaces = new Set();
@@ -184,16 +181,6 @@ export class Host extends ServiceOwner {
     }
   }
 
-  set aliases(value) {
-    this._aliases = union(value, this._aliases);
-  }
-
-  get aliases() {
-    return this.expand(
-      this.unionFromDirections(["this", "extends"], "_aliases")
-    );
-  }
-
   set provides(value) {
     this._provides = union(value, this._provides);
   }

package/src/services/bind.mjs

@@ -10,6 +10,7 @@ import {
   name_attribute,
   string_attribute,
   string_set_attribute,
+  string_attribute_writable,
   boolean_attribute,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
@@ -45,7 +46,7 @@ class bind_zone extends Base {
   static attributes = {
     id: { ...name_attribute, name: "id" },
     file: { ...string_attribute, name: "file" },
-    records: { ...string_set_attribute, name: "records" },
+    records: { ...string_attribute_writable, collection: true, name: "records" },
     foreign: { ...boolean_attribute, name: "foreign" }
   };
 
@@ -369,7 +370,7 @@ class bind_group extends Base {
       const hosts = new Set();
       const addresses = new Set();
 
-      console.log("ZONES for", this.owner.owner.name, this.name);
+      //console.log("ZONES for", this.owner.owner.name, this.name);
 
       for (const na of entries) {
         const address = na.address;