npm-pkgbuild 7.8.0 → 7.9.1

package/package.json

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

package/src/npm-pkgbuild-cli.mjs

@@ -31,6 +31,7 @@ program
     return Object.fromEntries([kv]);
   })
   .option("-d --destination <dir>", "where to put the package(s)", cwd)
+  .option("--verbose", "be more verbose", false)
   .option("-s --staging <dir>", "staging directory", "build")
   .option(
     "-c --content <dir>",
@@ -50,10 +51,7 @@ program
 
       const { properties, sources, output } = await extractFromPackage(
         JSON.parse(
-          await readFile(
-            join(pkgDir, "package.json"),
-            utf8StreamOptions
-          )
+          await readFile(join(pkgDir, "package.json"), utf8StreamOptions)
         ),
         pkgDir
       );
@@ -77,13 +75,15 @@ program
         const context = createContext({ properties });
         const output = new outputFactory(properties);
 
+        if (options.verbose) {
+          console.log(output.properties);
+        }
+
         const fileName = await output.execute(
           aggregateFifo(sources.map(c => c[Symbol.asyncIterator]())),
           options,
-          object => context.expand(object)
+          path => context.expand(path)
         );
-
-        console.log(fileName);
       }
     } catch (e) {
       console.log(e);

package/src/output/deb.mjs

@@ -3,7 +3,7 @@ import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
 import { keyValueTransformer } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, transform } from "../util.mjs";
+import { copyEntries, transform, fieldProvider } from "../util.mjs";
 
 const attributes = [{ pattern: /DEBIAN\/.*(inst|rm)/, mode: 0o775 }];
 
