pmcf 3.13.6 → 3.13.8

package/package.json

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

package/src/base.mjs

@@ -507,7 +507,7 @@ export class Base {
     const context = {
       stopClass: Base,
       root: this,
-      globals: Object.assign({}, this.properties, this.owner.properties)
+      globals: Object.assign({}, this.properties, this.owner?.properties)
     };
 
     return expand(object, context);

package/src/cluster.mjs

@@ -14,7 +14,6 @@ import { writeLines } from "./utils.mjs";
 const ClusterTypeDefinition = {
   name: "cluster",
   owners: [Owner.typeDefinition, "network", "location", "root"],
-  priority: 0.7,
   extends: Host.typeDefinition,
   key: "name",
   attributes: {

package/src/extra-source-service.mjs

@@ -8,7 +8,6 @@ export const ExtraSourceServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   attributes: {
     source: {
       ...default_attribute_writable,

package/src/host.mjs

@@ -26,7 +26,6 @@ import { NetworkInterfaceTypeDefinition } from "./network-interfaces/network-int
 
 const HostTypeDefinition = {
   name: "host",
-  priority: 0.5,
   owners: ["owner", "network", "root"],
   extends: Base.typeDefinition,
   key: "name",

package/src/location.mjs

@@ -7,7 +7,6 @@ import { loadHooks } from "./hooks.mjs";
 const LocationTypeDefinition = {
   name: "location",
   owners: [Owner.typeDefinition, "location", "root"],
-  priority: 1.0,
   extends: Owner.typeDefinition,
   key: "name",
   attributes: {

package/src/module.mjs

@@ -26,6 +26,7 @@ export * from "./services/openldap.mjs";
 export * from "./services/influxdb.mjs";
 export * from "./services/mosquitto.mjs";
 export * from "./services/headscale.mjs";
+export * from "./services/tailscale.mjs";
 export * from "./services/systemd-journal.mjs";
 export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";

package/src/network-interfaces/ethernet.mjs

@@ -10,7 +10,6 @@ export const EthernetNetworkInterfaceTypeDefinition = {
   extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   attributes: {
     arpbridge: {

package/src/network-interfaces/loopback.mjs

@@ -8,7 +8,6 @@ const LoopbackNetworkInterfaceTypeDefinition = {
   extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  priority: 0.1,
   key: "name"
 };
 

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

@@ -17,7 +17,6 @@ import { Network } from "../network.mjs";
 
 export const NetworkInterfaceTypeDefinition = {
   name: "network_interface",
-  priority: 0.4,
   owners: ["host"],
   extends: Base.typeDefinition,
   specializations: {},

package/src/network-interfaces/tun.mjs

@@ -7,7 +7,6 @@ const TUNdNetworkInterfaceTypeDefinition = {
   extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  priority: 0.1,
   key: "name"
 };
 

package/src/network-interfaces/wireguard.mjs

@@ -7,7 +7,6 @@ const WireguardNetworkInterfaceTypeDefinition = {
   extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  priority: 0.1,
   key: "name"
 };
 

package/src/network-interfaces/wlan.mjs

@@ -14,7 +14,6 @@ const WLANNetworkInterfaceTypeDefinition = {
   extends: EthernetNetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: EthernetNetworkInterfaceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   attributes: {
     ssid: string_attribute_writable,

package/src/network.mjs

@@ -7,7 +7,6 @@ import { networkAttributes } from "./network-support.mjs";
 export const NetworkTypeDefinition = {
   name: "network",
   owners: ["location", "owner", "root"],
-  priority: 0.8,
   extends: Owner.typeDefinition,
   key: "name",
   attributes: {

package/src/owner.mjs

@@ -14,7 +14,6 @@ import { networks_attribute } from "./network-support.mjs";
 const OwnerTypeDefinition = {
   name: "owner",
   owners: ["location", "owner", "root"],
-  priority: 0.9,
   extends: Base.typeDefinition,
   key: "name",
   attributes: {

package/src/root.mjs

@@ -5,7 +5,6 @@ import { addType, types, resolveTypeLinks, typeFactory } from "./types.mjs";
 
 const RootTypeDefinition = {
   name: "root",
-  priority: 1000,
   extends: Location.typeDefinition
 };
 
@@ -76,9 +75,9 @@ export class Root extends Location {
 
   async loadAll() {
     for (const type of Object.values(types).sort(
-      (a, b) => b.priority - a.priority
+      (a, b) => (b.priority || 1.0) - (a.priority || 1.0)
     )) {
-      if (type.clazz) {
+      if (type.clazz?.fileNameGlob) {
         for await (const name of glob(type.clazz.fileNameGlob, {
           cwd: this.directory
         })) {

package/src/service.mjs

@@ -43,7 +43,6 @@ export const endpointAttributes = {
 export const EndpointTypeDefinition = {
   name: "endpoint",
   owners: ["service", "network_interface"],
-  priority: 0.4,
   specializations: {},
   key: "type",
   attributes: endpointAttributes
@@ -52,7 +51,6 @@ export const EndpointTypeDefinition = {
 export const ServiceTypeDefinition = {
   name: "service",
   owners: [Host.typeDefinition, "cluster", "network_interface"],
-  priority: 0.4,
   extends: Base.typeDefinition,
   specializations: {},
   factoryFor(owner, value) {

package/src/services/bind.mjs

@@ -48,7 +48,6 @@ const BindServiceTypeDefinition = {
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   attributes: {
     /*views: {

package/src/services/chrony.mjs

@@ -14,7 +14,6 @@ const ChronyServiceTypeDefinition = {
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   service: {
     extends: ["ntp"],

package/src/services/headscale.mjs

@@ -1,16 +1,11 @@
 import { addType } from "../types.mjs";
-import { ServiceTypeDefinition } from "../service.mjs";
-import {
-  ExtraSourceService,
-  ExtraSourceServiceTypeDefinition
-} from "../extra-source-service.mjs";
+import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 const HeadscaleServiceTypeDefinition = {
   name: "headscale",
-  extends: ExtraSourceServiceTypeDefinition,
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   service: {
     endpoints: [
@@ -30,7 +25,7 @@ const HeadscaleServiceTypeDefinition = {
   }
 };
 
-export class HeadscaleService extends ExtraSourceService {
+export class HeadscaleService extends Service {
   static {
     addType(this);
   }

package/src/services/influxdb.mjs

@@ -10,7 +10,7 @@ const InfluxdbServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
+  //: 0.1,
   key: "name",
   attributes: {
     "metrics-disabled": {

package/src/services/kea.mjs

@@ -22,7 +22,6 @@ const KeaServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   attributes: {
     "ddns-send-updates": {

package/src/services/mosquitto.mjs

@@ -10,7 +10,6 @@ const MosquittoServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   attributes: {
     log_timestamp: {

package/src/services/openldap.mjs

@@ -11,7 +11,6 @@ const OpenLDAPServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   attributes: {
     baseDN: string_attribute_writable,

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

@@ -6,7 +6,6 @@ const SystemdJournalRemoteServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   service: {
     services: {

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

@@ -7,7 +7,6 @@ const SystemdJournalUploadServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name",
   attributes: {
     url: string_attribute_writable

package/src/services/systemd-journal.mjs

@@ -6,7 +6,6 @@ const SystemdJournalServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name"
 };
 

package/src/services/systemd-resolved.mjs

@@ -11,7 +11,6 @@ const SystemdResolvedServiceTypeDefinition = {
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
   key: "name"
 };
 

package/src/services/systemd-timesyncd.mjs

@@ -11,7 +11,6 @@ const SystemdTimesyncdServiceTypeDefinition = {
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1
 };
 
 export class SystemdTimesyncdService extends ExtraSourceService {

package/src/services/tailscale.mjs

@@ -0,0 +1,24 @@
+import { addType } from "../types.mjs";
+import { ServiceTypeDefinition, Service } from "../service.mjs";
+
+export class TailscaleService extends Service {
+  static name = "tailscale";
+  static extends = ServiceTypeDefinition;
+  static specializationOf = ServiceTypeDefinition;
+  static owners = ServiceTypeDefinition.owners;
+  static key = "name";
+  static service = {
+    endpoints: [
+      {
+        family: "IPv4",
+        port: 41641,
+        protocol: "tcp",
+        tls: false
+      }
+    ]
+  };
+
+  /*static {
+    addType(TailscaleService);
+  }*/
+}

package/src/subnet.mjs

@@ -14,7 +14,6 @@ import { addType } from "./types.mjs";
 const SubnetTypeDefinition = {
   name: "subnet",
   owners: ["location", "owner", "network", "root"],
-  priority: 0.6,
   constructWithIdentifierOnly: true,
   key: "address",
   attributes: {

package/types/cluster.d.mts

@@ -4,7 +4,6 @@ export class Cluster extends Host {
         owners: (string | {
             name: string;
             owners: string[];
-            priority: number;
             extends: {
                 name: string;
                 key: string;
@@ -97,7 +96,6 @@ export class Cluster extends Host {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         constructWithIdentifierOnly: boolean;
                         key: string;
                         attributes: {
@@ -166,10 +164,8 @@ export class Cluster extends Host {
                 };
             };
         })[];
-        priority: number;
         extends: {
             name: string;
-            priority: number;
             owners: string[];
             extends: {
                 name: string;

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

@@ -4,7 +4,6 @@ export namespace ExtraSourceServiceTypeDefinition {
     export { ServiceTypeDefinition as specializationOf };
     export let owners: (string | {
         name: string;
-        priority: number;
         owners: string[];
         extends: {
             name: string;
@@ -202,7 +201,6 @@ export namespace ExtraSourceServiceTypeDefinition {
             address: import("pacc").AttributeDefinition;
         };
     })[];
-    export let priority: number;
     export namespace attributes {
         let source: {
             type: any;
@@ -231,7 +229,6 @@ export class ExtraSourceService extends Service {
             name: string;
             owners: (string | {
                 name: string;
-                priority: number;
                 owners: string[];
                 extends: {
                     name: string;
@@ -429,7 +426,6 @@ export class ExtraSourceService extends Service {
                     address: import("pacc").AttributeDefinition;
                 };
             })[];
-            priority: number;
             extends: {
                 name: string;
                 key: string;
@@ -536,7 +532,6 @@ export class ExtraSourceService extends Service {
             name: string;
             owners: (string | {
                 name: string;
-                priority: number;
                 owners: string[];
                 extends: {
                     name: string;
@@ -734,7 +729,6 @@ export class ExtraSourceService extends Service {
                     address: import("pacc").AttributeDefinition;
                 };
             })[];
-            priority: number;
             extends: {
                 name: string;
                 key: string;
@@ -839,7 +833,6 @@ export class ExtraSourceService extends Service {
         };
         owners: (string | {
             name: string;
-            priority: number;
             owners: string[];
             extends: {
                 name: string;
@@ -1037,7 +1030,6 @@ export class ExtraSourceService extends Service {
                 address: import("pacc").AttributeDefinition;
             };
         })[];
-        priority: number;
         attributes: {
             source: {
                 type: any;

package/types/host.d.mts

@@ -1,7 +1,6 @@
 export class Host extends ServiceOwner {
     static get typeDefinition(): {
         name: string;
-        priority: number;
         owners: string[];
         extends: {
             name: string;

package/types/location.d.mts

@@ -4,7 +4,6 @@ export class Location extends Owner {
         owners: (string | {
             name: string;
             owners: string[];
-            priority: number;
             extends: {
                 name: string;
                 key: string;
@@ -97,7 +96,6 @@ export class Location extends Owner {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         constructWithIdentifierOnly: boolean;
                         key: string;
                         attributes: {
@@ -166,11 +164,9 @@ export class Location extends Owner {
                 };
             };
         })[];
-        priority: number;
         extends: {
             name: string;
             owners: string[];
-            priority: number;
             extends: {
                 name: string;
                 key: string;
@@ -263,7 +259,6 @@ export class Location extends Owner {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         constructWithIdentifierOnly: boolean;
                         key: string;
                         attributes: {

package/types/module.d.mts

@@ -26,6 +26,7 @@ export * from "./services/openldap.mjs";
 export * from "./services/influxdb.mjs";
 export * from "./services/mosquitto.mjs";
 export * from "./services/headscale.mjs";
+export * from "./services/tailscale.mjs";
 export * from "./services/systemd-journal.mjs";
 export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";

package/types/network-interfaces/ethernet.d.mts

@@ -3,7 +3,6 @@ export namespace EthernetNetworkInterfaceTypeDefinition {
     export { NetworkInterfaceTypeDefinition as extends };
     export { NetworkInterfaceTypeDefinition as specializationOf };
     export let owners: string[];
-    export let priority: number;
     export let key: string;
     export namespace attributes {
         let arpbridge: {
@@ -31,7 +30,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
         name: string;
         extends: {
             name: string;
-            priority: number;
             owners: string[];
             extends: {
                 name: string;
@@ -111,11 +109,9 @@ export class EthernetNetworkInterface extends NetworkInterface {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         extends: {
                             name: string;
                             owners: string[];
-                            priority: number;
                             extends: {
                                 name: string;
                                 key: string;
@@ -208,7 +204,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
                                     type: {
                                         name: string;
                                         owners: string[];
-                                        priority: number;
                                         constructWithIdentifierOnly: boolean;
                                         key: string;
                                         attributes: {
@@ -548,7 +543,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
         };
         specializationOf: {
             name: string;
-            priority: number;
             owners: string[];
             extends: {
                 name: string;
@@ -628,11 +622,9 @@ export class EthernetNetworkInterface extends NetworkInterface {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         extends: {
                             name: string;
                             owners: string[];
-                            priority: number;
                             extends: {
                                 name: string;
                                 key: string;
@@ -725,7 +717,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
                                     type: {
                                         name: string;
                                         owners: string[];
-                                        priority: number;
                                         constructWithIdentifierOnly: boolean;
                                         key: string;
                                         attributes: {
@@ -1064,7 +1055,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
             };
         };
         owners: string[];
-        priority: number;
         key: string;
         attributes: {
             arpbridge: {

package/types/network-interfaces/loopback.d.mts

@@ -3,7 +3,6 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
         name: string;
         extends: {
             name: string;
-            priority: number;
             owners: string[];
             extends: {
                 name: string;
@@ -83,11 +82,9 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         extends: {
                             name: string;
                             owners: string[];
-                            priority: number;
                             extends: {
                                 name: string;
                                 key: string;
@@ -180,7 +177,6 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                                     type: {
                                         name: string;
                                         owners: string[];
-                                        priority: number;
                                         constructWithIdentifierOnly: boolean;
                                         key: string;
                                         attributes: {
@@ -520,7 +516,6 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
         };
         specializationOf: {
             name: string;
-            priority: number;
             owners: string[];
             extends: {
                 name: string;
@@ -600,11 +595,9 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         extends: {
                             name: string;
                             owners: string[];
-                            priority: number;
                             extends: {
                                 name: string;
                                 key: string;
@@ -697,7 +690,6 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                                     type: {
                                         name: string;
                                         owners: string[];
-                                        priority: number;
                                         constructWithIdentifierOnly: boolean;
                                         key: string;
                                         attributes: {
@@ -1036,7 +1028,6 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
             };
         };
         owners: string[];
-        priority: number;
         key: string;
     };
     static isCommonName(name: any): any;