npm-pkgbuild 12.2.0 → 12.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -63,7 +63,7 @@
     "pacote": "^17.0.4",
     "pkg-dir": "^7.0.0",
     "tar-stream": "^3.1.6",
-    "uti": "^8.2.0"
+    "uti": "^8.2.1"
   },
   "devDependencies": {
     "@types/node": "^20.8.6",

package/src/output/arch.mjs

@@ -20,7 +20,8 @@ import {
   fieldProvider,
   quote,
   utf8StreamOptions,
-  packageNameMapping
+  packageNameMapping,
+  filterOutUnwantedDependencies
 } from "../util.mjs";
 
 function* keyValueLines(key, value, options) {
@@ -75,7 +76,7 @@ export class ARCH extends Packager {
     return fields;
   }
 
-  static async prepare(options={}, variant={}) {
+  static async prepare(options = {}, variant = {}) {
     if (_prepared === undefined) {
       try {
         await execa("makepkg", ["-V"]);
@@ -98,13 +99,16 @@ export class ARCH extends Packager {
         _ext = getValue("PKGEXT");
         _architecture = getValue("CARCH");
         _prepared = true;
-      } catch(e) {
+      } catch (e) {
         _prepared = false;
       }
     }
-     
-    return _prepared && (variant.arch === undefined || variant.arch === _architecture);
-    }
+
+    return (
+      _prepared &&
+      (variant.arch === undefined || variant.arch === _architecture)
+    );
+  }
 
   get packageFileName() {
     const p = this.properties;
@@ -258,8 +262,10 @@ function normalizeExpression(e) {
 }
 
 function makeDepends(dependencies) {
-  return Object.entries(dependencies).map(
-    ([name, version]) =>
-      `${packageNameMapping[name] || name}${normalizeExpression(version)}`
-  );
+  return Object.entries(dependencies)
+    .filter(filterOutUnwantedDependencies())
+    .map(
+      ([name, version]) =>
+        `${packageNameMapping[name] || name}${normalizeExpression(version)}`
+    );
 }

package/src/output/debian.mjs

@@ -19,7 +19,8 @@ import {
   fieldProvider,
   extractFunctions,
   utf8StreamOptions,
-  packageNameMapping
+  packageNameMapping,
+  filterOutUnwantedDependencies
 } from "../util.mjs";
 
 /**
@@ -53,7 +54,7 @@ export class DEBIAN extends Packager {
    * @param {string} variant.arch
    * @return {Promise<boolean>}
    */
-  static async prepare(options,variant) {
+  static async prepare(options, variant) {
     try {
       await execa("dpkg", ["--version"]);
       if (variant?.arch) {
@@ -105,10 +106,14 @@ export class DEBIAN extends Packager {
     );
 
     if (Object.keys(dependencies).length > 0) {
-      properties.Depends = Object.entries(dependencies).map(
-        ([name, e]) =>
-          `${packageNameMapping[name] ? packageNameMapping[name] : name} (${e})`
-      );
+      properties.Depends = Object.entries(dependencies)
+        .filter(filterOutUnwantedDependencies())
+        .map(
+          ([name, e]) =>
+            `${
+              packageNameMapping[name] ? packageNameMapping[name] : name
+            } (${e})`
+        );
     }
 
     const fp = fieldProvider(properties, fields);

package/src/output/docker.mjs

@@ -13,7 +13,8 @@ import {
   fieldProvider,
   copyEntries,
   utf8StreamOptions,
-  quote
+  quote,
+  filterOutUnwantedDependencies
 } from "../util.mjs";
 
 const DOCKERFILE = "Dockerfile";
@@ -54,13 +55,14 @@ export class DOCKER extends Packager {
     expander = v => v
   ) {
     const { properties, staging } = await this.prepareExecute(options);
-    
+
     async function* headLines() {
       let scratch = true;
       for (const [k, v] of Object.entries({
         ...properties.from,
         ...Object.fromEntries(
           Object.entries(dependencies)
+            .filter(filterOutUnwantedDependencies())
             .filter(([k, v]) => dependenciesToFrom[k])
             .map(([k, v]) => [dependenciesToFrom[k], v.replace(/[>=]*/, "")])
         )
@@ -69,8 +71,8 @@ export class DOCKER extends Packager {
         yield `FROM ${k}:${v}\n`;
       }
 
-      if(scratch) {
-      	yield "FROM scratch\n";
+      if (scratch) {
+        yield "FROM scratch\n";
       }
     }
 
@@ -78,7 +80,9 @@ export class DOCKER extends Packager {
       yield `WORKDIR ${properties.workdir}\n`;
       yield "COPY . .\n";
       if (properties.entrypoints) {
-        yield `ENTRYPOINT ["node", "${Object.values(properties.entrypoints)[0]}"]\n`;
+        yield `ENTRYPOINT ["node", "${
+          Object.values(properties.entrypoints)[0]
+        }"]\n`;
       }
     }
 

package/src/output/rpm.mjs

@@ -16,12 +16,12 @@ import {
   fieldProvider,
   utf8StreamOptions,
   extractFunctions,
-  packageNameMapping
+  packageNameMapping,
+  filterOutUnwantedDependencies
 } from "../util.mjs";
 
-
 function quoteFile(name) {
-  return name.match(/\s/) ? "\"" + name + "\"" : name;
+  return name.match(/\s/) ? '"' + name + '"' : name;
 }
 
 /**
@@ -38,16 +38,18 @@ const hookMapping = {
 };
 
 export function requiresFromDependencies(dependencies) {
-  return Object.entries(dependencies).map(
-    ([name, e]) =>
-      `${packageNameMapping[name] ? packageNameMapping[name] : name}${e
-        .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
-        .replace(/^\s*$/, "")
-        .replace(
-          /^\s*(<|<=|>|>=|=)\s*(\w+)/,
-          (match, p1, p2) => ` ${p1} ${p2}`
-        )}`
-  );
+  return Object.entries(dependencies)
+    .filter(filterOutUnwantedDependencies())
+    .map(
+      ([name, e]) =>
+        `${packageNameMapping[name] ? packageNameMapping[name] : name}${e
+          .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
+          .replace(/^\s*$/, "")
+          .replace(
+            /^\s*(<|<=|>|>=|=)\s*(\w+)/,
+            (match, p1, p2) => ` ${p1} ${p2}`
+          )}`
+    );
 }
 
 /**

package/src/util.mjs

@@ -17,6 +17,11 @@ export const packageNameMapping = {
   node: "nodejs"
 };
 
+export function filterOutUnwantedDependencies()
+{
+  return ([name, version]) => version !== "-";
+}
+
 /**
  * Decode a password
  * @param {string} password