npm-pkgbuild 7.28.4 → 8.0.0

package/README.md

@@ -45,6 +45,8 @@ The resulting pkg will contain the package dist content and all production depen
 *   [fields](#fields)
 *   [fields](#fields-1)
 *   [fields](#fields-2)
+*   [hookMapping](#hookmapping)
+*   [hookMapping](#hookmapping-1)
 *   [Field](#field)
     *   [Properties](#properties)
 *   [Packager](#packager)
@@ -52,7 +54,6 @@ The resulting pkg will contain the package dist content and all production depen
     *   [tmpdir](#tmpdir)
     *   [execute](#execute)
         *   [Parameters](#parameters-4)
-*   [hookMapping](#hookmapping)
 *   [decodePassword](#decodepassword)
     *   [Parameters](#parameters-5)
 *   [extractFunctions](#extractfunctions)
@@ -138,6 +139,14 @@ well known package properties
 
 *   **See**: <https://rpm-packaging-guide.github.io>
 
+## hookMapping
+
+map install hook named from arch to deb
+
+## hookMapping
+
+map install hook named from arch to rpm
+
 ## Field
 
 Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
@@ -173,10 +182,6 @@ Execute package generation
 *   `options`  
 *   `expander`  
 
-## hookMapping
-
-map install hook named from arch to rpm
-
 ## decodePassword
 
 Decode a password

package/package.json

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

package/src/extract-from-package.mjs

@@ -5,12 +5,12 @@ import { asArray } from "./util.mjs";
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
 import { NodeModulesContentProvider } from "./content/node-modules-content-provider.mjs";
 import { FileContentProvider } from "./content/file-content-provider.mjs";
-import { DEB } from "./output/deb.mjs";
+import { DEBIAN } from "./output/debian.mjs";
 import { ARCH } from "./output/arch.mjs";
 import { RPM } from "./output/rpm.mjs";
 
 export const allInputs = [NPMPackContentProvider, NodeModulesContentProvider];
-export const allOutputs = [DEB, ARCH, RPM];
+export const allOutputs = [DEBIAN, ARCH, RPM];
 
 export const npmArchMapping = {
   arm64: "aarch64",

package/src/module.mjs

@@ -6,7 +6,7 @@ export * from "./content/content-provider.mjs";
 export * from "./content/file-content-provider.mjs";
 export * from "./content/node-modules-content-provider.mjs";
 export * from "./content/npm-pack-content-provider.mjs";
-export * from "./output/deb.mjs";
+export * from "./output/debian.mjs";
 export * from "./output/rpm.mjs";
 export * from "./output/arch.mjs";
 export * from "./output/packager.mjs";

package/src/npm-pkgbuild-cli.mjs

@@ -4,7 +4,6 @@ import { readFileSync } from "fs";
 import { readFile } from "fs/promises";
 import { join } from "path";
 import { program } from "commander";
-import { aggregateFifo } from "aggregate-async-iterator";
 import { createContext } from "expression-expander";
 import { packageDirectory } from "pkg-dir";
 import {
@@ -131,7 +130,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 → debian.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 {
@@ -27,9 +28,9 @@ const hookMapping = {
   post_remove: "DEBIAN/postrm"
 };
 
-export class DEB extends Packager {
+export class DEBIAN extends Packager {
   static get name() {
-    return "deb";
+    return "debian";
   }
 
   static get description() {
@@ -58,40 +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: () =>
-              Object.create(
-                new StringContentEntry(
-                  name,
-                  f.body.replace(
-                    /\{\{(\w+)\}\}/m,
-                    (match, key, offset, string) =>
-                      properties[key] || "{{" + key + "}}"
-                  )
-                ),
-                { mode: { value: 0o775 } }
-              )
-          });
+          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(
@@ -101,6 +92,10 @@ export class DEB extends Packager {
       )
     );
 
+    properties.Depends = Object.entries(dependencies).map(
+      ([n, e]) => `${n} (${e})`
+    );
+
     const fp = fieldProvider(properties, fields);
     const debianControlName = "DEBIAN/control";
 
@@ -115,12 +110,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}`);
       }
     }
 
@@ -156,13 +154,16 @@ const fields = {
   },
   Homepage: { alias: "homepage", type: "string" },
   Bugs: { alias: "bugs", type: "string" },
-  Depends: { alias: "depends", type: "packageList" },
-  Recommends: { type: "packageList" },
-  Suggests: { type: "packageList" },
-  Provides: { type: "packageList" },
-  Breaks: { type: "packageList" },
-  Replaces: { type: "packageList" },
-
+  Depends: { type: "string[]" },
+  "Pre-Depends": { type: "string[]" },
+  "Build-Depends": { type: "string[]" },
+  "Build-Depends-Indep": { type: "string[]" },
+  "Build-Depends-Arch": { type: "string[]" },
+  Recommends: { type: "string[]" },
+  Suggests: { type: "string[]" },
+  Provides: { type: "string[]" },
+  Breaks: { type: "string[]" },
+  Replaces: { type: "string[]" },
   Source: { alias: "source", type: "string" },
   Uploaders: { mandatory: false },
   "Installed-Size": {}

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 =>

package/src/util.mjs

@@ -32,7 +32,7 @@ export function decodePassword(password)
  */
 export async function* extractFunctions(source) {
   let name;
-  let body = [];
+  const body = [];
 
   for await (const line of asLines(source)) {
     let m;