npm-pkgbuild 13.2.0 → 13.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/extract-from-package.mjs

@@ -360,6 +360,11 @@ export async function* extractFromPackage(options = {}, env = {}) {
           ...result,
           variant: { ...result.variant, output: name },
           output: { [name]: output },
+          // sources: [...result.sources, ...output.sources],
+          dependencies: mergeDependencies(
+            result.dependencies,
+            output.dependencies
+          ),
           properties: { ...result.properties, ...output.properties }
         };
       }

package/src/npm-pkgbuild-cli.mjs

@@ -12,7 +12,6 @@ import {
   allInputs,
   allOutputs,
   extractFromPackage,
-  publish,
   preparePublish
 } from "npm-pkgbuild";
 
@@ -139,7 +138,7 @@ program
               console.log(kv(dependencies, "  "));
             }
 
-            const fileName = await o.execute(
+            const artifact = await o.execute(
               sources.map(c => c[Symbol.asyncIterator]()),
               transformer,
               dependencies,
@@ -149,7 +148,7 @@ program
 
             if (!options.dry) {
               for (const p of options.publish) {
-                await publish(fileName, p, o.properties);
+                await o.publish(artifact, p, o.properties);
               }
             }
           } catch (e) {

package/src/output/docker.mjs

@@ -9,6 +9,7 @@ import {
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
+import { analysePublish } from "../publish.mjs";
 import {
   fieldProvider,
   copyEntries,
@@ -139,7 +140,12 @@ export class DOCKER extends Packager {
     if (!options.dry) {
       const docker = await execa(
         this.constructor.name,
-        ["build", "--tag", tag, staging],
+        [
+          "build",
+          "--tag",
+          tag,
+          /*"--output","type=tar,dest=out.tar",*/ staging
+        ],
         {
           cwd: staging
         }
@@ -159,6 +165,17 @@ export class DOCKER extends Packager {
 
     return image;
   }
+
+  async publish(artifact, destination, properties,logger) {
+
+    const publish = analysePublish(destination, properties);
+  
+    logger(`Publishing to ${publish.url}`);
+  
+    const name = `${properties.name}:${properties.version}`;
+    console.log(`docker tag ${artifact} ${publish.url}/${name}`);
+    console.log(`docker push ${name}`);
+  }
 }
 
 /**

package/src/output/packager.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { mkdtemp, mkdir } from "node:fs/promises";
-import { analysePublish } from "../publish.mjs";
+import { analysePublish, publish } from "../publish.mjs";
 
 /**
  * @typedef {Object} Field
@@ -37,7 +37,7 @@ export class Packager {
    * @param {Object} variant
    * @return {Promise<boolean>}
    */
-  static async prepare(options,variant) {
+  static async prepare(options, variant) {
     return false;
   }
 
@@ -47,11 +47,10 @@ export class Packager {
     this.#properties = { ...properties };
   }
 
-  get fileNameExtension()
-  {
-  	return this.constructor.fileNameExtension;
+  get fileNameExtension() {
+    return this.constructor.fileNameExtension;
   }
-  
+
   get fields() {
     return this.constructor.fields;
   }
@@ -60,7 +59,7 @@ export class Packager {
     const properties = this.#properties;
 
     Object.entries(this.fields).forEach(([k, v]) => {
-      if(v.set && properties[k] !== undefined) {
+      if (v.set && properties[k] !== undefined) {
         properties[k] = v.set(properties[k]);
       }
 
@@ -68,7 +67,6 @@ export class Packager {
       if (e !== undefined) {
         properties[k] = v.set ? v.set(e) : e;
       } else {
-
         const vak = v.alias || k;
         if (v.default !== undefined) {
           if (
@@ -109,11 +107,11 @@ export class Packager {
     }
 
     if (options.publish) {
-      for(const op of options.publish) {
+      for (const op of options.publish) {
         const publish = analysePublish(op, out.properties);
 
         out.destination = publish.scheme === "file:" ? publish.url : tmpdir;
-  
+
         await mkdir(out.destination, { recursive: true });
       }
     }
@@ -134,4 +132,8 @@ export class Packager {
    * @return {Promise<string>} location of the resulting package
    */
   async execute(sources, transformer, dependencies, options, expander) {}
+
+  async publish(artifact, destination, properties, logger) {
+    return publish(artifact, destination, properties, logger);
+  }
 }

package/src/util.mjs

@@ -22,6 +22,13 @@ export function filterOutUnwantedDependencies() {
 }
 
 export function mergeDependencies(a, b) {
+  if (!b) {
+    return a;
+  }
+  if (!a) {
+    return b;
+  }
+
   const keys = new Set([...Object.keys(a), ...Object.keys(b)]);
 
   const result = {};

package/types/output/packager.d.mts

@@ -40,6 +40,7 @@ export class Packager {
      * @return {Promise<string>} location of the resulting package
      */
     execute(sources: any, transformer: any, dependencies: any, options: any, expander: any): Promise<string>;
+    publish(artifact: any, destination: any, properties: any, logger: any): Promise<void>;
     #private;
 }
 export type Field = {

package/types/util.d.mts

@@ -1,5 +1,5 @@
 export function filterOutUnwantedDependencies(): ([name, version]: [any, any]) => boolean;
-export function mergeDependencies(a: any, b: any): {};
+export function mergeDependencies(a: any, b: any): any;
 /**
  * Decode a password
  * @param {string} password