npm-pkgbuild 7.4.2 → 7.4.3

package/package.json

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

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

@@ -11,7 +11,7 @@ import { ContentProvider } from "./content-provider.mjs";
  * @param {string} definitions.base base directory where to find the files
  */
 export class FileContentProvider extends ContentProvider {
-  constructor(definitions) {
+  constructor(definitions, entryProperties) {
     super();
 
     if (typeof definitions === "string") {
@@ -24,6 +24,8 @@ export class FileContentProvider extends ContentProvider {
       this.definitions = { pattern: ["**/*"], ...definitions };
       this.definitions.pattern = asArray(this.definitions.pattern);
     }
+
+    this.entryProperties = entryProperties;
   }
 
   async *[Symbol.asyncIterator]() {
@@ -33,7 +35,9 @@ export class FileContentProvider extends ContentProvider {
     for (const name of await globby(definitions.pattern, {
       cwd: base
     })) {
-      yield new FileSystemEntry(name, base);
+      const entry = new FileSystemEntry(name, base);
+      Object.assign(entry, this.entryProperties);
+      yield entry;
     }
   }
 }

package/src/npm-pkgbuild-cli.mjs

@@ -57,17 +57,20 @@ program
         sources.push(
           ...[...options.content, ...options.meta]
             .filter(x => x)
-            .map(source => [
-              new FileContentProvider({
-                base: source
-              }),
-              ""
-            ])
+            .map(
+              source =>
+                new FileContentProvider({
+                  base: source
+                })
+            )
         );
 
         const output = new outputFactory(properties);
 
-        const fileName = await output.execute(aggregateFifo(sources.map(([c, d]) => c[Symbol.asyncIterator]() )), options);
+        const fileName = await output.execute(
+          aggregateFifo(sources.map(c => c[Symbol.asyncIterator]())),
+          options
+        );
 
         console.log(fileName);
       }

package/src/util.mjs

@@ -63,16 +63,16 @@ export function extractFromPackage(pkg) {
       .forEach(([k, v]) => (properties[k] = v));
 
     if (pkgbuild.content) {
-      sources = Object.entries(pkgbuild.content).map(([destination, value]) => [
-        new FileContentProvider(value),
-        destination
-      ]);
+      sources = Object.entries(pkgbuild.content).map(
+        ([destination, value]) =>
+          new FileContentProvider(value, { destination })
+      );
     }
 
-    Object.assign(dependencies,pkgbuild.depends)
+    Object.assign(dependencies, pkgbuild.depends);
   }
 
-  return { properties, sources, dependencies};
+  return { properties, sources, dependencies };
 }
 
 /**
@@ -80,7 +80,7 @@ export function extractFromPackage(pkg) {
  * @param {AsyncIterator<ContentEntry>} source
  * @param {Transformer[]} transformers
  */
-export async function* transform(source, transformers=[], onlyMatching) {
+export async function* transform(source, transformers = [], onlyMatching) {
   const usedTransformers = new Set();
 
   for await (let entry of source) {
@@ -89,13 +89,13 @@ export async function* transform(source, transformers=[], onlyMatching) {
         entry = await t.transform(entry);
         usedTransformers.add(t);
 
-        if(onlyMatching) {
+        if (onlyMatching) {
           yield entry;
         }
       }
     }
 
-    if(!onlyMatching) {
+    if (!onlyMatching) {
       yield entry;
     }
   }
@@ -118,7 +118,7 @@ export async function copyEntries(
   attributes = []
 ) {
   for await (let entry of source) {
-    const destName = join(destinationDirectory, entry.name);
+    const destName = entry.destination === undefined ? join(destinationDirectory, entry.name) : join(destinationDirectory, entry.destination, entry.name);
     await mkdir(dirname(destName), { recursive: true });
 
     const options = { mode: entry.mode };