npm-pkgbuild 7.7.1 → 7.8.2

package/README.md

@@ -11,7 +11,7 @@
 
 ## npm-pkgbuild
 
-create ArchLinux packages from npm packages
+create ArchLinux, RPM and debian packages from npm packages.
 
 # usage
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.7.1",
+  "version": "7.8.2",
   "publishConfig": {
     "access": "public"
   },
@@ -8,7 +8,7 @@
   "exports": {
     ".": "./src/module.mjs"
   },
-  "description": "create packages from npm packages",
+  "description": "create ArchLinux, RPM and debian packages from npm packages",
   "keywords": [
     "ArchLinux",
     "arch-linux",

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);
   }

package/src/output/pkg.mjs

@@ -6,8 +6,8 @@ import {
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, transform } from "../util.mjs";
-import { quote, createPropertyTransformer } from "../util.mjs";
+import { copyEntries, transform, fieldProvider } from "../util.mjs";
+import { quote, createExpressionTransformer } from "../util.mjs";
 
 /**
  * @type KeyValueTransformOptions
@@ -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() {
@@ -77,16 +64,17 @@ package() {
 `;
     }
 
-    await copyEntries(transform(sources, []), join(staging, "src"), expander);
+    await copyEntries(transform(sources, [createExpressionTransformer(properties)]), join(staging, "src"), expander);
+
+    const fp = fieldProvider(properties, fields, mandatoryFields);
 
     const metaTransformers = [
-      createPropertyTransformer(properties),
       {
         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

@@ -1,5 +1,5 @@
 import { join } from "path";
-import { mkdir } from "fs/promises";
+import { mkdir, cp } from "fs/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
 import {
@@ -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
             })
@@ -78,7 +67,7 @@ export class RPM extends Packager {
 
     await copyEntries(transform(sources, transformers), staging, expander);
 
-    await execa("rpmbuild", [
+    const rpmbuild = await execa("rpmbuild", [
       "--define",
       `_topdir ${tmp}`,
       "-vv",
@@ -86,6 +75,11 @@ export class RPM extends Packager {
       join(staging, specFileName)
     ]);
 
+    await cp(
+      join(tmp, "RPMS", properties.arch, this.packageFileName),
+      join(options.destination, this.packageFileName),
+      { preserveTimestamps: true }
+    );
     return join(options.destination, this.packageFileName);
   }
 }

package/src/util.mjs

@@ -3,6 +3,7 @@ import { mkdir } from "fs/promises";
 import { pipeline } from "stream/promises";
 import { createWriteStream } from "fs";
 import { iterableStringInterceptor } from "iterable-string-interceptor";
+import { ReadableStreamContentEntry } from "content-entry";
 import { FileContentProvider } from "npm-pkgbuild";
 import { packageWalker } from "npm-package-walker";
 
@@ -24,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
@@ -32,7 +51,7 @@ export function asArray(o) {
  */
 export async function extractFromPackage(pkg, dir) {
   const properties = Object.fromEntries(
-    ["name", "version", "description", "homepage"]
+    ["name", "version", "description", "homepage", "license"]
       .map(key => [key, pkg[key]])
       .filter(([k, v]) => v !== undefined)
   );
@@ -58,13 +77,13 @@ export async function extractFromPackage(pkg, dir) {
   let dependencies = { ...pkg.engines };
   let sources = [];
   let output = {};
-  
+
   const processPkg = pkg => {
     if (pkg.pkgbuild) {
       const pkgbuild = pkg.pkgbuild;
 
       Object.assign(output, pkgbuild.output);
-      
+
       Object.entries(pkgbuild)
         .filter(([k, v]) => typeof v === "string")
         .forEach(([k, v]) => (properties[k] = v));
@@ -81,7 +100,7 @@ export async function extractFromPackage(pkg, dir) {
   };
 
   await packageWalker(async (pkg, base, modulePath) => {
-    processPkg(pkg)
+    processPkg(pkg);
     return true;
   }, dir);
 
@@ -90,18 +109,25 @@ export async function extractFromPackage(pkg, dir) {
   return { properties, sources, dependencies, output };
 }
 
-export function createPropertyTransformer(properties) {
+export function createExpressionTransformer(
+  properties,
+  match = entry => entry.name.match(/\.(conf|json)$/)
+) {
   async function* transformer(expression, remainder, source, cb) {
-    console.log("EXPRESSION", expression);
-    yield properties[expression];
+    const value = properties[expression];
+    console.log("EXPRESSION", expression, value);
+    yield value === undefined ? "" : value;
   }
 
   return {
-    match: entry => true, //entry.name.match(/(conf|json)$/),
+    match,
     transform: async entry =>
       new ReadableStreamContentEntry(
         entry.name,
-        iterableStringInterceptor(transformer)
+        iterableStringInterceptor(
+          await entry.getReadStream(utf8StreamOptions),
+          transformer
+        )
       )
   };
 }
@@ -170,7 +196,6 @@ export async function copyEntries(
       }
     }
 
-    console.log(destName);
     await pipeline(
       await entry.readStream,
       createWriteStream(destName, options)