pmcf 3.4.0 → 3.4.1

package/package.json

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

package/src/base.mjs

@@ -1,6 +1,14 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
-import { getAttribute, default_attribute, number_attribute, description_attribute, boolean_attribute } from "pacc";
+import {
+  getAttribute,
+  name_attribute,
+  string_attribute,
+  string_collection_attribute,
+  number_attribute,
+  description_attribute,
+  boolean_attribute
+} from "pacc";
 import { addType, primitives, typeFactory } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 
@@ -9,22 +17,21 @@ const BaseTypeDefinition = {
   owners: [],
   properties: {
     owner: { type: "base", collection: false, writable: false },
-    type: default_attribute,
+    type: string_attribute,
     name: {
-      ...default_attribute,
-      isKey: true,
+      ...name_attribute,
       writable: true
     },
     description: { ...description_attribute, writable: true },
     priority: { ...number_attribute, writable: true },
-    directory: { ...default_attribute, writable: false },
-    packaging: { ...default_attribute, writable: true },
+    directory: { ...string_attribute, writable: false },
+    packaging: { ...string_attribute, writable: true },
     disabled: {
       ...boolean_attribute,
       writable: true,
       default: false
     },
-    tags: { ...default_attribute, collection: true, writable: true }
+    tags: { ...string_collection_attribute, writable: true }
   }
 };
 

package/src/host.mjs

@@ -1,7 +1,12 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { default_attribute, number_attribute, boolean_attribute_false } from "pacc";
+import {
+  string_attribute,
+  string_collection_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,25 +36,25 @@ const HostTypeDefinition = {
       writable: true
     },
     services: { type: "service", collection: true, writable: true },
-    aliases: { ...default_attribute, collection: true, writable: true },
+    aliases: { ...string_collection_attribute, writable: true },
     os: {
-      ...default_attribute,
+      ...string_attribute,
       writable: true,
       values: ["osx", "windows", "linux"]
     },
-    "machine-id": { ...default_attribute, writable: true },
-    distribution: { ...default_attribute, writable: true },
+    "machine-id": { ...string_attribute, writable: true },
+    distribution: { ...string_attribute, writable: true },
     deployment: {
-      ...default_attribute,
+      ...string_attribute,
       writable: true,
       values: ["production", "development"]
     },
     weight: { ...number_attribute, writable: true },
-    serial: { ...default_attribute, writable: true },
-    vendor: { ...default_attribute, writable: true },
-    keymap: { ...default_attribute, writable: true },
+    serial: { ...string_attribute, writable: true },
+    vendor: { ...string_attribute, writable: true },
+    keymap: { ...string_attribute, writable: true },
     chassis: {
-      ...default_attribute,
+      ...string_attribute,
       writable: true,
       values: [
         "phone",
@@ -67,15 +72,15 @@ const HostTypeDefinition = {
       ]
     },
     architecture: {
-      ...default_attribute,
+      ...string_attribute,
       writable: true,
       values: ["x86", "x86_64", "aarch64", "armv7"]
     },
-    replaces: { ...default_attribute, collection: true, writable: true },
-    depends: { ...default_attribute, collection: true, writable: true },
-    provides: { ...default_attribute, collection: true, writable: true },
+    replaces: { ...string_collection_attribute, writable: true },
+    depends: { ...string_collection_attribute, writable: true },
+    provides: { ...string_collection_attribute, writable: true },
     extends: { type: "host", collection: true, writable: true },
-    model: { ...default_attribute, collection: false, writable: false },
+    model: string_attribute,
     isModel: boolean_attribute_false
   }
 };

package/src/location.mjs

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

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

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
-import { default_attribute, hostname_attribute } from "pacc";
+import { string_attribute, hostname_attribute } from "pacc";
 import { Base, cidrAddresses } from "pmcf";
 import {
   networkProperties,
@@ -41,11 +41,11 @@ export const NetworkInterfaceTypeDefinition = {
 
     services: { type: "service", collection: true, writable: true },
     hostName: { ...hostname_attribute, writable: true },
-    ipAddresses: { ...default_attribute, writable: true },
+    ipAddresses: { ...string_attribute, writable: true },
 
-    hwaddr: { ...default_attribute, writable: true },
+    hwaddr: { ...string_attribute, writable: true },
     network: { type: "network", collection: false, writable: true },
-    destination: { ...default_attribute, writable: true }
+    destination: { ...string_attribute, writable: true }
   }
 };
 

package/src/network-support.mjs

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

package/src/owner.mjs

@@ -1,5 +1,9 @@
 import { normalizeCIDR, familyIP } from "ip-utilties";
-import { default_attribute, email_attribute } from "pacc";
+import {
+  string_collection_attribute,
+  string_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";
@@ -15,12 +19,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: { ...default_attribute, writable: true },
-    domain: { ...default_attribute, writable: true },
-    domains: { ...default_attribute, collection: true, writable: true },
-    timezone: { ...default_attribute, writable: true },
-    architectures: { ...default_attribute, collection: true, writable: true },
-    locales: { ...default_attribute, 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 },
     administratorEmail: { ...email_attribute, writable: true }
   }
 };

package/src/service.mjs

