npm-pkgbuild 14.1.1 → 14.2.1

package/README.md

@@ -547,7 +547,7 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 
 ### Parameters
 
-*   `locations` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
+*   `locations` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**  (optional, default `[]`)
 *   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
 
     *   `properties.PKGBUILD_PUBLISH` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "14.1.1",
+  "version": "14.2.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -56,7 +56,7 @@
     "aggregate-async-iterator": "^1.2.0",
     "commander": "^12.0.0",
     "compare-versions": "^6.1.0",
-    "content-entry": "^9.0.3",
+    "content-entry": "^10.0.0",
     "content-entry-filesystem": "^6.0.0",
     "content-entry-transform": "^1.4.29",
     "execa": "^8.0.1",

package/src/extract-from-package.mjs

@@ -366,7 +366,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
             result.dependencies,
             output.dependencies
           ),
-          properties: { ...result.properties, ...output.properties }
+          properties: { output: name, ...result.properties, ...output.properties }
         };
       }
     }

package/src/npm-pkgbuild-cli.mjs

@@ -50,8 +50,6 @@ program
       const uc = new UTIController();
       uc.register(additionalUTIs);
 
-      const publishingDetails = createPublishingDetails(options.publish, process.env);
-
       for await (const {
         properties,
         sources,
@@ -67,11 +65,11 @@ program
         }
 
         for (const outputFactory of allOutputs.filter(
-          o => (options[o.name] === true || output[o.name] !== undefined) && options[o.name] !== false
+          o =>
+            (options[o.name] === true || output[o.name] !== undefined) &&
+            options[o.name] !== false
         )) {
-          if (
-            !(await outputFactory.prepare(options, variant))
-          ) {
+          if (!(await outputFactory.prepare(options, variant))) {
             console.warn(`output format ${outputFactory.name} not avaliable`);
             continue;
           }
@@ -123,6 +121,11 @@ program
               console.log(kv(dependencies, "  "));
             }
 
+            const publishingDetails = createPublishingDetails(options.publish, {
+              ...properties,
+              ...process.env
+            });
+
             const artifact = await o.create(
               sources.map(c => c[Symbol.asyncIterator]()),
               transformer,
@@ -133,7 +136,11 @@ program
             );
 
             if (!options.dry) {
-              await Promise.all(publishingDetails.map(publishDetail => o.publish(artifact, publishDetail, o.properties)));
+              await Promise.all(
+                publishingDetails.map(publishDetail =>
+                  o.publish(artifact, publishDetail, o.properties)
+                )
+              );
             }
           } catch (e) {
             handleError(e, options);

package/src/output/arch.mjs

@@ -3,7 +3,7 @@ import { createReadStream, createWriteStream } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
 import { execa } from "execa";
-import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { ContentEntry, ReadableStreamContentEntry } from "content-entry";
 import {
   transform,
   createPropertiesInterceptor
@@ -174,7 +174,7 @@ package() {
             trailingLines
           })
         ),
-      createEntryWhenMissing: () => new EmptyContentEntry(PKGBUILD)
+      createEntryWhenMissing: () => new ContentEntry(PKGBUILD)
     });
 
     for await (const file of copyEntries(

package/src/output/debian.mjs

@@ -3,7 +3,7 @@ import { createReadStream } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { execa } from "execa";
 import {
-  EmptyContentEntry,
+  ContentEntry,
   ReadableStreamContentEntry,
   StringContentEntry
 } from "content-entry";
@@ -135,7 +135,7 @@ export class DEBIAN extends Packager {
           entry.name,
           keyValueTransformer(await entry.readStream, fp)
         ),
-      createEntryWhenMissing: () => new EmptyContentEntry(debianControlName)
+      createEntryWhenMissing: () => new ContentEntry(debianControlName)
     });
 
     for await (const file of copyEntries(

package/src/output/docker.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
 import { execa } from "execa";
-import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { ContentEntry, ReadableStreamContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import { aggregateFifo } from "aggregate-async-iterator";
 import {
@@ -120,7 +120,7 @@ export class DOCKER extends Packager {
             trailingLines
           })
         ),
-      createEntryWhenMissing: () => new EmptyContentEntry(DOCKERFILE)
+      createEntryWhenMissing: () => new ContentEntry(DOCKERFILE)
     });
 
     for await (const file of copyEntries(

package/src/output/rpm.mjs

@@ -3,7 +3,7 @@ import { createReadStream } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { cp } from "node:fs/promises";
 import { execa } from "execa";
-import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { ContentEntry, ReadableStreamContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import {
   keyValueTransformer,
@@ -172,7 +172,7 @@ export class RPM extends Packager {
                 trailingLines
               })
             ),
-          createEntryWhenMissing: () => new EmptyContentEntry(specFileName)
+          createEntryWhenMissing: () => new ContentEntry(specFileName)
         }
       ]),
       staging,

package/src/publish.mjs

@@ -20,20 +20,39 @@ import { decodePassword } from "./util.mjs";
  * @param {string} [properties.access]
  * @return {PublishingDetail[]}
  */
-export function createPublishingDetails(locations=[], properties) {
-  const e = properties?.PKGBUILD_PUBLISH;
-  if (e) {
-    locations.push(e);
+export function createPublishingDetails(locations = [], properties) {
+  locations = [...locations];
+
+  let publishPropertyFound = false;
+
+  for (const s of ["output"]) {
+    let key = properties?.[s];
+    if (key !== undefined) {
+        const envKey = `PKGBUILD_PUBLISH_${key.toUpperCase()}`;  
+        const e = properties[envKey];
+        if (e) {
+          locations.push(e);
+        }
+        publishPropertyFound = true;
+    }
+  }
+
+  if (!publishPropertyFound) {
+    const e = properties?.PKGBUILD_PUBLISH;
+    if (e) {
+      locations.push(e);
+    }
   }
 
   const vm = k => properties?.[k] || k;
 
   return locations.map(location => {
-
     let url = location;
 
     const result = {
-      set properties(p) { properties = p;},
+      set properties(p) {
+        properties = p;
+      },
       get url() {
         return url.replace(
           /\{\{(\w+)\}\}/gm,
@@ -86,7 +105,7 @@ export async function publish(
   if (!publishingDetail) {
     return;
   }
-  
+
   publishingDetail.properties = properties;
 
   const url = publishingDetail.url + "/" + basename(artifactIdentifier);