pmcf 1.56.8 → 1.57.1

package/package.json

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

package/src/base.mjs

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { allOutputs } from "npm-pkgbuild";
 import { getAttribute } from "pacc";
 import { addType, primitives } from "./types.mjs";
 
@@ -15,7 +16,8 @@ const BaseTypeDefinition = {
       writeable: true
     },
     description: { type: "string", collection: false, writeable: true },
-    directory: { type: "string", collection: false, writeable: false }
+    directory: { type: "string", collection: false, writeable: false },
+    packaging: { type: "string", collection: false, writeable: true }
   }
 };
 
@@ -288,8 +290,28 @@ export class Base {
     return `${this.constructor.typeDefinition.name}-${this.name}`;
   }
 
+  #packaging = new Set();
+
+  set packaging(value) {
+    this.#packaging.add(value);
+  }
+
+  get derivedPackaging() {
+    return this.owner?.packaging;
+  }
+
+  get packaging() {
+    const dp = this.derivedPackaging;
+
+    if (dp) {
+      return this.#packaging.union(dp);
+    }
+
+    return this.#packaging;
+  }
+
   get outputs() {
-    return this.owner ? this.owner.outputs : new Set();
+    return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
   async preparePackage(stagingDir) {

package/src/host.mjs

@@ -1,6 +1,5 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import { allOutputs } from "npm-pkgbuild";
 import { Base } from "./base.mjs";
 import { networkProperties } from "./network-support.mjs";
 import {
@@ -39,7 +38,6 @@ const HostTypeDefinition = {
     serial: { type: "string", collection: false, writeable: true },
     vendor: { type: "string", collection: false, writeable: true },
     chassis: { type: "string", collection: false, writeable: true },
-    packaging: { type: "string", collection: false, writeable: true },
     priority: { type: "number", collection: false, writeable: true },
     replaces: { type: "string", collection: true, writeable: true },
     depends: { type: "string", collection: true, writeable: true },
@@ -68,7 +66,6 @@ export class Host extends Base {
   #deployment;
   #chassis;
   #vendor;
-  #packaging;
 
   static {
     addType(this);
@@ -145,12 +142,8 @@ export class Host extends Base {
     return this.#vendor || this.extends.find(e => e.vendor)?.vendor;
   }
 
-  set packaging(value) {
-    this.#packaging = value;
-  }
-
-  get packaging() {
-    return this.#packaging || this.extends.find(e => e.packaging)?.packaging;
+  get derivedPackaging() {
+    return this.extends.reduce((a, c) => a.union(c.packaging), new Set());
   }
 
   get isTemplate() {
@@ -336,9 +329,8 @@ export class Host extends Base {
     return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
   }
 
-  get outputs()
-  {
-    return new Set(allOutputs.filter(o=>o.name === this.packaging));
+  get packageName() {
+    return `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}`;
   }
 
   async preparePackage(stagingDir) {
@@ -351,7 +343,10 @@ export class Host extends Base {
       join(stagingDir, "root", ".ssh")
     );
 
-    result.properties.dependencies = [this.location.packageName, ...this.depends];
+    result.properties.dependencies = [
+      this.location.packageName,
+      ...this.depends
+    ];
     result.properties.provides = [...this.provides];
     result.properties.replaces = [`mf-${this.hostName}`, ...this.replaces];
     result.properties.backup = "root/.ssh/known_hosts";

package/src/owner.mjs

@@ -278,10 +278,10 @@ export class Owner extends Base {
     }
   }
 
-  get outputs() {
+  get derivedPackaging() {
     let all = new Set();
     for (const host of this.hosts()) {
-      all = all.union(host.outputs);
+      all = all.union(host.packaging);
     }
 
     return all;

package/types/base.d.mts

@@ -31,6 +31,11 @@ export class Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            packaging: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
         };
     };
     static get typeFileName(): string;
@@ -60,9 +65,12 @@ export class Base {
     get directory(): any;
     get fullName(): any;
     get packageName(): string;
-    get outputs(): any;
+    set packaging(value: Set<any>);
+    get packaging(): Set<any>;
+    get derivedPackaging(): any;
+    get outputs(): Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
     preparePackage(stagingDir: any): Promise<{
-        outputs: any;
+        outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
             description: string;

package/types/cluster.d.mts

@@ -35,6 +35,11 @@ export class Cluster extends Owner {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    packaging: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                 };
             };
             properties: {
@@ -209,6 +214,11 @@ export class Cluster extends Owner {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    packaging: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                 };
             };
             properties: {

package/types/host.d.mts

@@ -33,6 +33,11 @@ export class Host extends Base {
                     collection: boolean;
                     writeable: boolean;
                 };
+                packaging: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
             };
         };
         properties: {
@@ -86,11 +91,6 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
-            packaging: {
-                type: string;
-                collection: boolean;
-                writeable: boolean;
-            };
             priority: {
                 type: string;
                 collection: boolean;
@@ -160,8 +160,6 @@ export class Host extends Base {
     get chassis(): any;
     set vendor(value: any);
     get vendor(): any;
-    set packaging(value: any);
-    get packaging(): any;
     get isTemplate(): true | RegExpMatchArray;
     get isModel(): boolean;
     get model(): any;
@@ -189,7 +187,6 @@ export class Host extends Base {
     get rawAddresses(): any[];
     get cidrAddresses(): any[];
     publicKey(type?: string): Promise<string>;
-    get outputs(): Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
     #private;
 }
 export class NetworkInterface extends Base {
@@ -227,6 +224,11 @@ export class NetworkInterface extends Base {
                     collection: boolean;
                     writeable: boolean;
                 };
+                packaging: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
             };
         };
         properties: {

package/types/location.d.mts

@@ -35,6 +35,11 @@ export class Location extends Owner {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    packaging: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                 };
             };
             properties: {
@@ -209,6 +214,11 @@ export class Location extends Owner {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    packaging: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                 };
             };
             properties: {

package/types/network.d.mts

@@ -37,6 +37,11 @@ export class Network extends Owner {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    packaging: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                 };
             };
             properties: {

package/types/owner.d.mts

@@ -33,6 +33,11 @@ export class Owner extends Base {
                     collection: boolean;
                     writeable: boolean;
                 };
+                packaging: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
             };
         };
         properties: {
@@ -195,7 +200,7 @@ export class Owner extends Base {
     clusters(): any;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
-    get outputs(): Set<any>;
+    get derivedPackaging(): Set<any>;
     networkAddresses(): Generator<any, void, any>;
     set country(value: any);
     get country(): any;

package/types/root.d.mts

@@ -39,6 +39,11 @@ export class Root extends Location {
                             collection: boolean;
                             writeable: boolean;
                         };
+                        packaging: {
+                            type: string;
+                            collection: boolean;
+                            writeable: boolean;
+                        };
                     };
                 };
                 properties: {
@@ -213,6 +218,11 @@ export class Root extends Location {
                             collection: boolean;
                             writeable: boolean;
                         };
+                        packaging: {
+                            type: string;
+                            collection: boolean;
+                            writeable: boolean;
+                        };
                     };
                 };
                 properties: {

package/types/service.d.mts

@@ -33,6 +33,11 @@ export class Service extends Base {
                     collection: boolean;
                     writeable: boolean;
                 };
+                packaging: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
             };
         };
         properties: {