pmcf 4.24.4 → 4.25.0

package/README.md

@@ -73,11 +73,11 @@ generates config packages for:
     *   [Parameters](#parameters-12)
     *   [port](#port-1)
 *   [id](#id)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-13)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-13)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -263,14 +263,6 @@ Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
-## InitializationContext
-
-Keeps track of all in flight object creations and loose ends during config initialization.
-
-### Parameters
-
-*   `directory`   (optional, default `"/"`)
-
 ## SkeletonNetworkInterface
 
 **Extends ServiceOwner**
@@ -283,6 +275,14 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
 
+## InitializationContext
+
+Keeps track of all in flight object creations and loose ends during config initialization.
+
+### Parameters
+
+*   `directory`   (optional, default `"/"`)
+
 ## SystemdJournalRemoteService
 
 **Extends Service**

package/package.json

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

package/src/base.mjs

@@ -29,7 +29,7 @@ import { union } from "./utils.mjs";
 
 /**
  *
- * attributes: essential values
+ * attributes: as declared in the types
  * properties: use defined values to support attribute value definitions
  */
 export class Base {
@@ -65,12 +65,12 @@ export class Base {
   owner;
   description;
   name;
+  properties = {};
   extends = new Set();
   _tags = new Set();
   _packaging = new Set();
   _directory;
   _finalize;
-  _properties = {};
 
   /**
    *
@@ -222,7 +222,7 @@ export class Base {
    * @param {string} name
    * @returns {any}
    */
-  extendedAttribute(name) {
+  attribute(name) {
     for (const node of this.walkDirections(["this", "extends"])) {
       const value = getAttribute(node, name);
       if (value !== undefined) {
@@ -236,7 +236,7 @@ export class Base {
    * @param {Function} [filter]
    * @return {Iterable<[string,any]>} values
    */
-  *propertyIterator(filter) {
+  *attributeIterator(filter) {
     for (
       let typeDefinition = this.constructor.typeDefinition;
       typeDefinition;
@@ -247,7 +247,7 @@ export class Base {
         filter
       )) {
         const name = path.join(".");
-        const value = this.extendedAttribute(name);
+        const value = this.attribute(name);
 
         if (value !== undefined) {
           yield [def.externalName ?? name, toExternal(value, def), path, def];
@@ -261,8 +261,31 @@ export class Base {
    * @param {Function} [filter]
    * @return {Object} values
    */
-  getProperties(filter = filterPublic) {
-    return Object.fromEntries(this.propertyIterator(filter));
+  getAttributes(filter = filterPublic) {
+    return Object.fromEntries(this.attributeIterator(filter));
+  }
+
+  valueFor(name, at) {
+    if (at !== undefined) {
+      return this.attribute(name) ?? this.property(name);
+    }
+
+    return globals[name];
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns {any}
+   */
+  property(name) {
+    for (const node of this.walkDirections()) {
+      const value = node.properties?.[name];
+
+      if (value !== undefined) {
+        return this.expand(value);
+      }
+    }
   }
 
   get root() {
@@ -451,32 +474,6 @@ export class Base {
     return this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false;
   }
 
-  valueFor(name, at) {
-    if (at !== undefined) {
-      return this.extendedAttribute(name) ?? this.property(name);
-    }
-
-    return globals[name];
-  }
-
-  get properties() {
-    return this._properties;
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns {any}
-   */
-  property(name) {
-    for (const node of this.walkDirections(["this", "extends", "owner"])) {
-      const value = node._properties?.[name];
-      if (value !== undefined) {
-        return this.expand(value);
-      }
-    }
-  }
-
   /**
    *
    * @param {any} object

package/src/host.mjs

@@ -157,7 +157,7 @@ export class Host extends ServiceOwner {
   }
 
   get serial() {
-    return this.extendedAttribute("_serial");
+    return this.attribute("_serial");
   }
 
   set deployment(value) {
@@ -165,7 +165,7 @@ export class Host extends ServiceOwner {
   }
 
   get deployment() {
-    return this.extendedAttribute("_deployment");
+    return this.attribute("_deployment");
   }
 
   set chassis(value) {
@@ -173,7 +173,7 @@ export class Host extends ServiceOwner {
   }
 
   get chassis() {
-    return this.extendedAttribute("_chassis");
+    return this.attribute("_chassis");
   }
 
   set vendor(value) {
@@ -181,7 +181,7 @@ export class Host extends ServiceOwner {
   }
 
   get vendor() {
-    return this.extendedAttribute("_vendor");
+    return this.attribute("_vendor");
   }
 
   /**
@@ -196,7 +196,7 @@ export class Host extends ServiceOwner {
   }
 
   get keymap() {
-    return this.extendedAttribute("_keymap");
+    return this.attribute("_keymap");
   }
 
   set architecture(value) {
@@ -204,7 +204,7 @@ export class Host extends ServiceOwner {
   }
 
   get architecture() {
-    return this.extendedAttribute("_architecture");
+    return this.attribute("_architecture");
   }
 
   get derivedPackaging() {
@@ -284,7 +284,7 @@ export class Host extends ServiceOwner {
   }
 
   get os() {
-    return this.extendedAttribute("_os");
+    return this.attribute("_os");
   }
 
   set distribution(value) {
@@ -292,7 +292,7 @@ export class Host extends ServiceOwner {
   }
 
   get distribution() {
-    return this.extendedAttribute("_distribution");
+    return this.attribute("_distribution");
   }
 
   get modelName() {

package/src/initialization-context.mjs

@@ -188,7 +188,7 @@ export class InitializationContext {
 
   read(object, data, type = object.constructor.typeDefinition) {
     if (data?.properties) {
-      Object.assign(object._properties, data.properties);
+      Object.assign(object.properties, data.properties);
     }
 
     this._read(object, data, type);
@@ -309,7 +309,7 @@ export class InitializationContext {
             const data = JSON.parse(
               await readFile(join(this.directory, name), "utf8")
             );
-            this.root._properties = data.properties;
+            this.root.properties = data.properties;
           } else {
             await this.load("/" + name, { type });
           }

package/src/network-interfaces/network-interface.mjs

@@ -124,7 +124,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get hostName() {
-    return this.extendedAttribute("_hostName") ?? this.host.hostName;
+    return this.attribute("_hostName") ?? this.host.hostName;
   }
 
   set hostName(value) {
@@ -145,7 +145,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
   get scope() {
     return (
-      this.extendedAttribute("_scope") ??
+      this.attribute("_scope") ??
       this.network?.scope ??
       networkAttributes.scope.default
     );
@@ -156,7 +156,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get hwaddr() {
-    return this.extendedAttribute("_hwaddr");
+    return this.attribute("_hwaddr");
   }
 
   set metric(value) {
@@ -165,7 +165,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
   get metric() {
     return (
-      this.extendedAttribute("_metric") ??
+      this.attribute("_metric") ??
       this.network?.metric ??
       networkAttributes.metric.default
     );
@@ -176,7 +176,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get mtu() {
-    return this.extendedAttribute("_mtu");
+    return this.attribute("_mtu");
   }
 
   set class(value) {
@@ -184,7 +184,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get class() {
-    return this.extendedAttribute("_class") ?? this.network?.class;
+    return this.attribute("_class") ?? this.network?.class;
   }
 
   set kind(value) {
@@ -192,7 +192,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get kind() {
-    return this.extendedAttribute("_kind") ?? this.network?.kind;
+    return this.attribute("_kind") ?? this.network?.kind;
   }
 
   async systemdDefinitions(dir, packageData) {

package/src/network-interfaces/skeleton.mjs

@@ -59,7 +59,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
   }
 
   get network() {
-    return this.extendedAttribute("_network") ?? this.host?.network;
+    return this.attribute("_network") ?? this.host?.network;
   }
 
   set network(network) {

package/src/network-interfaces/wlan.mjs

@@ -50,7 +50,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
 
   get secretName() {
     return (
-      this.extendedAttribute("_secretName") ??
+      this.attribute("_secretName") ??
       this.network?.secretName ??
       `${this.network.name}.password`
     );
@@ -61,7 +61,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
   }
 
   get ssid() {
-    return this.extendedAttribute("_ssid") ?? this.network?.ssid;
+    return this.attribute("_ssid") ?? this.network?.ssid;
   }
 
   set psk(value) {
@@ -69,7 +69,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
   }
 
   get psk() {
-    return this.extendedAttribute("_psk") ?? this.network?.psk;
+    return this.attribute("_psk") ?? this.network?.psk;
   }
 
   async systemdDefinitions(dir, packageData) {

package/src/service.mjs

@@ -213,7 +213,7 @@ export class Service extends Base {
   }
 
   get alias() {
-    return this.extendedAttribute("_alias");
+    return this.attribute("_alias");
   }
 
   set port(value) {
@@ -221,7 +221,7 @@ export class Service extends Base {
   }
 
   get port() {
-    return this.extendedAttribute("_port") ?? serviceTypeEndpoints(ServiceTypes[this.type])[0]?.port;
+    return this.attribute("_port") ?? serviceTypeEndpoints(ServiceTypes[this.type])[0]?.port;
   }
 
   set weight(value) {
@@ -229,7 +229,7 @@ export class Service extends Base {
   }
 
   get weight() {
-    return this.extendedAttribute("_weight") ?? this.owner.weight ?? 1;
+    return this.attribute("_weight") ?? this.owner.weight ?? 1;
   }
 
   set type(value) {
@@ -237,7 +237,7 @@ export class Service extends Base {
   }
 
   get type() {
-    return this.extendedAttribute("_type") ?? this.name;
+    return this.attribute("_type") ?? this.name;
   }
 
   get types() {
@@ -246,7 +246,7 @@ export class Service extends Base {
 
   get systemdService() {
     return (
-      this.extendedAttribute("_systemdService") ??
+      this.attribute("_systemdService") ??
       ServiceTypes[this.type]?.systemdService
     );
   }

package/src/services/influxdb.mjs

@@ -62,7 +62,7 @@ export class InfluxdbService extends Service {
     await writeLines(
       join(dir, "etc", "influxdb"),
       "config.yml",
-      setionLinesFromPropertyIterator(this.propertyIterator(filterConfigurable))
+      setionLinesFromPropertyIterator(this.attributeIterator(filterConfigurable))
     );
 
     yield packageData;

package/src/services/openldap.mjs

@@ -40,7 +40,7 @@ export class OpenLDAPService extends Service {
   }
 
   get base() {
-    return this.extendedAttribute("_base");
+    return this.attribute("_base");
   }
 
   set base(value) {
@@ -48,7 +48,7 @@ export class OpenLDAPService extends Service {
   }
 
   get uri() {
-    return this.extendedAttribute("_uri");
+    return this.attribute("_uri");
   }
 
   set uri(value) {

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

@@ -107,7 +107,7 @@ export class SystemdJournalRemoteService extends Service {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
-      content: sectionLines("Remote", this.getProperties(filterConfigurable))
+      content: sectionLines("Remote", this.getAttributes(filterConfigurable))
     };
   }
 }

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

@@ -69,10 +69,11 @@ export class SystemdJournalUploadService extends Service {
    * @returns {Object}
    */
   systemdConfigs(name) {
+    console.log("PROPS",this.expand(this.getAttributes(filterConfigurable)));
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
-      content: sectionLines("Upload", this.getProperties(filterConfigurable))
+      content: sectionLines("Upload", this.getAttributes(filterConfigurable))
     };
   }
 }

package/src/services/systemd-journald.mjs

@@ -127,7 +127,7 @@ export class SystemdJournaldService extends Service {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal.conf.d/${name}.conf`,
-      content: sectionLines("Journal", this.getProperties(filterConfigurable))
+      content: sectionLines("Journal", this.getAttributes(filterConfigurable))
     };
   }
 }

package/src/services/systemd-resolved.mjs

@@ -107,12 +107,12 @@ export class SystemdResolvedService extends ExtraSourceService {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
-      //content: [...setionLinesFromPropertyIterator(this.propertyIterator( filterConfigurable)), "A=1"]
+      //content: [...setionLinesFromPropertyIterator(this.attributeIterator( filterConfigurable)), "A=1"]
       content: sectionLines("Resolve", {
         DNS: serviceEndpoints(this, options(300, 399, 4)),
         FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
         MulticastDNS: yesno(this.network.multicastDNS),
-        ...this.getProperties(filterConfigurable)
+        ...this.getAttributes(filterConfigurable)
       })
     };
   }

package/src/services/systemd-timesyncd.mjs

@@ -63,7 +63,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
       content: sectionLines("Time", {
         NTP: serviceEndpoints(this, options(300, 399)),
         FallbackNTP: serviceEndpoints(this, options(100, 199)),
-        ...this.getProperties(filterConfigurable)
+        ...this.getAttributes(filterConfigurable)
       })
     };
   }