pmcf 3.9.3 → 3.10.0

package/package.json

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

package/src/extra-source-service.mjs

@@ -1,5 +1,6 @@
 import { addType } from "./types.mjs";
 import { Service, ServiceTypeDefinition } from "./service.mjs";
+import { networkAddressType } from "pmcf";
 
 export const ExtraSourceServiceTypeDefinition = {
   name: "extra-source-service",
@@ -7,7 +8,7 @@ export const ExtraSourceServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   properties: {
-    source: { type: "network", collection: true, writable: true }
+    source: { type: networkAddressType, collection: true, writable: true }
   }
 };
 

package/src/network-support.mjs

@@ -6,6 +6,8 @@ import {
   boolean_attribute_writable
 } from "pacc";
 
+export const networkAddressType = ["network", "host", "network_interface"];
+
 export const networkProperties = {
   scope: {
     ...string_attribute_writable,

package/src/services/bind.mjs

@@ -16,14 +16,12 @@ import {
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
-import { ExtraSourceService, serviceEndpoints, addresses } from "pmcf";
+import { ExtraSourceService, serviceEndpoints, addresses, networkAddressType } from "pmcf";
 import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
 
-const address_types = ["network", "host", "network_interface"];
-
 const BindServiceTypeDefinition = {
   name: "bind",
   specializationOf: ServiceTypeDefinition,
@@ -32,17 +30,17 @@ const BindServiceTypeDefinition = {
   priority: 0.1,
   properties: {
     addresses: {
-      type: ["network", "host", "network_interface", "location", "owner"],
+      type: [...networkAddressType, "location", "owner"],
       collection: true,
       writable: true
     },
     trusted: {
-      type: address_types,
+      type: networkAddressType,
       collection: true,
       writable: true
     },
-    protected: { type: address_types, collection: true, writable: true },
-    internal: { type: address_types, collection: true, writable: true },
+    protected: { type: networkAddressType, collection: true, writable: true },
+    internal: { type: networkAddressType, collection: true, writable: true },
     hasSVRRecords: boolean_attribute_writable_false,
     hasCatalog: boolean_attribute_writable_true,
     hasLinkLocalAdresses: boolean_attribute_writable_false,
@@ -50,7 +48,7 @@ const BindServiceTypeDefinition = {
     excludeInterfaceKinds: {
       ...string_collection_attribute_writable
     },
-    exclude: { type: address_types, collection: true, writable: true },
+    exclude: { type: networkAddressType, collection: true, writable: true },
     notify: boolean_attribute_writable_false,
     recordTTL: { ...string_attribute_writable },
     serial: { ...number_attribute, writable: true },

package/types/extra-source-service.d.mts

@@ -5,9 +5,9 @@ export namespace ExtraSourceServiceTypeDefinition {
     export let priority: number;
     export namespace properties {
         namespace source {
-            let type: string;
-            let collection: boolean;
-            let writable: boolean;
+            export { networkAddressType as type };
+            export let collection: boolean;
+            export let writable: boolean;
         }
     }
 }
@@ -216,7 +216,7 @@ export class ExtraSourceService extends Service {
         priority: number;
         properties: {
             source: {
-                type: string;
+                type: string[];
                 collection: boolean;
                 writable: boolean;
             };
@@ -228,4 +228,5 @@ export class ExtraSourceService extends Service {
     get source(): any[];
 }
 import { ServiceTypeDefinition } from "./service.mjs";
+import { networkAddressType } from "pmcf";
 import { Service } from "./service.mjs";

package/types/network-support.d.mts

@@ -1,3 +1,4 @@
+export const networkAddressType: string[];
 export namespace networkProperties {
     export let scope: {
         values: string[];

package/types/services/bind.d.mts

@@ -404,7 +404,7 @@ export class BindService extends ExtraSourceService {
             priority: number;
             properties: {
                 source: {
-                    type: string;
+                    type: string[];
                     collection: boolean;
                     writable: boolean;
                 };

package/types/services/chrony.d.mts

@@ -404,7 +404,7 @@ export class ChronyService extends ExtraSourceService {
             priority: number;
             properties: {
                 source: {
-                    type: string;
+                    type: string[];
                     collection: boolean;
                     writable: boolean;
                 };

package/types/services/headscale.d.mts

@@ -404,7 +404,7 @@ export class HeadscaleService extends ExtraSourceService {
             priority: number;
             properties: {
                 source: {
-                    type: string;
+                    type: string[];
                     collection: boolean;
                     writable: boolean;
                 };

package/types/services/systemd-resolved.d.mts

@@ -404,7 +404,7 @@ export class SystemdResolvedService extends ExtraSourceService {
             priority: number;
             properties: {
                 source: {
-                    type: string;
+                    type: string[];
                     collection: boolean;
                     writable: boolean;
                 };

package/types/services/systemd-timesyncd.d.mts

@@ -404,7 +404,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
             priority: number;
             properties: {
                 source: {
-                    type: string;
+                    type: string[];
                     collection: boolean;
                     writable: boolean;
                 };