pmcf 1.59.7 → 1.59.8

package/bin/pmcf-package

@@ -5,7 +5,7 @@ import { readFile, mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { env } from "node:process";
 import { packageDirectory } from "pkg-dir";
-import { FileContentProvider, createPublishingDetails } from "npm-pkgbuild";
+import { createPublishingDetails } from "npm-pkgbuild";
 import { prepare } from "../src/cmd.mjs";
 import { asArray } from "../src/utils.mjs";
 
@@ -26,7 +26,7 @@ for (const name of args) {
   const object = await root.load(name);
   const stagingDir = join(options.output, object.fullName);
 
-  for await (const { properties, outputs } of object.preparePackages(
+  for await (const { sources, outputs, properties } of object.preparePackages(
     stagingDir
   )) {
     for (const outputFactory of outputs) {
@@ -40,10 +40,6 @@ for (const name of args) {
         console.log(properties);
       }
 
-      const sources = [
-        new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
-      ];
-
       const output = new outputFactory(properties);
 
       const artifact = await output.create(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.59.7",
+  "version": "1.59.8",
   "publishConfig": {
     "access": "public"
   },
@@ -38,12 +38,12 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "npm-pkgbuild": "^17.2.3",
+    "npm-pkgbuild": "^17.2.4",
     "pacc": "^3.3.0",
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.9",
+    "@types/node": "^22.13.10",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -317,10 +317,6 @@ export class Base {
       : this.owner.fullName;
   }
 
-  get packageName() {
-    return `${this.constructor.typeDefinition.name}-${this.name}`;
-  }
-
   #packaging = new Set();
 
   set packaging(value) {
@@ -348,9 +344,9 @@ export class Base {
   async *preparePackages(stagingDir) {
     yield {
       outputs: this.outputs,
+      sources: [],
       properties: {
-        name: this.packageName,
-        description: `${this.constructor.typeDefinition.name} definitions for ${this.fullName}`,
+        description: `${this.typeName} definitions for ${this.fullName}`,
         access: "private"
       }
     };

package/src/cluster.mjs

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { FileContentProvider } from "npm-pkgbuild";
 import { Owner } from "./owner.mjs";
 import { addType } from "./types.mjs";
 import { writeLines } from "./utils.mjs";
@@ -31,34 +32,27 @@ export class Cluster extends Owner {
     this.read(data, ClusterTypeDefinition);
   }
 
-  set masters(value)
-  {
+  set masters(value) {
     this.#masters.add(value);
   }
 
-  get masters()
-  {
+  get masters() {
     return this.#masters;
   }
 
-  set backups(value)
-  {
+  set backups(value) {
     this.#backups.add(value);
   }
 
-  get backups()
-  {
+  get backups() {
     return this.#backups;
   }
 
-  get packageName() {
-    return `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}`;
-  }
-
   async *preparePackages(stagingDir) {
     for await (const result of super.preparePackages(stagingDir)) {
       for (const ni of this.masters.union(this.backups)) {
-
+        const name = `${this.typeName}-${this.owner.name}-${this.name}-${ni.host.name}`;
+        const packageStagingDir = join(stagingDir, name);
         const cfg = [
           `vrrp_instance ${this.name} {`,
           `  state ${this.masters.has(ni) ? "MASTER" : "BACKUP"}`,
@@ -77,14 +71,20 @@ export class Cluster extends Owner {
         ];
 
         await writeLines(
-          join(stagingDir, "etc/keepalived"),
+          join(packageStagingDir, "etc/keepalived"),
           "keepalived.conf",
           cfg
         );
 
-        result.properties.name = `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}-${ni.host.name}`;
+        result.properties.name = name;
         result.properties.dependencies = ["keepalived"];
 
+        result.sources.push(
+          new FileContentProvider(packageStagingDir + "/")[
+            Symbol.asyncIterator
+          ]()
+        );
+
         yield result;
       }
     }

package/src/dns.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
+import { FileContentProvider } from "npm-pkgbuild";
 import { writeLines, isIPv6Address, normalizeIPAddress } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
@@ -103,17 +104,18 @@ export class DNSService extends Base {
     };
   }
 
-  get packageName() {
-    return `named-${this.owner.name}`;
-  }
-
   async *preparePackages(stagingDir) {
     for await (const result of super.preparePackages(stagingDir)) {
       await generateNamedDefs(this, stagingDir);
 
+      result.properties.name = `named-${this.owner.name}`;
       result.properties.dependencies = ["mf-named"];
       result.properties.replaces = ["mf-named-zones"];
 
+      result.sources.push(
+        new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
+      );
+
       yield result;
     }
   }

package/src/host.mjs

@@ -1,5 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
+import { FileContentProvider } from "npm-pkgbuild";
 import { Base } from "./base.mjs";
 import { networkProperties } from "./network-support.mjs";
 import {
@@ -340,10 +341,6 @@ export class Host extends Base {
     return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
   }
 
-  get packageName() {
-    return `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}`;
-  }
-
   async *preparePackages(stagingDir) {
     for await (const result of super.preparePackages(stagingDir)) {
       await generateNetworkDefs(this, stagingDir);
@@ -354,14 +351,19 @@ export class Host extends Base {
         join(stagingDir, "root", ".ssh")
       );
 
+      result.properties.name = `${this.typeName}-${this.owner.name}-${this.name}`;
       result.properties.dependencies = [
-        this.location.packageName,
+        `${this.location.typeName}-${this.location.name}`,
         ...this.depends
       ];
       result.properties.provides = [...this.provides];
       result.properties.replaces = [`mf-${this.hostName}`, ...this.replaces];
       result.properties.backup = "root/.ssh/known_hosts";
 
+      result.sources.push(
+        new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
+      );
+
       yield result;
     }
   }

package/src/location.mjs

@@ -1,5 +1,6 @@
 import { mkdir, copyFile } from "node:fs/promises";
 import { join } from "node:path";
+import { FileContentProvider } from "npm-pkgbuild";
 import { Owner } from "./owner.mjs";
 import { addType } from "./types.mjs";
 import { writeLines, sectionLines } from "./utils.mjs";
@@ -82,6 +83,8 @@ export class Location extends Owner {
         join(locationDir, "location.json")
       );
 
+      result.properties.name = `${this.typeName}-${this.name}`;
+
       result.properties.provides = [
         "location",
         "mf-location",
@@ -89,6 +92,10 @@ export class Location extends Owner {
       ];
       result.properties.replaces = [`mf-location-${this.name}`];
 
+      result.sources.push(
+        new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
+      );
+
       /*
     const install = "location.install";
 

package/types/base.d.mts

@@ -67,15 +67,14 @@ export class Base {
     set directory(directory: any);
     get directory(): any;
     get fullName(): any;
-    get packageName(): string;
     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>;
     preparePackages(stagingDir: any): AsyncGenerator<{
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
+        sources: any[];
         properties: {
-            name: string;
             description: string;
             access: string;
         };