npm-pkgbuild 7.14.14 → 7.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.14.14",
+  "version": "7.15.2",
   "publishConfig": {
     "access": "public"
   },
@@ -40,8 +40,9 @@
   "dependencies": {
     "aggregate-async-iterator": "^1.1.7",
     "commander": "^8.3.0",
-    "content-entry": "^3.0.3",
-    "content-entry-filesystem": "^3.1.15",
+    "content-entry": "^4.0.0",
+    "content-entry-filesystem": "^4.0.0",
+    "content-entry-transform": "^1.3.1",
     "execa": "^6.0.0",
     "expression-expander": "^7.0.9",
     "globby": "^12.0.2",

package/src/npm-pkgbuild-cli.mjs

@@ -8,9 +8,10 @@ import { aggregateFifo } from "aggregate-async-iterator";
 import { createContext } from "expression-expander";
 import { packageDirectory } from "pkg-dir";
 import {
-  utf8StreamOptions,
-  createExpressionTransformer
-} from "./util.mjs";
+  createExpressionTransformer,
+  nameExtensionMatcher
+} from "content-entry-transform";
+import { utf8StreamOptions } from "./util.mjs";
 import {
   FileContentProvider,
   allInputs,
@@ -95,7 +96,19 @@ program
 
         const context = createContext({ properties });
         const output = new outputFactory(context.expand(properties));
-        const transformer = [createExpressionTransformer(properties)];
+        const transformer = [
+          createExpressionTransformer(
+            nameExtensionMatcher([
+              ".conf",
+              ".json",
+              ".html",
+              ".txt",
+              ".service",
+              ".socket"
+            ]),
+            properties
+          )
+        ];
 
         if (options.verbose) {
           console.log(output.properties);

package/src/output/arch.mjs

@@ -3,6 +3,7 @@ import { createReadStream, createWriteStream } from "fs";
 import { pipeline } from "stream/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { transform, createPropertiesInterceptor } from "content-entry-transform";
 import { iterableStringInterceptor } from "iterable-string-interceptor";
 import {
   keyValueTransformer,
@@ -11,9 +12,7 @@ import {
 import { Packager } from "./packager.mjs";
 import {
   copyEntries,
-  transform,
   fieldProvider,
-  createPropertiesInterceptor,
   quote,
   utf8StreamOptions
 } from "../util.mjs";

package/src/output/deb.mjs

@@ -1,17 +1,20 @@
 import { join } from "path";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import {
+  transform,
+  createPropertiesTransformer
+} from "content-entry-transform";
 import { keyValueTransformer } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, transform, fieldProvider, createModeTransformer } from "../util.mjs";
+import { copyEntries, fieldProvider } from "../util.mjs";
 
 export class DEB extends Packager {
   static get name() {
     return "deb";
   }
 
-  static get description()
-  {
+  static get description() {
     return "generate Debian package";
   }
 
@@ -32,35 +35,40 @@ export class DEB extends Packager {
     const properties = this.properties;
     const staging = await this.tmpdir;
 
-    transformer.push(createModeTransformer(0o775, entry => entry.name.match(/DEBIAN\/.*(inst|rm)/) ? true: false));
+    transformer.push(
+      createPropertiesTransformer(
+        entry => (entry.name.match(/DEBIAN\/.*(inst|rm)/) ? true : false),
+        { mode: { value: 0o775 } },
+        "mode"
+      )
+    );
 
     const fp = fieldProvider(properties, fields);
     const debianControlName = "DEBIAN/control";
-    
-    transformer.push(
-      {
-        match: entry => entry.name === debianControlName,
-        transform: async entry =>
-          new ReadableStreamContentEntry(
-            entry.name,
-            keyValueTransformer(await entry.readStream, fp)
-          ),
-        createEntryWhenMissing: () => new EmptyContentEntry(debianControlName)
-      });
- 
-      for await (const file of copyEntries(
-        transform(sources, transformer),
-        staging,
-        expander
-      )) {
-        if (options.verbose) {
-          console.log(file.destination);
-        }
+
+    transformer.push({
+      match: entry => entry.name === debianControlName,
+      transform: async entry =>
+        new ReadableStreamContentEntry(
+          entry.name,
+          keyValueTransformer(await entry.readStream, fp)
+        ),
+      createEntryWhenMissing: () => new EmptyContentEntry(debianControlName)
+    });
+
+    for await (const file of copyEntries(
+      transform(sources, transformer),
+      staging,
+      expander
+    )) {
+      if (options.verbose) {
+        console.log(file.destination);
       }
-  
+    }
+
     const dpkg = await execa("dpkg", ["-b", staging, options.destination]);
 
-    if(options.verbose) {
+    if (options.verbose) {
       console.log(dpkg.stdout);
     }
 

package/src/output/rpm.mjs

@@ -2,12 +2,13 @@ import { join } from "path";
 import { mkdir, cp } from "fs/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { transform } from "content-entry-transform";
 import {
   keyValueTransformer,
   colonSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, transform, fieldProvider } from "../util.mjs";
+import { copyEntries, fieldProvider } from "../util.mjs";
 
 export class RPM extends Packager {
   static get name() {

package/src/util.mjs

@@ -58,77 +58,6 @@ export function fieldProvider(properties, fields) {
   };
 }
 
-export function createModeTransformer(mode, match) {
-  return {
-    name: "mode",
-    match,
-    transform: async entry => Object.create(entry, { mode: { value: mode } })
-  };
-}
-
-export function createPropertiesInterceptor(properties) {
-  return async function* transformer(expression, remainder, source, cb) {
-    const value = properties[expression];
-    yield value === undefined ? "" : value;
-  };
-}
-
-export function createExpressionTransformer(
-  properties,
-  match = entry =>
-    entry.name.match(/\.(conf|json|html|txt|service|socket)$/) ? true : false
-) {
-  return {
-    name: "expression",
-    match,
-    transform: async entry => {
-      //console.log("TRANSFORM",entry.name);
-      const ne = new ReadableStreamContentEntry(
-        entry.name,
-        iterableStringInterceptor(
-          await entry.getReadStream(utf8StreamOptions),
-          createPropertiesInterceptor(properties)
-        )
-      );
-      ne.destination = entry.destination; // TODO all the other attributes ?
-      return ne;
-      //return Object.assign(entry,ne);
-    }
-  };
-}
-
-/**
- * Apply transformers.
- * @param {AsyncIterator<ContentEntry>} source
- * @param {Transformer[]} transformers
- * @param {Boolean]} onlyMatching filter out all none matching entries
- */
-export async function* transform(source, transformers = [], onlyMatching) {
-  const usedTransformers = new Set();
-
-  for await (let entry of source) {
-    let didMatch = false;
-    for (const t of transformers) {
-      //console.log(t.name,entry.name,t.match(entry));
-      if (t.match(entry)) {
-        didMatch = true;
-        entry = await t.transform(entry);
-        usedTransformers.add(t);
-      }
-    }
-
-    if ((onlyMatching && didMatch) || !onlyMatching) {
-      yield entry;
-    }
-  }
-
-  for (const t of transformers) {
-    if (!usedTransformers.has(t) && t.createEntryWhenMissing !== undefined) {
-      yield t.transform(await t.createEntryWhenMissing());
-    }
-  }
-}
-
 /**
  * @typedef {Function} Expander
  * @param {string} path