pmcf 3.13.13 → 3.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.13.13",
+  "version": "3.14.1",
   "publishConfig": {
     "access": "public"
   },
@@ -51,21 +51,21 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.4.9",
-    "npm-pkgbuild": "^18.3.10",
-    "pacc": "^4.39.4",
+    "ip-utilties": "^1.4.11",
+    "npm-pkgbuild": "^19.0.1",
+    "pacc": "^4.41.1",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
-    "@types/node": "^24.7.1",
+    "@types/node": "^24.10.1",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.9",
+    "semantic-release": "^25.0.2",
     "typescript": "^5.9.3"
   },
   "engines": {
-    "node": ">=22.20.0"
+    "node": ">=24.11.1"
   },
   "repository": {
     "type": "git",

package/src/base.mjs

@@ -1,6 +1,8 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
 import {
+  typeFactory,
+  addType,
   parse,
   globals,
   expand,
@@ -14,13 +16,15 @@ import {
   description_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
-import { addType, typeFactory } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 
-const BaseTypeDefinition = {
-  name: "base",
-  key: "name",
-  attributes: {
+/**
+ *
+ */
+export class Base {
+  static name = "base";
+  static key = "name";
+  static attributes = {
     owner: { ...default_attribute, type: "base" },
     type: string_attribute,
     name: name_attribute_writable,
@@ -30,13 +34,8 @@ const BaseTypeDefinition = {
     packaging: string_attribute_writable,
     disabled: boolean_attribute_writable,
     tags: string_collection_attribute_writable
-  }
-};
+  };
 
-/**
- *
- */
-export class Base {
   owner;
   description;
   name;
@@ -55,7 +54,7 @@ export class Base {
   }
 
   static get typeDefinition() {
-    return BaseTypeDefinition;
+    return this;
   }
 
   static get typeFileName() {
@@ -74,12 +73,13 @@ export class Base {
         this.name = data;
         break;
       case "object":
-        this.read(data, BaseTypeDefinition);
+        this.read(data, this.constructor);
     }
   }
 
   ownerFor(attribute, data) {
     const owners = attribute.type.owners;
+
     if (owners) {
       for (const type of owners) {
         if (this.typeName === type?.name) {

package/src/cluster.mjs

@@ -3,12 +3,12 @@ import { FileContentProvider } from "npm-pkgbuild";
 import {
   default_attribute_writable,
   default_attribute,
-  number_attribute_writable
+  number_attribute_writable,
+  addType
 } from "pacc";
 import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
 import { serviceEndpoints } from "pmcf";
-import { addType } from "./types.mjs";
 import { writeLines } from "./utils.mjs";
 
 const ClusterTypeDefinition = {

package/src/extra-source-service.mjs

@@ -1,5 +1,4 @@
-import { default_attribute_writable } from "pacc";
-import { addType } from "./types.mjs";
+import { default_attribute_writable, addType } from "pacc";
 import { Service, ServiceTypeDefinition } from "./service.mjs";
 import { networkAddressType } from "pmcf";
 

package/src/host.mjs

@@ -7,7 +7,8 @@ import {
   string_attribute_writable,
   string_collection_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_false
+  boolean_attribute_false,
+  addType
 } from "pacc";
 import { ServiceOwner, Base, addresses } from "pmcf";
 import { networkAddressAttributes } from "./network-support.mjs";
@@ -19,7 +20,6 @@ import {
   sectionLines,
   asArray
 } from "./utils.mjs";
-import { addType } from "./types.mjs";
 import { loadHooks } from "./hooks.mjs";
 import { generateMachineInfo, generateKnownHosts } from "./host-utils.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interfaces/network-interface.mjs";

package/src/location.mjs

@@ -1,7 +1,6 @@
 import { FileContentProvider } from "npm-pkgbuild";
-import { string_collection_attribute_writable } from "pacc";
+import { string_collection_attribute_writable, addType } from "pacc";
 import { Owner } from "pmcf";
-import { addType } from "./types.mjs";
 import { loadHooks } from "./hooks.mjs";
 
 const LocationTypeDefinition = {

package/src/module.mjs

@@ -8,13 +8,13 @@ export * from "./service-owner.mjs";
 export * from "./network.mjs";
 export * from "./network-address.mjs";
 export * from "./network-support.mjs";
+export * from "./host.mjs";
 export * from "./network-interfaces/network-interface.mjs";
 export * from "./network-interfaces/loopback.mjs";
 export * from "./network-interfaces/ethernet.mjs";
 export * from "./network-interfaces/wlan.mjs";
 export * from "./network-interfaces/wireguard.mjs";
 export * from "./network-interfaces/tun.mjs";
-export * from "./host.mjs";
 export * from "./service-types.mjs";
 export * from "./service.mjs";
 export * from "./extra-source-service.mjs";
@@ -32,4 +32,3 @@ export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";
 export * from "./services/systemd-timesyncd.mjs";
 export * from "./services/systemd-resolved.mjs";
-export * from "./types.mjs";

package/src/network-interfaces/ethernet.mjs

@@ -1,5 +1,4 @@
-import { default_attribute_writable } from "pacc";
-import { addType } from "../types.mjs";
+import { default_attribute_writable, addType } from "pacc";
 import {
   NetworkInterface,
   NetworkInterfaceTypeDefinition

package/src/network-interfaces/loopback.mjs

@@ -1,7 +1,7 @@
+import { addType } from "pacc";
 import { SUBNET_LOCALHOST_IPV4, SUBNET_LOCALHOST_IPV6 } from "pmcf";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
-import { addType } from "../types.mjs";
 
 const LoopbackNetworkInterfaceTypeDefinition = {
   name: "loopback",

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

@@ -3,7 +3,8 @@ import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
 import {
   default_attribute_writable,
   string_attribute_writable,
-  hostname_attribute
+  hostname_attribute,
+  addType
 } from "pacc";
 import { Base, cidrAddresses } from "pmcf";
 import {
@@ -11,7 +12,6 @@ import {
   networkAddressAttributes
 } from "../network-support.mjs";
 import { asArray, writeLines, sectionLines } from "../utils.mjs";
-import { addType } from "../types.mjs";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { Network } from "../network.mjs";
 
@@ -71,7 +71,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   static isCommonName(name) {
-    false;
+    return false;
   }
 
   _ipAddresses = new Map();

package/src/network-interfaces/tun.mjs

@@ -1,6 +1,6 @@
+import { addType } from "pacc";
 import { NetworkInterface } from "./network-interface.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
-import { addType } from "../types.mjs";
 
 const TUNdNetworkInterfaceTypeDefinition = {
   name: "tun",

package/src/network-interfaces/wireguard.mjs

@@ -1,6 +1,6 @@
+import { addType } from "pacc";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
-import { addType } from "../types.mjs";
 
 const WireguardNetworkInterfaceTypeDefinition = {
   name: "wireguard",

package/src/network-interfaces/wlan.mjs

@@ -1,7 +1,6 @@
 import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
-import { string_attribute_writable, secret_attribute } from "pacc";
-import { addType } from "../types.mjs";
+import { string_attribute_writable, secret_attribute, addType } from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 import {

package/src/network-support.mjs

@@ -1,5 +1,4 @@
 import {
-  oneOfType,
   default_attribute_writable,
   string_collection_attribute_writable,
   string_attribute_writable,
@@ -8,10 +7,13 @@ import {
   boolean_attribute_writable
 } from "pacc";
 
-export const networkAddressType = oneOfType("network|host|network_interface");
-//export const networkAddressType = oneOfType([NetworkTypeDefinition,"host","network_interface"]);
+export const networkAddressType = "network|host|network_interface";
 
-export const networks_attribute = { ...default_attribute_writable, type: "network", collection: true };
+export const networks_attribute = {
+  ...default_attribute_writable,
+  type: "network",
+  collection: true
+};
 
 export const networkAttributes = {
   scope: {

package/src/network.mjs

@@ -1,7 +1,6 @@
-import { default_attribute_writable } from "pacc";
+import { default_attribute_writable, addType } from "pacc";
 import { Owner } from "./owner.mjs";
 import { Subnet } from "./subnet.mjs";
-import { addType } from "./types.mjs";
 import { networkAttributes } from "./network-support.mjs";
 
 export const NetworkTypeDefinition = {

package/src/owner.mjs

@@ -3,12 +3,12 @@ import {
   default_attribute_writable,
   string_collection_attribute_writable,
   string_attribute_writable,
-  email_attribute
+  email_attribute,
+  addType, types
 } from "pacc";
 import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
-import { addType, types } from "./types.mjs";
 import { networks_attribute } from "./network-support.mjs";
 
 const OwnerTypeDefinition = {

package/src/root.mjs

@@ -1,7 +1,7 @@
 import { readFile, glob } from "node:fs/promises";
 import { join } from "node:path";
+import { typeFactory, addType, types, resolveTypeLinks } from "pacc";
 import { Location } from "./location.mjs";
-import { addType, types, resolveTypeLinks, typeFactory } from "./types.mjs";
 
 const RootTypeDefinition = {
   name: "root",

package/src/service.mjs

@@ -3,7 +3,8 @@ import {
   string_collection_attribute,
   string_collection_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_false
+  boolean_attribute_false,
+  addType
 } from "pacc";
 import {
   Base,
@@ -13,7 +14,6 @@ import {
   HTTPEndpoint,
   UnixEndpoint
 } from "pmcf";
-import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressAttributes } from "./network-support.mjs";
 import {

package/src/services/bind.mjs

@@ -3,6 +3,7 @@ import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal, reverseArpa } from "ip-utilties";
 import {
+  addType,
   oneOfType,
   default_attribute_writable,
   string_attribute_writable,
@@ -23,9 +24,9 @@ import {
   ExtraSourceService,
   serviceEndpoints,
   addresses,
-  networkAddressType
+  networkAddressType,
+  addServiceType
 } from "pmcf";
-import { addType } from "../types.mjs";
 import { ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
@@ -56,7 +57,7 @@ const BindServiceTypeDefinition = {
       writable: true
     },*/
     zones: {
-      type: oneOfType([networkAddressType, "location", "owner"]),
+      type: networkAddressType + "|location|owner",
       collection: true,
       writable: true
     },
@@ -154,6 +155,7 @@ export class BindService extends ExtraSourceService {
   minimum = 60000;
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {
@@ -329,7 +331,6 @@ export class BindService extends ExtraSourceService {
       name: `named-zones-${name}-outfacing`,
       description: `outfacing zone definitions for ${names}`,
       access: "private",
-      replaces: [`named-zones-${name}-OUTFACING`],
       hooks: {}
     };
 
@@ -357,9 +358,9 @@ export class BindService extends ExtraSourceService {
       addHook(
         packageData.properties.hooks,
         "post_upgrade",
-        `/usr/bin/named-hostname-info ${outfacingZones
+        `/usr/bin/named-hostname-update ${outfacingZones
           .map(zone => zone.id)
-          .join(" ")}|/usr/bin/named-hostname-update`
+          .join(" ")}`
       );
 
       await this.writeZones(packageData, configs);

package/src/services/chrony.mjs

@@ -1,7 +1,8 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
-import { addType } from "../types.mjs";
+import { addType } from "pacc";
+import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, serviceEndpoints } from "../service.mjs";
 import {
   ExtraSourceService,
@@ -45,6 +46,7 @@ const ChronyServiceTypeDefinition = {
 export class ChronyService extends ExtraSourceService {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

package/src/services/headscale.mjs

@@ -1,4 +1,5 @@
-import { addType } from "../types.mjs";
+import { addType } from "pacc";
+import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 const HeadscaleServiceTypeDefinition = {
@@ -40,6 +41,7 @@ const HeadscaleServiceTypeDefinition = {
 export class HeadscaleService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

package/src/services/influxdb.mjs

@@ -1,8 +1,8 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { boolean_attribute_writable_true } from "pacc";
+import { boolean_attribute_writable_true, addType } from "pacc";
+import { addServiceType } from "pmcf";
 import { writeLines } from "../utils.mjs";
-import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const InfluxdbServiceTypeDefinition = {
@@ -38,6 +38,7 @@ const InfluxdbServiceTypeDefinition = {
 export class InfluxdbService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

package/src/services/kea.mjs

@@ -4,9 +4,11 @@ import { reverseArpa, isLinkLocal } from "ip-utilties";
 import {
   string_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_writable_true
+  boolean_attribute_writable_true,
+  addType
 } from "pacc";
 import {
+  addServiceType,
   Service,
   sortDescendingByPriority,
   ServiceTypeDefinition,
@@ -14,7 +16,6 @@ import {
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6
 } from "pmcf";
-import { addType } from "../types.mjs";
 import { writeLines } from "../utils.mjs";
 
 const KeaServiceTypeDefinition = {
@@ -130,6 +131,7 @@ const keaVersion = "3.0.1";
 export class KeaService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

package/src/services/mosquitto.mjs

@@ -1,8 +1,8 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { boolean_attribute_writable_true } from "pacc";
+import { boolean_attribute_writable_true, addType } from "pacc";
+import { addServiceType } from "pmcf";
 import { writeLines } from "../utils.mjs";
-import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const MosquittoServiceTypeDefinition = {
@@ -29,6 +29,7 @@ const MosquittoServiceTypeDefinition = {
 export class MosquittoService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

package/src/services/openldap.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { string_attribute_writable } from "pacc";
-import { addType } from "../types.mjs";
+import { string_attribute_writable, addType } from "pacc";
+import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 import { writeLines } from "../utils.mjs";
 import { addHook } from "../hooks.mjs";
@@ -35,6 +35,7 @@ const OpenLDAPServiceTypeDefinition = {
 export class OpenLDAPService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

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

@@ -1,5 +1,5 @@
-import { Service, ServiceTypeDefinition } from "pmcf";
-import { addType } from "../types.mjs";
+import { addType } from "pacc";
+import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
 
 const SystemdJournalRemoteServiceTypeDefinition = {
   name: "systemd-journal-remote",
@@ -30,6 +30,7 @@ const SystemdJournalRemoteServiceTypeDefinition = {
 export class SystemdJournalRemoteService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

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

@@ -1,6 +1,5 @@
-import { string_attribute_writable } from "pacc";
-import { Service, ServiceTypeDefinition } from "pmcf";
-import { addType } from "../types.mjs";
+import { string_attribute_writable, addType } from "pacc";
+import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
 
 const SystemdJournalUploadServiceTypeDefinition = {
   name: "systemd-journal-upload",
@@ -16,6 +15,7 @@ const SystemdJournalUploadServiceTypeDefinition = {
 export class SystemdJournalUploadService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {

package/src/services/systemd-journal.mjs

@@ -1,5 +1,5 @@
+import { addType } from "pacc";
 import { Service, ServiceTypeDefinition } from "pmcf";
-import { addType } from "../types.mjs";
 
 const SystemdJournalServiceTypeDefinition = {
   name: "systemd-journal",

package/src/services/systemd-resolved.mjs

@@ -1,10 +1,10 @@
+import { addType } from "pacc";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition,
   ServiceTypeDefinition,
-  serviceEndpoints
+  serviceEndpoints,
 } from "pmcf";
-import { addType } from "../types.mjs";
 
 const SystemdResolvedServiceTypeDefinition = {
   name: "systemd-resolved",

package/src/services/systemd-timesyncd.mjs

@@ -1,10 +1,10 @@
+import { addType } from "pacc";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition,
   ServiceTypeDefinition,
   serviceEndpoints
 } from "pmcf";
-import { addType } from "../types.mjs";
 
 const SystemdTimesyncdServiceTypeDefinition = {
   name: "systemd-timesyncd",

package/src/services/tailscale.mjs

@@ -1,4 +1,4 @@
-import { addType } from "../types.mjs";
+import { addType } from "pacc";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 export class TailscaleService extends Service {

package/src/subnet.mjs

@@ -6,10 +6,9 @@ import {
   familyIP,
   matchPrefixIP
 } from "ip-utilties";
-import { string_attribute, name_attribute, number_attribute } from "pacc";
+import { string_attribute, name_attribute, number_attribute, addType } from "pacc";
 import { networks_attribute } from "./network-support.mjs";
 import { Base } from "./base.mjs";
-import { addType } from "./types.mjs";
 
 const SubnetTypeDefinition = {
   name: "subnet",