npm-pkgbuild 7.11.13 → 7.12.0

package/package.json

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

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

@@ -4,4 +4,9 @@ import { ContentProvider } from "./content-provider.mjs";
  * Content from node_modules
  */
 export class NodeModulesContentProvider extends ContentProvider {
+
+  static get name()
+  {
+  	return "node-modules";
+  }
 }

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

@@ -9,6 +9,15 @@ import { BufferContentEntry } from "content-entry";
  * Content from npm pack.
  */
 export class NPMPackContentProvider extends ContentProvider {
+
+  /**
+   * @return {string} name of the content provider
+   */
+  static get name()
+  {
+  	return "npm-pack";	
+  }
+  
   async *[Symbol.asyncIterator]() {
     //const m = await pacote.manifest(context.dir);
     //console.log('got it', m);

package/src/npm-pkgbuild-cli.mjs

@@ -7,9 +7,8 @@ import program from "commander";
 import { aggregateFifo } from "aggregate-async-iterator";
 import { createContext } from "expression-expander";
 import { packageDirectory } from "pkg-dir";
-import { utf8StreamOptions, extractFromPackage } from "./util.mjs";
-import { FileContentProvider, DEB, ARCH, RPM } from "npm-pkgbuild";
-import { createExpressionTransformer } from "./util.mjs";
+import { utf8StreamOptions, extractFromPackage, createExpressionTransformer } from "./util.mjs";
+import { FileContentProvider, DEB, ARCH, RPM, NPMPackContentProvider, NodeModulesContentProvider } from "npm-pkgbuild";
 
 const { version, description } = JSON.parse(
   readFileSync(new URL("../package.json", import.meta.url).pathname),
@@ -18,6 +17,7 @@ const { version, description } = JSON.parse(
 
 const cwd = process.cwd();
 
+const allInputs  = [NPMPackContentProvider, NodeModulesContentProvider];
 const allOutputs = [DEB, ARCH, RPM];
 
 program.description(description).version(version);
@@ -26,6 +26,9 @@ allOutputs.forEach(o =>
   program.option(`--${o.name}`, `generate ${o.name} package`)
 );
 
+allInputs.forEach(i =>
+  program.option(`--${i.name}`, `input from ${i.name}`));
+
 program
   .option("--verbose", "be more verbose", false)
   .option("-D --define <a=b>", "define property", str => Object.fromEntries([str.split(/=/)]))

package/src/output/arch.mjs

@@ -1,6 +1,5 @@
-import { join, dirname } from "path";
+import { join } from "path";
 import { createReadStream, createWriteStream } from "fs";
-import { mkdir } from "fs/promises";
 import { pipeline } from "stream/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
@@ -27,13 +26,18 @@ export const pkgKeyValuePairOptions = {
     }
   },
   keyValueLine: (key, value, lineEnding) =>
-    `${key}=${
+    `${keyPrefix(key)}=${
       Array.isArray(value)
         ? "(" + value.map(v => quote(v)).join(",") + ")"
         : quote(value)
     }${lineEnding}`
 };
 
+function keyPrefix(key) {
+  const f = fields[key];
+  return f && f.prefix ? f.prefix + key : key;
+}
+
 export class ARCH extends Packager {
   static get name() {
     return "arch";
@@ -58,6 +62,9 @@ export class ARCH extends Packager {
     if (properties.source) {
       properties.md5sums = ["SKIP"];
     }
+    if (properties.hooks) {
+      properties.install = `${properties.name}.install`;
+    }
 
     const staging = await this.tmpdir;
 
@@ -76,31 +83,12 @@ package() {
 `;
     }
 
-    const fp = fieldProvider(properties, fields);
-
-    transformer.push({
-      match: entry => entry.name === "PKGBUILD",
-      transform: async entry =>
-        new ReadableStreamContentEntry(
-          entry.name,
-          keyValueTransformer(await entry.readStream, fp, {
-            ...pkgKeyValuePairOptions,
-            trailingLines
-          })
-        ),
-      createEntryWhenMissing: () => new EmptyContentEntry("PKGBUILD")
-    });
-
     if (properties.hooks) {
       async function* transformer(expression, remainder, source, cb) {
         const value = properties[expression];
         yield value === undefined ? "" : value;
       }
 
-      const destination = join(staging, properties.hooks);
-
-      await mkdir(dirname(destination), { recursive: true });
-
       await pipeline(
         iterableStringInterceptor(
           createReadStream(
@@ -109,13 +97,28 @@ package() {
           ),
           transformer
         ),
-        createWriteStream(destination, utf8StreamOptions)
+        createWriteStream(join(staging, properties.install), utf8StreamOptions)
       );
     }
 
+    const fp = fieldProvider(properties, fields);
+
+    transformer.push({
+      match: entry => entry.name === "PKGBUILD",
+      transform: async entry =>
+        new ReadableStreamContentEntry(
+          "../" + entry.name,
+          keyValueTransformer(await entry.readStream, fp, {
+            ...pkgKeyValuePairOptions,
+            trailingLines
+          })
+        ),
+      createEntryWhenMissing: () => new EmptyContentEntry("PKGBUILD")
+    });
+
     for await (const file of copyEntries(
-      transform(sources, transformer, true),
-      staging,
+      transform(sources, transformer),
+      join(staging, "src"),
       expander
     )) {
       if (options.verbose) {
@@ -145,7 +148,7 @@ package() {
  * https://www.archlinux.org/pacman/PKGBUILD.5.html
  */
 const fields = {
-  Maintainer: { alias: "maintainer", type: "string" },
+  Maintainer: { alias: "maintainer", type: "string", prefix: "# " },
 
   pkgname: { alias: "name", type: "string[]", mandatory: true },
   pkgver: { alias: "version", type: "string", mandatory: true },
@@ -154,7 +157,7 @@ const fields = {
   pkgdesc: { alias: "description", type: "string", mandatory: true },
   url: { alias: "homepage", type: "string" },
   license: { type: "string[]", mandatory: true },
-  install: { alias: "hooks", type: "string" },
+  install: { type: "string" },
   changelog: { type: "string" },
   source: { type: "string[]" },
   validpgpkeys: { type: "string[]" },

package/src/output/deb.mjs

@@ -44,7 +44,7 @@ export class DEB extends Packager {
       });
  
       for await (const file of copyEntries(
-        transform(sources, transformer, true),
+        transform(sources, transformer),
         staging,
         expander
       )) {

package/src/output/rpm.mjs

@@ -46,19 +46,28 @@ export class RPM extends Packager {
     const staging = join(tmp, "BUILDROOT");
     const specFileName = `${properties.name}.spec`;
 
+    const files = [];
+
     async function* trailingLines() {
-       yield "%define _unpackaged_files_terminate_build 0\n";
+      yield "%define _unpackaged_files_terminate_build 0\n";
 
       for (const [name, options] of Object.entries(sections)) {
         if (options.mandatory) {
           yield `%${name}\n\n`;
 
           if (name === "files") {
+            for (const file of files) {
+              yield "/" + file + "\n";
+            }
+
             for await (const file of copyEntries(
               transform(sources, transformer),
               staging,
               expander
             )) {
+              if (options.verbose) {
+                console.log(file);
+              }
               yield file.destination + "\n";
             }
           }
@@ -86,6 +95,7 @@ export class RPM extends Packager {
       staging,
       expander
     )) {
+      files.push(file.destination);
     }
 
     const rpmbuild = await execa("rpmbuild", [

package/src/util.mjs

@@ -92,7 +92,9 @@ export async function extractFromPackage(pkg, dir) {
   }
 
   if (pkg.repository) {
-    properties.source = pkg.repository.url;
+    if(pkg.repository.url) {
+      properties.source = pkg.repository.url;
+    }
   }
 
   let dependencies = { ...pkg.engines };
@@ -213,7 +215,7 @@ export async function* copyEntries(
   destinationDirectory,
   expander = v => v
 ) {
-  for await (let entry of source) {
+  for await (const entry of source) {
     const name = expander(
       entry.destination === undefined
         ? entry.name