pmcf 4.28.1 → 4.28.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.28.1",
+  "version": "4.28.3",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.6.9",
     "ip-utilties": "^3.0.4",
     "npm-pkgbuild": "^20.7.3",
-    "pacc": "^9.3.1",
+    "pacc": "^9.3.2",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {

package/src/cluster.mjs

@@ -16,7 +16,6 @@ export class Cluster extends Host {
   static name = "cluster";
   static priority = 1.5;
   static owners = [Owner, "network", "location", "root"];
-  static extends = Host;
   static key = "name";
   static attributes = {
     routerId: { ...number_attribute_writable, default: 100 },

package/src/extra-source-service.mjs

@@ -2,10 +2,8 @@ import { default_attribute_writable, addType } from "pacc";
 import { Service } from "./service.mjs";
 import { networkAddressType } from "pmcf";
 
-
 export class ExtraSourceService extends Service {
   static name = "extra-source-service";
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static attributes = {
@@ -16,7 +14,6 @@ export class ExtraSourceService extends Service {
     }
   };
 
-
   static {
     addType(this);
   }

package/src/host.mjs

@@ -28,7 +28,6 @@ export class Host extends ServiceOwner {
   static name = "host";
   static priority = 1.9;
   static owners = ["owner", "network", "root"];
-  static extends = ServiceOwner;
   static key = "name";
   static attributes = {
     ...networkAddressAttributes,

package/src/location.mjs

@@ -7,7 +7,6 @@ export class Location extends Owner {
   static name = "location";
   static priority = 2;
   static owners = [Owner, Location, "root"];
-  static extends = Owner;
   static key = "name";
   static attributes = {};
 

package/src/network-interfaces/ethernet.mjs

@@ -3,7 +3,6 @@ import { NetworkInterface } from "./network-interface.mjs";
 
 export class EthernetNetworkInterface extends NetworkInterface {
   static name = "ethernet";
-  static extends = NetworkInterface;
   static specializationOf = NetworkInterface;
   static owners = NetworkInterface.owners;
   static key = "name";

package/src/network-interfaces/loopback.mjs

@@ -12,7 +12,6 @@ const _localDomains = new Set(["localhost"]);
 
 export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   static name = "loopback";
-  static extends = NetworkInterface;
   static specializationOf = NetworkInterface;
   static owners = NetworkInterface.owners;
   static key = "name";

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

@@ -6,7 +6,7 @@ import {
   hostname_attribute,
   addType
 } from "pacc";
-import { Base, cidrAddresses } from "pmcf";
+import { Host, cidrAddresses } from "pmcf";
 import {
   networkAttributes,
   networkAddressAttributes
@@ -18,8 +18,7 @@ import { yesno } from "../utils.mjs";
 
 export class NetworkInterface extends SkeletonNetworkInterface {
   static name = "network_interface";
-  static owners = ["host"];
-  static extends = Base;
+  static owners = [Host];
   static specializations = {};
   static factoryFor(owner, value) {
     let st = this.specializations[value.kind];

package/src/network-interfaces/skeleton.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { AggregatedMap } from "aggregated-map";
+import { addType } from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
 import { NetworkAddress, Host, cidrAddresses } from "pmcf";
 import { ServiceOwner } from "../service-owner.mjs";
@@ -8,10 +9,15 @@ import { ServiceOwner } from "../service-owner.mjs";
  *
  */
 export class SkeletonNetworkInterface extends ServiceOwner {
+  
   static get typeName() {
     return "network_interface";
   }
 
+  static {
+    addType(this);
+  }
+
   _network;
 
   get typeName() {

package/src/network-interfaces/tun.mjs

@@ -3,7 +3,6 @@ import { NetworkInterface } from "./network-interface.mjs";
 
 export class TUNNetworkInterface extends NetworkInterface {
   static name = "tun";
-  static extends = NetworkInterface;
   static specializationOf = NetworkInterface;
   static owners = NetworkInterface.owners;
   static key = "name";

package/src/network-interfaces/wireguard.mjs

@@ -4,7 +4,6 @@ import { NetworkInterface } from "./network-interface.mjs";
 
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {
   static name = "wireguard";
-  static extends = NetworkInterface;
   static specializationOf = NetworkInterface;
   static owners = NetworkInterface.owners;
   static key = "name";

package/src/network-interfaces/wlan.mjs

@@ -11,7 +11,6 @@ import { EthernetNetworkInterface } from "./ethernet.mjs";
 
 export class WLANNetworkInterface extends EthernetNetworkInterface {
   static name = "wlan";
-  static extends = EthernetNetworkInterface;
   static specializationOf = NetworkInterface;
   static owners = EthernetNetworkInterface.owners;
   static key = "name";

package/src/network.mjs

@@ -7,7 +7,6 @@ export class Network extends Owner {
   static name = "network";
   static priority = 2;
   static owners = ["location", Owner, "root"];
-  static extends = Owner;
   static key = "name";
   static attributes = {
     ...networkAttributes,

package/src/owner.mjs

@@ -19,7 +19,6 @@ export class Owner extends Base {
   static name = "owner";
   static priority = 2;
   static owners = ["location", Owner, "root"];
-  static extends = Base;
   static key = "name";
   static attributes = {
     networks: networks_attribute,

package/src/service-owner.mjs

@@ -5,7 +5,6 @@ export class ServiceOwner extends Base {
   static name = "service-owner";
   static priority = 1.9;
   static owners = ["owner", "network", "root"];
-  static extends = Base;
   static key = "name";
   static attributes = {
     services: {

package/src/service.mjs

@@ -44,7 +44,6 @@ export class Service extends Base {
   static name = "service";
   static priority = 1.1;
   static owners = [Host, "cluster", "network_interface"];
-  static extends = Base;
   static specializations = {};
   static factoryFor(owner, value) {
     const type = value.type ?? value.name;

package/src/services/alpm.mjs

@@ -9,7 +9,6 @@ import { addServiceType, Base } from "pmcf";
 import { Service } from "../service.mjs";
 
 class alpm_repository extends Base {
-  static extends = Base;
   static key = "name";
   static attributes = {
     name: name_attribute_writable,
@@ -25,7 +24,6 @@ class alpm_repository extends Base {
 export class ALPMService extends Service {
   static name = "alpm";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static attributes = {

package/src/services/bind.mjs

@@ -398,7 +398,6 @@ function addressesStatement(prefix, objects, generateEmpty = false) {
 
 export class BindService extends ExtraSourceService {
   static name = "bind";
-  static extends = ExtraSourceService;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/chrony.mjs

@@ -9,7 +9,6 @@ import { writeLines } from "../utils.mjs";
 export class ChronyService extends ExtraSourceService {
   static name = "chrony";
   static priority = 1;
-  static extends = ExtraSourceService;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/headscale.mjs

@@ -5,7 +5,6 @@ import { Service } from "../service.mjs";
 export class HeadscaleService extends Service {
   static name = "headscale";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/influxdb.mjs

@@ -12,7 +12,6 @@ import { Service } from "../service.mjs";
 export class InfluxdbService extends Service {
   static name = "influxdb";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/kea.mjs

@@ -22,7 +22,6 @@ const keaVersion = "3.0.1";
 export class KeaService extends Service {
   static name = "kea";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/mosquitto.mjs

@@ -5,7 +5,6 @@ import { Service } from "../service.mjs";
 export class MosquittoService extends Service {
   static name = "mosquitto";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/openldap.mjs

@@ -5,7 +5,6 @@ import { Service } from "../service.mjs";
 export class OpenLDAPService extends Service {
   static name = "openldap";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";
@@ -52,6 +51,8 @@ export class OpenLDAPService extends Service {
 
     const packageData = this.packageData;
 
+    console.log([...this.walkDirections(["this", "extends"]) ].map(n=>n.fullName));
+
     packageData.sources = await Array.fromAsync(
       this.templateContent(
         {

package/src/services/postfix.mjs

@@ -5,7 +5,6 @@ import { Service } from "../service.mjs";
 export class PostfixService extends Service {
   static name = "postfix";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

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

@@ -15,7 +15,6 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 export class SystemdJournalRemoteService extends Service {
   static name = "systemd-journal-remote";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

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

@@ -15,7 +15,6 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 export class SystemdJournalUploadService extends Service {
   static name = "systemd-journal-upload";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/systemd-journald.mjs

@@ -9,7 +9,6 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 export class SystemdJournaldService extends Service {
   static name = "systemd-journald";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/systemd-resolved.mjs

@@ -22,7 +22,6 @@ import {
 export class SystemdResolvedService extends ExtraSourceService {
   static name = "systemd-resolved";
   static priority = 1;
-  static extends = ExtraSourceService;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";

package/src/services/systemd-timesyncd.mjs

@@ -14,7 +14,6 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 export class SystemdTimesyncdService extends ExtraSourceService {
   static name = "systemd-timesyncd";
   static priority = 1;
-  static extends = ExtraSourceService;
   static specializationOf = Service;
   static owners = Service.owners;
 

package/src/services/tailscale.mjs

@@ -4,7 +4,6 @@ import { Service } from "../service.mjs";
 export class TailscaleService extends Service {
   static name = "tailscale";
   static priority = 1;
-  static extends = Service;
   static specializationOf = Service;
   static owners = Service.owners;
   static key = "name";