pmcf 4.16.13 → 4.16.14

package/bin/pmcf-package

@@ -67,7 +67,7 @@ for (const object of root.find(args)) {
       const output = new outputFactory(properties);
 
       const artifact = await output.create(
-        sources.map(source => source[Symbol.asyncIterator]()),
+        sources.flat().map(source => source[Symbol.asyncIterator]()),
         [],
         publishingDetails,
         options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.16.13",
+  "version": "4.16.14",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   "dependencies": {
     "content-entry-transform": "^1.6.4",
     "ip-utilties": "^3.0.0",
-    "npm-pkgbuild": "^20.5.1",
+    "npm-pkgbuild": "^20.6.1",
     "pacc": "^8.8.0",
     "package-directory": "^8.2.0"
   },

package/src/base.mjs

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { stat } from "node:fs/promises";
 import { allOutputs } from "npm-pkgbuild";
 import {
   createExpressionTransformer,
@@ -318,6 +319,11 @@ export class Base {
     return this.owner.addObject(object);
   }
 
+  /**
+   * Walk the object graph in some directions and deliver seen nodes.
+   * @param {string[]} directions
+   * @return {Iterable<Base>}
+   */
   *walkDirections(directions = ["this", "extends", "owner"]) {
     yield* this._walkDirections(
       directions,
@@ -567,17 +573,33 @@ export class Base {
     ];
   }
 
-  templateContent(entryProperties, directoryProperties) {
-    return [...this.walkDirections(["this", "extends"])].map(e =>
-      transform(
-        new FileContentProvider(
-          { dir: join(e.directory, "content"), pattern: "**/*" },
-          entryProperties,
-          directoryProperties
-        ),
-        this.templateTransformers
-      )
-    );
+  /**
+   *
+   * @param {*} entryProperties
+   * @param {*} directoryProperties
+   * @returns {AsyncIterable<ContentProvider>}
+   */
+  async *templateContent(entryProperties, directoryProperties) {
+    for (const node of this.walkDirections(["this", "extends"])) {
+      const dir = join(node.directory, "content");
+
+      try {
+        if ((await stat(dir)).isDirectory) {
+          yield transform(
+            new FileContentProvider(
+              { dir, pattern: "**/*" },
+              entryProperties,
+              directoryProperties
+            ),
+            this.templateTransformers
+          );
+        }
+      } catch (e) {
+        if (e.code !== "ENOENT") {
+          throw e;
+        }
+      }
+    }
   }
 
   get tags() {

package/src/host.mjs

@@ -412,7 +412,7 @@ export class Host extends ServiceOwner {
     const pkgName = `${this.typeName}-${this.owner.name}-${this.name}`;
     let packageData = {
       sources: [
-        ...this.templateContent(),
+        await Array.fromAsync(this.templateContent()),
         new FileContentProvider(
           { dir: this.directory, pattern: "*.pub" },
           { destination: "/etc/ssh/", mode: 0o644 }
@@ -491,4 +491,3 @@ export class Host extends ServiceOwner {
     }
   }
 }
-

package/src/service.mjs

@@ -272,7 +272,7 @@ export class Service extends Base {
 
   async *preparePackages(dir) {
     const pd = this.packageData;
-    pd.sources = this.templateContent();
+    pd.sources = await Array.fromAsync(this.templateContent());
     if (pd.sources.length) {
       yield pd;
     }

package/src/services/mosquitto.mjs

@@ -55,17 +55,19 @@ export class MosquittoService extends Service {
     const group = "mosquitto";
 
     const packageData = this.packageData;
-    packageData.sources = this.templateContent(
-      {
-        mode: 0o644,
-        owner,
-        group
-      },
-      {
-        mode: 0o755,
-        owner,
-        group
-      }
+    packageData.sources = await Array.fromAsync(
+      this.templateContent(
+        {
+          mode: 0o644,
+          owner,
+          group
+        },
+        {
+          mode: 0o755,
+          owner,
+          group
+        }
+      )
     );
 
     yield packageData;

package/src/services/openldap.mjs

@@ -63,17 +63,19 @@ export class OpenLDAPService extends Service {
 
     const packageData = this.packageData;
 
-    packageData.sources = this.templateContent(
-      {
-        mode: 0o644,
-        owner,
-        group
-      },
-      {
-        mode: 0o755,
-        owner,
-        group
-      }
+    packageData.sources = await Array.fromAsync(
+      this.templateContent(
+        {
+          mode: 0o644,
+          owner,
+          group
+        },
+        {
+          mode: 0o755,
+          owner,
+          group
+        }
+      )
     );
 
     yield packageData;

package/types/base.d.mts

@@ -63,7 +63,12 @@ export class Base {
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
-    walkDirections(directions?: string[]): Generator<any, void, any>;
+    /**
+     * Walk the object graph in some directions and deliver seen nodes.
+     * @param {string[]} directions
+     * @return {Iterable<Base>}
+     */
+    walkDirections(directions?: string[]): Iterable<Base>;
     _walkDirections(directions: any, withThis: any, seen: any): Generator<any, void, any>;
     forOwner(owner: any): any;
     isNamed(name: any): boolean;
@@ -128,7 +133,13 @@ export class Base {
     get outputs(): Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
     preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
     get templateTransformers(): any[];
-    templateContent(entryProperties: any, directoryProperties: any): any[];
+    /**
+     *
+     * @param {*} entryProperties
+     * @param {*} directoryProperties
+     * @returns {AsyncIterable<ContentProvider>}
+     */
+    templateContent(entryProperties: any, directoryProperties: any): AsyncIterable<ContentProvider>;
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): any;

package/types/host.d.mts

@@ -261,7 +261,7 @@ export class Host extends ServiceOwner {
     get subnets(): Set<any>;
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
-        sources: any[];
+        sources: (FileContentProvider | ContentProvider[])[];
         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;