npm-pkgbuild 11.1.14 → 11.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "11.1.14",
+  "version": "11.1.16",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "@npmcli/arborist": "^6.2.0",
+    "@npmcli/arborist": "^6.2.1",
     "@vercel/nft": "^0.22.5",
     "aggregate-async-iterator": "^1.1.15",
     "commander": "^10.0.0",

package/src/extract-from-package.mjs

@@ -150,13 +150,19 @@ export async function* extractFromPackage(options = {}, env = {}) {
         }
 
         if (fullfilled) {
-          console.log(`${name}: requirement fullfilled`, requires);
+          if(options.verbose) {
+            console.log(`${name}: requirement fullfilled`, requires);
+          }
         } else {
-          console.log(`${name}: requirement not fullfilled`, requires);
+          if(options.verbose) {
+            console.log(`${name}: requirement not fullfilled`, requires);
+          }
           continue;
         }
       } else {
-        console.log(`${name}: load`);
+        if(options.verbose) {
+          console.log(`${name}: load`);
+        }
       }
 
       const fragment = {
@@ -316,9 +322,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
       yield result;
     } else {
       for (const a of [...arch].sort()) {
-        if (variant.restrictArch.size && !variant.restrictArch.has(a)) {
-          console.log("RESTRICT", a);
-        } else {
+        if (variant.restrictArch.size === 0 || variant.restrictArch.has(a)) {
           result.variant.arch = a;
           result.properties.arch = [a];
           yield result;

package/src/output/docker.mjs

@@ -13,13 +13,22 @@ import { fieldProvider, copyEntries, utf8StreamOptions } from "../util.mjs";
 
 const DOCKERFILE = "Dockerfile";
 
+function* keyValueLines(key, value, options) {
+  yield `LABEL ${key}=${value}${options.lineEnding}`;
+}
+
+const labelKeyValuePairs = {
+  ...equalSeparatedKeyValuePairOptions,
+  keyValueLines
+};
+
 export class DOCKER extends Packager {
   static get name() {
     return "docker";
   }
 
   static get description() {
-    return "generate container image with docker|podman";
+    return "generate container image with docker or podman";
   }
 
   async execute(
@@ -49,7 +58,7 @@ ENTRYPOINT ["node", ""]
         new ReadableStreamContentEntry(
           entry.name,
           keyValueTransformer(await entry.readStream, fp, {
-            ...equalSeparatedKeyValuePairOptions,
+            ...labelKeyValuePairs,
             trailingLines
           })
         ),
@@ -62,7 +71,7 @@ ENTRYPOINT ["node", ""]
       expander
     )) {
       if (options.verbose) {
-        console.log("D", file.destination);
+        console.log(file.destination);
       }
     }
 

package/src/output/rpm.mjs

@@ -162,7 +162,7 @@ export class RPM extends Packager {
 
     if (options.verbose) {
       console.log(
-        await readFile(join(staging, specFileName), { encoding: "utf8" })
+        await readFile(join(staging, specFileName), utf8StreamOptions)
       );
     }