npm-pkgbuild 7.3.7 → 7.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.3.7",
+  "version": "7.3.11",
   "publishConfig": {
     "access": "public"
   },
@@ -40,8 +40,8 @@
   "dependencies": {
     "aggregate-async-iterator": "^1.1.7",
     "commander": "^8.3.0",
-    "content-entry": "^2.9.6",
-    "content-entry-filesystem": "^3.1.9",
+    "content-entry": "^2.10.0",
+    "content-entry-filesystem": "^3.1.11",
     "execa": "^6.0.0",
     "expression-expander": "^7.0.9",
     "globby": "^12.0.2",

package/src/output/deb.mjs

@@ -1,14 +1,13 @@
 import { join, dirname } from "path";
 import { tmpdir } from "os";
-import { createWriteStream } from "fs";
-import { mkdtemp, mkdir, chmod } from "fs/promises";
-import { pipeline } from "stream/promises";
+import { mkdtemp } from "fs/promises";
 import { execa } from "execa";
-import { EmptyContentEntry } from "content-entry";
+import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
 import { keyValueTransformer } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
+import { copyEntries, transform } from "../util.mjs";
 
-const executableAttributes = { chmod: "0775" };
+const executableAttributes = { mode: 0o775 };
 
 const permissions = {
   "DEBIAN/preinst": executableAttributes,
@@ -58,49 +57,15 @@ export class DEB extends Packager {
       {
         match: entry => entry.name === debianControlName,
         transform: async entry =>
-          keyValueTransformer(await entry.readStream, controlProperties),
-        createEntryWhenMissing: new EmptyContentEntry(debianControlName)
-        }
-    ];
-
-    let debianControlEntry;
-
-    for await (const entry of this.source) {
-      const destName = join(staging, entry.name);
-
-      await mkdir(dirname(destName), { recursive: true });
-
-      if (entry.name === debianControlName) {
-        debianControlEntry = entry;
-      } else {
-        console.log("ENTRY", entry.name, entry.basename);
-        await pipeline(await entry.readStream, createWriteStream(destName));
-
-        await Promise.all(
-          Object.entries(permissions).map(async ([pattern, option]) => {
-            if (destName.endsWith(pattern)) {
-              return chmod(destName, option.chmod);
-            }
-          })
-        );
+          new ReadableStreamContentEntry(
+            entry.name,
+            keyValueTransformer(await entry.readStream, controlProperties)
+          ),
+        createEntryWhenMissing: () => new EmptyContentEntry(debianControlName)
       }
-    }
-
-    if (!debianControlEntry) {
-      debianControlEntry = new EmptyContentEntry(debianControlName);
-    }
-
-    let destName = join(staging, debianControlEntry.name);
-
-    await mkdir(dirname(destName), { recursive: true });
+    ];
 
-    await pipeline(
-      keyValueTransformer(
-        await debianControlEntry.readStream,
-        controlProperties
-      ),
-      createWriteStream(destName)
-    );
+    await copyEntries(transform(this.source, transformers), staging);
 
     await execa("dpkg", ["-b", staging, options.destination]);
 

package/src/util.mjs

@@ -1,3 +1,8 @@
+import { join, dirname } from "path";
+import { mkdir } from "fs/promises";
+import { pipeline } from "stream/promises";
+import { createWriteStream } from "fs";
+
 import { FileContentProvider } from "npm-pkgbuild";
 
 export const utf8StreamOptions = { encoding: "utf8" };
@@ -62,25 +67,40 @@ export function extractFromPackage(pkg) {
 }
 
 /**
- * Copy content from source into destinationDirectory
+ * Apply transformers
  * @param {AsyncIterator<ContentEntry>} source
- * @param {string} destinationDirectory
  * @param {Transformer[]} transformers
  */
-export async function copyEntries(source, destinationDirectory, transformers) {
-  for await (const entry of source) {
-    const destName = join(destinationDirectory, entry.name);
-
-    await mkdir(dirname(destName), { recursive: true });
+export async function* transform(source, transformers) {
+  const usedTransformers = new Set();
 
+  for await (let entry of source) {
     for (const t of transformers) {
       if (t.match(entry)) {
-        t.transform(entry);
-
-        break;
+        entry = await t.transform(entry);
+        usedTransformers.add(t);
       }
     }
 
-    await pipeline(await entry.readStream, createWriteStream(destName));
+    yield entry;
+  }
+
+  for (const t of transformers) {
+    if (!usedTransformers.has(t) && t.createEntryWhenMissing !== undefined) {
+      yield t.transform(await t.createEntryWhenMissing());
+    }
+  }
+}
+
+/**
+ * Copy content from source into destinationDirectory
+ * @param {AsyncIterator<ContentEntry>} source
+ * @param {string} destinationDirectory
+ */
+export async function copyEntries(source, destinationDirectory) {
+  for await (let entry of source) {
+    const destName = join(destinationDirectory, entry.name);
+    await mkdir(dirname(destName), { recursive: true });
+    await pipeline(await entry.readStream, createWriteStream(destName, { mode: entry.mode }));
   }
 }