pmcf 2.74.0 → 2.74.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.74.0",
+  "version": "2.74.2",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "ip-utilties": "^1.4.7",
     "npm-pkgbuild": "^18.2.12",
-    "pacc": "^3.12.0",
+    "pacc": "^3.13.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/host.mjs

@@ -1,6 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
+import { default_attribute } from "pacc";
 import { ServiceOwner, Base, addresses } from "pmcf";
 import { networkAddressProperties } from "./network-support.mjs";
 import { addHook } from "./hooks.mjs";
@@ -32,26 +33,23 @@ const HostTypeDefinition = {
     services: { type: "service", collection: true, writeable: true },
     aliases: { type: "string", collection: true, writeable: true },
     os: {
-      type: "string",
-      collection: false,
+      ...default_attribute,
       writeable: true,
       values: ["osx", "windows", "linux"]
     },
-    "machine-id": { type: "string", collection: false, writeable: true },
-    distribution: { type: "string", collection: false, writeable: true },
+    "machine-id": { ...default_attribute, writeable: true },
+    distribution: { ...default_attribute, writeable: true },
     deployment: {
-      type: "string",
-      collection: false,
+      ...default_attribute,
       writeable: true,
       values: ["production", "development"]
     },
     weight: { type: "number", collection: false, writeable: true },
-    serial: { type: "string", collection: false, writeable: true },
-    vendor: { type: "string", collection: false, writeable: true },
-    keymap: { type: "string", collection: false, writeable: true },
+    serial: { ...default_attribute, writeable: true },
+    vendor: { ...default_attribute, writeable: true },
+    keymap: { ...default_attribute, writeable: true },
     chassis: {
-      type: "string",
-      collection: false,
+      ...default_attribute,
       writeable: true,
       values: [
         "phone",
@@ -69,16 +67,15 @@ const HostTypeDefinition = {
       ]
     },
     architecture: {
-      type: "string",
-      collection: false,
+      ...default_attribute,
       writeable: true,
       values: ["x86", "x86_64", "aarch64", "armv7"]
     },
-    replaces: { type: "string", collection: true, writeable: true },
-    depends: { type: "string", collection: true, writeable: true },
-    provides: { type: "string", collection: true, writeable: true },
+    replaces: { ...default_attribute, collection: true, writeable: true },
+    depends: { ...default_attribute, collection: true, writeable: true },
+    provides: { ...default_attribute, collection: true, writeable: true },
     extends: { type: "host", collection: true, writeable: true },
-    model: { type: "string", collection: false, writeable: false },
+    model: { ...default_attribute, collection: false, writeable: false },
     isModel: { type: "boolean", collection: false, writeable: false }
   }
 };
