npm-pkgbuild 7.2.1 → 7.2.5

package/package.json

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

package/src/key-value-transformer.mjs

@@ -4,17 +4,38 @@
  * @param updates
  */
 export async function* keyValueTransformer(source, updates) {
-  for await (let line of asLines(source)) {
-    const m = line.match(/^(\w+):\s+(.*)/);
-    if (m) {
-      const [k, v] = updates(m[1], m[2]);
+  let key, value;
+
+  function * eject() {
+    if (key !== undefined) {
+      const [k, v] = updates(key, value);
       if (k !== undefined) {
-        yield `${k}: ${v}\n`;
+        yield`${k}: ${v}\n`;
+      }
+      key = value = undefined;
+    }
+  }
+
+  for await (const line of asLines(source)) {
+    const m = line.match(/^(\w+):\s*(.*)/);
+    if (m) {
+      yield *eject();
+      key = m[1];
+      value = m[2];
+    } else if (key !== undefined) {
+      const m = line.match(/^\s+(.*)/);
+      if (m) {
+        value += m[1];
+      } else {
+        yield * eject();
+        yield line + "\n";
       }
     } else {
       yield line + "\n";
     }
   }
+
+  yield *eject();
 }
 
 async function* asLines(source) {

package/src/npm-pkgbuild-cli.mjs

@@ -53,12 +53,15 @@ program
         );
 
         const properties = Object.fromEntries(
-          ["name", "version", "description", "homepage"].map(key => [
-            key,
-            pkg[key]
-          ]).filter(([k,v]) => v !== undefined )
+          ["name", "version", "description", "homepage"]
+            .map(key => [key, pkg[key]])
+            .filter(([k, v]) => v !== undefined)
         );
 
+        if(pkg.contributors) {
+          properties.maintainer = pkg.contributors.map(c => `${c.name} <${c.email}>`)[0];
+        }
+
         const sources = [...options.content, ...options.meta]
           .filter(x => x)
           .map(source =>

package/src/output/deb.mjs

@@ -13,17 +13,18 @@ const permissions = {
 };
 
 export class Deb extends Packager {
-
-  static get name() { return "deb"; }
+  static get name() {
+    return "deb";
+  }
 
   static get fileNameExtension() {
     return ".deb";
   }
 
   async execute() {
-    Object.entries(fields).forEach(([k,v])=>{
+    Object.entries(fields).forEach(([k, v]) => {
       const e = this.properties[v.alias];
-      if(e !== undefined) {
+      if (e !== undefined) {
         this.properties[k] = e;
       }
     });
@@ -34,6 +35,19 @@ export class Deb extends Packager {
       `${this.properties.name}-${this.properties.version}`
     );
 
+    const presentProperties = new Set();
+
+    const controlProperties = (k, v) => {
+      presentProperties.add(k);
+      return [k, this.properties[k] || v];
+    };
+
+    const mandatoryProperties = new Set(
+      Object.entries(fields)
+        .filter(([k, v]) => v.mandatory)
+        .map(([k, v]) => k)
+    );
+
     const output = `${staging}${this.constructor.fileNameExtension}`;
 
     for await (const entry of this.source) {
@@ -43,10 +57,7 @@ export class Deb extends Packager {
 
       if (entry.name === "DEBIAN/control") {
         await pipeline(
-          keyValueTransformer(await entry.getReadStream(), (k, v) => [
-            k,
-            this.properties[k] === undefined ? v : this.properties[k]
-          ]),
+          keyValueTransformer(await entry.getReadStream(), controlProperties),
           createWriteStream(destName)
         );
       } else {
@@ -66,6 +77,8 @@ export class Deb extends Packager {
       }
     }
 
+    //console.log(presentProperties, mandatoryProperties);
+
     await execa("dpkg", ["-b", staging]);
 
     return output;
@@ -80,9 +93,10 @@ const fields = {
   Package: { alias: "name", mandatory: true },
   Version: { alias: "version", mandatory: true },
   Architecture: { default: "any", mandatory: true },
+  Description: { alias: "description", mandatory: true },
   Homepage: { alias: "homepage" },
   Source: { mandatory: true },
-  Maintainer: { mandatory: true },
+  Maintainer: { alias: "maintainer", mandatory: true },
   Uploaders: { mandatory: false },
   Section: { recommended: true },
   Priority: { recommended: true },