npm-pkgbuild 7.22.10 → 7.23.3

package/package.json

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

package/src/extract-from-package.mjs

@@ -1,3 +1,4 @@
+import { arch as hostArch } from 'process';
 import { packageWalker } from "npm-package-walker";
 import { asArray } from "./util.mjs";
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
@@ -10,12 +11,14 @@ import { RPM } from "./output/rpm.mjs";
 export const allInputs = [NPMPackContentProvider, NodeModulesContentProvider];
 export const allOutputs = [DEB, ARCH, RPM];
 
-const npmArchMapping = {
+export const npmArchMapping = {
   arm64: "aarch64",
   arm: "armv7h",
-  x86: "x86_64"
+  x64: "x86_64"
 };
 
+export const archMapping = Object.fromEntries(Object.entries(npmArchMapping).map(a=>[a[1],a[0]]));
+
 /**
  * Extract package definition from package.json.
  * @param {Object} pkg package.json content
@@ -69,7 +72,9 @@ export async function extractFromPackage(pkg, dir) {
       if (pkgbuild.abstract || !modulePath) {
         if (pkgbuild.arch) {
           for (const a of asArray(pkgbuild.arch)) {
-            arch.add(a);
+            if(npmArchMapping[hostArch] === a) {
+              arch.add(a);
+            }
           }
         }
 

package/src/output/rpm.mjs

@@ -1,4 +1,5 @@
 import { join } from "path";
+import { createReadStream } from "fs";
 import { cp } from "fs/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
@@ -8,7 +9,22 @@ import {
   colonSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, fieldProvider } from "../util.mjs";
+import {
+  copyEntries,
+  fieldProvider,
+  utf8StreamOptions,
+  extractFunctions
+} from "../util.mjs";
+
+/**
+ * map install hook named from arch to rpm
+ */
+const hookMapping = {
+  pre_instll: "pre",
+  post_install: "post",
+  pre_remove: "preun",
+  post_remove: "postun"
+};
 
 export class RPM extends Packager {
   static get name() {
@@ -64,29 +80,40 @@ export class RPM extends Packager {
 
     async function* trailingLines() {
       yield "%define _unpackaged_files_terminate_build 0\n";
-
-      for (const [name, options] of Object.entries(sections)) {
-        if (options.mandatory) {
-          yield `%${name}\n\n`;
-
-          if (name === "files") {
-            for (const file of files) {
-              yield "/" + file + "\n";
-            }
-
-            for await (const file of copyEntries(
-              transform(sources, transformer),
-              staging,
-              expander
-            )) {
-              if (options.verbose) {
-                console.log(file.destination);
-              }
-              yield file.destination + "\n";
-            }
+      yield `%description\n\n`;
+
+      if (properties.hooks) {
+        for await (const f of extractFunctions(
+          createReadStream(properties.hooks, utf8StreamOptions)
+        )) {
+          const name = hookMapping[f.name];
+          if (name) {
+            yield `%${name}\n`;
+
+            yield f.body.replace(
+              /\{\{(\w+)\}\}/m,
+              (match, key, offset, string) =>
+                properties[key] || "{{" + key + "}}"
+            ) + "\n\n";
           }
         }
       }
+
+      yield `%files\n\n`;
+      for (const file of files) {
+        yield "/" + file + "\n";
+      }
+
+      for await (const file of copyEntries(
+        transform(sources, transformer),
+        staging,
+        expander
+      )) {
+        if (options.verbose) {
+          console.log(file.destination);
+        }
+        yield file.destination + "\n";
+      }
     }
 
     const fp = fieldProvider(properties, fields);
@@ -159,13 +186,3 @@ const fields = {
   URL: { alias: "homepage", type: "string" },
   Requires: { type: "string[]" }
 };
-
-const sections = {
-  description: { mandatory: true },
-  prep: { mandatory: false },
-  build: { mandatory: false },
-  install: { mandatory: false },
-  check: { mandatory: false },
-  files: { mandatory: true },
-  changelog: { mandatory: false }
-};