npm-pkgbuild 7.4.3 → 7.4.4

package/package.json

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

package/src/npm-pkgbuild-cli.mjs

@@ -5,6 +5,7 @@ import { readFile } from "fs/promises";
 import { join } from "path";
 import program from "commander";
 import { aggregateFifo } from "aggregate-async-iterator";
+import { createContext } from "expression-expander";
 import { packageDirectory } from "pkg-dir";
 import { utf8StreamOptions, extractFromPackage } from "./util.mjs";
 import { FileContentProvider, DEB, PKG, RPM } from "npm-pkgbuild";
@@ -65,11 +66,15 @@ program
             )
         );
 
+        const context = createContext();
+        context.properties = properties;
+
         const output = new outputFactory(properties);
 
         const fileName = await output.execute(
           aggregateFifo(sources.map(c => c[Symbol.asyncIterator]())),
-          options
+          options,
+          (object) => context.expand(object)
         );
 
         console.log(fileName);

package/src/output/deb.mjs

@@ -25,7 +25,7 @@ export class DEB extends Packager {
     return `${p.name}_${p.version}_${p.arch}${this.constructor.fileNameExtension}`;
   }
 
-  async execute(sources, options) {
+  async execute(sources, options, expander) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
     const staging = await this.tmpdir;
@@ -56,7 +56,7 @@ export class DEB extends Packager {
       }
     ];
 
-    await copyEntries(transform(sources, transformers), staging, attributes);
+    await copyEntries(transform(sources, transformers), staging, expander, attributes);
 
     await execa("dpkg", ["-b", staging, options.destination]);
 

package/src/output/pkg.mjs

@@ -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) {
+  async execute(sources, options,expander) {
     const properties = this.properties;
 
     //properties.depends = makeDepends({ ...pkg.engines });
@@ -77,7 +77,7 @@ package() {
 `;
     }
 
-    await copyEntries(transform(sources, []), join(staging, "src"));
+    await copyEntries(transform(sources, []), join(staging, "src"), expander);
 
     const metaTransformers = [
       {
@@ -94,7 +94,7 @@ package() {
       }
     ];
 
-    await copyEntries(transform(sources, metaTransformers, true), staging);
+    await copyEntries(transform(sources, metaTransformers, true), staging, expander);
 
     await execa("makepkg", ["-f"], { cwd: staging });
 

package/src/output/rpm.mjs

@@ -27,7 +27,7 @@ export class RPM extends Packager {
     return fields;
   }
 
-  async execute(sources, options) {
+  async execute(sources, options, expander) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
     const tmp = await this.tmpdir;
@@ -76,7 +76,7 @@ export class RPM extends Packager {
       }
     ];
 
-    await copyEntries(transform(sources, transformers), staging);
+    await copyEntries(transform(sources, transformers), staging, expander);
 
     await execa("rpmbuild", [
       "--define",

package/src/util.mjs

@@ -108,17 +108,20 @@ export async function* transform(source, transformers = [], onlyMatching) {
 }
 
 /**
- * Copy content from source into destinationDirectory
+ * Copy content from source into destinationDirectory.
  * @param {AsyncIterator<ContentEntry>} source
  * @param {string} destinationDirectory
+ * @param {Function} expander
+ * @param {ContentEntryAttribute[]} attributes
  */
 export async function copyEntries(
   source,
   destinationDirectory,
+  expander = (v) => v,
   attributes = []
 ) {
   for await (let entry of source) {
-    const destName = entry.destination === undefined ? join(destinationDirectory, entry.name) : join(destinationDirectory, entry.destination, entry.name);
+    const destName = expander(entry.destination === undefined ? join(destinationDirectory, entry.name) : join(destinationDirectory, entry.destination, entry.name));
     await mkdir(dirname(destName), { recursive: true });
 
     const options = { mode: entry.mode };