pmcf 4.25.10 → 4.25.12

package/package.json

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

package/src/cluster.mjs

@@ -12,13 +12,13 @@ import { Host } from "./host.mjs";
 import { serviceEndpoints } from "pmcf";
 import { writeLines } from "./utils.mjs";
 
-const ClusterTypeDefinition = {
-  name: "cluster",
-  priority: 1.5,
-  owners: [Owner.typeDefinition, "network", "location", "root"],
-  extends: Host.typeDefinition,
-  key: "name",
-  attributes: {
+export class Cluster extends Host {
+  static name = "cluster";
+  static priority = 1.5;
+  static owners = [Owner.typeDefinition, "network", "location", "root"];
+  static extends = Host.typeDefinition;
+  static key = "name";
+  static attributes = {
     routerId: { ...number_attribute_writable, default: 100 },
     masters: {
       ...default_attribute_writable,
@@ -36,11 +36,9 @@ const ClusterTypeDefinition = {
       collection: true
     },
     checkInterval: { ...duration_attribute_writable, default: 60 }
-  }
-};
+  };
 
-export class Cluster extends Host {
-  static typeDefinition = ClusterTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -177,9 +175,7 @@ export class Cluster extends Host {
 
           for (const member of this.members) {
             const memberService = Array.from(
-              member.expression(
-                `services[types[${endpoint.type}]][0]`
-              )
+              member.expression(`services[types[${endpoint.type}]][0]`)
             );
 
             console.log(member.fullName, endpoint.type, memberService);

package/src/host.mjs

@@ -24,13 +24,13 @@ import { loadHooks } from "./hooks.mjs";
 import { generateKnownHosts } from "./host-utils.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interfaces/network-interface.mjs";
 
-const HostTypeDefinition = {
-  name: "host",
-  priority: 1.9,
-  owners: ["owner", "network", "root"],
-  extends: Base.typeDefinition,
-  key: "name",
-  attributes: {
+export class Host extends ServiceOwner {
+  static name = "host";
+  static priority = 1.9;
+  static owners = ["owner", "network", "root"];
+  static extends = Base.typeDefinition;
+  static key = "name";
+  static attributes = {
     ...networkAddressAttributes,
     networkInterfaces: {
       ...default_attribute_writable,
@@ -85,11 +85,9 @@ const HostTypeDefinition = {
     extends: { ...default_attribute_writable, type: "host", collection: true },
     model: string_attribute,
     isModel: boolean_attribute_false
-  }
-};
+  };
 
-export class Host extends ServiceOwner {
-  static typeDefinition = HostTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);

package/src/network-interfaces/loopback.mjs

@@ -3,14 +3,6 @@ import { SUBNET_LOCALHOST_IPV4, SUBNET_LOCALHOST_IPV6 } from "pmcf";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 
-const LoopbackNetworkInterfaceTypeDefinition = {
-  name: "loopback",
-  extends: NetworkInterfaceTypeDefinition,
-  specializationOf: NetworkInterfaceTypeDefinition,
-  owners: NetworkInterfaceTypeDefinition.owners,
-  key: "name"
-};
-
 const _localAddresses = new Map([
   ["127.0.0.1", SUBNET_LOCALHOST_IPV4],
   ["::1", SUBNET_LOCALHOST_IPV6]
@@ -19,7 +11,13 @@ const _localAddresses = new Map([
 const _localDomains = new Set(["localhost"]);
 
 export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
-  static typeDefinition = LoopbackNetworkInterfaceTypeDefinition;
+  static name = "loopback";
+  static extends = NetworkInterfaceTypeDefinition;
+  static specializationOf = NetworkInterfaceTypeDefinition;
+  static owners = NetworkInterfaceTypeDefinition.owners;
+  static key = "name";
+
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -30,7 +28,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   }
 
   get kind() {
-    return LoopbackNetworkInterfaceTypeDefinition.name;
+    return "loopback";
   }
 
   set scope(v) {}

package/src/network-interfaces/tun.mjs

@@ -2,23 +2,21 @@ import { addType } from "pacc";
 import { NetworkInterface } from "./network-interface.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 
-const TUNdNetworkInterfaceTypeDefinition = {
-  name: "tun",
-  extends: NetworkInterfaceTypeDefinition,
-  specializationOf: NetworkInterfaceTypeDefinition,
-  owners: NetworkInterfaceTypeDefinition.owners,
-  key: "name"
-};
-
 export class TUNNetworkInterface extends NetworkInterface {
-  static typeDefinition = TUNdNetworkInterfaceTypeDefinition;
+  static name = "tun";
+  static extends = NetworkInterfaceTypeDefinition;
+  static specializationOf = NetworkInterfaceTypeDefinition;
+  static owners = NetworkInterfaceTypeDefinition.owners;
+  static key = "name";
+
+  static typeDefinition = this;
 
   static {
     addType(this);
   }
 
   get kind() {
-    return TUNdNetworkInterfaceTypeDefinition.name;
+    return "tun";
   }
 
   async systemdDefinitions(dir, packageData) {}

package/src/network-interfaces/wireguard.mjs

@@ -2,23 +2,21 @@ import { addType } from "pacc";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 
-const WireguardNetworkInterfaceTypeDefinition = {
-  name: "wireguard",
-  extends: NetworkInterfaceTypeDefinition,
-  specializationOf: NetworkInterfaceTypeDefinition,
-  owners: NetworkInterfaceTypeDefinition.owners,
-  key: "name"
-};
-
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {
-  static typeDefinition = WireguardNetworkInterfaceTypeDefinition;
+  static name = "wireguard";
+  static extends = NetworkInterfaceTypeDefinition;
+  static specializationOf = NetworkInterfaceTypeDefinition;
+  static owners = NetworkInterfaceTypeDefinition.owners;
+  static key = "name";
+
+  static typeDefinition = this;
 
   static {
     addType(this);
   }
-  
+
   get kind() {
-    return WireguardNetworkInterfaceTypeDefinition.name;
+    return "wireguard";
   }
 
   get ipAddresses() {

package/src/network-interfaces/wlan.mjs

@@ -12,21 +12,19 @@ import {
   EthernetNetworkInterfaceTypeDefinition
 } from "./ethernet.mjs";
 
-const WLANNetworkInterfaceTypeDefinition = {
-  name: "wlan",
-  extends: EthernetNetworkInterfaceTypeDefinition,
-  specializationOf: NetworkInterfaceTypeDefinition,
-  owners: EthernetNetworkInterfaceTypeDefinition.owners,
-  key: "name",
-  attributes: {
+export class WLANNetworkInterface extends EthernetNetworkInterface {
+  static name = "wlan";
+  static extends = EthernetNetworkInterfaceTypeDefinition;
+  static specializationOf = NetworkInterfaceTypeDefinition;
+  static owners = EthernetNetworkInterfaceTypeDefinition.owners;
+  static key = "name";
+  static attributes = {
     ssid: string_attribute_writable,
     psk: secret_attribute_writable,
     secretName: string_attribute_writable
-  }
-};
+  };
 
-export class WLANNetworkInterface extends EthernetNetworkInterface {
-  static typeDefinition = WLANNetworkInterfaceTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -41,7 +39,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
   _secretName;
 
   get kind() {
-    return WLANNetworkInterfaceTypeDefinition.name;
+    return "wlan";
   }
 
   set secretName(value) {

package/src/network.mjs

@@ -3,13 +3,13 @@ import { Owner } from "./owner.mjs";
 import { Subnet } from "./subnet.mjs";
 import { networkAttributes } from "./network-support.mjs";
 
-export const NetworkTypeDefinition = {
-  name: "network",
-  priority: 2,
-  owners: ["location", "owner", "root"],
-  extends: Owner.typeDefinition,
-  key: "name",
-  attributes: {
+export class Network extends Owner {
+  static name = "network";
+  static priority = 2;
+  static owners = ["location", "owner", "root"];
+  static extends = Owner.typeDefinition;
+  static key = "name";
+  static attributes = {
     ...networkAttributes,
     bridge: {
       ...default_attribute_writable,
@@ -17,11 +17,9 @@ export const NetworkTypeDefinition = {
       collection: true
     },
     gateway: { ...default_attribute_writable, type: "host" }
-  }
-};
+  };
 
-export class Network extends Owner {
-  static typeDefinition = NetworkTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);

package/src/owner.mjs

@@ -13,13 +13,15 @@ import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { networks_attribute } from "./network-support.mjs";
 
-const OwnerTypeDefinition = {
-  name: "owner",
-  priority: 2,
-  owners: ["location", "owner", "root"],
-  extends: Base.typeDefinition,
-  key: "name",
-  attributes: {
+const EMPTY = new Map();
+
+export class Owner extends Base {
+  static name = "owner";
+  static priority = 2;
+  static owners = ["location", "owner", "root"];
+  static extends = Base.typeDefinition;
+  static key = "name";
+  static attributes = {
     networks: networks_attribute,
     hosts: { ...default_attribute_writable, type: "host", collection: true },
     clusters: {
@@ -40,13 +42,9 @@ const OwnerTypeDefinition = {
     locales: { ...string_set_attribute_writable, description: "unix locale" },
     administratorEmail: { ...email_attribute, writable: true },
     template: { ...boolean_attribute_writable, private: true }
-  }
-};
+  };
 
-const EMPTY = new Map();
-
-export class Owner extends Base {
-  static typeDefinition = OwnerTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);