pmcf 3.1.2 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "ip-utilties": "^1.4.7",
     "npm-pkgbuild": "^18.2.16",
-    "pacc": "^4.1.0",
+    "pacc": "^4.1.1",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
-import { getAttribute, default_attribute, description_attribute, boolean_attribute } from "pacc";
+import { getAttribute, default_attribute, number_attribute, description_attribute, boolean_attribute } from "pacc";
 import { addType, primitives, typeFactory } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 
@@ -16,7 +16,7 @@ const BaseTypeDefinition = {
       writable: true
     },
     description: { ...description_attribute, writable: true },
-    priority: { type: "number", collection: false, writable: true },
+    priority: { ...number_attribute, writable: true },
     directory: { ...default_attribute, writable: false },
     packaging: { ...default_attribute, writable: true },
     disabled: {

package/src/cluster.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
+import { number_attribute } from "pacc";
 import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
 import { serviceEndpoints } from "pmcf";
@@ -12,11 +13,11 @@ const ClusterTypeDefinition = {
   priority: 0.7,
   extends: Host.typeDefinition,
   properties: {
-    routerId: { type: "number", collection: false, writable: true },
+    routerId: { ...number_attribute, writable: true },
     masters: { type: "network_interface", collection: true, writable: true },
     backups: { type: "network_interface", collection: true, writable: true },
     members: { type: "network_interface", collection: true, writable: false },
-    checkInterval: { type: "number", collection: false, writable: true }
+    checkInterval: { ...number_attribute, writable: true }
   }
 };
 

package/src/host.mjs

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { default_attribute } from "pacc";
+import { default_attribute, number_attribute, boolean_attribute_false } from "pacc";
 import { ServiceOwner, Base, addresses } from "pmcf";
 import { networkAddressProperties } from "./network-support.mjs";
 import { addHook } from "./hooks.mjs";
@@ -31,7 +31,7 @@ const HostTypeDefinition = {
       writable: true
     },
     services: { type: "service", collection: true, writable: true },
-    aliases: { type: "string", collection: true, writable: true },
+    aliases: { ...default_attribute, collection: true, writable: true },
     os: {
       ...default_attribute,
       writable: true,
@@ -44,7 +44,7 @@ const HostTypeDefinition = {
       writable: true,
       values: ["production", "development"]
     },
-    weight: { type: "number", collection: false, writable: true },
+    weight: { ...number_attribute, writable: true },
     serial: { ...default_attribute, writable: true },
     vendor: { ...default_attribute, writable: true },
     keymap: { ...default_attribute, writable: true },
@@ -76,7 +76,7 @@ const HostTypeDefinition = {
     provides: { ...default_attribute, collection: true, writable: true },
     extends: { type: "host", collection: true, writable: true },
     model: { ...default_attribute, collection: false, writable: false },
-    isModel: { type: "boolean", collection: false, writable: false }
+    isModel: boolean_attribute_false
   }
 };
 

package/src/network-support.mjs

@@ -1,4 +1,4 @@
-import { default_attribute, hostname_attribute, boolean_attribute } from "pacc";
+import { default_attribute, number_attribute, hostname_attribute, boolean_attribute } from "pacc";
 
 export const networkProperties = {
   scope: {
@@ -19,8 +19,8 @@ export const networkProperties = {
   },
   ssid: { ...default_attribute, writable: true },
   psk: { ...default_attribute, writable: true },
-  metric: { type: "number", collection: false, writable: true, default: 1004 },
-  mtu: { type: "number", collection: false, writable: true, default: 1500 },
+  metric: { ...number_attribute, writable: true, default: 1004 },
+  mtu: { ...number_attribute, writable: true, default: 1500 },
   gateway: { type: "host", collection: false, writable: true },
   multicastDNS: {
     ...boolean_attribute,

package/src/service.mjs

@@ -1,4 +1,4 @@
-import { default_attribute, boolean_attribute } from "pacc";
+import { default_attribute, string_attribute, number_attribute, boolean_attribute_false } from "pacc";
 import {
   Base,
   Host,
@@ -20,7 +20,7 @@ import {
 } from "./dns-utils.mjs";
 
 export const endpointProperties = {
-  port: { type: "number", collection: false, writable: true },
+  port: { ...number_attribute, writable: true },
   protocol: {
     ...default_attribute,
     writable: true,
@@ -28,10 +28,7 @@ export const endpointProperties = {
   },
   type: { ...default_attribute, writable: true },
   types: { ...default_attribute, collection: true },
-  tls: {
-    ...boolean_attribute,
-    writable: false
-  }
+  tls: boolean_attribute_false
 };
 
 export const EndpointTypeDefinition = {
@@ -63,8 +60,8 @@ export const ServiceTypeDefinition = {
     ...networkAddressProperties,
     ...endpointProperties,
     alias: { ...default_attribute, writable: true },
-    weight: { type: "number", collection: false, writable: true, default: 1 },
-    systemd: { type: "string", collection: true, writable: true }
+    weight: { ...number_attribute, writable: true, default: 1 },
+    systemd: { ...string_attribute, collection: true, writable: true }
   }
 };
 

package/src/services/bind.mjs

@@ -2,7 +2,7 @@ import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal, reverseArpa } from "ip-utilties";
-import { boolean_attribute, default_attribute } from "pacc";
+import { default_attribute, boolean_attribute, number_attribute } from "pacc";
 import { writeLines, asArray } from "../utils.mjs";
 import {
   DNSRecord,
@@ -68,7 +68,7 @@ const BindServiceTypeDefinition = {
       default: false
     },
     recordTTL: { ...default_attribute, writable: true },
-    serial: { type: "number", collection: false, writable: true },
+    serial: { ...number_attribute, writable: true },
     refresh: { ...default_attribute, writable: true },
     retry: { ...default_attribute, writable: true },
     expire: { ...default_attribute, writable: true },

package/src/services/influxdb.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
+import { boolean_attribute_writeable_true } from "pacc";
 import { writeLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
@@ -10,7 +11,12 @@ const InfluxdbServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  properties: {
+    "metrics-disabled": {
+      ...boolean_attribute_writeable_true,
+      isCommonOption: true
+    }
+  },
   service: {
     endpoints: [
       {
@@ -64,7 +70,12 @@ export class InfluxdbService extends Service {
       }
     };
 
-    const lines = ["metrics-disabled: true"];
+    const lines = Object.entries(InfluxdbServiceTypeDefinition.properties)
+      .filter(
+        ([key, attribute]) =>
+          attribute.isCommonOption && this[key] !== undefined
+      )
+      .map(([key]) => `${key}: ${this[key]}`);
 
     await writeLines(join(dir, "etc", "influxdb"), "config.yml", lines);
 

package/src/services/mosquitto.mjs

@@ -1,5 +1,10 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
+import {
+  boolean_attribute_writeable_true,
+  boolean_attribute_writeable_false
+} from "pacc";
+
 import { writeLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
@@ -10,7 +15,16 @@ const MosquittoServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  properties: {
+    log_timestamp: {
+      ...boolean_attribute_writeable_false,
+      isCommonOption: true
+    },
+    allow_anonymous: {
+      ...boolean_attribute_writeable_false,
+      isCommonOption: true
+    }
+  },
   service: {
     extends: ["mqtt"]
   }
@@ -51,16 +65,21 @@ export class MosquittoService extends Service {
       }
     };
 
+    const lines = Object.entries(MosquittoServiceTypeDefinition.properties)
+      .filter(
+        ([key, attribute]) =>
+          attribute.isCommonOption && this[key] !== undefined
+      )
+      .map(([key]) => `${key}: ${this[key]}`);
+
     const endpoint = this.endpoint("mqtt");
 
-    const lines = [
+    lines.push(
       `listener ${endpoint.port}`,
-      "log_timestamp false",
-      "allow_anonymous true",
       "persistence_location /var/lib/mosquitto",
       "password_file /etc/mosquitto/passwd",
       "acl_file /etc/mosquitto/acl"
-    ];
+    );
 
     await writeLines(join(dir, "etc", "mosquitto"), "mosquitto.conf", lines);
 

package/src/subnet.mjs

@@ -6,7 +6,7 @@ import {
   familyIP,
   matchPrefixIP
 } from "ip-utilties";
-import { default_attribute } from "pacc";
+import { default_attribute, number_attribute } from "pacc";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
@@ -21,7 +21,7 @@ const SubnetTypeDefinition = {
       isKey: true
     },
     networks: { type: "network", collection: true, writable: true },
-    prefixLength: { type: "number", collection: false, writable: false }
+    prefixLength: { ...number_attribute, writable: false }
   }
 };
 

package/types/base.d.mts

@@ -43,9 +43,18 @@ export class Base {
                 env?: string[] | string;
             };
             priority: {
+                writable: boolean;
                 type: string;
+                isKey: boolean;
+                mandatory: boolean;
                 collection: boolean;
-                writable: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
             };
             directory: {
                 writable: boolean;

package/types/cluster.d.mts

@@ -44,9 +44,18 @@ export class Cluster extends Host {
                         env?: string[] | string;
                     };
                     priority: {
+                        writable: boolean;
                         type: string;
+                        isKey: boolean;
+                        mandatory: boolean;
                         collection: boolean;
-                        writable: boolean;
+                        private?: boolean;
+                        depends?: string;
+                        description?: string;
+                        default?: any;
+                        set?: Function;
+                        get?: Function;
+                        env?: string[] | string;
                     };
                     directory: {
                         writable: boolean;
@@ -149,9 +158,18 @@ export class Cluster extends Host {
                                 writable: boolean;
                             };
                             prefixLength: {
+                                writable: boolean;
                                 type: string;
+                                isKey: boolean;
+                                mandatory: boolean;
                                 collection: boolean;
-                                writable: boolean;
+                                private?: boolean;
+                                depends?: string;
+                                description?: string;
+                                default?: any;
+                                set?: Function;
+                                get?: Function;
+                                env?: string[] | string;
                             };
                         };
                     };
@@ -302,9 +320,18 @@ export class Cluster extends Host {
                         env?: string[] | string;
                     };
                     priority: {
+                        writable: boolean;
                         type: string;
+                        isKey: boolean;
+                        mandatory: boolean;
                         collection: boolean;
-                        writable: boolean;
+                        private?: boolean;
+                        depends?: string;
+                        description?: string;
+                        default?: any;
+                        set?: Function;
+                        get?: Function;
+                        env?: string[] | string;
                     };
                     directory: {
                         writable: boolean;
@@ -376,9 +403,18 @@ export class Cluster extends Host {
                     writable: boolean;
                 };
                 aliases: {
-                    type: string;
                     collection: boolean;
                     writable: boolean;
+                    type: string;
+                    isKey: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    env?: string[] | string;
                 };
                 os: {
                     writable: boolean;
@@ -439,9 +475,18 @@ export class Cluster extends Host {
                     env?: string[] | string;
                 };
                 weight: {
+                    writable: boolean;
                     type: string;
+                    isKey: boolean;
+                    mandatory: boolean;
                     collection: boolean;
-                    writable: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    env?: string[] | string;
                 };
                 serial: {
                     writable: boolean;
@@ -576,11 +621,7 @@ export class Cluster extends Host {
                     get?: Function;
                     env?: string[] | string;
                 };
-                isModel: {
-                    type: string;
-                    collection: boolean;
-                    writable: boolean;
-                };
+                isModel: import("pacc").AttributeDefinition;
                 hostName: {
                     writable: boolean;
                     type: string;
@@ -655,9 +696,18 @@ export class Cluster extends Host {
         };
         properties: {
             routerId: {
+                writable: boolean;
                 type: string;
+                isKey: boolean;
+                mandatory: boolean;
                 collection: boolean;
-                writable: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
             };
             masters: {
                 type: string;
@@ -675,9 +725,18 @@ export class Cluster extends Host {
                 writable: boolean;
             };
             checkInterval: {
+                writable: boolean;
                 type: string;
+                isKey: boolean;
+                mandatory: boolean;
                 collection: boolean;
-                writable: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
             };
         };
     };

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

@@ -58,9 +58,18 @@ export class ExtraSourceService extends Service {
                         env?: string[] | string;
                     };
                     priority: {
+                        writable: boolean;
                         type: string;
+                        isKey: boolean;
+                        mandatory: boolean;
                         collection: boolean;
-                        writable: boolean;
+                        private?: boolean;
+                        depends?: string;
+                        description?: string;
+                        default?: any;
+                        set?: Function;
+                        get?: Function;
+                        env?: string[] | string;
                     };
                     directory: {
                         writable: boolean;
@@ -138,24 +147,35 @@ export class ExtraSourceService extends Service {
                     env?: string[] | string;
                 };
                 weight: {
-                    type: string;
-                    collection: boolean;
                     writable: boolean;
                     default: number;
-                };
-                systemd: {
                     type: string;
+                    isKey: boolean;
+                    mandatory: boolean;
                     collection: boolean;
-                    writable: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    set?: Function;
+                    get?: Function;
+                    env?: string[] | string;
                 };
-                port: {
-                    type: string;
+                systemd: {
                     collection: boolean;
                     writable: boolean;
+                    type: string;
+                    isKey: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    env?: string[] | string;
                 };
-                protocol: {
+                port: {
                     writable: boolean;
-                    values: string[];
                     type: string;
                     isKey: boolean;
                     mandatory: boolean;
@@ -168,8 +188,9 @@ export class ExtraSourceService extends Service {
                     get?: Function;
                     env?: string[] | string;
                 };
-                type: {
+                protocol: {
                     writable: boolean;
+                    values: string[];
                     type: string;
                     isKey: boolean;
                     mandatory: boolean;
@@ -182,12 +203,12 @@ export class ExtraSourceService extends Service {
                     get?: Function;
                     env?: string[] | string;
                 };
-                types: {
-                    collection: boolean;
+                type: {
+                    writable: boolean;
                     type: string;
                     isKey: boolean;
-                    writable: boolean;
                     mandatory: boolean;
+                    collection: boolean;
                     private?: boolean;
                     depends?: string;
                     description?: string;
@@ -196,12 +217,12 @@ export class ExtraSourceService extends Service {
                     get?: Function;
                     env?: string[] | string;
                 };
-                tls: {
-                    writable: boolean;
+                types: {
+                    collection: boolean;
                     type: string;
                     isKey: boolean;
+                    writable: boolean;
                     mandatory: boolean;
-                    collection: boolean;
                     private?: boolean;
                     depends?: string;
                     description?: string;
@@ -210,6 +231,7 @@ export class ExtraSourceService extends Service {
                     get?: Function;
                     env?: string[] | string;
                 };
+                tls: import("pacc").AttributeDefinition;
                 hostName: {
                     writable: boolean;
                     type: string;

package/types/host.d.mts

@@ -42,9 +42,18 @@ export class Host extends ServiceOwner {
                     env?: string[] | string;
                 };
                 priority: {
+                    writable: boolean;
                     type: string;
+                    isKey: boolean;
+                    mandatory: boolean;
                     collection: boolean;
-                    writable: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    env?: string[] | string;
                 };
                 directory: {
                     writable: boolean;
@@ -116,9 +125,18 @@ export class Host extends ServiceOwner {
                 writable: boolean;
             };
             aliases: {
-                type: string;
                 collection: boolean;
                 writable: boolean;
+                type: string;
+                isKey: boolean;
+                mandatory: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
             };
             os: {
                 writable: boolean;
@@ -179,9 +197,18 @@ export class Host extends ServiceOwner {
                 env?: string[] | string;
             };
             weight: {
+                writable: boolean;
                 type: string;
+                isKey: boolean;
+                mandatory: boolean;
                 collection: boolean;
-                writable: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
             };
             serial: {
                 writable: boolean;
@@ -316,11 +343,7 @@ export class Host extends ServiceOwner {
                 get?: Function;
                 env?: string[] | string;
             };
-            isModel: {
-                type: string;
-                collection: boolean;
-                writable: boolean;
-            };
+            isModel: import("pacc").AttributeDefinition;
             hostName: {
                 writable: boolean;
                 type: string;