@@ -30,18 +30,7 @@ export class DEB extends Packager {
     const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
 
-    function* controlProperties(k, v, presentKeys) {
-      if (k === undefined) {
-        for (const p of mandatoryFields) {
-          if (!presentKeys.has(p)) {
-            const v = properties[p];
-            yield [p, v === undefined ? fields[p].default : v];
-          }
-        }
-      } else {
-        yield [k, properties[k] || v];
-      }
-    }
+    const fp = fieldProvider(properties, fields, mandatoryFields);
 
     const debianControlName = "DEBIAN/control";
     const transformers = [
@@ -50,7 +39,7 @@ export class DEB extends Packager {
         transform: async entry =>
           new ReadableStreamContentEntry(
             entry.name,
-            keyValueTransformer(await entry.readStream, controlProperties)
+            keyValueTransformer(await entry.readStream, fp)
           ),
         createEntryWhenMissing: () => new EmptyContentEntry(debianControlName)
       }
@@ -59,7 +48,6 @@ export class DEB extends Packager {
     await copyEntries(transform(sources, transformers), staging, expander, attributes);
 
     const dpkg = await execa("dpkg", ["-b", staging, options.destination]);
-    //console.log(dpkg.stdout);
 
     return join(options.destination, this.packageFileName);
   }
@@ -75,8 +63,8 @@ const fields = {
   Version: { alias: "version", type: "string", mandatory: true },
   Maintainer: { alias: "maintainer", type: "string", mandatory: true },
   Description: { alias: "description", type: "string", mandatory: true },
-  Section: { type: "string", recommended: true },
-  Priority: { type: "string", recommended: true },
+  Section: { type: "string" },
+  Priority: { type: "string" },
   Essential: { type: "boolean" },
   Origin: { type: "string" },
   Architecture: {

package/src/output/packager.mjs

@@ -19,7 +19,7 @@ export class Packager {
   }
 
   constructor(properties) {
-    this._properties = properties;
+    this._properties = { ...properties };
   }
 
   get fields() {

package/src/output/pkg.mjs

@@ -6,7 +6,7 @@ import {
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, transform } from "../util.mjs";
+import { copyEntries, transform, fieldProvider } from "../util.mjs";
 import { quote, createExpressionTransformer } from "../util.mjs";
 
 /**
@@ -56,19 +56,6 @@ export class PKG extends Packager {
     const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
 
-    function* controlProperties(k, v, presentKeys) {
-      if (k === undefined) {
-        for (const p of mandatoryFields) {
-          if (!presentKeys.has(p)) {
-            const v = properties[p];
-            yield [p, v === undefined ? fields[p].default : v];
-          }
-        }
-      } else {
-        yield [k, properties[k] || v];
-      }
-    }
-
     async function* trailingLines() {
       yield `
 package() {
@@ -79,13 +66,15 @@ package() {
 
     await copyEntries(transform(sources, [createExpressionTransformer(properties)]), join(staging, "src"), expander);
 
+    const fp = fieldProvider(properties, fields, mandatoryFields);
+
     const metaTransformers = [
       {
         match: entry => entry.name === "PKGBUILD",
         transform: async entry =>
           new ReadableStreamContentEntry(
             entry.name,
-            keyValueTransformer(await entry.readStream, controlProperties, {
+            keyValueTransformer(await entry.readStream, fp, {
               ...pkgKeyValuePairOptions,
               trailingLines
             })

package/src/output/rpm.mjs

@@ -7,7 +7,7 @@ import {
   colonSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, transform } from "../util.mjs";
+import { copyEntries, transform, fieldProvider } from "../util.mjs";
 
 export class RPM extends Packager {
   static get name() {
@@ -40,18 +40,7 @@ export class RPM extends Packager {
 
     const staging = join(tmp, "staging");
 
-    function* controlProperties(k, v, presentKeys) {
-      if (k === undefined) {
-        for (const p of mandatoryFields) {
-          if (!presentKeys.has(p)) {
-            const v = properties[p];
-            yield [p, v === undefined ? fields[p].default : v];
-          }
-        }
-      } else {
-        yield [k, properties[k] || v];
-      }
-    }
+    const fp = fieldProvider(properties, fields, mandatoryFields);
 
     const specFileName = `${properties.name}.spec`;
 
@@ -67,7 +56,7 @@ export class RPM extends Packager {
         transform: async entry =>
           new ReadableStreamContentEntry(
             entry.name,
-            keyValueTransformer(await entry.readStream, controlProperties, {
+            keyValueTransformer(await entry.readStream, fp, {
               ...colonSeparatedKeyValuePairOptions,
               trailingLines
             })
@@ -89,7 +78,7 @@ export class RPM extends Packager {
     await cp(
       join(tmp, "RPMS", properties.arch, this.packageFileName),
       join(options.destination, this.packageFileName),
-      {preserveTimestamps :true }
+      { preserveTimestamps: true }
     );
     return join(options.destination, this.packageFileName);
   }

package/src/util.mjs

@@ -25,6 +25,24 @@ export function asArray(o) {
   return Array.isArray(o) ? o : [o];
 }
 
+export function fieldProvider(properties, fields, mandatoryFields) {
+  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}`);
+          }
+          yield [p, v === undefined ? fields[p].default : v];
+        }
+      }
+    } else {
+      yield [k, properties[k] || v];
+    }
+  };
+}
+
 /**
  * Extract package definition from package.json.
  * @param {Object} pkg package.json content
@@ -91,7 +109,10 @@ export async function extractFromPackage(pkg, dir) {
   return { properties, sources, dependencies, output };
 }
 
-export function createExpressionTransformer(properties) {
+export function createExpressionTransformer(
+  properties,
+  match = entry => entry.name.match(/\.(conf|json)$/)
+) {
   async function* transformer(expression, remainder, source, cb) {
     const value = properties[expression];
     console.log("EXPRESSION", expression, value);
@@ -99,7 +120,7 @@ export function createExpressionTransformer(properties) {
   }
 
   return {
-    match: entry => true, //entry.name.match(/(conf|json)$/),
+    match,
     transform: async entry =>
       new ReadableStreamContentEntry(
         entry.name,
@@ -144,11 +165,17 @@ export async function* transform(source, transformers = [], onlyMatching) {
   }
 }
 
+/**
+ * @typedef {Function} Expander
+ * @param {string} path 
+ * @return {string}
+ */
+
 /**
  * Copy content from source into destinationDirectory.
  * @param {AsyncIterator<ContentEntry>} source
  * @param {string} destinationDirectory
- * @param {Function} expander
+ * @param {Expander} expander
  * @param {ContentEntryAttribute[]} attributes
  */
 export async function copyEntries(
@@ -175,7 +202,6 @@ export async function copyEntries(
       }
     }
 
-    console.log(destName);
     await pipeline(
       await entry.readStream,
       createWriteStream(destName, options)