npm-pkgbuild 8.0.2 → 8.1.1

package/README.md

@@ -11,18 +11,37 @@
 
 ## npm-pkgbuild
 
-create ArchLinux, RPM and Debian packages from npm packages.
+Create ArchLinux, RPM and Debian packages from npm packages.
 
 # usage
 
 In a package directory execute
 
 ```shell
-npm-pkgbuild --pkg
+npm-pkgbuild --rpm --debian --arch --content build
 ```
 
-This will create a PKGBUILD file and execute it
-The resulting pkg will contain the package dist content and all production dependencies
+This will create a arch, rpm and a debian package of the build dir.
+
+You can specify the package content in package.json.
+
+```json
+{
+	"pkg": {
+		"content": {
+			"/some/location" : { "base": "build" },
+			"/etc/myconfig.json" : "sample-config.json"
+		},
+		"hooks" : "pkg/hooks",
+		"output": {
+			"debian" : {},
+			"rpm" : {},
+			"arch" : {}
+		},
+		"dependencies": { "nginx" : ">=1.12" }
+	}
+}
+```
 
 # API
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "8.0.2",
+  "version": "8.1.1",
   "publishConfig": {
     "access": "public"
   },
@@ -13,7 +13,9 @@
     "ArchLinux",
     "arch-linux",
     "aur",
+    "deb",
     "debian",
+    "package",
     "pacman",
     "pkgbuild",
     "rpm",
@@ -41,14 +43,15 @@
     "@npmcli/arborist": "^5.0.3",
     "aggregate-async-iterator": "^1.1.9",
     "commander": "^9.1.0",
-    "content-entry": "^4.1.7",
-    "content-entry-filesystem": "^4.0.7",
-    "content-entry-transform": "^1.3.13",
+    "content-entry": "^4.1.9",
+    "content-entry-filesystem": "^4.0.9",
+    "content-entry-transform": "^1.3.15",
     "execa": "^6.1.0",
     "expression-expander": "^7.0.15",
     "globby": "^13.1.0",
+    "ini": "^2.0.0",
     "iterable-string-interceptor": "^1.0.14",
-    "key-value-transformer": "^2.0.2",
+    "key-value-transformer": "^2.1.1",
     "node-fetch": "^3.2.3",
     "npm-package-walker": "^5.0.5",
     "npm-packlist": "^4.0.0",
@@ -64,7 +67,7 @@
     "stream-buffers": "^3.0.2"
   },
   "engines": {
-    "node": ">=16.13.0"
+    "node": ">=16.14.2"
   },
   "repository": {
     "type": "git",

package/src/content/node-modules-content-provider.mjs

@@ -1,8 +1,9 @@
-import { tmpdir } from "os";
+import { tmpdir, homedir } from "os";
 import { join } from "path";
 import { mkdtemp, readFile, writeFile } from "fs/promises";
 import { globby } from "globby";
 import Arborist from "@npmcli/arborist";
+import { parse } from "ini";
 import { StringContentEntry } from "content-entry";
 import { FileSystemEntry } from "content-entry-filesystem";
 import { ContentProvider } from "./content-provider.mjs";
@@ -47,7 +48,9 @@ export class NodeModulesContentProvider extends ContentProvider {
       utf8StreamOptions
     );
 
-    const arb = new Arborist({ path: tmp });
+    // TODO find .npmrc
+    const npmrc = parse(await readFile(join(homedir(), ".npmrc"), utf8StreamOptions));
+    const arb = new Arborist({ path: tmp, ...npmrc });
     await arb.buildIdealTree({
       update: true,
       prune: true,

package/src/output/arch.mjs

@@ -1,5 +1,5 @@
 import { join } from "path";
-import { createReadStream, createWriteStream, truncateSync } from "fs";
+import { createReadStream, createWriteStream } from "fs";
 import { pipeline } from "stream/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
@@ -34,14 +34,17 @@ export const pkgKeyValuePairOptions = {
       return [m[2], m[3] ? m[3].split(/\s*,\s*/) : m[4]];
     }
   },
-  keyValueLine: (key, value, lineEnding) =>
-    `${keyPrefix(key)}=${
-      Array.isArray(value)
-        ? "(" + value.map(v => quote(v)).join(" ") + ")"
-        : quote(value)
-    }${lineEnding}`
+  keyValueLines: keyValueLines3
 };
 
+function* keyValueLines3(key, value, lineEnding) {
+  yield `${keyPrefix(key)}=${
+    Array.isArray(value)
+      ? "(" + value.map(v => quote(v)).join(" ") + ")"
+      : quote(value)
+  }${lineEnding}`;
+}
+
 function keyPrefix(key) {
   const f = fields[key];
   return f && f.prefix ? f.prefix + key : key;

package/src/output/rpm.mjs

@@ -6,7 +6,7 @@ import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import {
   keyValueTransformer,
-  colonSeparatedKeyValuePairOptions
+  colonSeparatedKeyValuePairOptionsDoublingKeys
 } from "key-value-transformer";
 import { aggregateFifo } from "aggregate-async-iterator";
 import { Packager } from "./packager.mjs";
@@ -25,7 +25,7 @@ const hookMapping = {
   post_install: "post",
   pre_remove: "preun",
   post_remove: "postun"
-/* TODO with logic check $1
+  /* TODO with logic check $1
   pre_upgrade:
   post_upgrade:*/
 };
@@ -74,9 +74,10 @@ export class RPM extends Packager {
     const { properties, tmpdir, staging, destination } =
       await this.prepareExecute(options);
 
-    properties.Requires = Object.entries(dependencies)
-      .map(([n, e]) => `${n}${e}`)
-      .join(" ");
+    properties.Requires = Object.entries(dependencies).map(
+      ([name, e]) =>
+        `${name} ${e.replace(/([<=>])\d/, (match, p1) => `${p1} `)}`
+    );
 
     const specFileName = `${properties.name}.spec`;
 
@@ -130,7 +131,7 @@ export class RPM extends Packager {
             new ReadableStreamContentEntry(
               entry.name,
               keyValueTransformer(await entry.readStream, fp, {
-                ...colonSeparatedKeyValuePairOptions,
+                ...colonSeparatedKeyValuePairOptionsDoublingKeys,
                 trailingLines
               })
             ),
@@ -168,6 +169,8 @@ export class RPM extends Packager {
   }
 }
 
+
+const pkglist = { type: "string[]" };
 /**
  * @see https://rpm-packaging-guide.github.io
  */
@@ -188,5 +191,8 @@ const fields = {
     mandatory: true
   },
   URL: { alias: "homepage", type: "string" },
-  Requires: { type: "string[]" }
+  Requires: pkglist,
+  Obsoletes: pkglist,
+  Conflicts: pkglist
 };
+