pmcf 3.8.9 → 3.8.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.8.9",
+  "version": "3.8.11",
   "publishConfig": {
     "access": "public"
   },
@@ -52,8 +52,8 @@
   },
   "dependencies": {
     "ip-utilties": "^1.4.7",
-    "npm-pkgbuild": "^18.2.28",
-    "pacc": "^4.12.0",
+    "npm-pkgbuild": "^18.2.29",
+    "pacc": "^4.13.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -2,8 +2,9 @@ import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
 import {
   getAttribute,
-  name_attribute,
+  name_attribute_writable,
   string_attribute,
+  string_attribute_writable,
   string_collection_attribute_writable,
   number_attribute_writable,
   description_attribute,
@@ -18,14 +19,11 @@ const BaseTypeDefinition = {
   properties: {
     owner: { type: "base", collection: false, writable: false },
     type: string_attribute,
-    name: {
-      ...name_attribute,
-      writable: true
-    },
+    name: name_attribute_writable,
     description: { ...description_attribute, writable: true },
     priority: number_attribute_writable,
     directory: { ...string_attribute, writable: false },
-    packaging: { ...string_attribute, writable: true },
+    packaging: string_attribute_writable,
     disabled: boolean_attribute_writable,
     tags: string_collection_attribute_writable
   }

package/src/cluster.mjs

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { number_attribute } from "pacc";
+import { number_attribute_writable } from "pacc";
 import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
 import { serviceEndpoints } from "pmcf";
@@ -13,11 +13,11 @@ const ClusterTypeDefinition = {
   priority: 0.7,
   extends: Host.typeDefinition,
   properties: {
-    routerId: { ...number_attribute, writable: true },
+    routerId: { ...number_attribute_writable },
     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: { ...number_attribute, writable: true }
+    checkInterval: { ...number_attribute_writable }
   }
 };
 

package/src/host.mjs

@@ -3,8 +3,9 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   string_attribute,
-  string_collection_attribute,
-  number_attribute,
+  string_attribute_writable,
+  string_collection_attribute_writable,
+  number_attribute_writable,
   boolean_attribute_false
 } from "pacc";
 import { ServiceOwner, Base, addresses } from "pmcf";
@@ -36,26 +37,23 @@ const HostTypeDefinition = {
       writable: true
     },
     services: { type: "service", collection: true, writable: true },
-    aliases: { ...string_collection_attribute, writable: true },
+    aliases: { ...string_collection_attribute_writable },
     os: {
-      ...string_attribute,
-      writable: true,
+      ...string_attribute_writable,
       values: ["osx", "windows", "linux"]
     },
-    "machine-id": { ...string_attribute, writable: true },
-    distribution: { ...string_attribute, writable: true },
+    "machine-id": { ...string_attribute_writable },
+    distribution: { ...string_attribute_writable },
     deployment: {
-      ...string_attribute,
-      writable: true,
+      ...string_attribute_writable,
       values: ["production", "development"]
     },
-    weight: { ...number_attribute, writable: true },
-    serial: { ...string_attribute, writable: true },
-    vendor: { ...string_attribute, writable: true },
-    keymap: { ...string_attribute, writable: true },
+    weight: { ...number_attribute_writable },
+    serial: { ...string_attribute_writable },
+    vendor: { ...string_attribute_writable },
+    keymap: { ...string_attribute_writable },
     chassis: {
-      ...string_attribute,
-      writable: true,
+      ...string_attribute_writable,
       values: [
         "phone",
         "tablet",
@@ -73,13 +71,12 @@ const HostTypeDefinition = {
       ]
     },
     architecture: {
-      ...string_attribute,
-      writable: true,
+      ...string_attribute_writable,
       values: ["x86", "x86_64", "aarch64", "armv7"]
     },
-    replaces: { ...string_collection_attribute, writable: true },
-    depends: { ...string_collection_attribute, writable: true },
-    provides: { ...string_collection_attribute, writable: true },
+    replaces: { ...string_collection_attribute_writable },
+    depends: { ...string_collection_attribute_writable },
+    provides: { ...string_collection_attribute_writable },
     extends: { type: "host", collection: true, writable: true },
     model: string_attribute,
     isModel: boolean_attribute_false

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

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
-import { string_attribute, hostname_attribute } from "pacc";
+import { string_attribute_writable, hostname_attribute } from "pacc";
 import { Base, cidrAddresses } from "pmcf";
 import {
   networkProperties,
@@ -41,11 +41,10 @@ export const NetworkInterfaceTypeDefinition = {
 
     services: { type: "service", collection: true, writable: true },
     hostName: { ...hostname_attribute, writable: true },
-    ipAddresses: { ...string_attribute, writable: true },
-
-    hwaddr: { ...string_attribute, writable: true },
+    ipAddresses: { ...string_attribute_writable },
+    hwaddr: { ...string_attribute_writable },
     network: { type: "network", collection: false, writable: true },
-    destination: { ...string_attribute, writable: true }
+    destination: { ...string_attribute_writable }
   }
 };
 
@@ -191,7 +190,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     if (this.name !== "eth0" && this.hwaddr) {
       const disabled = {};
-      if(this.disabled) {
+      if (this.disabled) {
         disabled.Unmanaged = "yes";
       }
       await writeLines(networkDir, `${this.name}.link`, [

package/src/network-support.mjs

@@ -1,6 +1,6 @@
 import {
-  string_collection_attribute,
-  string_attribute,
+  string_collection_attribute_writable,
+  string_attribute_writable,
   number_attribute_writable,
   hostname_attribute,
   boolean_attribute_writable
@@ -8,33 +8,30 @@ import {
 
 export const networkProperties = {
   scope: {
-    ...string_attribute,
-    writable: true,
-    values: ["global", "site", "link", "host"],
-  //  default: "global"
+    ...string_attribute_writable,
+    values: ["global", "site", "link", "host"]
+    //  default: "global"
   },
   class: {
-    ...string_attribute,
-    writable: true,
+    ...string_attribute_writable,
     values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
   },
   kind: {
-    ...string_attribute,
-    writable: true,
+    ...string_attribute_writable,
     values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
   },
-  ssid: { ...string_attribute, writable: true },
-  psk: { ...string_attribute, writable: true },
-  metric: { ...number_attribute_writable, /*default: 1004*/ },
+  ssid: { ...string_attribute_writable },
+  psk: { ...string_attribute_writable },
+  metric: { ...number_attribute_writable /*default: 1004*/ },
   mtu: { ...number_attribute_writable, default: 1500 },
   gateway: { type: "host", collection: false, writable: true },
-  multicastDNS: boolean_attribute_writable,
+  multicastDNS: boolean_attribute_writable
 };
 
 export const networkAddressProperties = {
   hostName: { ...hostname_attribute, writable: true },
-  cidrAddresses: { ...string_collection_attribute, writable: false },
-  cidrAddress: { ...string_attribute, writable: false },
-  addresses: { ...string_collection_attribute, writable: false },
-  address: { ...string_attribute, writable: false }
+  cidrAddresses: { ...string_collection_attribute_writable },
+  cidrAddress: { ...string_attribute_writable },
+  addresses: { ...string_collection_attribute_writable },
+  address: { ...string_attribute_writable }
 };

package/src/owner.mjs

@@ -1,7 +1,8 @@
 import { normalizeCIDR, familyIP } from "ip-utilties";
 import {
-  string_collection_attribute,
+  string_collection_attribute_writable,
   string_attribute,
+  string_attribute_writable,
   email_attribute
 } from "pacc";
 import { asIterator } from "./utils.mjs";
@@ -19,12 +20,12 @@ const OwnerTypeDefinition = {
     hosts: { type: "host", collection: true, writable: true },
     clusters: { type: "cluster", collection: true, writable: true },
     subnets: { type: Subnet.typeDefinition, collection: true, writable: true },
-    country: { ...string_attribute, writable: true },
-    domain: { ...string_attribute, writable: true },
-    domains: { ...string_collection_attribute, writable: true },
-    timezone: { ...string_attribute, writable: true },
-    architectures: { ...string_collection_attribute, writable: true },
-    locales: { ...string_collection_attribute, writable: true },
+    country: { ...string_attribute_writable },
+    domain: { ...string_attribute_writable },
+    domains: { ...string_collection_attribute_writable },
+    timezone: { ...string_attribute_writable },
+    architectures: { ...string_collection_attribute_writable },
+    locales: { ...string_collection_attribute_writable },
     administratorEmail: { ...email_attribute, writable: true }
   }
 };

package/src/service.mjs

@@ -1,5 +1,5 @@
 import {
-  string_attribute,
+  string_attribute_writable,
   string_collection_attribute,
   string_collection_attribute_writable,
   number_attribute_writable,
@@ -28,11 +28,10 @@ import {
 export const endpointProperties = {
   port: { ...number_attribute_writable },
   protocol: {
-    ...string_attribute,
-    writable: true,
+    ...string_attribute_writable,
     values: ["tcp", "udp"]
   },
-  type: { ...string_attribute, writable: true },
+  type: { ...string_attribute_writable },
   types: string_collection_attribute,
   tls: boolean_attribute_false
 };
@@ -65,7 +64,7 @@ export const ServiceTypeDefinition = {
   properties: {
     ...networkAddressProperties,
     ...endpointProperties,
-    alias: { ...string_attribute, writable: true },
+    alias: { ...string_attribute_writable },
     weight: { ...number_attribute_writable /*default: 1*/ },
     systemd: string_collection_attribute_writable
   }

package/src/services/bind.mjs

@@ -3,7 +3,7 @@ import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal, reverseArpa } from "ip-utilties";
 import {
-  string_attribute,
+  string_attribute_writable,
   string_collection_attribute,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
@@ -53,12 +53,12 @@ const BindServiceTypeDefinition = {
     },
     exclude: { type: address_types, collection: true, writable: true },
     notify: boolean_attribute_writable_false,
-    recordTTL: { ...string_attribute, writable: true },
+    recordTTL: { ...string_attribute_writable },
     serial: { ...number_attribute, writable: true },
-    refresh: { ...string_attribute, writable: true, default: 36000 },
-    retry: { ...string_attribute, writable: true, default: 72000 },
-    expire: { ...string_attribute, writable: true, default: 600000 },
-    minimum: { ...string_attribute, writable: true, default: 60000 },
+    refresh: { ...string_attribute_writable, default: 36000 },
+    retry: { ...string_attribute_writable, default: 72000 },
+    expire: { ...string_attribute_writable, default: 600000 },
+    minimum: { ...string_attribute_writable, default: 60000 },
     allowedUpdates: { ...string_collection_attribute, writable: true }
   },
 

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

@@ -1,4 +1,4 @@
-import { string_attribute } from "pacc";
+import { string_attribute_writable } from "pacc";
 import { Service, ServiceTypeDefinition } from "pmcf";
 import { addType } from "../types.mjs";
 
@@ -9,7 +9,7 @@ const SystemdJournalUploadServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   properties: {
-    url: { ...string_attribute, writable: true }
+    url: { ...string_attribute_writable }
   },
   service: {}
 };

package/types/base.d.mts

@@ -14,20 +14,7 @@ export class Base {
                 writable: boolean;
             };
             type: import("pacc").AttributeDefinition;
-            name: {
-                writable: boolean;
-                type: string;
-                isKey: boolean;
-                mandatory: boolean;
-                collection: boolean;
-                private?: boolean;
-                depends?: string;
-                description?: string;
-                default?: any;
-                set?: Function;
-                get?: Function;
-                env?: string[] | string;
-            };
+            name: import("pacc").AttributeDefinition;
             description: {
                 writable: boolean;
                 type: string;
@@ -57,20 +44,7 @@ export class Base {
                 get?: Function;
                 env?: string[] | string;
             };
-            packaging: {
-                writable: boolean;
-                type: string;
-                isKey: boolean;
-                mandatory: boolean;
-                collection: boolean;
-                private?: boolean;
-                depends?: string;
-                description?: string;
-                default?: any;
-                set?: Function;
-                get?: Function;
-                env?: string[] | string;
-            };
+            packaging: import("pacc").AttributeDefinition;
             disabled: import("pacc").AttributeDefinition;
             tags: import("pacc").AttributeDefinition;
         };