@@ -516,11 +513,9 @@ export class Host extends ServiceOwner {
 
     for (const service of this.services) {
       if (service.systemdConfigs) {
-        for (const {
-          serviceName,
-          configFileName,
-          content
-        } of asArray(service.systemdConfigs(this.name))) {
+        for (const { serviceName, configFileName, content } of asArray(
+          service.systemdConfigs(this.name)
+        )) {
           await writeLines(dir, configFileName, sectionLines(...content));
 
           addHook(

package/src/location.mjs

@@ -1,4 +1,5 @@
 import { FileContentProvider } from "npm-pkgbuild";
+import { default_attribute } from "pacc";
 import { Owner } from "pmcf";
 import { addType } from "./types.mjs";
 import { loadHooks } from "./hooks.mjs";
@@ -9,7 +10,7 @@ const LocationTypeDefinition = {
   priority: 1.0,
   extends: Owner.typeDefinition,
   properties: {
-    locales: { type: "string", collection: true, writeable: true }
+    locales: { ...default_attribute, collection: true, writeable: true }
   }
 };
 

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

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
+import { default_attribute, hostname_attribute } from "pacc";
 import { Base, cidrAddresses } from "pmcf";
 import {
   networkProperties,
@@ -39,12 +40,12 @@ export const NetworkInterfaceTypeDefinition = {
     ...networkAddressProperties,
 
     services: { type: "service", collection: true, writeable: true },
-    hostName: { type: "string", collection: false, writeable: true },
-    ipAddresses: { type: "string", collection: true, writeable: true },
+    hostName: { ...hostname_attribute, writeable: true },
+    ipAddresses: { ...default_attribute, writeable: true },
 
-    hwaddr: { type: "string", collection: false, writeable: true },
+    hwaddr: { ...default_attribute, writeable: true },
     network: { type: "network", collection: false, writeable: true },
-    destination: { type: "string", collection: false, writeable: true }
+    destination: { ...default_attribute, writeable: true }
   }
 };
 

package/src/network-support.mjs

@@ -1,40 +1,37 @@
+import { default_attribute, hostname_attribute, boolean_attribute } from "pacc";
+
 export const networkProperties = {
   scope: {
-    type: "string",
-    collection: false,
+    ...default_attribute,
     writeable: true,
     values: ["global", "site", "link", "host"],
     default: "global"
   },
   class: {
-    type: "string",
-    collection: false,
+    ...default_attribute,
     writeable: true,
     values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
   },
   kind: {
-    type: "string",
-    collection: false,
+    ...default_attribute,
     writeable: true,
     values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
   },
-  ssid: { type: "string", collection: false, writeable: true },
-  psk: { type: "string", collection: false, writeable: true },
+  ssid: { ...default_attribute, writeable: true },
+  psk: { ...default_attribute, writeable: true },
   metric: { type: "number", collection: false, writeable: true, default: 1004 },
   mtu: { type: "number", collection: false, writeable: true, default: 1500 },
   gateway: { type: "host", collection: false, writeable: true },
   multicastDNS: {
-    type: "boolean",
-    collection: false,
-    writeable: true,
-    default: false
+    ...boolean_attribute,
+    writeable: true
   }
 };
 
 export const networkAddressProperties = {
-  hostName: { type: "string", collection: false, writeable: true },
-  cidrAddresses: { type: "string", collection: true, writeable: false },
-  cidrAddress: { type: "string", collection: false, writeable: false },
-  addresses: { type: "string", collection: true, writeable: false },
-  address: { type: "string", collection: false, writeable: false }
+  hostName: { ...hostname_attribute, writeable: true },
+  cidrAddresses: { ...default_attribute, collection: true, writeable: false },
+  cidrAddress: { ...default_attribute, writeable: false },
+  addresses: { ...default_attribute, collection: true, writeable: false },
+  address: { ...default_attribute, writeable: false }
 };

package/src/owner.mjs

@@ -1,4 +1,5 @@
 import { normalizeCIDR, familyIP } from "ip-utilties";
+import { default_attribute, email_attribute } from "pacc";
 import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
@@ -14,14 +15,13 @@ const OwnerTypeDefinition = {
     hosts: { type: "host", collection: true, writeable: true },
     clusters: { type: "cluster", collection: true, writeable: true },
     subnets: { type: Subnet.typeDefinition, collection: true, writeable: true },
-
-    country: { type: "string", collection: false, writeable: true },
-    domain: { type: "string", collection: false, writeable: true },
-    domains: { type: "string", collection: true, writeable: true },
-    timezone: { type: "string", collection: false, writeable: true },
-    architectures: { type: "string", collection: true, writeable: true },
-    locales: { type: "string", collection: true, writeable: true },
-    administratorEmail: { type: "string", collection: false, writeable: true }
+    country: { ...default_attribute, writeable: true },
+    domain: { ...default_attribute, writeable: true },
+    domains: { ...default_attribute, collection: true, writeable: true },
+    timezone: { ...default_attribute, writeable: true },
+    architectures: { ...default_attribute, collection: true, writeable: true },
+    locales: { ...default_attribute, collection: true, writeable: true },
+    administratorEmail: { ...email_attribute, writeable: true }
   }
 };
 

package/src/service.mjs

@@ -1,3 +1,4 @@
+import { default_attribute, boolean_attribute } from "pacc";
 import {
   Base,
   Host,
@@ -21,18 +22,15 @@ import {
 export const endpointProperties = {
   port: { type: "number", collection: false, writeable: true },
   protocol: {
-    type: "string",
-    collection: false,
+    ...default_attribute,
     writeable: true,
     values: ["tcp", "udp"]
   },
-  type: { type: "string", collection: false, writeable: true },
-  types: { type: "string", collection: true, writeable: false },
+  type: { ...default_attribute, writeable: true },
+  types: { ...default_attribute, collection: true },
   tls: {
-    type: "boolean",
-    collection: false,
-    writeable: false,
-    default: false
+    ...boolean_attribute,
+    writeable: false
   }
 };
 
@@ -64,7 +62,7 @@ export const ServiceTypeDefinition = {
   properties: {
     ...networkAddressProperties,
     ...endpointProperties,
-    alias: { type: "string", collection: false, writeable: true },
+    alias: { ...default_attribute, writeable: true },
     weight: { type: "number", collection: false, writeable: true, default: 1 },
     systemd: { type: "string", collection: true, writeable: true }
   }

package/src/services/kea.mjs

@@ -94,7 +94,7 @@ const KeaServiceTypeDefinition = {
 };
 
 const keaVersion = 3.0;
-export const fetureHasHTTPEndpoints = keaVersion > 2.7;
+export const fetureHasHTTPEndpoints = keaVersion >= 3.0;
 
 export class KeaService extends Service {
   static {

package/src/subnet.mjs

@@ -6,6 +6,7 @@ import {
   familyIP,
   matchPrefixIP
 } from "ip-utilties";
+import { default_attribute } from "pacc";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
@@ -16,9 +17,7 @@ const SubnetTypeDefinition = {
   constructWithIdentifierOnly: true,
   properties: {
     address: {
-      type: "string",
-      collection: false,
-      writeable: false,
+      ...default_attribute,
       identifier: true
     },
     networks: { type: "network", collection: true, writeable: true },