pmcf 3.10.14 → 3.10.16

package/package.json

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

package/src/base.mjs

@@ -26,7 +26,7 @@ const BaseTypeDefinition = {
     name: name_attribute_writable,
     description: { ...description_attribute, writable: true },
     priority: number_attribute_writable,
-    directory: { ...string_attribute, writable: false },
+    directory: string_attribute_writable,
     packaging: string_attribute_writable,
     disabled: boolean_attribute_writable,
     tags: string_collection_attribute_writable

package/src/cluster.mjs

@@ -13,11 +13,11 @@ const ClusterTypeDefinition = {
   priority: 0.7,
   extends: Host.typeDefinition,
   attributes: {
-    routerId: { ...number_attribute_writable },
+    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 }
+    checkInterval: number_attribute_writable
   }
 };
 
@@ -35,7 +35,6 @@ export class Cluster extends Host {
     return ClusterTypeDefinition;
   }
 
-
   set masters(value) {
     this._masters.push(value);
     value.cluster = this;

package/src/filter.mjs

@@ -55,31 +55,28 @@ export function* objectFilter(type, objects, filter) {
         return false;
       };
       for (let t = type; t; t = t.extends) {
-        for (const property of Object.values(t.attributes)) {
-          switch (property.type[0]) {
+        for (const [name, attribute] of Object.entries(t.attributes)) {
+          switch (attribute.type[0]) {
             case "boolean":
-              if (
-                filter[property.name] !== undefined &&
-                filter[property.name] != object[property.name]
-              ) {
+              if (filter[name] !== undefined && filter[name] != object[name]) {
                 continue advance;
               }
               break;
 
             case "number":
-              if (!filterNumber(property.name)) {
+              if (!filterNumber(name)) {
                 continue advance;
               }
               break;
             case "string":
-              if (property.collection && filter[property.name] !== undefined) {
-                const value = object[property.name];
+              if (attribute.collection && filter[name] !== undefined) {
+                const value = object[name];
 
-                if (value instanceof Set && value.has(filter[property.name])) {
+                if (value instanceof Set && value.has(filter[name])) {
                   break;
                 }
                 continue advance;
-              } else if (!filterString(property.name)) {
+              } else if (!filterString(name)) {
                 continue advance;
               }
               break;

package/src/host.mjs

@@ -36,21 +36,21 @@ const HostTypeDefinition = {
       writable: true
     },
     services: { type: "service", collection: true, writable: true },
-    aliases: { ...string_collection_attribute_writable },
+    aliases: string_collection_attribute_writable,
     os: {
       ...string_attribute_writable,
       values: ["osx", "windows", "linux"]
     },
-    "machine-id": { ...string_attribute_writable },
-    distribution: { ...string_attribute_writable },
+    "machine-id": string_attribute_writable,
+    distribution: string_attribute_writable,
     deployment: {
       ...string_attribute_writable,
       values: ["production", "development"]
     },
-    weight: { ...number_attribute_writable },
-    serial: { ...string_attribute_writable },
-    vendor: { ...string_attribute_writable },
-    keymap: { ...string_attribute_writable },
+    weight: number_attribute_writable,
+    serial: string_attribute_writable,
+    vendor: string_attribute_writable,
+    keymap: string_attribute_writable,
     chassis: {
       ...string_attribute_writable,
       values: [
@@ -73,9 +73,9 @@ const HostTypeDefinition = {
       ...string_attribute_writable,
       values: ["x86", "x86_64", "aarch64", "armv7"]
     },
-    replaces: { ...string_collection_attribute_writable },
-    depends: { ...string_collection_attribute_writable },
-    provides: { ...string_collection_attribute_writable },
+    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/location.mjs

@@ -1,5 +1,5 @@
 import { FileContentProvider } from "npm-pkgbuild";
-import { string_collection_attribute } from "pacc";
+import { string_collection_attribute_writable } 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,
   attributes: {
-    locales: { ...string_collection_attribute, writable: true }
+    locales: string_collection_attribute_writable
   }
 };
 

package/src/network-support.mjs

@@ -22,8 +22,8 @@ export const networkAttributes = {
     ...string_attribute_writable,
     values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
   },
-  ssid: { ...string_attribute_writable },
-  psk: { ...string_attribute_writable },
+  ssid: string_attribute_writable,
+  psk: string_attribute_writable,
   secretName: string_attribute_writable,
   metric: { ...number_attribute_writable /*default: 1004*/ },
   mtu: { ...number_attribute_writable, default: 1500 },
@@ -33,8 +33,8 @@ export const networkAttributes = {
 
 export const networkAddressAttributes = {
   hostName: { ...hostname_attribute, writable: true },
-  cidrAddresses: { ...string_collection_attribute_writable },
-  cidrAddress: { ...string_attribute_writable },
-  addresses: { ...string_collection_attribute_writable },
-  address: { ...string_attribute_writable }
+  cidrAddresses: string_collection_attribute_writable ,
+  cidrAddress: string_attribute_writable,
+  addresses: string_collection_attribute_writable,
+  address: string_attribute_writable
 };

package/src/owner.mjs

@@ -19,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: { ...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 },
+    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

@@ -26,12 +26,12 @@ import {
 } from "./dns-utils.mjs";
 
 export const endpointAttributes = {
-  port: { ...number_attribute_writable },
+  port: number_attribute_writable,
   protocol: {
     ...string_attribute_writable,
     values: ["tcp", "udp"]
   },
-  type: { ...string_attribute_writable },
+  type: string_attribute_writable,
   types: string_collection_attribute,
   tls: boolean_attribute_false
 };
@@ -64,7 +64,7 @@ export const ServiceTypeDefinition = {
   attributes: {
     ...networkAddressAttributes,
     ...endpointAttributes,
-    alias: { ...string_attribute_writable },
+    alias: string_attribute_writable,
     weight: { ...number_attribute_writable /*default: 1*/ },
     systemd: string_collection_attribute_writable
   }

package/src/services/bind.mjs

@@ -6,7 +6,7 @@ import {
   string_attribute_writable,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
-  number_attribute,
+  number_attribute_writable,
   string_collection_attribute_writable
 } from "pacc";
 import { writeLines, asArray } from "../utils.mjs";
@@ -50,18 +50,16 @@ const BindServiceTypeDefinition = {
     hasCatalog: boolean_attribute_writable_true,
     hasLinkLocalAdresses: boolean_attribute_writable_false,
     hasLocationRecord: boolean_attribute_writable_true,
-    excludeInterfaceKinds: {
-      ...string_collection_attribute_writable
-    },
+    excludeInterfaceKinds: string_collection_attribute_writable,
     exclude: { type: networkAddressType, collection: true, writable: true },
     notify: boolean_attribute_writable_false,
-    recordTTL: { ...string_attribute_writable },
-    serial: { ...number_attribute, writable: true },
+    recordTTL: string_attribute_writable,
+    serial: number_attribute_writable,
     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 }
+    allowedUpdates: string_collection_attribute_writable
   },
 
   service: {

package/src/services/openldap.mjs

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { string_attribute } from "pacc";
+import { string_attribute_writable } from "pacc";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 import { writeLines } from "../utils.mjs";
@@ -13,18 +13,9 @@ const OpenLDAPServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   attributes: {
-    baseDN: {
-      ...string_attribute,
-      writable: true
-    },
-    rootDN: {
-      ...string_attribute,
-      writable: true
-    },
-    uri: {
-      ...string_attribute,
-      writable: true
-    }
+    baseDN: string_attribute_writable,
+    rootDN: string_attribute_writable,
+    uri: string_attribute_writable
   },
   service: {
     extends: ["ldap"],

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

@@ -9,7 +9,7 @@ const SystemdJournalUploadServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   attributes: {
-    url: { ...string_attribute_writable }
+    url: string_attribute_writable
   },
   service: {}
 };

package/src/subnet.mjs

@@ -6,7 +6,7 @@ import {
   familyIP,
   matchPrefixIP
 } from "ip-utilties";
-import { string_attribute, number_attribute } from "pacc";
+import { string_attribute, name_attribute, number_attribute } from "pacc";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
@@ -16,13 +16,10 @@ const SubnetTypeDefinition = {
   priority: 0.6,
   constructWithIdentifierOnly: true,
   attributes: {
-    address: {
-      ...string_attribute,
-      isKey: true
-    },
+    address: name_attribute,
     networks: { type: "network", collection: true, writable: true },
-    prefixLength: { ...number_attribute },
-    family: { ...string_attribute }
+    prefixLength: number_attribute,
+    family: string_attribute
   }
 };
 

package/src/types.mjs

@@ -30,7 +30,6 @@ export function resolveTypeLinks() {
     }
     for (const [path, attribute] of attributeIterator(type.attributes)) {
       const name = path.join(".");
-      attribute.name = name;
       const ts = [];
 
       for (const type of asArray(attribute.type)) {

package/types/base.d.mts

@@ -30,20 +30,7 @@ export class Base {
                 env?: string[] | string;
             };
             priority: import("pacc").AttributeDefinition;
-            directory: {
-                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;
-            };
+            directory: import("pacc").AttributeDefinition;
             packaging: import("pacc").AttributeDefinition;
             disabled: import("pacc").AttributeDefinition;
             tags: import("pacc").AttributeDefinition;