npm-pkgbuild 14.0.3 → 14.1.0

package/README.md

@@ -97,28 +97,28 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [FileContentProvider](#filecontentprovider)
     *   [Parameters](#parameters-1)
     *   [name](#name)
-*   [NFTContentProvider](#nftcontentprovider)
-    *   [Parameters](#parameters-2)
-    *   [name](#name-1)
-*   [NodeModulesContentProvider](#nodemodulescontentprovider)
-    *   [Parameters](#parameters-3)
-    *   [Properties](#properties-1)
-    *   [name](#name-2)
 *   [utf8StreamOptions](#utf8streamoptions)
-    *   [Properties](#properties-2)
+    *   [Properties](#properties-1)
 *   [packageNameMapping](#packagenamemapping)
 *   [decodePassword](#decodepassword)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-2)
 *   [FunctionDecl](#functiondecl)
-    *   [Properties](#properties-3)
+    *   [Properties](#properties-2)
 *   [extractFunctions](#extractfunctions)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-3)
 *   [fieldProvider](#fieldprovider)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-4)
 *   [Expander](#expander)
-    *   [Parameters](#parameters-7)
+    *   [Parameters](#parameters-5)
 *   [copyEntries](#copyentries)
+    *   [Parameters](#parameters-6)
+*   [NFTContentProvider](#nftcontentprovider)
+    *   [Parameters](#parameters-7)
+    *   [name](#name-1)
+*   [NodeModulesContentProvider](#nodemodulescontentprovider)
     *   [Parameters](#parameters-8)
+    *   [Properties](#properties-3)
+    *   [name](#name-2)
 *   [NPMPackContentProvider](#npmpackcontentprovider)
     *   [Parameters](#parameters-9)
     *   [Properties](#properties-4)
@@ -137,22 +137,40 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [DOCKER](#docker)
     *   [prepare](#prepare-1)
         *   [Parameters](#parameters-11)
-*   [publish](#publish)
-    *   [Parameters](#parameters-12)
 *   [OCI](#oci)
-*   [Field](#field)
-    *   [Properties](#properties-5)
 *   [Packager](#packager)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-12)
     *   [tmpdir](#tmpdir)
-    *   [execute](#execute)
+    *   [prepare](#prepare-2)
+        *   [Parameters](#parameters-13)
+    *   [create](#create)
         *   [Parameters](#parameters-14)
     *   [workspaceLayout](#workspacelayout)
-    *   [prepare](#prepare-2)
+    *   [prepare](#prepare-3)
         *   [Parameters](#parameters-15)
+*   [Packager](#packager-1)
+    *   [Parameters](#parameters-16)
+    *   [tmpdir](#tmpdir-1)
+    *   [prepare](#prepare-4)
+        *   [Parameters](#parameters-17)
+    *   [create](#create-1)
+        *   [Parameters](#parameters-18)
+    *   [workspaceLayout](#workspacelayout-1)
+    *   [prepare](#prepare-5)
+        *   [Parameters](#parameters-19)
+*   [Field](#field)
+    *   [Properties](#properties-5)
+*   [PublishingDetail](#publishingdetail)
+    *   [Properties](#properties-6)
+*   [createPublishingDetails](#createpublishingdetails)
+    *   [Parameters](#parameters-20)
+*   [publish](#publish)
+    *   [Parameters](#parameters-21)
+*   [quoteFile](#quotefile)
+    *   [Parameters](#parameters-22)
 *   [RPM](#rpm)
-    *   [prepare](#prepare-3)
-        *   [Parameters](#parameters-16)
+    *   [prepare](#prepare-6)
+        *   [Parameters](#parameters-23)
 
 ## ContentProvider
 
@@ -192,44 +210,6 @@ Content provided form the file system.
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
 
-## NFTContentProvider
-
-**Extends ContentProvider**
-
-Content provided form the file system.
-
-### Parameters
-
-*   `definitions` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))** 
-
-    *   `definitions.pattern` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [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;
-    *   `definitions.base` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** base directory where to find the files
-*   `entryProperties` &#x20;
-
-### name
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
-
-## NodeModulesContentProvider
-
-**Extends ContentProvider**
-
-Content from node\_modules.
-Requires .npmrc or NPM\_TOKEN environment
-
-### Parameters
-
-*   `definitions` &#x20;
-*   `entryProperties` &#x20;
-
-### Properties
-
-*   `withoutDevelpmentDependencies` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
-
-### name
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
-
 ## utf8StreamOptions
 
 Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
@@ -301,6 +281,44 @@ Destination paths a generated without leading '/' (as for entry names too).
 *   `destinationDirectory` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 *   `expander` **[Expander](#expander)**  (optional, default `v=>v`)
 
+## NFTContentProvider
+
+**Extends ContentProvider**
+
+Content provided form the file system.
+
+### Parameters
+
+*   `definitions` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))**&#x20;
+
+    *   `definitions.pattern` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [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;
+    *   `definitions.base` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** base directory where to find the files
+*   `entryProperties` &#x20;
+
+### name
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
+
+## NodeModulesContentProvider
+
+**Extends ContentProvider**
+
+Content from node\_modules.
+Requires .npmrc or NPM\_TOKEN environment
+
+### Parameters
+
+*   `definitions` &#x20;
+*   `entryProperties` &#x20;
+
+### Properties
+
+*   `withoutDevelpmentDependencies` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
+
+### name
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
+
 ## NPMPackContentProvider
 
 **Extends ContentProvider**
@@ -392,31 +410,62 @@ Check for docker presence.
 
 Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)>** true when docker executable is present
 
-## publish
+## OCI
+
+**Extends Packager**
+
+Low level OCI compatible packager
+
+## Packager
 
 ### Parameters
 
-*   `fileName` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
-*   `destination` **any**&#x20;
-*   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
-*   `logger` **function (any): void**  (optional, default `console.log`)
+*   `properties` &#x20;
 
-## OCI
+### tmpdir
 
-**Extends Packager**
+Create tmp directory.
 
-Low level OCI compatible packager
+Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** directory path
 
-## Field
+### prepare
 
-Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+Prepares artifact generation
 
-### Properties
+#### Parameters
 
-*   `alias` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** interchangeable field name
-*   `type` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
-*   `default` **any**&#x20;
-*   `mandatory` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `publishingDetail` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
+
+Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<{properties: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object), destination: [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String), tmpdir: [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String), staging: [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)}>**&#x20;
+
+### create
+
+Execute package generation.
+
+#### Parameters
+
+*   `sources` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `transformer` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
+*   `dependencies` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `publishingDetails` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[PublishingDetail](#publishingdetail)>**&#x20;
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `expander` **function ([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)): [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** identifier of the resulting package
+
+### workspaceLayout
+
+Returns **{named: [object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object), others: \[]}**&#x20;
+
+### prepare
+
+#### Parameters
+
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `variant` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+
+Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)>**&#x20;
 
 ## Packager
 
@@ -432,23 +481,35 @@ Create tmp directory.
 
 Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** directory path
 
-### execute
+### prepare
+
+Prepares artifact generation
+
+#### Parameters
+
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `publishingDetail` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
+
+Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<{properties: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object), destination: [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String), tmpdir: [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String), staging: [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)}>**&#x20;
+
+### create
 
 Execute package generation.
 
 #### Parameters
 
-*   `sources` &#x20;
-*   `transformer` &#x20;
-*   `dependencies` &#x20;
-*   `options` &#x20;
-*   `expander` &#x20;
+*   `sources` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `transformer` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
+*   `dependencies` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `publishingDetails` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[PublishingDetail](#publishingdetail)>**&#x20;
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `expander` **function ([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)): [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 
-Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** location of the resulting package
+Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** identifier of the resulting package
 
 ### workspaceLayout
 
-Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+Returns **{named: [object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object), others: \[]}**&#x20;
 
 ### prepare
 
@@ -459,6 +520,57 @@ Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)>**&#x20;
 
+## Field
+
+Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+
+### Properties
+
+*   `alias` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** interchangeable field name
+*   `type` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `default` **any**&#x20;
+*   `mandatory` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
+
+## PublishingDetail
+
+Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+
+### Properties
+
+*   `url` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `scheme` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `username` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?**&#x20;
+*   `password` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?**&#x20;
+
+## createPublishingDetails
+
+### 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;
+*   `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;
+    *   `properties.arch` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?**&#x20;
+    *   `properties.access` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?**&#x20;
+
+Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[PublishingDetail](#publishingdetail)>**&#x20;
+
+## publish
+
+### Parameters
+
+*   `artifactIdentifier` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `publishingDetail` **[PublishingDetail](#publishingdetail)**&#x20;
+*   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `logger` **function (any): void**  (optional, default `console.log`)
+
+## quoteFile
+
+### Parameters
+
+*   `name` &#x20;
+
 ## RPM
 
 **Extends Packager**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "14.0.3",
+  "version": "14.1.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -56,15 +56,15 @@
     "aggregate-async-iterator": "^1.2.0",
     "commander": "^12.0.0",
     "compare-versions": "^6.1.0",
-    "content-entry": "^9.0.2",
+    "content-entry": "^9.0.3",
     "content-entry-filesystem": "^6.0.0",
     "content-entry-transform": "^1.4.29",
     "execa": "^8.0.1",
     "expression-expander": "^7.1.3",
     "globby": "^14.0.1",
     "ini": "^4.1.2",
-    "iterable-string-interceptor": "^2.3.1",
-    "key-value-transformer": "^3.2.2",
+    "iterable-string-interceptor": "^3.0.0",
+    "key-value-transformer": "^3.2.3",
     "npm-package-walker": "^6.2.4",
     "npm-packlist": "^8.0.2",
     "pacote": "^17.0.6",

package/src/content/node-modules-content-provider.mjs

@@ -28,9 +28,11 @@ export class NodeModulesContentProvider extends ContentProvider {
     return "use node_modules as source";
   }
 
+  withoutDevelpmentDependencies = true;
+
   constructor(definitions, entryProperties) {
     super(definitions, entryProperties);
-    Object.assign(this, { withoutDevelpmentDependencies: true }, definitions);
+    Object.assign(this, definitions);
   }
 
   toString() {
@@ -45,6 +47,7 @@ export class NodeModulesContentProvider extends ContentProvider {
         pkgSourceDir = await mkdtemp(join(tmpdir(), "node-modules"));
 
         const json = JSON.parse(
+          //@ts-ignore
           await readFile(join(this.dir, "package.json"), utf8StreamOptions)
         );
         delete json.devDependencies;
@@ -96,9 +99,9 @@ export class NodeModulesContentProvider extends ContentProvider {
             try {
               const json = shrinkNPM(
                 JSON.parse(
+                  //@ts-ignore
                   await readFile(join(pkgSourceDir, name), utf8StreamOptions)
-                ),
-                {}
+                )
               );
 
               if (json) {

package/src/extract-from-package.mjs

@@ -96,6 +96,7 @@ function* content2Sources(content, dir) {
  * @property {Object} output package type
  * @property {Object} variant identifier of the variant
  * @property {string} variant.name name of the variant
+ * @property {string} variant.arch name of the architecture
  */
 
 /**

package/src/module.mjs

@@ -1,15 +1,19 @@
-
 export * from "./util.mjs";
-export * from "./publish.mjs";
-export * from "./extract-from-package.mjs";
-export * from "./content/content-provider.mjs";
-export * from "./content/file-content-provider.mjs";
-export * from "./content/node-modules-content-provider.mjs";
-export * from "./content/npm-pack-content-provider.mjs";
-export * from "./content/nft-content-provider.mjs";
-export * from "./output/debian.mjs";
-export * from "./output/rpm.mjs";
-export * from "./output/arch.mjs";
-export * from "./output/oci.mjs";
-export * from "./output/docker.mjs";
-export * from "./output/packager.mjs";
+export { createPublishingDetails, publish } from "./publish.mjs";
+export {
+  extractFromPackage,
+  allInputs,
+  allOutputs,
+  npmArchMapping
+} from "./extract-from-package.mjs";
+export { ContentProvider } from "./content/content-provider.mjs";
+export { FileContentProvider } from "./content/file-content-provider.mjs";
+export { NodeModulesContentProvider } from "./content/node-modules-content-provider.mjs";
+export { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
+export { NFTContentProvider } from "./content/nft-content-provider.mjs";
+export { DEBIAN } from "./output/debian.mjs";
+export { RPM } from "./output/rpm.mjs";
+export { ARCH } from "./output/arch.mjs";
+export { OCI } from "./output/oci.mjs";
+export { DOCKER } from "./output/docker.mjs";
+export { Packager } from "./output/packager.mjs";

package/src/npm-pkgbuild-cli.mjs

@@ -9,7 +9,7 @@ import {
   allInputs,
   allOutputs,
   extractFromPackage,
-  preparePublish
+  createPublishingDetails
 } from "npm-pkgbuild";
 import pkg from "../package.json" assert { type: "json" };
 
@@ -50,7 +50,7 @@ program
       const uc = new UTIController();
       uc.register(additionalUTIs);
 
-      options.publish = preparePublish(options.publish, process.env);
+      const publishingDetails = createPublishingDetails(options.publish, process.env);
 
       for await (const {
         properties,
@@ -123,16 +123,17 @@ program
               console.log(kv(dependencies, "  "));
             }
 
-            const artifact = await o.execute(
+            const artifact = await o.create(
               sources.map(c => c[Symbol.asyncIterator]()),
               transformer,
               dependencies,
+              publishingDetails,
               options,
               context.expand
             );
 
             if (!options.dry) {
-              await Promise.all(options.publish.map(pl => o.publish(artifact, pl, o.properties)));
+              await Promise.all(publishingDetails.map(publishDetail => o.publish(artifact, publishDetail, o.properties)));
             }
           } catch (e) {
             handleError(e, options);

package/src/output/arch.mjs

@@ -120,8 +120,8 @@ export class ARCH extends Packager {
     return `${p.name}-${p.version}-${p.release}-${p.arch}${this.fileNameExtension}`;
   }
 
-  async execute(sources, transformer, dependencies, options, expander) {
-    const { properties, staging, destination } = await this.prepareExecute(
+  async create(sources, transformer, dependencies, publishingDetails, options, expander) {
+    const { properties, staging, destination } = await this.prepare(
       options
     );
 

package/src/output/debian.mjs

@@ -62,7 +62,7 @@ export class DEBIAN extends Packager {
       await execa("dpkg", ["--version"]);
       if (variant?.arch) {
         const uname = await execa("uname", ["-m"]);
-        return uname.stdout.match(variant.arch);
+        return uname.stdout.match(variant.arch) ? true : false;
       }
       return true;
     } catch {}
@@ -72,6 +72,7 @@ export class DEBIAN extends Packager {
 
   get packageFileName() {
     const p = this.properties;
+    // @ts-ignore
     return `${p.name}_${p.version}_${p.arch}${this.constructor.fileNameExtension}`;
   }
 
@@ -95,10 +96,15 @@ export class DEBIAN extends Packager {
     }
   }
 
-  async execute(sources, transformer, dependencies, options, expander) {
-    const { properties, staging, destination } = await this.prepareExecute(
-      options
-    );
+  async create(
+    sources,
+    transformer,
+    dependencies,
+    publishingDetails,
+    options,
+    expander
+  ) {
+    const { properties, staging, destination } = await this.prepare(options);
 
     transformer.push(
       createPropertiesTransformer(
@@ -141,6 +147,7 @@ export class DEBIAN extends Packager {
       expander
     )) {
       if (options.verbose) {
+        // @ts-ignore
         console.log(file.destination, `mode=${file.mode}`);
       }
     }

package/src/output/docker.mjs

@@ -9,7 +9,6 @@ import {
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { analysePublish } from "../publish.mjs";
 import {
   fieldProvider,
   copyEntries,
@@ -67,14 +66,15 @@ export class DOCKER extends Packager {
     return false;
   }
 
-  async execute(
+  async create(
     sources,
     transformer,
     dependencies,
     options,
+    publishingDetails,
     expander = v => v
   ) {
-    const { properties, staging } = await this.prepareExecute(options);
+    const { properties, staging } = await this.prepare(options, publishingDetails);
 
     async function* headLines() {
       let scratch = true;
@@ -144,6 +144,7 @@ export class DOCKER extends Packager {
       const docker = await execa(
         this.constructor.name,
         [
+          "buildx",
           "build",
           "--tag",
           tag,
@@ -169,20 +170,28 @@ export class DOCKER extends Packager {
     return image;
   }
 
-  async publish(artifact, destination, properties, logger = console.log) {
-    const publish = analysePublish(destination, properties);
-
+  async publish(artifact, publishingDetails, properties, logger = console.log) {
     try {
-      const url = new URL(publish.url);
-      const repoLocation = `${url.host}/${publish.username}`;
+      const url = new URL(publishingDetails.url);
+      const repoLocation = `${url.host}/${publishingDetails.username}`;
       const name = `${properties.name}:${properties.version}`;
 
       logger(`Publishing to ${repoLocation}`);
 
-      console.log(`docker tag ${artifact} ${repoLocation}/${name}`);
-      console.log(`docker push ${repoLocation}/${name}`);
+      let p1 = await execa(this.constructor.name, [
+        "tag",
+        artifact,
+        `${repoLocation}/${name}`
+      ]);
+      let p2 = await execa(this.constructor.name, [
+        "push",
+        `${repoLocation}/${name}`
+      ]);
+
+      //console.log(`docker tag ${artifact} ${repoLocation}/${name}`);
+      //console.log(`docker push ${repoLocation}/${name}`);
     } catch (e) {
-      console.log(e, publish.url);
+      console.log(e, publishingDetails.url);
     }
   }
 }

package/src/output/oci.mjs

@@ -76,14 +76,15 @@ export class OCI extends Packager {
     return `${p.name}-${p.version}${this.fileNameExtension}`;
   }
 
-  async execute(
+  async create(
     sources,
     transformer,
     dependencies,
+    publishingDetails,
     options,
     expander = v => v
   ) {
-    const { properties, destination } = await this.prepareExecute(options);
+    const { properties, destination } = await this.prepare(options);
     const packageFile = join(destination, this.packageFileName);
 
     const meta = {