npm-pkgbuild 7.4.1 → 7.5.0

package/package.json

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

package/src/content/file-content-provider.mjs

@@ -11,7 +11,7 @@ import { ContentProvider } from "./content-provider.mjs";
  * @param {string} definitions.base base directory where to find the files
  */
 export class FileContentProvider extends ContentProvider {
-  constructor(definitions) {
+  constructor(definitions, entryProperties) {
     super();
 
     if (typeof definitions === "string") {
@@ -24,6 +24,8 @@ export class FileContentProvider extends ContentProvider {
       this.definitions = { pattern: ["**/*"], ...definitions };
       this.definitions.pattern = asArray(this.definitions.pattern);
     }
+
+    this.entryProperties = entryProperties;
   }
 
   async *[Symbol.asyncIterator]() {
@@ -33,7 +35,9 @@ export class FileContentProvider extends ContentProvider {
     for (const name of await globby(definitions.pattern, {
       cwd: base
     })) {
-      yield new FileSystemEntry(name, base);
+      const entry = new FileSystemEntry(name, base);
+      Object.assign(entry, this.entryProperties);
+      yield entry;
     }
   }
 }

package/src/npm-pkgbuild-cli.mjs

@@ -5,6 +5,7 @@ import { readFile } from "fs/promises";
 import { join } from "path";
 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, PKG, RPM } from "npm-pkgbuild";
@@ -25,7 +26,10 @@ outputs.forEach(o =>
 );
 
 program
-  .option("--pkgver <version>", "package version")
+  .option("-D --define <a=b>", "define property", str => {
+    const kv = str.split(/=/);
+    return Object.fromEntries([kv]);
+  })
   .option("-d --destination <dir>", "where to put the package(s)", cwd)
   .option("-s --staging <dir>", "staging directory", "build")
   .option(
@@ -54,20 +58,27 @@ program
           )
         );
 
+        Object.assign(properties, options.define);
+
         sources.push(
           ...[...options.content, ...options.meta]
             .filter(x => x)
-            .map(source => [
-              new FileContentProvider({
-                base: source
-              }),
-              ""
-            ])
+            .map(
+              source =>
+                new FileContentProvider({
+                  base: source
+                })
+            )
         );
 
+        const context = createContext({ properties });
         const output = new outputFactory(properties);
 
-        const fileName = await output.execute(aggregateFifo(sources.map(([c, d]) => c[Symbol.asyncIterator]() )), options);
+        const fileName = await output.execute(
+          aggregateFifo(sources.map(c => c[Symbol.asyncIterator]())),
+          options,
+          object => context.expand(object)
+        );
 
         console.log(fileName);
       }

package/src/output/deb.mjs

@@ -25,7 +25,7 @@ export class DEB extends Packager {
     return `${p.name}_${p.version}_${p.arch}${this.constructor.fileNameExtension}`;
   }
 
-  async execute(sources, options) {
+  async execute(sources, options, expander) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
@@ -56,7 +56,7 @@ export class DEB extends Packager {
       }
     ];
 
-    await copyEntries(transform(sources, transformers), staging, attributes);
+    await copyEntries(transform(sources, transformers), staging, expander, attributes);
 
     await execa("dpkg", ["-b", staging, options.destination]);
 

package/src/output/pkg.mjs

