npm-pkgbuild 17.3.0 → 17.3.2

package/README.md

@@ -117,9 +117,8 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
     *   [Parameters](#parameters-6)
     *   [Properties](#properties-3)
     *   [asyncIterator](#asynciterator)
-*   [hookMapping](#hookmapping)
-*   [hookMapping](#hookmapping-1)
 *   [DEBIAN](#debian)
+    *   [hookMapping](#hookmapping)
     *   [prepare](#prepare)
         *   [Parameters](#parameters-7)
 *   [fields](#fields)
@@ -130,6 +129,7 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [quoteFile](#quotefile)
     *   [Parameters](#parameters-8)
 *   [RPM](#rpm)
+    *   [hookMapping](#hookmapping-1)
     *   [prepare](#prepare-1)
         *   [Parameters](#parameters-9)
 *   [OCI](#oci)
@@ -339,20 +339,16 @@ List all entries.
 
 Returns **AsyncIterable\<ContentEntry>** all entries
 
-## hookMapping
-
-map install hook named from arch to deb
-
-## hookMapping
-
-map install hook named from arch to rpm
-
 ## DEBIAN
 
 **Extends Packager**
 
 Create .deb packages
 
+### hookMapping
+
+Map install hook named from default (arch) to deb.
+
 ### prepare
 
 #### Parameters
@@ -398,6 +394,10 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 
 Produce rpm packages.
 
+### hookMapping
+
+Map install hook named from default (arch) to rpm.
+
 ### prepare
 
 Check for rpmbuild presence.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "17.3.0",
+  "version": "17.3.2",
   "publishConfig": {
     "access": "public",
     "provenance": false

package/src/output/arch.mjs

@@ -117,6 +117,10 @@ export class ARCH extends Packager {
     return `${p.name}-${p.version}-${p.release}-${p.arch}${this.fileNameExtension}`;
   }
 
+  dependencyExpression(name, expression) {
+    return quote(`${this.packageName(name)}${normalizeExpression(expression)}`);
+  }
+
   async create(sources, transformer, publishingDetails, options, expander) {
     const { properties, staging, destination } = await this.prepare(options);
 
@@ -143,11 +147,7 @@ export class ARCH extends Packager {
     async function* trailingLines() {
       yield `
 package() {
-  depends=(${self
-    .makeDepends(properties.dependencies, (name, expression) =>
-      quote(`${self.packageName(name)}${normalizeExpression(expression)}`)
-    )
-    .join(" ")})
+  depends=(${self.makeDepends(properties.dependencies).join(" ")})
 
   if [ "$(ls -A $srcdir)" ]
   then

package/src/output/debian.mjs

@@ -75,12 +75,9 @@ export class DEBIAN extends Packager {
     };
   }
 
-  makeDepends(deps) {
-    return super.makeDepends(deps, (name, expression) =>
-      expression
-        ? `${this.packageName(name)} (${expression})`
-        : this.packageName(name)
-    );
+  dependencyExpression(name, expression) {
+    name = this.packageName(name);
+    return expression ? `${name} (${expression})` : name;
   }
 
   async create(sources, transformer, publishingDetails, options, expander) {
@@ -94,11 +91,9 @@ export class DEBIAN extends Packager {
       )
     );
 
-    if (
-      properties.dependencies &&
-      Object.keys(properties.dependencies).length > 0
-    ) {
-      properties.Depends = this.makeDepends(properties.dependencies);
+    const depends = this.makeDepends(properties.dependencies);
+    if(depends.length) {
+      properties.Depends = depends;
     }
 
     const fp = fieldProvider(properties, fields);
@@ -115,10 +110,7 @@ export class DEBIAN extends Packager {
     });
 
     for await (const file of copyEntries(
-      transform(
-        aggregateFifo([...sources, this.hookContent()]),
-        transformer
-      ),
+      transform(aggregateFifo([...sources, this.hookContent()]), transformer),
       staging,
       expander
     )) {

package/src/output/packager.mjs

@@ -115,10 +115,11 @@ export class Packager {
     }
   }
 
-  makeDepends(
-    dependencies,
-    exp = (name, expression) => `${name}${expression}`
-  ) {
+  dependencyExpression(name, expression) {
+    return expression ? `${name}${expression}`: name;
+  }
+
+  makeDepends(dependencies) {
     if (!dependencies) {
       return [];
     }
@@ -133,7 +134,7 @@ export class Packager {
     }
     return Object.entries(dependencies)
       .filter(filterOutUnwantedDependencies())
-      .map(([name, expression]) => exp(name, expression));
+      .map(([name, expression]) => this.dependencyExpression(name, expression));
   }
 
   get fileNameExtension() {

package/src/output/rpm.mjs

@@ -20,7 +20,6 @@ import {
   copyEntries,
   fieldProvider,
   utf8StreamOptions,
-  extractFunctions,
   compileFields
 } from "../util.mjs";
 
@@ -86,18 +85,14 @@ export class RPM extends Packager {
     return false;
   }
 
-  makeDepends(deps) {
-    return super.makeDepends(
-      deps,
-      (name, expression) =>
-        `${this.packageName(name)}${expression
-          .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
-          .replace(/^\s*$/, "")
-          .replace(
-            /^\s*(<|<=|>|>=|=)\s*(\w+)/,
-            (match, p1, p2) => ` ${p1} ${p2}`
-          )}`
-    );
+  dependencyExpression(name, expression) {
+    return `${this.packageName(name)}${expression
+      .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
+      .replace(/^\s*$/, "")
+      .replace(
+        /^\s*(<|<=|>|>=|=)\s*(\w+)/,
+        (match, p1, p2) => ` ${p1} ${p2}`
+      )}`;
   }
 
   /**
@@ -138,7 +133,7 @@ export class RPM extends Packager {
 
       for await (const hook of self.hookContent()) {
         yield `%${hook.name}\n`;
-        yield * hook.string.split("\n").map(l=>l+"\n");
+        yield* hook.string.split("\n").map(l => l + "\n");
       }
 
       yield `%files\n\n`;

package/types/output/debian.d.mts

@@ -22,7 +22,6 @@ export class DEBIAN extends Packager {
         post_install: string;
         post_remove: string;
     };
-    makeDepends(deps: any): string[];
     create(sources: any, transformer: any, publishingDetails: any, options: any, expander: any): Promise<string>;
 }
 import { Packager } from "./packager.mjs";

package/types/output/packager.d.mts

@@ -40,7 +40,8 @@ export class Packager {
     packageName(name: string): string;
     get hookMapping(): {};
     hookContent(): AsyncGenerator<StringContentEntry, void, unknown>;
-    makeDepends(dependencies: any, exp?: (name: any, expression: any) => string): string[];
+    dependencyExpression(name: any, expression: any): any;
+    makeDepends(dependencies: any): any[];
     get fileNameExtension(): any;
     get fields(): any;
     get properties(): any;

package/types/output/rpm.d.mts

@@ -22,7 +22,7 @@ export class RPM extends Packager {
         arch: string;
     }): Promise<boolean>;
     get packageFileName(): string;
-    makeDepends(deps: any): string[];
+    dependencyExpression(name: any, expression: any): string;
     /**
      * Map install hook named from default (arch) to rpm.
      */