pmcf 4.0.8 → 4.1.1

package/README.md

@@ -42,59 +42,61 @@ generates config packages for:
 
 *   [Base](#base)
     *   [Parameters](#parameters)
-    *   [getProperties](#getproperties)
+    *   [propertyIterator](#propertyiterator)
         *   [Parameters](#parameters-1)
+    *   [getProperties](#getproperties)
+        *   [Parameters](#parameters-2)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-2)
-    *   [findService](#findservice)
         *   [Parameters](#parameters-3)
-    *   [expand](#expand)
+    *   [findService](#findservice)
         *   [Parameters](#parameters-4)
+    *   [expand](#expand)
+        *   [Parameters](#parameters-5)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-6)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-7)
     *   [port](#port-1)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-7)
+        *   [Parameters](#parameters-8)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-8)
+        *   [Parameters](#parameters-9)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-9)
+        *   [Parameters](#parameters-10)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-10)
+    *   [Parameters](#parameters-11)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-11)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-12)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-13)
 *   [isTemplate](#istemplate)
 *   [services](#services)
-    *   [Parameters](#parameters-13)
-*   [named](#named)
     *   [Parameters](#parameters-14)
-*   [serviceEndpoints](#serviceendpoints)
+*   [named](#named)
     *   [Parameters](#parameters-15)
-*   [domainName](#domainname)
+*   [serviceEndpoints](#serviceendpoints)
     *   [Parameters](#parameters-16)
-*   [domainFromDominName](#domainfromdominname)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-17)
-*   [sectionLines](#sectionlines)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-18)
-*   [asArray](#asarray)
+*   [sectionLines](#sectionlines)
     *   [Parameters](#parameters-19)
-*   [asIterator](#asiterator)
+*   [asArray](#asarray)
     *   [Parameters](#parameters-20)
+*   [asIterator](#asiterator)
+    *   [Parameters](#parameters-21)
 
 ## Base
 
@@ -103,13 +105,23 @@ generates config packages for:
 *   `owner` **[Base](#base)** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
 
+### propertyIterator
+
+Retrive attribute values from an object.
+
+#### Parameters
+
+*   `filter` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** 
+
+Returns **Iterable<\[[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String), any]>** values
+
 ### getProperties
 
 Retrive attribute values from an object.
 
 #### Parameters
 
-*   `filter`   (optional, default `filterPublic`)
+*   `filter` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?**  (optional, default `filterPublic`)
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** values
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.0.8",
+  "version": "4.1.1",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -1,6 +1,7 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
 import {
+  getAttribute,
   typeFactory,
   addType,
   parse,
@@ -346,7 +347,7 @@ export class Base {
     if (!seen.has(this)) {
       seen.add(this);
 
-      const value = this[propertyName];
+      const value = getAttribute(e, propertyName);
       if (value !== undefined) {
         yield value;
       }
@@ -362,7 +363,8 @@ export class Base {
       seen.add(this);
       for (const e of this.extends) {
         const value =
-          e[propertyName] ?? e._extendedProperty(propertyName, seen);
+          getAttribute(e, propertyName) ??
+          e._extendedProperty(propertyName, seen);
         if (value !== undefined) {
           return value;
         }
@@ -371,7 +373,7 @@ export class Base {
   }
 
   extendedProperty(propertyName) {
-    const value = this[propertyName];
+    const value = getAttribute(this, propertyName);
     if (value !== undefined) {
       return value;
     }
@@ -381,11 +383,10 @@ export class Base {
 
   /**
    * Retrive attribute values from an object.
-   * @return {Object} values
+   * @param {Function} [filter]
+   * @return {Iterable<[string,any]>} values
    */
-  getProperties(filter = filterPublic) {
-    const result = {};
-
+  *propertyIterator(filter) {
     for (
       let typeDefinition = this.constructor.typeDefinition;
       typeDefinition;
@@ -396,16 +397,22 @@ export class Base {
         filter
       )) {
         const name = path.join(".");
-
-        let value = this.extendedProperty(name);
+        const value = this.extendedProperty(name);
 
         if (value !== undefined) {
-          result[def.externalName ?? name] = toExternal(value, def);
+          yield [def.externalName ?? name, toExternal(value, def), path, def];
         }
       }
     }
+  }
 
-    return result;
+  /**
+   * Retrive attribute values from an object.
+   * @param {Function} [filter]
+   * @return {Object} values
+   */
+  getProperties(filter = filterPublic) {
+    return Object.fromEntries(this.propertyIterator(filter));
   }
 
   get root() {

package/src/host.mjs

@@ -425,6 +425,7 @@ export class Host extends ServiceOwner {
   }
 
   async *preparePackages(dir) {
+    const pkgName = `${this.typeName}-${this.owner.name}-${this.name}`;
     let packageData = {
       dir,
       sources: [
@@ -440,7 +441,7 @@ export class Host extends ServiceOwner {
       ],
       outputs: this.outputs,
       properties: {
-        name: `${this.typeName}-${this.owner.name}-${this.name}`,
+        name: pkgName,
         description: `${this.typeName} definitions for ${this.fullName}`,
         access: "private",
         dependencies: [
@@ -448,7 +449,7 @@ export class Host extends ServiceOwner {
           ...this.depends
         ],
         provides: [...this.provides],
-        replaces: [`mf-${this.hostName}`, ...this.replaces],
+        replaces: [...this.replaces],
         requires: [],
         backup: "root/.ssh/known_hosts",
         hooks: await loadHooks(
@@ -474,7 +475,7 @@ export class Host extends ServiceOwner {
         for (const { serviceName, configFileName, content } of asArray(
           service.expand(service.systemdConfigs(this.name))
         )) {
-          await writeLines(dir, configFileName, sectionLines(...content));
+          await writeLines(dir, configFileName, content);
 
           addHook(
             packageData.properties.hooks,
@@ -496,7 +497,7 @@ export class Host extends ServiceOwner {
           name: `${this.typeName}-extra-${this.owner.name}-${this.name}`,
           description: `additional files for ${this.fullName}`,
           access: "private",
-          dependencies: [`${this.typeName}-${this.owner.name}-${this.name}`]
+          dependencies: [pkgName]
         }
       };
 

package/src/service.mjs

@@ -222,7 +222,7 @@ export class Service extends Base {
   }
 
   get port() {
-    return this._port ?? serviceTypeEndpoints(ServiceTypes[this.type])[0].port;
+    return this._port ?? serviceTypeEndpoints(ServiceTypes[this.type])[0]?.port;
   }
 
   set weight(value) {

package/src/services/systemd-journal-remote.mjs

@@ -4,7 +4,7 @@ import {
   boolean_attribute_writable
 } from "pacc";
 import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
-import { filterConfigurable } from "../utils.mjs";
+import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdJournalRemoteServiceTypeDefinition = {
   name: "systemd-journal-remote",
@@ -105,7 +105,7 @@ export class SystemdJournalRemoteService extends Service {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
-      content: ["Remote", this.getProperties(filterConfigurable)]
+      content: sectionLines("Remote", this.getProperties(filterConfigurable))
     };
   }
 }

package/src/services/systemd-journal-upload.mjs

@@ -4,7 +4,7 @@ import {
   addType
 } from "pacc";
 import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
-import { filterConfigurable } from "../utils.mjs";
+import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdJournalUploadServiceTypeDefinition = {
   name: "systemd-journal-upload",
@@ -73,7 +73,7 @@ export class SystemdJournalUploadService extends Service {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
-      content: ["Upload", this.getProperties(filterConfigurable)]
+      content: sectionLines("Upload", this.getProperties(filterConfigurable))
     };
   }
 }

package/src/services/systemd-journald.mjs

@@ -4,7 +4,7 @@ import {
   duration_attribute_writable
 } from "pacc";
 import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
-import { filterConfigurable } from "../utils.mjs";
+import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdJournalServiceTypeDefinition = {
   name: "systemd-journald",
@@ -129,7 +129,7 @@ export class SystemdJournaldService extends Service {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal.conf.d/${name}.conf`,
-      content: ["Journal", this.getProperties(filterConfigurable)]
+      content: sectionLines("Journal", this.getProperties(filterConfigurable))
     };
   }
 }

package/src/services/systemd-resolved.mjs

@@ -1,5 +1,6 @@
 import {
   addType,
+  object_attribute,
   duration_attribute_writable,
   string_attribute_writable,
   boolean_attribute_writable,
@@ -12,7 +13,12 @@ import {
   serviceEndpoints,
   addServiceType
 } from "pmcf";
-import { filterConfigurable, yesno } from "../utils.mjs";
+import {
+  filterConfigurable,
+  yesno,
+  sectionLines,
+  setionLinesFromPropertyIterator
+} from "../utils.mjs";
 
 const SystemdResolvedServiceTypeDefinition = {
   name: "systemd-resolved",
@@ -21,24 +27,42 @@ const SystemdResolvedServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    DNS: { ...string_attribute_writable, configurable: true },
-    FallbackDNS: { ...string_attribute_writable, configurable: true },
-    Domains: { ...string_attribute_writable, configurable: true },
-    MulticastDNS: { ...boolean_attribute_writable, configurable: true },
-    Cache: { ...boolean_attribute_writable, configurable: true },
-    CacheFromLocalhost: { ...boolean_attribute_writable, configurable: true },
-    DNSStubListener: { ...boolean_attribute_writable, configurable: true },
-    DNSStubListenerExtra: { ...string_attribute_writable, configurable: true },
-    ReadEtcHosts: { ...boolean_attribute_writable, configurable: true },
-    ResolveUnicastSingleLabel: {
-      ...boolean_attribute_writable,
-      configurable: true
-    },
-    StaleRetentionSec: { ...duration_attribute_writable, configurable: true },
-    RefuseRecordTypes: { ...string_attribute_writable, configurable: true },
-    DNSSEC: { ...yesno_attribute_writable, default: false, configurable: true },
-    DNSOverTLS: { ...yesno_attribute_writable, configurable: true },
-    LLMNR: { ...yesno_attribute_writable, configurable: true }
+   /* Resolve: {
+      ...object_attribute,
+      attributes: {*/
+        DNS: { ...string_attribute_writable, configurable: true },
+        FallbackDNS: { ...string_attribute_writable, configurable: true },
+        Domains: { ...string_attribute_writable, configurable: true },
+        MulticastDNS: { ...yesno_attribute_writable, configurable: true },
+        Cache: { ...boolean_attribute_writable, configurable: true },
+        CacheFromLocalhost: {
+          ...boolean_attribute_writable,
+          configurable: true
+        },
+        DNSStubListener: { ...boolean_attribute_writable, configurable: true },
+        DNSStubListenerExtra: {
+          ...string_attribute_writable,
+          configurable: true
+        },
+        ReadEtcHosts: { ...boolean_attribute_writable, configurable: true },
+        ResolveUnicastSingleLabel: {
+          ...boolean_attribute_writable,
+          configurable: true
+        },
+        StaleRetentionSec: {
+          ...duration_attribute_writable,
+          configurable: true
+        },
+        RefuseRecordTypes: { ...string_attribute_writable, configurable: true },
+        DNSSEC: {
+          ...yesno_attribute_writable,
+          default: false,
+          configurable: true
+        },
+        DNSOverTLS: { ...yesno_attribute_writable, configurable: true },
+        LLMNR: { ...yesno_attribute_writable, configurable: true }
+     /* }
+    }*/
   },
   service: {
     systemdService: "systemd-resolved.service"
@@ -59,6 +83,8 @@ export class SystemdResolvedService extends ExtraSourceService {
     return SystemdResolvedServiceTypeDefinition.name;
   }
 
+  Resolve = {};
+
   systemdConfigs(name) {
     const options = (lower, upper, limit) => {
       return {
@@ -76,16 +102,14 @@ export class SystemdResolvedService extends ExtraSourceService {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
-      content: [
-        "Resolve",
-        {
-          DNS: serviceEndpoints(this, options(300, 399, 4)),
-          FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
-          Domains: [...this.localDomains].join(" "),
-          MulticastDNS: yesno(this.network.multicastDNS),
-          ...this.getProperties(filterConfigurable)
-        }
-      ]
+      //content: [...setionLinesFromPropertyIterator(this.propertyIterator( filterConfigurable)), "A=1"]
+      content: sectionLines("Resolve", {
+        DNS: serviceEndpoints(this, options(300, 399, 4)),
+        FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
+        Domains: [...this.localDomains].join(" "),
+        MulticastDNS: yesno(this.network.multicastDNS),
+        ...this.getProperties(filterConfigurable)
+      })
     };
   }
 }

package/src/services/systemd-timesyncd.mjs

@@ -10,7 +10,7 @@ import {
   serviceEndpoints,
   addServiceType
 } from "pmcf";
-import { filterConfigurable } from "../utils.mjs";
+import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdTimesyncdServiceTypeDefinition = {
   name: "systemd-timesyncd",
@@ -61,14 +61,14 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/timesyncd.conf.d/${name}.conf`,
-      content: [
+      content: sectionLines(
         "Time",
         {
           NTP: serviceEndpoints(this, options(300, 399)),
           FallbackNTP: serviceEndpoints(this, options(100, 199)),
           ...this.getProperties(filterConfigurable)
-        }
-      ]
+        })
+      
     };
   }
 }

package/src/utils.mjs

@@ -7,8 +7,8 @@ export function yesno(flag) {
 
 /**
  * Appends default domain if name does not already have a domain.
- * @param {string} name 
- * @param {string} [defaultDomain] 
+ * @param {string} name
+ * @param {string} [defaultDomain]
  * @returns {string|undefined}
  */
 export function domainName(name, defaultDomain) {
@@ -20,7 +20,7 @@ export function domainName(name, defaultDomain) {
 
 /**
  * Extracts domain name from a name.
- * @param {string} domainName 
+ * @param {string} domainName
  * @param {string} [defaultDomain]
  * @returns {string|undefined}
  */
@@ -62,9 +62,9 @@ export async function writeLines(dir, name, lines) {
 }
 
 /**
- * 
- * @param {string} sectionName 
- * @param {Object} values 
+ *
+ * @param {string} sectionName
+ * @param {Object} values
  * @returns {Array<string>}
  */
 export function sectionLines(sectionName, values) {
@@ -77,12 +77,22 @@ export function sectionLines(sectionName, values) {
   return lines;
 }
 
+export function* setionLinesFromPropertyIterator(properties) {
+  for (const [name, value, path, attribute] of properties) {
+    if (attribute.attributes) {
+      yield `[${name}]`;
+    } else {
+      yield `${name}=${value}`;
+    }
+  }
+}
+
 export function bridgeToJSON(bridge) {
   return [...bridge].map(n => n.fullName || `(${n})`).sort();
 }
 
 /**
- * @param {any} value 
+ * @param {any} value
  * @returns {Array<any>}
  */
 export function asArray(value) {
@@ -90,7 +100,7 @@ export function asArray(value) {
 }
 
 /**
- * @param {any} value 
+ * @param {any} value
  * @returns {Iterable<any>}
  */
 export function asIterator(value) {
@@ -108,5 +118,5 @@ export function asIterator(value) {
   return asArray(value);
 }
 
-
-export const filterConfigurable = (name, attribute) => !attribute.private & attribute.configurable;
+export const filterConfigurable = (name, attribute) =>
+  !attribute.private & attribute.configurable;

package/types/base.d.mts

@@ -71,9 +71,16 @@ export class Base {
     extendedProperty(propertyName: any): any;
     /**
      * Retrive attribute values from an object.
+     * @param {Function} [filter]
+     * @return {Iterable<[string,any]>} values
+     */
+    propertyIterator(filter?: Function): Iterable<[string, any]>;
+    /**
+     * Retrive attribute values from an object.
+     * @param {Function} [filter]
      * @return {Object} values
      */
-    getProperties(filter?: typeof filterPublic): any;
+    getProperties(filter?: Function): any;
     get root(): any;
     get location(): any;
     get host(): any;
@@ -136,4 +143,3 @@ export class Base {
     toString(): string;
     toJSON(): any;
 }
-import { filterPublic } from "pacc";

package/types/services/systemd-journald.d.mts

@@ -1258,7 +1258,7 @@ export class SystemdJournaldService extends Service {
     systemdConfigs(name: any): {
         serviceName: any;
         configFileName: string;
-        content: any[];
+        content: string[];
     };
 }
 import { Service } from "pmcf";

package/types/services/systemd-resolved.d.mts

@@ -1303,25 +1303,8 @@ export class SystemdResolvedService extends ExtraSourceService {
             };
             MulticastDNS: {
                 configurable: boolean;
-                type: object;
-                isKey: boolean;
                 writable: boolean;
-                mandatory: boolean;
                 collection: boolean;
-                private?: boolean;
-                credential?: boolean;
-                persistent?: boolean;
-                depends?: string;
-                description?: string;
-                default?: any;
-                set?: Function;
-                get?: Function;
-                toInternal?: Function;
-                toExternal?: Function;
-                values?: Set<any>;
-                externalName?: string;
-                env?: string[] | string;
-                additionalValues?: object;
             };
             Cache: {
                 configurable: boolean;
@@ -1520,10 +1503,11 @@ export class SystemdResolvedService extends ExtraSourceService {
             systemdService: string;
         };
     };
+    Resolve: {};
     systemdConfigs(name: any): {
         serviceName: any;
         configFileName: string;
-        content: any[];
+        content: string[];
     };
 }
 import { ExtraSourceService } from "pmcf";

package/types/services/systemd-timesyncd.d.mts

@@ -1396,7 +1396,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     systemdConfigs(name: any): {
         serviceName: any;
         configFileName: string;
-        content: any[];
+        content: string[];
     };
 }
 import { ExtraSourceService } from "pmcf";

package/types/utils.d.mts

@@ -21,6 +21,7 @@ export function writeLines(dir: any, name: any, lines: any): Promise<void>;
  * @returns {Array<string>}
  */
 export function sectionLines(sectionName: string, values: any): Array<string>;
+export function setionLinesFromPropertyIterator(properties: any): Generator<string, void, unknown>;
 export function bridgeToJSON(bridge: any): any[];
 /**
  * @param {any} value