npm-pkgbuild 7.2.13 → 7.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.2.13",
+  "version": "7.3.3",
   "publishConfig": {
     "access": "public"
   },
@@ -40,9 +40,9 @@
   "dependencies": {
     "aggregate-async-iterator": "^1.1.7",
     "commander": "^8.3.0",
-    "content-entry": "^2.7.1",
-    "content-entry-filesystem": "^3.0.1",
-    "execa": "^5.1.1",
+    "content-entry": "^2.9.6",
+    "content-entry-filesystem": "^3.1.9",
+    "execa": "^6.0.0",
     "expression-expander": "^7.0.9",
     "globby": "^12.0.2",
     "iterable-string-interceptor": "^1.0.8",
@@ -55,11 +55,11 @@
     "ava": "^3.15.0",
     "c8": "^7.10.0",
     "documentation": "^13.2.5",
-    "semantic-release": "^18.0.0",
+    "semantic-release": "^18.0.1",
     "stream-buffers": "^3.0.2"
   },
   "engines": {
-    "node": ">=16.12.0"
+    "node": ">=16.13.0"
   },
   "repository": {
     "type": "git",

package/src/content/file-content-provider.mjs

@@ -1,3 +1,4 @@
+import { dirname } from "path";
 import { globby } from "globby";
 import { FileSystemEntry } from "content-entry-filesystem";
 import { asArray } from "../util.mjs";
@@ -10,13 +11,20 @@ export class FileContentProvider extends ContentProvider {
   constructor(definitions) {
     super();
 
-    this.definitions = { pattern: ["**/*"], ...definitions };
-    this.definitions.pattern = asArray(this.definitions.pattern);
+    if (typeof definitions === "string") {
+      const base = dirname(definitions);
+      this.definitions = {
+        base,
+        pattern: [definitions.substring(base.length)]
+      };
+    } else {
+      this.definitions = { pattern: ["**/*"], ...definitions };
+      this.definitions.pattern = asArray(this.definitions.pattern);
+    }
   }
 
-  async *entries() {
+  async *[Symbol.asyncIterator]() {
     const definitions = this.definitions;
-
     const base = definitions.base;
 
     for (const name of await globby(definitions.pattern, {

package/src/npm-pkgbuild-cli.mjs

@@ -24,7 +24,6 @@ outputs.forEach(o =>
   program.option(`--${o.name}`, `generate ${o.name} package`)
 );
 
-
 program
   .option("--pkgver <version>", "package version")
   .option("-p --package <dir>", "where to put the package(s)", cwd)
@@ -46,22 +45,30 @@ program
       for (const outputFactory of outputs.filter(
         o => options[o.name] === true
       )) {
-        const {properties, content} = extractFromPackage(JSON.parse(
-          await readFile(
-            join(await packageDirectory(), "package.json"),
-            utf8StreamOptions
+        const { properties, sources } = extractFromPackage(
+          JSON.parse(
+            await readFile(
+              join(await packageDirectory(), "package.json"),
+              utf8StreamOptions
+            )
           )
-        ));
+        );
 
-        const sources = [...options.content, ...options.meta]
-          .filter(x => x)
-          .map(source =>
-            new FileContentProvider({
-              base: source
-            }).entries()
-          );
+        sources.push(
+          ...[...options.content, ...options.meta]
+            .filter(x => x)
+            .map(source => [
+              new FileContentProvider({
+                base: source
+              }),
+              ""
+            ])
+        );
 
-        const output = new outputFactory(aggregateFifo(sources), properties);
+        const output = new outputFactory(
+          aggregateFifo(sources.map(([c, d]) => c.entries())),
+          properties
+        );
 
         const fileName = await output.execute();
 

package/src/output/deb.mjs

@@ -3,16 +3,18 @@ import { tmpdir } from "os";
 import { createWriteStream } from "fs";
 import { mkdtemp, mkdir, chmod } from "fs/promises";
 import { pipeline } from "stream/promises";
-import execa from "execa";
+import { execa } from "execa";
 import { EmptyContentEntry } from "content-entry";
 import { Packager } from "./packager.mjs";
 import { keyValueTransformer } from "../key-value-transformer.mjs";
 
+const executableAttributes = { chmod: "0775" };
+
 const permissions = {
-  "DEBIAN/preinst": { chmod: "0775" },
-  "DEBIAN/postinst": { chmod: "0775" },
-  "DEBIAN/prerm": { chmod: "0775" },
-  "DEBIAN/postrm": { chmod: "0775" }
+  "DEBIAN/preinst": executableAttributes,
+  "DEBIAN/postinst": executableAttributes,
+  "DEBIAN/prerm": executableAttributes,
+  "DEBIAN/postrm": executableAttributes
 };
 
 export class Deb extends Packager {
@@ -68,8 +70,9 @@ export class Deb extends Packager {
       if (entry.name === "DEBIAN/control") {
         debianControlEntry = entry;
       } else {
+        console.log("ENTRY", entry.name, entry.basename);
         await pipeline(
-          await entry.getReadStream(),
+          await entry.readStream,
           createWriteStream(destName)
         );
 
@@ -94,7 +97,7 @@ export class Deb extends Packager {
 
     await pipeline(
       keyValueTransformer(
-        await debianControlEntry.getReadStream(),
+        await debianControlEntry.readStream,
         controlProperties
       ),
       createWriteStream(destName)

package/src/output/pkg.mjs

@@ -3,7 +3,7 @@ import { tmpdir } from "os";
 import { finished } from "stream";
 import { promisify } from "util";
 import { mkdtemp, mkdir, chmod } from "fs/promises";
-import execa from "execa";
+import { execa } from "execa";
 import { Packager } from "./packager.mjs";
 import { quote } from "../util.mjs";
 

package/src/util.mjs

@@ -1,6 +1,7 @@
-export const utf8StreamOptions = { encoding: "utf8" };
 import { FileContentProvider } from "npm-pkgbuild";
 
+export const utf8StreamOptions = { encoding: "utf8" };
+
 export function quote(v) {
   if (v === undefined) return "";
 
@@ -20,7 +21,7 @@ export function asArray(o) {
 /**
  *
  * @param {Object} pkg package.json content
- * @returns
+ * @returns {Object}
  */
 export function extractFromPackage(pkg) {
   const properties = Object.fromEntries(
@@ -43,15 +44,19 @@ export function extractFromPackage(pkg) {
     )[0];
   }
 
-  let content = [];
+  let sources = [];
 
   if (pkg.pkgbuild) {
+    Object.entries(pkg.pkgbuild)
+      .filter(([k, v]) => typeof v === "string")
+      .forEach(([k, v]) => (properties[k] = v));
+
     if (pkg.pkgbuild.content) {
-      for (const [name, value] of Object.entries(pkg.pkgbuild.content)) {
-        content.push(new FileContentProvider(value));
-      }
+      sources = Object.entries(pkg.pkgbuild.content).map(
+        ([destination, value]) => [new FileContentProvider(value), destination]
+      );
     }
   }
 
-  return { properties, content };
+  return { properties, sources };
 }