@@ -1,3 +1,4 @@
+import { join } from "path";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
 import {
@@ -18,7 +19,7 @@ export const pkgKeyValuePairOptions = {
   extractKeyValue: line => {
     const m = line.match(/^(\w+)=\s*\((.*)\)|(.*)/);
     if (m) {
-      return [m[1], m[2] ? [m[2]] : m[3]];
+      return [m[1], m[2] ? [m[2].split(/\s*,\s*/)] : m[3]];
     }
   },
   keyValueLine: (key, value, lineEnding) =>
@@ -47,8 +48,11 @@ export class PKG extends Packager {
     return `${p.name}-${p.version}-${p.release}.${p.arch}${this.constructor.fileNameExtension}`;
   }
 
-  async execute(sources, options) {
+  async execute(sources, options,expander) {
     const properties = this.properties;
+
+    //properties.depends = makeDepends({ ...pkg.engines });
+
     const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
 
@@ -73,7 +77,9 @@ package() {
 `;
     }
 
-    const transformers = [
+    await copyEntries(transform(sources, []), join(staging, "src"), expander);
+
+    const metaTransformers = [
       {
         match: entry => entry.name === "PKGBUILD",
         transform: async entry =>
@@ -88,11 +94,11 @@ package() {
       }
     ];
 
-    const [meta,content] = split(transform(sources, transformers),);
-
-    await copyEntries(transform(sources, transformers), staging);
+    await copyEntries(transform(sources, metaTransformers, true), staging, expander);
 
     await execa("makepkg", ["-f"], { cwd: staging });
+
+    return join(options.destination, this.packageFileName);
   }
 }
 
@@ -107,7 +113,7 @@ const fields = {
   pkgdesc: { alias: "description", type: "string", mandatory: true },
   arch: { default: ["any"], type: "string[]", mandatory: true },
 
-  license: { type: "string[]", mandatory: true },
+  license: { default: [], type: "string[]", mandatory: true },
   source: { default: [], type: "string[]" },
   validpgpkeys: { type: "string[]" },
   noextract: { type: "string[]" },
@@ -134,12 +140,6 @@ const fields = {
 };
 
 /*
-  const properties = {
-    makedepends: "git"
-  };
-
-  properties.depends = makeDepends({ ...pkg.engines });
-
   out.write(
     `# ${pkg.contributors
       .map(
@@ -171,19 +171,8 @@ package() {
 }
 `
   );
-
-function makeDepends(d) {
-  if (d === undefined) {
-    return [];
-  }
-
-  return Object.keys(d).reduce((a, c) => {
-    const mapping = {
-      node: "nodejs"
-    };
-
-    a.push(`${mapping[c] ? mapping[c] : c}${d[c].replace(/\-([\w\d]+)$/, "")}`);
-    return a;
-  }, []);
-}
 */
+
+const mapping = {
+  node: "nodejs"
+};

package/src/output/rpm.mjs

@@ -27,7 +27,7 @@ export class RPM extends Packager {
     return fields;
   }
 
-  async execute(sources, options) {
+  async execute(sources, options, expander) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
     const tmp = await this.tmpdir;
@@ -76,7 +76,7 @@ export class RPM extends Packager {
       }
     ];
 
-    await copyEntries(transform(sources, transformers), staging);
+    await copyEntries(transform(sources, transformers), staging, expander);
 
     await execa("rpmbuild", [
       "--define",

package/src/util.mjs

@@ -53,6 +53,7 @@ export function extractFromPackage(pkg) {
     properties.source = pkg.repository.url;
   }
 
+  let dependencies = { ...pkg.engines };
   let sources = [];
 
   if (pkg.pkgbuild) {
@@ -62,14 +63,16 @@ export function extractFromPackage(pkg) {
       .forEach(([k, v]) => (properties[k] = v));
 
     if (pkgbuild.content) {
-      sources = Object.entries(pkgbuild.content).map(([destination, value]) => [
-        new FileContentProvider(value),
-        destination
-      ]);
+      sources = Object.entries(pkgbuild.content).map(
+        ([destination, value]) =>
+          new FileContentProvider(value, { destination })
+      );
     }
+
+    Object.assign(dependencies, pkgbuild.depends);
   }
 
-  return { properties, sources };
+  return { properties, sources, dependencies };
 }
 
 /**
@@ -77,7 +80,7 @@ export function extractFromPackage(pkg) {
  * @param {AsyncIterator<ContentEntry>} source
  * @param {Transformer[]} transformers
  */
-export async function* transform(source, transformers) {
+export async function* transform(source, transformers = [], onlyMatching) {
   const usedTransformers = new Set();
 
   for await (let entry of source) {
@@ -85,10 +88,16 @@ export async function* transform(source, transformers) {
       if (t.match(entry)) {
         entry = await t.transform(entry);
         usedTransformers.add(t);
+
+        if (onlyMatching) {
+          yield entry;
+        }
       }
     }
 
-    yield entry;
+    if (!onlyMatching) {
+      yield entry;
+    }
   }
 
   for (const t of transformers) {
@@ -99,17 +108,26 @@ export async function* transform(source, transformers) {
 }
 
 /**
- * Copy content from source into destinationDirectory
+ * Copy content from source into destinationDirectory.
  * @param {AsyncIterator<ContentEntry>} source
  * @param {string} destinationDirectory
+ * @param {Function} expander
+ * @param {ContentEntryAttribute[]} attributes
  */
 export async function copyEntries(
   source,
   destinationDirectory,
+  expander = v => v,
   attributes = []
 ) {
   for await (let entry of source) {
-    const destName = join(destinationDirectory, entry.name);
+    const destName = expander(
+      entry.destination === undefined
+        ? join(destinationDirectory, entry.name)
+        : entry.destination.endsWith("/")
+        ? join(destinationDirectory, entry.destination, entry.name)
+        : join(destinationDirectory, entry.destination)
+    );
     await mkdir(dirname(destName), { recursive: true });
 
     const options = { mode: entry.mode };