pmcf 4.25.17 → 4.25.19

package/README.md

@@ -73,28 +73,31 @@ generates config packages for:
     *   [Parameters](#parameters-12)
     *   [port](#port-1)
 *   [id](#id)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-13)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-13)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-14)
+        *   [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)
 *   [secretName](#secretname)
 *   [isTemplate](#istemplate-1)
 *   [named](#named)
@@ -263,6 +266,14 @@ 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**
@@ -275,14 +286,6 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 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**
@@ -358,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;
+
 ## secretName
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;

package/package.json

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

package/src/base.mjs

@@ -48,14 +48,12 @@ export class Base {
     type: string_attribute
   };
 
-  static typeDefinition = this;
-
   static {
     addType(this);
   }
 
   static get typeName() {
-    return this.typeDefinition?.name || this.name;
+    return this.name;
   }
 
   static get typeFileName() {
@@ -213,7 +211,7 @@ export class Base {
 
   get typeName() {
     // @ts-ignore
-    return this.constructor.typeDefinition.name;
+    return this.constructor.name;
   }
 
   /**
@@ -236,15 +234,8 @@ export class Base {
    * @return {Iterable<[string,any]>} values
    */
   *attributeIterator(filter) {
-    for (
-      let typeDefinition = this.constructor.typeDefinition;
-      typeDefinition;
-      typeDefinition = typeDefinition.extends
-    ) {
-      for (const [path, def] of attributeIterator(
-        typeDefinition.attributes,
-        filter
-      )) {
+    for (let type = this.constructor; type; type = type.extends) {
+      for (const [path, def] of attributeIterator(type.attributes, filter)) {
         const name = path.join(".");
         const value = this.attribute(name);
 
@@ -545,14 +536,11 @@ export class Base {
   }
 
   toJSON() {
-    return extractFrom(this, this.constructor.typeDefinition);
+    return extractFrom(this, this.constructor);
   }
 }
 
-export function extractFrom(
-  object,
-  typeDefinition = object?.constructor?.typeDefinition
-) {
+export function extractFrom(object, type = object?.constructor) {
   switch (typeof object) {
     case "undefined":
     case "string":
@@ -572,12 +560,12 @@ export function extractFrom(
       return undefined;
     }
 
-    if (typeDefinition?.key) {
+    if (type?.key) {
       return Object.fromEntries(
         object.map(o => {
           o = extractFrom(o);
-          const name = o[typeDefinition.key];
-          delete o[typeDefinition.key];
+          const name = o[type.key];
+          delete o[type.key];
           return [name, o];
         })
       );
@@ -588,9 +576,9 @@ export function extractFrom(
 
   const json = {};
 
-  for (; typeDefinition; typeDefinition = typeDefinition.extends) {
+  for (; type; type = type.extends) {
     for (const [path, def] of attributeIterator(
-      typeDefinition.attributes,
+      type.attributes,
       filterPublic
     )) {
       const name = path.join(".");

package/src/cluster.mjs

@@ -38,7 +38,6 @@ export class Cluster extends Host {
     checkInterval: { ...duration_attribute_writable, default: 60 }
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/extra-source-service.mjs

@@ -16,7 +16,6 @@ export class ExtraSourceService extends Service {
     }
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/host.mjs

@@ -87,7 +87,6 @@ export class Host extends ServiceOwner {
     isModel: boolean_attribute_false
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/initialization-context.mjs

@@ -188,7 +188,7 @@ export class InitializationContext {
     return object;
   }
 
-  read(object, data, type = object.constructor.typeDefinition) {
+  read(object, data, type = object.constructor) {
     if (data?.properties) {
       Object.assign(object.properties, data.properties);
     }
@@ -200,7 +200,7 @@ export class InitializationContext {
     }
   }
 
-  _read(object, data, type = object.constructor.typeDefinition) {
+  _read(object, data, type) {
     if (type.extends) {
       this._read(object, data, type.extends);
     }

package/src/location.mjs

@@ -11,7 +11,6 @@ export class Location extends Owner {
   static key = "name";
   static attributes = {};
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/network-interfaces/ethernet.mjs

@@ -15,8 +15,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
     }
   };
 
-  static typeDefinition = this;
-
   static {
     addType(this);
   }

package/src/network-interfaces/loopback.mjs

@@ -17,8 +17,6 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   static owners = NetworkInterface.owners;
   static key = "name";
 
-  static typeDefinition = this;
-
   static {
     addType(this);
   }
@@ -28,7 +26,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   }
 
   get kind() {
-    return "loopback";
+    return this.constructor.name;
   }
 
   set scope(v) {}

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

@@ -61,8 +61,6 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     destination: string_attribute_writable
   };
 
-  static typeDefinition = this;
-
   static {
     addType(this);
   }

package/src/network-interfaces/tun.mjs

@@ -8,14 +8,12 @@ export class TUNNetworkInterface extends NetworkInterface {
   static owners = NetworkInterface.owners;
   static key = "name";
 
-  static typeDefinition = this;
-
   static {
     addType(this);
   }
 
   get kind() {
-    return "tun";
+    return this.constructor.name;
   }
 
   async systemdDefinitions(dir, packageData) {}

package/src/network-interfaces/wireguard.mjs

@@ -9,14 +9,13 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
   static owners = NetworkInterface.owners;
   static key = "name";
 
-  static typeDefinition = this;
 
   static {
     addType(this);
   }
 
   get kind() {
-    return "wireguard";
+    return this.constructor.name;
   }
 
   get ipAddresses() {

package/src/network-interfaces/wlan.mjs

@@ -21,8 +21,6 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
     secretName: string_attribute_writable
   };
 
-  static typeDefinition = this;
-
   static {
     addType(this);
   }
@@ -36,7 +34,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
   _secretName;
 
   get kind() {
-    return "wlan";
+    return this.constructor.name;
   }
 
   set secretName(value) {

package/src/network.mjs

@@ -19,7 +19,6 @@ export class Network extends Owner {
     gateway: { ...default_attribute_writable, type: "host" }
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/owner.mjs

@@ -44,7 +44,6 @@ export class Owner extends Base {
     template: { ...boolean_attribute_writable, private: true }
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/root.mjs

@@ -4,7 +4,6 @@ import { Location } from "./location.mjs";
 export class Root extends Location {
   static name = "root";
   static priority = 3;
-  static typeDefinition = this;
   
   static {
     addType(this);

package/src/service.mjs

@@ -74,7 +74,6 @@ export class Service extends Base {
     systemdService: string_attribute_writable
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/services/alpm.mjs

@@ -18,7 +18,6 @@ class ALPMRepository extends Base {
     architectures: string_set_attribute_writable
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
   }
@@ -42,7 +41,6 @@ export class ALPMService extends Service {
     extends: ["https", "http"]
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/bind.mjs

@@ -77,7 +77,6 @@ class bind_group extends Base {
     minimum: { ...duration_attribute_writable, default: 60000 }
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
   }
@@ -454,7 +453,6 @@ export class BindService extends ExtraSourceService {
     }
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);

package/src/services/chrony.mjs

@@ -40,7 +40,6 @@ export class ChronyService extends ExtraSourceService {
     }
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/headscale.mjs

@@ -37,7 +37,6 @@ export class HeadscaleService extends Service {
       }
     ]
   };
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/influxdb.mjs

@@ -42,7 +42,6 @@ export class InfluxdbService extends Service {
     ]
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/kea.mjs

@@ -127,7 +127,6 @@ export class KeaService extends Service {
     }
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/mosquitto.mjs

@@ -31,7 +31,6 @@ export class MosquittoService extends Service {
   static service = {
     extends: ["mqtt"]
   };
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/openldap.mjs

@@ -19,7 +19,6 @@ export class OpenLDAPService extends Service {
     services: {}
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/postfix.mjs

@@ -16,7 +16,6 @@ export class PostfixService extends Service {
     services: {}
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

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

@@ -86,7 +86,6 @@ export class SystemdJournalRemoteService extends Service {
     ]
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

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

@@ -50,7 +50,6 @@ export class SystemdJournalUploadService extends Service {
   static service = {
     systemdService: "systemd-journal-upload.service"
   };
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/systemd-journald.mjs

@@ -110,7 +110,6 @@ export class SystemdJournaldService extends Service {
   static service = {
     systemdService: "systemd-journald.service"
   };
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/systemd-resolved.mjs

@@ -75,7 +75,6 @@ export class SystemdResolvedService extends ExtraSourceService {
     systemdService: "systemd-resolved.service"
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/systemd-timesyncd.mjs

@@ -31,7 +31,6 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     systemdService: "systemd-timesyncd.service"
   };
 
-  static typeDefinition = this;
   static {
     addType(this);
     addServiceType(this.service, this.name);

package/src/services/tailscale.mjs

@@ -19,8 +19,6 @@ export class TailscaleService extends Service {
     ]
   };
 
-  static typeDefinition = this;
-
   static {
     addType(this);
   }

package/src/subnet.mjs

@@ -28,7 +28,6 @@ export class Subnet extends Base {
     family: string_attribute
   };
 
-  static typeDefinition = this;
 
   static {
     addType(this);