npm-pkgbuild 7.4.1 → 7.4.2

package/package.json

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

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) =>
@@ -49,6 +50,9 @@ export class PKG extends Packager {
 
   async execute(sources, options) {
     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"));
+
+    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);
 
     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/util.mjs

@@ -53,6 +53,7 @@ export function extractFromPackage(pkg) {
     properties.source = pkg.repository.url;
   }
 
+  let dependencies = { ...pkg.engines };
   let sources = [];
 
   if (pkg.pkgbuild) {
@@ -67,9 +68,11 @@ export function extractFromPackage(pkg) {
         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) {