npm-pkgbuild 7.4.4 → 7.5.0

package/package.json

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

package/src/npm-pkgbuild-cli.mjs

@@ -26,7 +26,10 @@ outputs.forEach(o =>
 );
 
 program
-  .option("--pkgver <version>", "package version")
+  .option("-D --define <a=b>", "define property", str => {
+    const kv = str.split(/=/);
+    return Object.fromEntries([kv]);
+  })
   .option("-d --destination <dir>", "where to put the package(s)", cwd)
   .option("-s --staging <dir>", "staging directory", "build")
   .option(
@@ -55,6 +58,8 @@ program
           )
         );
 
+        Object.assign(properties, options.define);
+
         sources.push(
           ...[...options.content, ...options.meta]
             .filter(x => x)
@@ -66,15 +71,13 @@ program
             )
         );
 
-        const context = createContext();
-        context.properties = properties;
-
+        const context = createContext({ properties });
         const output = new outputFactory(properties);
 
         const fileName = await output.execute(
           aggregateFifo(sources.map(c => c[Symbol.asyncIterator]())),
           options,
-          (object) => context.expand(object)
+          object => context.expand(object)
         );
 
         console.log(fileName);

package/src/util.mjs

@@ -117,11 +117,17 @@ export async function* transform(source, transformers = [], onlyMatching) {
 export async function copyEntries(
   source,
   destinationDirectory,
-  expander = (v) => v,
+  expander = v => v,
   attributes = []
 ) {
   for await (let entry of source) {
-    const destName = expander(entry.destination === undefined ? join(destinationDirectory, entry.name) : join(destinationDirectory, entry.destination, entry.name));
+    const destName = 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 });
 
     const options = { mode: entry.mode };