npm-pkgbuild 7.11.10 → 7.11.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.11.10",
+  "version": "7.11.14",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "ava": "^3.15.0",
+    "ava": "^4.0.0",
     "c8": "^7.11.0",
     "documentation": "^13.2.5",
     "semantic-release": "^18.0.1",

package/src/output/arch.mjs

@@ -21,9 +21,9 @@ export const pkgKeyValuePairOptions = {
   ...equalSeparatedKeyValuePairOptions,
 
   extractKeyValue: line => {
-    const m = line.match(/^(\w+)=\s*\((.*)\)|(.*)/);
+    const m = line.match(/^(#\s*)?(\w+)=\s*\((.*)\)|(.*)/);
     if (m) {
-      return [m[1], m[2] ? [m[2].split(/\s*,\s*/)] : m[3]];
+      return [m[2], m[3] ? m[3].split(/\s*,\s*/) : m[4]];
     }
   },
   keyValueLine: (key, value, lineEnding) =>
@@ -58,49 +58,33 @@ export class ARCH extends Packager {
     if (properties.source) {
       properties.md5sums = ["SKIP"];
     }
+    if (properties.hooks) {
+      properties.install = `${properties.name}.install`;
+    }
 
     const staging = await this.tmpdir;
 
     async function* trailingLines() {
       yield `
 package() {
-  depends=(${makeDepends(dependencies).map(v=>quote(v)).join(',')})
-  cp -r $srcdir/* "$pkgdir"
+  depends=(${makeDepends(dependencies)
+    .map(v => quote(v))
+    .join(",")})
+
+  if [ "$(ls -A $srcdir)" ]
+  then
+    cp -rp $srcdir/* "$pkgdir"
+  fi
 }
 `;
     }
 
-    await copyEntries(
-      transform(sources, transformer),
-      join(staging, "src"),
-      expander
-    );
-
-    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,11 +93,34 @@ package() {
           ),
           transformer
         ),
-        createWriteStream(destination, utf8StreamOptions)
+        createWriteStream(join(staging, properties.install), utf8StreamOptions)
       );
     }
 
-    await copyEntries(transform(sources, transformer, true), staging, expander);
+    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),
+      join(staging,'src'),
+      expander
+    )) {
+      if (options.verbose) {
+        console.log(file.destination);
+      }
+    }
 
     if (options.verbose) {
       console.log(`stagingDir: ${staging}`);
@@ -137,6 +144,8 @@ package() {
  * https://www.archlinux.org/pacman/PKGBUILD.5.html
  */
 const fields = {
+  Maintainer: { alias: "maintainer", type: "string" },
+
   pkgname: { alias: "name", type: "string[]", mandatory: true },
   pkgver: { alias: "version", type: "string", mandatory: true },
   pkgrel: { alias: "release", type: "integer", default: 1, mandatory: true },
@@ -144,7 +153,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

@@ -43,8 +43,16 @@ export class DEB extends Packager {
         createEntryWhenMissing: () => new EmptyContentEntry(debianControlName)
       });
  
-    await copyEntries(transform(sources, transformer), staging, expander);
-
+      for await (const file of copyEntries(
+        transform(sources, transformer, true),
+        staging,
+        expander
+      )) {
+        if (options.verbose) {
+          console.log(file.destination);
+        }
+      }
+  
     const dpkg = await execa("dpkg", ["-b", staging, options.destination]);
 
     if(options.verbose) {

package/src/output/rpm.mjs

@@ -27,7 +27,13 @@ export class RPM extends Packager {
     return fields;
   }
 
-  async execute(sources, transformer, dependencies, options, expander) {
+  async execute(
+    sources,
+    transformer,
+    dependencies,
+    options,
+    expander
+  ) {
     const properties = this.properties;
     const tmp = await this.tmpdir;
 
@@ -41,31 +47,46 @@ export class RPM extends Packager {
     const specFileName = `${properties.name}.spec`;
 
     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 await (const file of copyEntries(
+              transform(sources, transformer),
+              staging,
+              expander
+            )) {
+              yield file.destination + "\n";
+            }
+          }
         }
       }
     }
 
     const fp = fieldProvider(properties, fields);
 
-    transformer.push({
-      match: entry => entry.name === specFileName,
-      transform: async entry =>
-        new ReadableStreamContentEntry(
-          entry.name,
-          keyValueTransformer(await entry.readStream, fp, {
-            ...colonSeparatedKeyValuePairOptions,
-            trailingLines
-          })
-        ),
-      createEntryWhenMissing: () => new EmptyContentEntry(specFileName)
-    });
-
-    await copyEntries(transform(sources, transformer), staging, expander);
+    for await (const file of copyEntries(
+      transform(sources, [
+        {
+          match: entry => entry.name === specFileName,
+          transform: async entry =>
+            new ReadableStreamContentEntry(
+              entry.name,
+              keyValueTransformer(await entry.readStream, fp, {
+                ...colonSeparatedKeyValuePairOptions,
+                trailingLines
+              })
+            ),
+          createEntryWhenMissing: () => new EmptyContentEntry(specFileName)
+        }
+      ]),
+      staging,
+      expander
+    )) {
+    }
 
     const rpmbuild = await execa("rpmbuild", [
       "--define",
@@ -101,7 +122,8 @@ const fields = {
   Release: { alias: "release", type: "integer", default: 1, mandatory: true },
   Source0: { alias: "source", type: "string" },
   Group: { alias: "group", type: "string" },
-  Packager: { type: "string" },
+  Packager: { alias: "maintainer", type: "string" },
+  Vendor: { alias: "vendor", type: "string" },
   BuildArch: {
     alias: "arch",
     default: "noarch",

package/src/util.mjs

@@ -32,6 +32,10 @@ export function asArray(o) {
  * @returns {Function}
  */
 export function fieldProvider(properties, fields) {
+  function av(field, value) {
+    return field.type.endsWith("]") ? asArray(value) : value;
+  }
+
   return function* controlProperties(k, v, presentKeys) {
     if (k === undefined) {
       for (const [name, field] of Object.entries(fields)) {
@@ -46,17 +50,12 @@ export function fieldProvider(properties, fields) {
               yield [name, field.default];
             }
           } else {
-            yield [
-              name,
-              field.type.endsWith("]") && !Array.isArray(value)
-                ? [value]
-                : value
-            ];
+            yield [name, av(field, value)];
           }
         }
       }
     } else {
-      yield [k, properties[k] || v];
+      yield [k, av(fields[k], properties[k] || v)];
     }
   };
 }
@@ -75,7 +74,9 @@ export async function extractFromPackage(pkg, dir) {
   );
 
   if (pkg.bugs) {
-    properties.bugs = pkg.bugs.url;
+    if (pkg.bugs.url) {
+      properties.bugs = pkg.bugs.url;
+    }
   }
 
   Object.assign(properties, pkg.config);
@@ -207,19 +208,22 @@ export async function* transform(source, transformers = [], onlyMatching) {
  * @param {Expander} expander
  * @param {ContentEntryAttribute[]} attributes
  */
-export async function copyEntries(
+export async function* copyEntries(
   source,
   destinationDirectory,
   expander = v => v
 ) {
   for await (let entry of source) {
-    const destination = expander(
+    const name = expander(
       entry.destination === undefined
-        ? join(destinationDirectory, entry.name)
+        ? entry.name
         : entry.destination.endsWith("/")
-        ? join(destinationDirectory, entry.destination, entry.name)
-        : join(destinationDirectory, entry.destination)
+        ? join(entry.destination, entry.name)
+        : entry.destination
     );
+
+    entry.destination = name;
+    const destination = join(destinationDirectory, name);
     await mkdir(dirname(destination), { recursive: true });
 
     const options = { mode: entry.mode };
@@ -228,5 +232,7 @@ export async function copyEntries(
       await entry.readStream,
       createWriteStream(destination, options)
     );
+
+    yield entry;
   }
 }