npm-pkgbuild 7.3.9 → 7.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.3.9",
+  "version": "7.3.13",
   "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/content/content-provider.mjs

@@ -2,17 +2,10 @@
  * Source of package content.
  */
 export class ContentProvider {
-  /**
-   * Delivers content entries to be packed.
-   * @return {asyncIterator<ContentEntry>} all entries
-   */
-  async *entries() {}
-
   /**
    * List all entries.
    * @return {asyncIterator<ContentEntry>} all entries
    */
   async *[Symbol.asyncIterator]() {
-    return yield* this.entries();
   }
 }

package/src/content/node-modules-content-provider.mjs

@@ -4,5 +4,4 @@ import { ContentProvider } from "./content-provider.mjs";
  * content from node_modules
  */
 export class NodeModulesContentProvider extends ContentProvider {
-  async * entries() {}
 }

package/src/content/npm-pack-content-provider.mjs

@@ -9,7 +9,7 @@ import { BufferContentEntry } from "content-entry";
  * content from npm pack
  */
 export class NPMPackContentProvider extends ContentProvider {
-  async *entries(context) {
+  async *[Symbol.asyncIterator]() {
     //const m = await pacote.manifest(context.dir);
     //console.log('got it', m);
 

package/src/npm-pkgbuild-cli.mjs

@@ -65,12 +65,9 @@ program
             ])
         );
 
-        const output = new outputFactory(
-          aggregateFifo(sources.map(([c, d]) => c.entries())),
-          properties
-        );
+        const output = new outputFactory(properties);
 
-        const fileName = await output.execute(options);
+        const fileName = await output.execute(aggregateFifo(sources.map(([c, d]) => c[Symbol.asyncIterator]() )), options);
 
         console.log(fileName);
       }

package/src/output/deb.mjs

@@ -1,21 +1,11 @@
-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 { join } from "path";
 import { execa } from "execa";
 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 permissions = {
-  "DEBIAN/preinst": executableAttributes,
-  "DEBIAN/postinst": executableAttributes,
-  "DEBIAN/prerm": executableAttributes,
-  "DEBIAN/postrm": executableAttributes
-};
+const attributes = [{ pattern: /DEBIAN\/.*(inst|rm)/, mode: 0o775 }];
 
 export class DEB extends Packager {
   static get name() {
@@ -34,11 +24,10 @@ export class DEB extends Packager {
     return `${this.properties.name}_${this.properties.version}_${this.properties.arch}${this.constructor.fileNameExtension}`;
   }
 
-  async execute(options) {
+  async execute(sources, options) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
-    const tmp = await mkdtemp(join(tmpdir(), "deb-"));
-    const staging = join(tmp, `${properties.name}-${properties.version}`);
+    const staging = await this.tmpdir;
 
     function* controlProperties(k, v, presentKeys) {
       if (k === undefined) {
@@ -62,48 +51,11 @@ export class DEB extends Packager {
             entry.name,
             keyValueTransformer(await entry.readStream, controlProperties)
           ),
-        createEntryWhenMissing: new EmptyContentEntry(debianControlName)
+        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);
-            }
-          })
-        );
-      }
-    }
-
-    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(sources, transformers), staging, attributes);
 
     await execa("dpkg", ["-b", staging, options.destination]);
 
@@ -113,7 +65,7 @@ export class DEB extends Packager {
 
 /**
  * @see https://www.debian.org/doc/debian-policy/ch-controlfields.html
- * @ https://linux.die.net/man/5/deb-control
+ * @see https://linux.die.net/man/5/deb-control
  */
 
 const fields = {

package/src/output/packager.mjs

@@ -1,3 +1,8 @@
+import { join } from "path";
+import { tmpdir } from "os";
+import { mkdtemp } from "fs/promises";
+
+
 /**
  * @typedef {Object} Field
  * @property {string} alias interchangeable field name
@@ -14,8 +19,7 @@ export class Packager {
     return {};
   }
 
-  constructor(source, properties) {
-    this.source = source;
+  constructor(properties) {
     this._properties = properties;
   }
 
@@ -53,8 +57,17 @@ export class Packager {
     return mandatoryFields;
   }
 
+  /**
+   * Create tmp directory.
+   * @return {Promise<string>} directory path
+   */
+  get tmpdir()
+  {
+    return mkdtemp(join(tmpdir(), this.constructor.name));
+  }
+
   /**
    * Execute package generation
    */
-  async execute() {}
+  async execute(sources,options) {}
 }

package/src/output/pkg.mjs

@@ -21,13 +21,19 @@ export class PKG extends Packager {
     return fields;
   }
 
-  async execute(options) {
-    const tmp = await mkdtemp(join(tmpdir(), "pkg-"));
+  async execute(sources,options) {
+    const properties = this.properties;
+    const mandatoryFields = this.mandatoryFields;
+    const staging = await this.tmpdir;
 
     const pkgbuildFileName = join(tmp, "PKGBUILD");
 
     this.writePkbuild(pkgbuildFileName);
 
+    const transformers = [];
+
+    await copyEntries(transform(sources, transformers), staging);
+
     await execa("makepkg", [], { cwd: tmp });
   }
 

package/src/output/rpm.mjs

@@ -14,16 +14,19 @@ export class RPM extends Packager {
     return fields;
   }
 
-  async execute(options) {
+  async execute(sources,options) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
+    const staging = await this.tmpdir;
 
-    const tmp = await mkdtemp(join(tmpdir(), "deb-"));
-    const staging = join(tmp, `${properties.name}-${properties.version}`);
+    let specFileName = `${properties.name}.spec`;
 
-    let specFileName = ".spec";
+    const transformers = [];
 
-    //if (entry.name === ".spec")
+    await copyEntries(
+      transform(sources, transformers),
+      staging
+    );
 
     await execa("rpmbuild", ["-ba", specFileName]);
   }

package/src/util.mjs

@@ -66,23 +66,57 @@ export function extractFromPackage(pkg) {
   return { properties, sources };
 }
 
+/**
+ * Apply transformers
+ * @param {AsyncIterator<ContentEntry>} source
+ * @param {Transformer[]} transformers
+ */
+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)) {
+        entry = await t.transform(entry);
+        usedTransformers.add(t);
+      }
+    }
+
+    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
- * @param {Transformer[]} transformers
  */
-export async function copyEntries(source, destinationDirectory, transformers) {
+export async function copyEntries(
+  source,
+  destinationDirectory,
+  attributes = []
+) {
   for await (let entry of source) {
     const destName = join(destinationDirectory, entry.name);
     await mkdir(dirname(destName), { recursive: true });
 
-    for (const t of transformers) {
-      if (t.match(entry)) {
-        entry = await t.transform(entry);
+    const options = { mode: entry.mode };
+
+    for (const a of attributes) {
+      if (entry.name.match(a.pattern)) {
+        options.mode = a.mode;
       }
     }
 
-    await pipeline(await entry.readStream, createWriteStream(destName));
+    await pipeline(
+      await entry.readStream,
+      createWriteStream(destName, options)
+    );
   }
 }