npm-pkgbuild 7.9.2 → 7.10.0

package/package.json

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

package/src/npm-pkgbuild-cli.mjs

@@ -9,6 +9,7 @@ import { createContext } from "expression-expander";
 import { packageDirectory } from "pkg-dir";
 import { utf8StreamOptions, extractFromPackage } from "./util.mjs";
 import { FileContentProvider, DEB, PKG, RPM } from "npm-pkgbuild";
+import { createExpressionTransformer } from "./util.mjs";
 
 const { version, description } = JSON.parse(
   readFileSync(new URL("../package.json", import.meta.url).pathname),
@@ -74,13 +75,15 @@ program
 
         const context = createContext({ properties });
         const output = new outputFactory(properties);
-
+        const transformer = [createExpressionTransformer(properties)];
+ 
         if (options.verbose) {
           console.log(output.properties);
         }
 
         const fileName = await output.execute(
           aggregateFifo(sources.map(c => c[Symbol.asyncIterator]())),
+          transformer,
           options,
           path => context.expand(path)
         );

package/src/output/deb.mjs

@@ -3,9 +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, fieldProvider } from "../util.mjs";
-
-const attributes = [{ pattern: /DEBIAN\/.*(inst|rm)/, mode: 0o775 }];
+import { copyEntries, transform, fieldProvider, createModeTransformer } from "../util.mjs";
 
 export class DEB extends Packager {
   static get name() {
@@ -25,15 +23,16 @@ export class DEB extends Packager {
     return `${p.name}_${p.version}_${p.arch}${this.constructor.fileNameExtension}`;
   }
 
-  async execute(sources, options, expander) {
+  async execute(sources, transformer, options, expander) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
 
     const fp = fieldProvider(properties, fields, mandatoryFields);
-
     const debianControlName = "DEBIAN/control";
-    const transformers = [
+    
+    transformer.push(createModeTransformer(0o775, entry => entry.name.match(/DEBIAN\/.*(inst|rm)/)));
+    transformer.push(
       {
         match: entry => entry.name === debianControlName,
         transform: async entry =>
@@ -42,10 +41,9 @@ export class DEB extends Packager {
             keyValueTransformer(await entry.readStream, fp)
           ),
         createEntryWhenMissing: () => new EmptyContentEntry(debianControlName)
-      }
-    ];
-
-    await copyEntries(transform(sources, transformers), staging, expander, attributes);
+      });
+ 
+    await copyEntries(transform(sources, transformer), staging, expander);
 
     const dpkg = await execa("dpkg", ["-b", staging, options.destination]);
 

package/src/output/pkg.mjs

@@ -7,7 +7,7 @@ import {
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
 import { copyEntries, transform, fieldProvider } from "../util.mjs";
-import { quote, createExpressionTransformer } from "../util.mjs";
+import { quote } from "../util.mjs";
 
 /**
  * @type KeyValueTransformOptions
@@ -48,7 +48,7 @@ export class PKG extends Packager {
     return `${p.name}-${p.version}-${p.release}-${p.arch}${this.constructor.fileNameExtension}`;
   }
 
-  async execute(sources, options, expander) {
+  async execute(sources, transformer, options, expander) {
     const properties = this.properties;
 
     //properties.depends = makeDepends({ ...pkg.engines });
@@ -64,11 +64,11 @@ package() {
 `;
     }
 
-    await copyEntries(transform(sources, [createExpressionTransformer(properties)]), join(staging, "src"), expander);
+    await copyEntries(transform(sources, transformer), join(staging, "src"), expander);
 
     const fp = fieldProvider(properties, fields, mandatoryFields);
 
-    const metaTransformers = [
+    transformer.push(
       {
         match: entry => entry.name === "PKGBUILD",
         transform: async entry =>
@@ -80,11 +80,10 @@ package() {
             })
           ),
         createEntryWhenMissing: () => new EmptyContentEntry("PKGBUILD")
-      }
-    ];
+      });
 
     await copyEntries(
-      transform(sources, metaTransformers, true),
+      transform(sources, transformer, true),
       staging,
       expander
     );

package/src/output/rpm.mjs

@@ -27,7 +27,7 @@ export class RPM extends Packager {
     return fields;
   }
 
-  async execute(sources, options, expander) {
+  async execute(sources, transformer, options, expander) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
     const tmp = await this.tmpdir;
@@ -50,7 +50,7 @@ export class RPM extends Packager {
       }
     }
 
-    const transformers = [
+    transformer.push(
       {
         match: entry => entry.name === specFileName,
         transform: async entry =>
@@ -62,10 +62,9 @@ export class RPM extends Packager {
             })
           ),
         createEntryWhenMissing: () => new EmptyContentEntry(specFileName)
-      }
-    ];
+      });
 
-    await copyEntries(transform(sources, transformers), staging, expander);
+    await copyEntries(transform(sources, transformer), staging, expander);
 
     const rpmbuild = await execa("rpmbuild", [
       "--define",

package/src/util.mjs

@@ -111,13 +111,20 @@ export async function extractFromPackage(pkg, dir) {
   return { properties, sources, dependencies, output };
 }
 
+export function createModeTransformer(mode, match)
+{
+   return {
+   	 match,
+   	 transform: async entry => Object.create(entry,{ mode: { value: mode }})
+   };
+}
+
 export function createExpressionTransformer(
   properties,
-  match = entry => entry.name.match(/\.(conf|json)$/)
+  match = entry => entry.name.match(/\.(conf|json|html|txt)$/)
 ) {
   async function* transformer(expression, remainder, source, cb) {
     const value = properties[expression];
-    console.log("EXPRESSION", expression, value);
     yield value === undefined ? "" : value;
   }
 
@@ -183,30 +190,23 @@ export async function* transform(source, transformers = [], onlyMatching) {
 export async function copyEntries(
   source,
   destinationDirectory,
-  expander = v => v,
-  attributes = []
+  expander = v => v
 ) {
   for await (let entry of source) {
-    const destName = expander(
+    const destination = expander(
       entry.destination === undefined
         ? join(destinationDirectory, entry.name)
         : entry.destination.endsWith("/")
         ? join(destinationDirectory, entry.destination, entry.name)
         : join(destinationDirectory, entry.destination)
     );
-    await mkdir(dirname(destName), { recursive: true });
+    await mkdir(dirname(destination), { recursive: true });
 
     const options = { mode: entry.mode };
 
-    for (const a of attributes) {
-      if (entry.name.match(a.pattern)) {
-        options.mode = a.mode;
-      }
-    }
-
     await pipeline(
       await entry.readStream,
-      createWriteStream(destName, options)
+      createWriteStream(destination, options)
     );
   }
 }