pmcf 4.25.11 → 4.25.13

package/package.json

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

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/services/alpm.mjs

@@ -8,54 +8,50 @@ import {
 import { addServiceType, Base } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 
-const ALPMRepositoryTypeDefinition = {
-  name: "alpm_repository",
-  extends: Base.typeDefinition,
-  key: "name",
-  attributes: {
+class ALPMRepository extends Base {
+  static name = "alpm_repository";
+  static extends = Base.typeDefinition;
+  static key = "name";
+  static attributes = {
     name: name_attribute_writable,
     base: string_attribute_writable,
     architectures: string_set_attribute_writable
-  }
-};
+  };
 
-class ALPMRepository extends Base {
-  static typeDefinition = ALPMRepositoryTypeDefinition;
+  static typeDefinition = this;
   static {
     addType(this);
   }
 }
 
-const ALPMServiceTypeDefinition = {
-  name: "alpm",
-  priority: 1,
-  extends: ServiceTypeDefinition,
-  specializationOf: ServiceTypeDefinition,
-  owners: ServiceTypeDefinition.owners,
-  attributes: {
+export class ALPMService extends Service {
+  static name = "alpm";
+  static priority = 1;
+  static extends = ServiceTypeDefinition;
+  static specializationOf = ServiceTypeDefinition;
+  static owners = ServiceTypeDefinition.owners;
+  static attributes = {
     repositories: {
       ...default_attribute_writable,
       type: "alpm_repository",
       collection: true
     }
-  },
+  };
 
-  service: {
+  static service = {
     extends: ["https", "http"]
-  }
-};
+  };
 
-export class ALPMService extends Service {
-  static typeDefinition = ALPMServiceTypeDefinition;
+  static typeDefinition = this;
   static {
     addType(this);
-    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
+    addServiceType(this.service, this.name);
   }
 
   repositories = new Map();
 
   typeNamed(type, name) {
-    if (type === ALPMRepositoryTypeDefinition.name) {
+    if (type === ALPMService.name) {
       return this.repositories.get(name);
     }
 

package/src/services/postfix.mjs

@@ -2,29 +2,27 @@ import { addType } from "pacc";
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 
-const PostfixServiceTypeDefinition = {
-  name: "postfix",
-  priority: 1,
-  extends: ServiceTypeDefinition,
-  specializationOf: ServiceTypeDefinition,
-  owners: ServiceTypeDefinition.owners,
-  key: "name",
-  attributes: {},
-  service: {
+export class PostfixService extends Service {
+  static name = "postfix";
+  static priority = 1;
+  static extends = ServiceTypeDefinition;
+  static specializationOf = ServiceTypeDefinition;
+  static owners = ServiceTypeDefinition.owners;
+  static key = "name";
+  static attributes = {};
+  static service = {
     systemdService: "postfix.service",
     extends: ["smtp", "lmtp", "submission"],
     services: {}
-  }
-};
+  };
 
-export class PostfixService extends Service {
-  static typeDefinition = PostfixServiceTypeDefinition;
+  static typeDefinition = this;
   static {
     addType(this);
-    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
+    addServiceType(this.service, this.name);
   }
 
   get type() {
-    return PostfixServiceTypeDefinition.name;
+    return "postfix";
   }
 }

package/src/services/tailscale.mjs

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