npm-pkgbuild 7.2.6 → 7.2.7

package/package.json

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

package/src/key-value-transformer.mjs

@@ -6,11 +6,11 @@
 export async function* keyValueTransformer(source, updates) {
   let key, value;
 
-  function * eject() {
+  function* eject() {
     if (key !== undefined) {
       const [k, v] = updates(key, value);
       if (k !== undefined) {
-        yield`${k}: ${v}\n`;
+        yield `${k}: ${v}\n`;
       }
       key = value = undefined;
     }
@@ -19,7 +19,7 @@ export async function* keyValueTransformer(source, updates) {
   for await (const line of asLines(source)) {
     const m = line.match(/^(\w+):\s*(.*)/);
     if (m) {
-      yield *eject();
+      yield* eject();
       key = m[1];
       value = m[2];
     } else if (key !== undefined) {
@@ -27,7 +27,7 @@ export async function* keyValueTransformer(source, updates) {
       if (m) {
         value += m[1];
       } else {
-        yield * eject();
+        yield* eject();
         yield line + "\n";
       }
     } else {
@@ -35,7 +35,7 @@ export async function* keyValueTransformer(source, updates) {
     }
   }
 
-  yield *eject();
+  yield* eject();
 }
 
 async function* asLines(source) {

package/src/output/deb.mjs

@@ -4,6 +4,7 @@ import { createWriteStream } from "fs";
 import { mkdtemp, mkdir, chmod } from "fs/promises";
 import { pipeline } from "stream/promises";
 import execa from "execa";
+import { EmptyContentEntry } from "content-entry";
 import { Packager } from "./packager.mjs";
 import { keyValueTransformer } from "../key-value-transformer.mjs";
 
@@ -52,16 +53,15 @@ export class Deb extends Packager {
 
     const output = `${staging}${this.constructor.fileNameExtension}`;
 
+    let debianControlEntry;
+
     for await (const entry of this.source) {
       const destName = join(staging, entry.name);
 
       await mkdir(dirname(destName), { recursive: true });
 
       if (entry.name === "DEBIAN/control") {
-        await pipeline(
-          keyValueTransformer(await entry.getReadStream(), controlProperties),
-          createWriteStream(destName)
-        );
+        debianControlEntry = entry;
       } else {
         await pipeline(
           await entry.getReadStream(),
@@ -79,7 +79,22 @@ export class Deb extends Packager {
       }
     }
 
-    //console.log(presentProperties, mandatoryProperties);
+    if (!debianControlEntry) {
+      debianControlEntry = new EmptyContentEntry("DEBIAN/control");
+    }
+
+    let destName = join(staging, debianControlEntry.name);
+
+    console.log("A", destName, dirname(destName));
+    await mkdir(dirname(destName), { recursive: true });
+
+    const x = await pipeline(
+      keyValueTransformer(
+        await debianControlEntry.getReadStream(),
+        controlProperties
+      ),
+      createWriteStream(destName)
+    );
 
     await execa("dpkg", ["-b", staging]);