@@ -1,4 +1,9 @@
-import { default_attribute, string_attribute, number_attribute, boolean_attribute_false } from "pacc";
+import {
+  string_attribute,
+  string_collection_attribute,
+  number_attribute,
+  boolean_attribute_false
+} from "pacc";
 import {
   Base,
   Host,
@@ -22,12 +27,12 @@ import {
 export const endpointProperties = {
   port: { ...number_attribute, writable: true },
   protocol: {
-    ...default_attribute,
+    ...string_attribute,
     writable: true,
     values: ["tcp", "udp"]
   },
-  type: { ...default_attribute, writable: true },
-  types: { ...default_attribute, collection: true },
+  type: { ...string_attribute, writable: true },
+  types: string_collection_attribute,
   tls: boolean_attribute_false
 };
 
@@ -59,9 +64,9 @@ export const ServiceTypeDefinition = {
   properties: {
     ...networkAddressProperties,
     ...endpointProperties,
-    alias: { ...default_attribute, writable: true },
+    alias: { ...string_attribute, writable: true },
     weight: { ...number_attribute, writable: true, default: 1 },
-    systemd: { ...string_attribute, collection: true, writable: true }
+    systemd: { ...string_collection_attribute, writable: true }
   }
 };
 

package/src/services/bind.mjs

@@ -3,7 +3,8 @@ import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal, reverseArpa } from "ip-utilties";
 import {
-  default_attribute,
+  string_attribute,
+  string_collection_attribute,
   boolean_attribute_writeable_true,
   boolean_attribute_writeable_false,
   number_attribute
@@ -48,19 +49,18 @@ const BindServiceTypeDefinition = {
     hasLinkLocalAdresses: boolean_attribute_writeable_true,
     hasLocationRecord: boolean_attribute_writeable_true,
     excludeInterfaceKinds: {
-      ...default_attribute,
-      collection: true,
+      ...string_collection_attribute,
       writable: true
     },
     exclude: { type: address_types, collection: true, writable: true },
     notify: boolean_attribute_writeable_false,
-    recordTTL: { ...default_attribute, writable: true },
+    recordTTL: { ...string_attribute, writable: true },
     serial: { ...number_attribute, writable: true },
-    refresh: { ...default_attribute, writable: true, default: 36000 },
-    retry: { ...default_attribute, writable: true, default: 72000 },
-    expire: { ...default_attribute, writable: true, default: 600000 },
-    minimum: { ...default_attribute, writable: true, default: 60000 },
-    allowedUpdates: { ...default_attribute, collection: true, 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 },
+    allowedUpdates: { ...string_collection_attribute, writable: true }
   },
 
   service: {

package/src/services/kea.mjs

@@ -1,7 +1,11 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { reverseArpa } from "ip-utilties";
-import { default_attribute, boolean_attribute_writeable_true } from "pacc";
+import {
+  string_attribute,
+  number_attribute,
+  boolean_attribute_writeable_true
+} from "pacc";
 import {
   Service,
   sortDescendingByPriority,
@@ -25,29 +29,26 @@ const KeaServiceTypeDefinition = {
       isCommonOption: true
     },
     "renew-timer": {
-      ...default_attribute,
-      type: "number",
+      ...number_attribute,
       writable: true,
       isCommonOption: true,
       default: 900
     },
     "rebind-timer": {
-      ...default_attribute,
-      type: "number",
+      ...number_attribute,
       writable: true,
       isCommonOption: true,
       default: 1800
     },
     "valid-lifetime": {
-      ...default_attribute,
-      type: "number",
+      ...number_attribute,
       writable: true,
       mandatory: true,
       isCommonOption: true,
       default: 86400
     },
     "ddns-conflict-resolution-mode": {
-      ...default_attribute,
+      ...string_attribute,
       writable: true,
       isCommonOption: true
       //values: ["check-exists-with-dhcid"]

package/src/services/openldap.mjs

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { default_attribute } from "pacc";
+import { string_attribute } from "pacc";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 import { writeLines } from "../utils.mjs";
@@ -14,15 +14,15 @@ const OpenLDAPServiceTypeDefinition = {
   priority: 0.1,
   properties: {
     baseDN: {
-      ...default_attribute,
+      ...string_attribute,
       writable: true
     },
     rootDN: {
-      ...default_attribute,
+      ...string_attribute,
       writable: true
     },
     uri: {
-      ...default_attribute,
+      ...string_attribute,
       writable: true
     }
   },

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

@@ -1,4 +1,4 @@
-import { default_attribute } from "pacc";
+import { string_attribute } 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: { ...default_attribute, writable: true }
+    url: { ...string_attribute, writable: true }
   },
   service: {}
 };

package/src/subnet.mjs

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

package/types/base.d.mts

@@ -15,9 +15,9 @@ export class Base {
             };
             type: import("pacc").AttributeDefinition;
             name: {
-                isKey: boolean;
                 writable: boolean;
                 type: string;
+                isKey: boolean;
                 mandatory: boolean;
                 collection: boolean;
                 private?: boolean;
@@ -99,18 +99,18 @@ export class Base {
                 env?: string[] | string;
             };
             tags: {
-                collection: boolean;
                 writable: boolean;
+                collection: boolean;
                 type: string;
                 isKey: boolean;
                 mandatory: boolean;
-                private?: boolean;
-                depends?: string;
-                description?: string;
-                default?: any;
-                set?: Function;
-                get?: Function;
-                env?: string[] | string;
+                private: boolean;
+                depends: string;
+                description: string;
+                default: any;
+                set: Function;
+                get: Function;
+                env: string[] | string;
             };
         };
     };