npm-pkgbuild 7.28.2 → 7.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.28.2",
+  "version": "7.29.0",
   "publishConfig": {
     "access": "public"
   },

package/src/npm-pkgbuild-cli.mjs

@@ -131,7 +131,7 @@ program
         }
 
         const fileName = await output.execute(
-          aggregateFifo(sources.map(c => c[Symbol.asyncIterator]())),
+          sources.map(c => c[Symbol.asyncIterator]()),
           transformer,
           dependencies,
           options,

package/src/output/arch.mjs

@@ -12,6 +12,7 @@ import {
   keyValueTransformer,
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
+import { aggregateFifo } from "aggregate-async-iterator";
 import { Packager } from "./packager.mjs";
 import {
   copyEntries,
@@ -136,7 +137,7 @@ package() {
     });
 
     for await (const file of copyEntries(
-      transform(sources, transformer),
+      transform(aggregateFifo(sources), transformer),
       join(staging, "src"),
       expander
     )) {

package/src/output/deb.mjs

@@ -10,6 +10,7 @@ import {
   transform,
   createPropertiesTransformer
 } from "content-entry-transform";
+import { aggregateFifo } from "aggregate-async-iterator";
 import { keyValueTransformer } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
 import {
@@ -58,37 +59,30 @@ export class DEB extends Packager {
     return `${p.name}_${p.version}_${p.arch}${this.constructor.fileNameExtension}`;
   }
 
-  async execute(sources, transformer, dependencies, options, expander) {
-    const { properties, staging, destination } = await this.prepareExecute(
-      options
-    );
-
+  async *hookFiles(properties) {
     if (properties.hooks) {
       for await (const f of extractFunctions(
         createReadStream(properties.hooks, utf8StreamOptions)
       )) {
         const name = hookMapping[f.name];
         if (name) {
-          transformer.push({
-            match: entry => entry.name === name,
-            transform: async entry =>
-              new ReadableStreamContentEntry(
-                entry.name,
-                keyValueTransformer(await entry.readStream, fp)
-              ),
-            createEntryWhenMissing: () =>
-              new StringContentEntry(
-                name,
-                f.body.replace(
-                  /\{\{(\w+)\}\}/m,
-                  (match, key, offset, string) =>
-                    properties[key] || "{{" + key + "}}"
-                )
-              )
-          });
+          yield new StringContentEntry(
+            name,
+            f.body.replace(
+              /\{\{(\w+)\}\}/m,
+              (match, key, offset, string) =>
+                properties[key] || "{{" + key + "}}"
+            )
+          );
         }
       }
     }
+  }
+
+  async execute(sources, transformer, dependencies, options, expander) {
+    const { properties, staging, destination } = await this.prepareExecute(
+      options
+    );
 
     transformer.push(
       createPropertiesTransformer(
@@ -112,12 +106,15 @@ export class DEB extends Packager {
     });
 
     for await (const file of copyEntries(
-      transform(sources, transformer),
+      transform(
+        aggregateFifo([...sources, this.hookFiles(properties)]),
+        transformer
+      ),
       staging,
       expander
     )) {
       if (options.verbose) {
-        console.log(file.destination);
+        console.log(file.destination, `mode=${file.mode}`);
       }
     }
 

package/src/output/rpm.mjs

@@ -8,6 +8,7 @@ import {
   keyValueTransformer,
   colonSeparatedKeyValuePairOptions
 } from "key-value-transformer";
+import { aggregateFifo } from "aggregate-async-iterator";
 import { Packager } from "./packager.mjs";
 import {
   copyEntries,
@@ -122,7 +123,7 @@ export class RPM extends Packager {
     const fp = fieldProvider(properties, fields);
 
     for await (const file of copyEntries(
-      transform(sources, [
+      transform(aggregateFifo(sources), [
         {
           match: entry => entry.name === specFileName,
           transform: async entry =>