pmcf 3.13.4 → 3.13.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.13.4",
+  "version": "3.13.6",
   "publishConfig": {
     "access": "public"
   },
@@ -53,16 +53,16 @@
   "dependencies": {
     "ip-utilties": "^1.4.9",
     "npm-pkgbuild": "^18.3.9",
-    "pacc": "^4.39.2",
+    "pacc": "^4.39.3",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
-    "@types/node": "^24.6.0",
+    "@types/node": "^24.6.2",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "semantic-release": "^24.2.9",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   },
   "engines": {
     "node": ">=22.20.0"

package/src/extra-source-service.mjs

@@ -5,8 +5,9 @@ import { networkAddressType } from "pmcf";
 
 export const ExtraSourceServiceTypeDefinition = {
   name: "extra-source-service",
-  owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
+  specializationOf: ServiceTypeDefinition,
+  owners: ServiceTypeDefinition.owners,
   priority: 0.1,
   attributes: {
     source: {

package/src/network-interfaces/ethernet.mjs

@@ -7,9 +7,9 @@ import {
 
 export const EthernetNetworkInterfaceTypeDefinition = {
   name: "ethernet",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {

package/src/network-interfaces/loopback.mjs

@@ -5,9 +5,9 @@ import { addType } from "../types.mjs";
 
 const LoopbackNetworkInterfaceTypeDefinition = {
   name: "loopback",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
   key: "name"
 };

package/src/network-interfaces/tun.mjs

@@ -4,9 +4,9 @@ import { addType } from "../types.mjs";
 
 const TUNdNetworkInterfaceTypeDefinition = {
   name: "tun",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
   key: "name"
 };

package/src/network-interfaces/wireguard.mjs

@@ -4,9 +4,9 @@ import { addType } from "../types.mjs";
 
 const WireguardNetworkInterfaceTypeDefinition = {
   name: "wireguard",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
   key: "name"
 };

package/src/network-interfaces/wlan.mjs

@@ -11,9 +11,9 @@ import {
 
 const WLANNetworkInterfaceTypeDefinition = {
   name: "wlan",
+  extends: EthernetNetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: EthernetNetworkInterfaceTypeDefinition.owners,
-  extends: EthernetNetworkInterfaceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {

package/src/services/bind.mjs

@@ -9,7 +9,8 @@ import {
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
   number_attribute_writable,
-  string_collection_attribute_writable
+  string_collection_attribute_writable,
+  name_attribute_writable
 } from "pacc";
 import { writeLines, asArray } from "../utils.mjs";
 import {
@@ -25,18 +26,36 @@ import {
   networkAddressType
 } from "pmcf";
 import { addType } from "../types.mjs";
-import { Service, ServiceTypeDefinition } from "../service.mjs";
+import { ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
 
+const BindServiceViewTypeDefinition = {
+  name: "bind-view",
+  key: "name",
+  attributes: {
+    name: { ...name_attribute_writable },
+    access: {
+      type: networkAddressType,
+      collection: true,
+      writable: true
+    }
+  }
+};
+
 const BindServiceTypeDefinition = {
   name: "bind",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {
+    /*views: {
+      type: "object", //BindServiceViewTypeDefinition,
+      collection: true,
+      writable: true
+    },*/
     zones: {
       type: oneOfType([networkAddressType, "location", "owner"]),
       collection: true,

package/src/services/chrony.mjs

@@ -2,11 +2,7 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
 import { addType } from "../types.mjs";
-import {
-  Service,
-  ServiceTypeDefinition,
-  serviceEndpoints
-} from "../service.mjs";
+import { ServiceTypeDefinition, serviceEndpoints } from "../service.mjs";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition
@@ -15,9 +11,9 @@ import { writeLines } from "../utils.mjs";
 
 const ChronyServiceTypeDefinition = {
   name: "chrony",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   service: {

package/src/services/headscale.mjs

@@ -7,9 +7,9 @@ import {
 
 const HeadscaleServiceTypeDefinition = {
   name: "headscale",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   service: {

package/src/services/influxdb.mjs

@@ -7,9 +7,9 @@ import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const InfluxdbServiceTypeDefinition = {
   name: "influxdb",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {

package/src/services/kea.mjs

@@ -19,9 +19,9 @@ import { writeLines } from "../utils.mjs";
 
 const KeaServiceTypeDefinition = {
   name: "kea",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {
@@ -155,7 +155,7 @@ export class KeaService extends Service {
     console.log("kea", name, network.name);
 
     const dnsServerEndpoints = serviceEndpoints(network, {
-      services: 'type="dns" && priority >= 300',
+      services: 'in("dns",types) && priority>=300',
       endpoints: endpoint => endpoint.networkInterface?.kind !== "loopback"
     });
 

package/src/services/mosquitto.mjs

@@ -7,9 +7,9 @@ import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const MosquittoServiceTypeDefinition = {
   name: "mosquitto",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {

package/src/services/openldap.mjs

@@ -8,9 +8,9 @@ import { addHook } from "../hooks.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {

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

@@ -3,9 +3,9 @@ import { addType } from "../types.mjs";
 
 const SystemdJournalRemoteServiceTypeDefinition = {
   name: "systemd-journal-remote",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   service: {

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

@@ -4,9 +4,9 @@ import { addType } from "../types.mjs";
 
 const SystemdJournalUploadServiceTypeDefinition = {
   name: "systemd-journal-upload",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name",
   attributes: {

package/src/services/systemd-journal.mjs

@@ -3,9 +3,9 @@ import { addType } from "../types.mjs";
 
 const SystemdJournalServiceTypeDefinition = {
   name: "systemd-journal",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name"
 };

package/src/services/systemd-resolved.mjs

@@ -8,9 +8,9 @@ import { addType } from "../types.mjs";
 
 const SystemdResolvedServiceTypeDefinition = {
   name: "systemd-resolved",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
   key: "name"
 };

package/src/types.mjs

@@ -7,16 +7,14 @@ import {
 import { addServiceType } from "./service-types.mjs";
 export { types };
 
-export function addType(clazz) {
-  const type = clazz.typeDefinition;
-  type.clazz = clazz;
+export function addType(type) {
+  type = paccAddType(type);
 
   if (type.specializationOf) {
     type.specializationOf.specializations[type.name] = type;
   }
 
   addServiceType(type.service, type.name);
-  paccAddType(type);
 }
 
 export function resolveTypeLinks() {