npm-pkgbuild 7.11.1 → 7.11.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.11.1",
+  "version": "7.11.5",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "ava": "^3.15.0",
-    "c8": "^7.10.0",
+    "c8": "^7.11.0",
     "documentation": "^13.2.5",
     "semantic-release": "^18.0.1",
     "stream-buffers": "^3.0.2"

package/src/output/deb.mjs

@@ -25,13 +25,13 @@ export class DEB extends Packager {
 
   async execute(sources, transformer, options, expander) {
     const properties = this.properties;
-    const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
 
-    const fp = fieldProvider(properties, fields, mandatoryFields);
+    transformer.push(createModeTransformer(0o775, entry => entry.name.match(/DEBIAN\/.*(inst|rm)/)));
+
+    const fp = fieldProvider(properties, fields);
     const debianControlName = "DEBIAN/control";
     
-    transformer.push(createModeTransformer(0o775, entry => entry.name.match(/DEBIAN\/.*(inst|rm)/)));
     transformer.push(
       {
         match: entry => entry.name === debianControlName,

package/src/output/packager.mjs

@@ -43,19 +43,6 @@ export class Packager {
     return properties;
   }
 
-  /**
-   * @return {Set<string,Field>} mandatory fields
-   */
-  get mandatoryFields() {
-    const mandatoryFields = new Set(
-      Object.entries(this.fields)
-        .filter(([k, v]) => v.mandatory)
-        .map(([k, v]) => k)
-    );
-
-    return mandatoryFields;
-  }
-
   /**
    * Create tmp directory.
    * @return {Promise<string>} directory path

package/src/output/pkg.mjs

@@ -1,14 +1,17 @@
-import { join } from "path";
-import { cp } from "fs/promises";
+import { join, dirname } 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";
+import { iterableStringInterceptor } from "iterable-string-interceptor";
 import {
   keyValueTransformer,
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
 import { copyEntries, transform, fieldProvider } from "../util.mjs";
-import { quote } from "../util.mjs";
+import { quote, utf8StreamOptions } from "../util.mjs";
 
 /**
  * @type KeyValueTransformOptions
@@ -52,9 +55,12 @@ export class PKG extends Packager {
   async execute(sources, transformer, options, expander) {
     const properties = this.properties;
 
+    if (properties.source) {
+      properties.md5sums = ["SKIP"];
+    }
+
     //properties.depends = makeDepends({ ...pkg.engines });
 
-    const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
 
     async function* trailingLines() {
@@ -71,7 +77,7 @@ package() {
       expander
     );
 
-    const fp = fieldProvider(properties, fields, mandatoryFields);
+    const fp = fieldProvider(properties, fields);
 
     transformer.push({
       match: entry => entry.name === "PKGBUILD",
@@ -87,19 +93,41 @@ package() {
     });
 
     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(
+            join(options.pkgdir, properties.hooks),
+            utf8StreamOptions
+          ),
+          transformer
+        ),
+        createWriteStream(destination, utf8StreamOptions)
+      );
+
+      /*
       await cp(
         join(options.pkgdir, properties.hooks),
-        join(staging, `${properties.name}.install`),
+        join(staging, properties.hooks),
         {
           preserveTimestamps: true
         }
       );
+      */
     }
 
     await copyEntries(transform(sources, transformer, true), staging, expander);
 
     if (options.verbose) {
-      console.log(staging);
+      console.log(`stagingDir: ${staging}`);
     }
 
     const makepkg = await execa("makepkg", ["-f"], {
@@ -122,19 +150,18 @@ package() {
 const fields = {
   pkgname: { alias: "name", type: "string[]", mandatory: true },
   pkgver: { alias: "version", type: "string", mandatory: true },
-  pkgrel: { alias: "release", type: "integer", default: 0, mandatory: true },
+  pkgrel: { alias: "release", type: "integer", default: 1, mandatory: true },
   epoch: { type: "integer", default: 0 },
   pkgdesc: { alias: "description", type: "string", mandatory: true },
   url: { alias: "homepage", type: "string" },
-  license: { default: [], type: "string[]", mandatory: true },
+  license: { type: "string[]", mandatory: true },
   install: { alias: "hooks", type: "string" },
   changelog: { type: "string" },
-  source: { default: [], type: "string[]" },
-  validpgpkeys: { type: "string[]" },
+  source: { type: "string[]" },
   validpgpkeys: { type: "string[]" },
   noextract: { type: "string[]" },
   cksums: { type: "string[]" },
-  md5sums: { /*default: ["SKIP"],*/ type: "string[]" },
+  md5sums: { type: "string[]" },
   sha1sums: { type: "string[]" },
   sha256sums: { type: "string[]" },
   sha384sums: { type: "string[]" },
@@ -178,8 +205,6 @@ package() {
   mkdir -p \${pkgdir}${installdir}
   npx npm-pkgbuild --package \${srcdir}/\${pkgname}${directory} --staging \${pkgdir} content
 }
-`
-  );
 */
 
 const mapping = {

package/src/output/rpm.mjs

@@ -29,7 +29,6 @@ export class RPM extends Packager {
 
   async execute(sources, transformer, options, expander) {
     const properties = this.properties;
-    const mandatoryFields = this.mandatoryFields;
     const tmp = await this.tmpdir;
 
     await Promise.all(
@@ -39,45 +38,46 @@ export class RPM extends Packager {
     );
 
     const staging = join(tmp, "BUILDROOT");
-
-    const fp = fieldProvider(properties, fields, mandatoryFields);
-
     const specFileName = `${properties.name}.spec`;
 
     async function* trailingLines() {
+      yield "%define _unpackaged_files_terminate_build 0\n";
+
       for (const [name, options] of Object.entries(sections)) {
-        if(options.mandatory) {
+        if (options.mandatory) {
           yield `%${name}\n\n`;
         }
       }
     }
 
-    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)
-      });
+    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);
 
     const rpmbuild = await execa("rpmbuild", [
       "--define",
       `_topdir ${tmp}`,
-//      "--buildroot", staging,
+      "--buildroot",
+      staging,
       "-vv",
       "-bb",
       join(staging, specFileName)
     ]);
 
-    if(options.verbose) {
+    if (options.verbose) {
       console.log(rpmbuild.stdout);
     }
 

package/src/util.mjs

@@ -25,16 +25,34 @@ export function asArray(o) {
   return Array.isArray(o) ? o : [o];
 }
 
-export function fieldProvider(properties, fields, mandatoryFields) {
+/**
+ *
+ * @param {Object} properties
+ * @param {Object} fields
+ * @returns {Function}
+ */
+export function fieldProvider(properties, fields) {
   return function* controlProperties(k, v, presentKeys) {
     if (k === undefined) {
-      for (const p of mandatoryFields) {
-        if (!presentKeys.has(p)) {
-          const v = properties[p];
-          if (v === undefined && fields[p].default === undefined) {
-            console.log(`Missing value for mandatory field ${p}`);
+      for (const [name, field] of Object.entries(fields)) {
+        if (!presentKeys.has(name)) {
+          const value = properties[field.alias || name];
+          if (value === undefined) {
+            if (field.default === undefined) {
+              if (field.mandatory) {
+                console.log(`Missing value for mandatory field ${name}`);
+              }
+            } else {
+              yield [name, field.default];
+            }
+          } else {
+            yield [
+              name,
+              field.type.endsWith("]") && !Array.isArray(value)
+                ? [value]
+                : value
+            ];
           }
-          yield [p, v === undefined ? fields[p].default : v];
         }
       }
     } else {
@@ -61,7 +79,7 @@ export async function extractFromPackage(pkg, dir) {
   }
 
   Object.assign(properties, pkg.config);
-  
+
   if (properties.name) {
     properties.name = properties.name.replace(/^\@\w+\//, "");
   }
@@ -111,12 +129,11 @@ export async function extractFromPackage(pkg, dir) {
   return { properties, sources, dependencies, output };
 }
 
-export function createModeTransformer(mode, match)
-{
-   return {
-   	 match,
-   	 transform: async entry => Object.create(entry,{ mode: { value: mode }})
-   };
+export function createModeTransformer(mode, match) {
+  return {
+    match,
+    transform: async entry => Object.create(entry, { mode: { value: mode } })
+  };
 }
 
 export function createExpressionTransformer(
@@ -136,9 +153,11 @@ export function createExpressionTransformer(
         iterableStringInterceptor(
           await entry.getReadStream(utf8StreamOptions),
           transformer
-        ));
-	  ne.destination = entry.destination; // TODO all the other attributes ? 
-      return ne; }
+        )
+      );
+      ne.destination = entry.destination; // TODO all the other attributes ?
+      return ne;
+    }
   };
 }
 
@@ -177,7 +196,7 @@ export async function* transform(source, transformers = [], onlyMatching) {
 
 /**
  * @typedef {Function} Expander
- * @param {string} path 
+ * @param {string} path
  * @return {string}
  */