pmcf 1.54.13 → 1.56.0

package/bin/pmcf-package

@@ -4,11 +4,7 @@ import { join } from "node:path";
 import { readFile, mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { packageDirectory } from "pkg-dir";
-import {
-  FileContentProvider,
-  createPublishingDetails,
-  ARCH
-} from "npm-pkgbuild";
+import { FileContentProvider, createPublishingDetails } from "npm-pkgbuild";
 import { prepare } from "../src/cmd.mjs";
 
 const { root, args, options } = await prepare();
@@ -25,28 +21,37 @@ const publishingDetails = createPublishingDetails(options.publish, process.env);
 for (const name of args) {
   const object = await root.load(name);
   const stagingDir = join(options.output, object.fullName);
-  const { properties } = await object.preparePackage(stagingDir);
-
-  properties.version = pkg.version;
-  properties.license = pkg.license;
-
-  if (properties.verbose) {
-    console.log(properties);
-  }
-
-  const output = new ARCH(properties);
-  const sources = [
-    new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
-  ];
-  const artifact = await output.create(sources, [], publishingDetails, options);
-
-  if (properties.verbose) {
-    console.log(artifact);
+  const { properties, outputs } = await object.preparePackage(stagingDir);
+
+  for (const outputFactory of outputs) {
+    properties.version = pkg.version;
+    properties.license = pkg.license;
+
+    if (properties.verbose) {
+      console.log(properties);
+    }
+
+    const sources = [
+      new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
+    ];
+
+    const output = new outputFactory(properties);
+
+    const artifact = await output.create(
+      sources,
+      [],
+      publishingDetails,
+      options
+    );
+
+    if (properties.verbose) {
+      console.log(artifact);
+    }
+
+    await Promise.all(
+      publishingDetails.map(publishDetail =>
+        output.publish(artifact, publishDetail)
+      )
+    );
   }
-
-  await Promise.all(
-    publishingDetails.map(publishDetail =>
-      output.publish(artifact, publishDetail)
-    )
-  );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.54.13",
+  "version": "1.56.0",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "npm-pkgbuild": "^17.1.0",
+    "npm-pkgbuild": "^17.1.1",
     "pacc": "^3.3.0",
     "pkg-dir": "^8.0.0"
   },

package/src/base.mjs

@@ -288,8 +288,13 @@ export class Base {
     return `${this.constructor.typeDefinition.name}-${this.name}`;
   }
 
+  get outputs() {
+    return new Set();
+  }
+
   async preparePackage(stagingDir) {
     return {
+      outputs: this.outputs,
       properties: {
         name: this.packageName,
         description: `${this.constructor.typeDefinition.name} definitions for ${this.fullName}`,

package/src/dns.mjs

@@ -104,14 +104,14 @@ export class DNSService extends Base {
   }
 
   async preparePackage(stagingDir) {
-    const { properties } = await super.preparePackage(stagingDir);
+    const result = await super.preparePackage(stagingDir);
 
     await generateNamedDefs(this, stagingDir);
 
-    properties.dependencies = ["mf-named"];
-    properties.replaces = ["mf-named-zones"];
+    result.properties.dependencies = ["mf-named"];
+    result.properties.replaces = ["mf-named-zones"];
 
-    return { properties };
+    return result;
   }
 }
 

package/src/host.mjs

@@ -1,5 +1,6 @@
 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 {
@@ -17,6 +18,7 @@ import {
   copySshKeys,
   generateKnownHosts
 } from "./host-utils.mjs";
+import { OutputFileType } from "typescript";
 
 const HostTypeDefinition = {
   name: "host",
@@ -38,6 +40,7 @@ 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 },
@@ -66,6 +69,7 @@ export class Host extends Base {
   #deployment;
   #chassis;
   #vendor;
+  #packaging;
 
   static {
     addType(this);
@@ -142,6 +146,14 @@ 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 isTemplate() {
     return this.isModel || this.name.match(/services\//); // TODO
   }
@@ -325,8 +337,13 @@ 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));
+  }
+
   async preparePackage(stagingDir) {
-    const { properties } = await super.preparePackage(stagingDir);
+    const result = await super.preparePackage(stagingDir);
     await generateNetworkDefs(this, stagingDir);
     await generateMachineInfo(this, stagingDir);
     await copySshKeys(this, stagingDir);
@@ -335,12 +352,12 @@ export class Host extends Base {
       join(stagingDir, "root", ".ssh")
     );
 
-    properties.dependencies = [this.location.packageName, ...this.depends];
-    properties.provides = [...this.provides];
-    properties.replaces = [`mf-${this.hostName}`, ...this.replaces];
-    properties.backup = "root/.ssh/known_hosts";
+    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";
 
-    return { properties };
+    return result;
   }
 }
 

package/src/location.mjs

@@ -46,7 +46,7 @@ export class Location extends Owner {
   }
 
   async preparePackage(stagingDir) {
-    const { properties } = await super.preparePackage(stagingDir);
+    const result = await super.preparePackage(stagingDir);
 
     await writeLines(
       join(stagingDir, "etc/systemd/resolved.conf.d"),
@@ -83,21 +83,26 @@ export class Location extends Owner {
       join(locationDir, "location.json")
     );
 
-    properties.provides = [
+    result.properties.provides = [
       "location",
       "mf-location",
       `mf-location-${this.name}`
     ];
-    properties.replaces = [`mf-location-${this.name}`];
+    result.properties.replaces = [`mf-location-${this.name}`];
 
+    /*
     const install = "location.install";
+
+    console.log(new URL(install, import.meta.url));
+
     await copyFile(
       new URL(install, import.meta.url),
       join(stagingDir, install)
     );
 
-    properties.install = install;
-
-    return { properties };
+    result.properties.install = install;
+    */
+   
+    return result;
   }
 }

package/src/owner.mjs

@@ -278,6 +278,15 @@ export class Owner extends Base {
     }
   }
 
+  get outputs() {
+    let all = new Set();
+    for (const host of this.hosts()) {
+      all = all.union(host.outputs);
+    }
+
+    return all;
+  }
+
   *networkAddresses() {
     for (const host of this.hosts()) {
       yield* host.networkAddresses();

package/types/base.d.mts

@@ -60,7 +60,9 @@ export class Base {
     get directory(): any;
     get fullName(): any;
     get packageName(): string;
+    get outputs(): Set<any>;
     preparePackage(stagingDir: any): Promise<{
+        outputs: Set<any>;
         properties: {
             name: string;
             description: string;

package/types/host.d.mts

@@ -86,6 +86,11 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            packaging: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             priority: {
                 type: string;
                 collection: boolean;
@@ -155,6 +160,8 @@ 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;
@@ -182,6 +189,7 @@ export class Host extends Base {
     get rawAddresses(): any[];
     get cidrAddresses(): any[];
     publicKey(type?: string): Promise<string>;
+    get outputs(): Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
     #private;
 }
 export class NetworkInterface extends Base {