npm-pkgbuild 11.5.2 → 11.5.4

package/package.json

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

package/src/output/docker.mjs

@@ -9,12 +9,17 @@ import {
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { fieldProvider, copyEntries, utf8StreamOptions } from "../util.mjs";
+import {
+  fieldProvider,
+  copyEntries,
+  utf8StreamOptions,
+  quote
+} from "../util.mjs";
 
 const DOCKERFILE = "Dockerfile";
 
 function* keyValueLines(key, value, options) {
-  yield `LABEL ${key}="${value}"${options.lineEnding}`;
+  yield `LABEL ${quote(key, '"')}=${quote(value, '"')}${options.lineEnding}`;
 }
 
 const labelKeyValuePairs = {
@@ -48,7 +53,7 @@ export class DOCKER extends Packager {
 
     async function* trailingLines() {
       for (const [k, v] of Object.entries({
-        ...options.from,
+        ...properties.from,
         ...Object.fromEntries(
           Object.entries(dependencies)
             .filter(([k, v]) => dependenciesToFrom[k])

package/src/util.mjs

@@ -84,16 +84,16 @@ async function* asLines(source) {
   }
 }
 
-export function quote(v) {
+export function quote(v, qc = "'") {
   if (v === undefined) return "";
 
   if (Array.isArray(v)) {
-    return "(" + v.map(x => quote(x)).join(" ") + ")";
+    return "(" + v.map(x => quote(x, qc)).join(" ") + ")";
   }
   if (typeof v === "number" || v instanceof Number) return v;
 
   if (typeof v === "string" || v instanceof String)
-    return v.match(/^\w+$/) ? v : "'" + v + "'";
+    return v.match(/^\w+$/) ? v : qc + v + qc;
 }
 
 export function asArray(o) {
@@ -159,7 +159,7 @@ export async function* copyEntries(
 
     const name = expander(
       d === undefined ? entry.name : d.endsWith("/") ? join(d, entry.name) : d
-    ).replace(/^\//,'');
+    ).replace(/^\//, "");
 
     entry.destination = name;
     const destination = join(destinationDirectory, name);