pmcf 4.17.1 → 4.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.17.1",
+  "version": "4.17.3",
   "publishConfig": {
     "access": "public"
   },
@@ -60,7 +60,7 @@
     "package-directory": "^8.2.0"
   },
   "devDependencies": {
-    "@types/node": "^25.2.2",
+    "@types/node": "^25.2.3",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -142,8 +142,11 @@ export class Base {
                 }
               } else {
                 if (current instanceof Set) {
-                  // TODO
-                  this[name] = value;
+                  if (value instanceof Set) {
+                    this[name] = current.union(value);
+                  } else {
+                    this[name].add(value);
+                  }
                 } else if (current instanceof Map) {
                   // TODO
                   this[name] = value;
@@ -558,6 +561,18 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
+  get packageData() {
+    return {
+      sources: [],
+      outputs: this.outputs,
+      properties: {
+        access: "private",
+        dependencies: this.depends,
+        groups: [this.type]
+      }
+    };
+  }
+
   async *preparePackages(stagingDir) {}
 
   get templateTransformers() {

package/src/cluster.mjs

@@ -84,17 +84,17 @@ export class Cluster extends Host {
       const packageStagingDir = join(stagingDir, host.name);
       const location = `${this.location.name}-${host.name}`;
 
-      const result = {
-        sources: [new FileContentProvider(packageStagingDir + "/")],
-        outputs: host.outputs,
-        properties: {
-          name: `keepalived-${location}`,
-          description: `${this.typeName} definitions for ${this.fullName}`,
-          access: "private",
-          dependencies: ["keepalived>=2.3.4"],
-          groups: ["service-config", location, "keepalived"]
-        }
-      };
+      const packageData = host.packageData;
+      packageData.sources.push(
+        new FileContentProvider(packageStagingDir + "/")
+      );
+      packageData.properties.name = `keepalived-${location}`;
+      packageData.properties.description = `${this.typeName} definitions for ${this.fullName}`;
+      packageData.properties.groups.push(
+        "service-config",
+        location,
+        "keepalived"
+      );
 
       const extra = [];
 
@@ -251,7 +251,7 @@ export class Cluster extends Host {
         cfg
       );
 
-      yield result;
+      yield packageData;
     }
   }
 }

package/src/host.mjs

@@ -434,7 +434,6 @@ export class Host extends ServiceOwner {
         ],
         provides: [...this.provides],
         replaces: [...this.replaces],
-        requires: [],
         backup: "root/.ssh/known_hosts"
       }
     };

package/src/service.mjs

@@ -256,18 +256,12 @@ export class Service extends Base {
   }
 
   get packageData() {
+    const packageData = super.packageData;
     const location = `${this.location.name}-${this.host.name}`;
-    return {
-      sources: [],
-      outputs: this.outputs,
-      properties: {
-        name: `${this.type}-${location}`,
-        description: `${this.type} service definitions for ${this.fullName}`,
-        access: "private",
-        dependencies: this.depends,
-        groups: ["service-config", location, this.type]
-      }
-    };
+    packageData.properties.name = `${this.type}-${location}`;
+    packageData.properties.description =`${this.type} service definitions for ${this.fullName}`;
+    packageData.properties.groups.push("service-config", location);
+    return packageData;
   }
 
   async *preparePackages(dir) {

package/src/services/bind.mjs

@@ -6,10 +6,11 @@ import {
   addType,
   default_attribute_writable,
   string_attribute_writable,
+  string_collection_attribute_writable,
+  string_set_attribute_writable,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
   number_attribute_writable,
-  string_collection_attribute_writable,
   name_attribute_writable
 } from "pacc";
 import {
@@ -79,7 +80,7 @@ const BindServiceTypeDefinition = {
     hasCatalog: boolean_attribute_writable_true,
     hasLinkLocalAdresses: boolean_attribute_writable_false,
     hasLocationRecord: boolean_attribute_writable_true,
-    excludeInterfaceKinds: string_collection_attribute_writable,
+    excludeInterfaceKinds: string_set_attribute_writable,
     exclude: {
       ...default_attribute_writable,
       type: networkAddressType,
@@ -160,7 +161,8 @@ export class BindService extends ExtraSourceService {
   _zones = [];
   _trusted = [];
   _exclude = new Set([]);
-  _excludeInterfaceKinds = new Set();
+
+  excludeInterfaceKinds = new Set();
 
   serial = Math.ceil(Date.now() / 1000);
   refresh = 36000;
@@ -245,14 +247,6 @@ export class BindService extends ExtraSourceService {
     return this._exclude;
   }
 
-  set excludeInterfaceKinds(value) {
-    this._excludeInterfaceKinds.add(value);
-  }
-
-  get excludeInterfaceKinds() {
-    return this._excludeInterfaceKinds;
-  }
-
   async *preparePackages(dir) {
     const sources = this.zones.length ? this.zones : [this.owner];
     const names = sources.map(a => a.fullName).join(" ");

package/types/base.d.mts

@@ -131,6 +131,15 @@ export class Base {
     set packaging(value: any);
     get packaging(): any;
     get outputs(): Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
+    get packageData(): {
+        sources: any[];
+        outputs: Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
+        properties: {
+            access: string;
+            dependencies: any;
+            groups: any[];
+        };
+    };
     preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
     get templateTransformers(): any[];
     /**

package/types/cluster.d.mts

@@ -502,17 +502,6 @@ export class Cluster extends Host {
     set backups(value: any[]);
     get backups(): any[];
     get members(): Set<any>;
-    preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: FileContentProvider[];
-        outputs: any;
-        properties: {
-            name: string;
-            description: string;
-            access: string;
-            dependencies: string[];
-            groups: string[];
-        };
-    }, void, unknown>;
+    preparePackages(stagingDir: any): AsyncGenerator<any, void, unknown>;
 }
 import { Host } from "./host.mjs";
-import { FileContentProvider } from "npm-pkgbuild";

package/types/host.d.mts

@@ -270,7 +270,6 @@ export class Host extends ServiceOwner {
             dependencies: any[];
             provides: any[];
             replaces: any[];
-            requires: any[];
             backup: string;
         };
     } | {

package/types/service.d.mts

@@ -658,23 +658,10 @@ export class Service extends Base {
     get type(): any;
     get types(): Set<any>;
     get systemdService(): any;
-    get packageData(): {
-        sources: any[];
-        outputs: Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
-        properties: {
-            name: string;
-            description: string;
-            access: string;
-            dependencies: any;
-            groups: any[];
-        };
-    };
     preparePackages(dir: any): AsyncGenerator<{
         sources: any[];
         outputs: Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
-            name: string;
-            description: string;
             access: string;
             dependencies: any;
             groups: any[];

package/types/services/bind.d.mts

@@ -1539,7 +1539,7 @@ export class BindService extends ExtraSourceService {
     _zones: any[];
     _trusted: any[];
     _exclude: Set<any>;
-    _excludeInterfaceKinds: Set<any>;
+    excludeInterfaceKinds: Set<any>;
     serial: number;
     refresh: number;
     retry: number;
@@ -1558,8 +1558,6 @@ export class BindService extends ExtraSourceService {
     get trusted(): any[];
     set exclude(value: Set<any>);
     get exclude(): Set<any>;
-    set excludeInterfaceKinds(value: Set<any>);
-    get excludeInterfaceKinds(): Set<any>;
     preparePackages(dir: any): AsyncGenerator<any, void, unknown>;
     generateOutfacingDefs(outputControl: any, sources: any): AsyncGenerator<any, void, unknown>;
     generateZoneDefs(outputControl: any, sources: any): Promise<any>;