npm-pkgbuild 13.0.22 → 13.1.1

package/README.md

@@ -134,6 +134,7 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [DEBIAN](#debian)
     *   [prepare](#prepare)
         *   [Parameters](#parameters-10)
+*   [OCI](#oci)
 *   [Field](#field)
     *   [Properties](#properties-5)
 *   [Packager](#packager)
@@ -279,7 +280,8 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 **Extends ContentProvider**
 
-Content from node\_modules
+Content from node\_modules.
+Requires .npmrc or NPM\_TOKEN environment
 
 ### Parameters
 
@@ -366,6 +368,12 @@ Create .deb packages
 
 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;
 
+## OCI
+
+**Extends Packager**
+
+Low level OCI compatible packager
+
 ## Field
 
 Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
@@ -379,6 +387,8 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 
 ## Packager
 
+Base Packager
+
 ### Parameters
 
 *   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "13.0.22",
+  "version": "13.1.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -39,7 +39,7 @@
     "npm-pkgbuild": "src/npm-pkgbuild-cli.mjs"
   },
   "scripts": {
-    "prepare": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types -t esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs --rootDir src",
+    "prepare": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types -t esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
     "test": "npm run test:ava",
     "test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",

package/src/extract-from-package.mjs

@@ -350,14 +350,29 @@ export async function* extractFromPackage(options = {}, env = {}) {
       arch
     );*/
 
+    function* forEachOutput(result) {
+      if (Object.entries(result.output).length === 0) {
+        yield result;
+      }
+
+      for (const [name, output] of Object.entries(result.output)) {
+        yield {
+          ...result,
+          variant: { ...result.variant, output: name },
+          output: { [name]: output },
+          properties: { ...result.properties, ...output.properties }
+        };
+      }
+    }
+
     if (arch.size === 0) {
-      yield result;
+      yield* forEachOutput(result);
     } else {
       for (const a of [...arch].sort()) {
         if (variant.restrictArch.size === 0 || variant.restrictArch.has(a)) {
           result.variant.arch = a;
           result.properties.arch = [a];
-          yield result;
+          yield* forEachOutput(result);
         }
       }
     }

package/src/npm-pkgbuild-cli.mjs

@@ -88,7 +88,7 @@ program
           try {
             Object.assign(
               properties,
-              output[outputFactory.name],
+              output?.[outputFactory.name]?.properties,
               {
                 type: outputFactory.name,
                 "user-agent": `npm-pkgbuild-${version}`
@@ -130,7 +130,6 @@ program
               console.log("  " + sources.join("\n  "));
               console.log("dependencies:");
               console.log(kv(dependencies, "  "));
-              console.log(kv(output.properties));
             }
 
             const fileName = await o.execute(

package/src/output/docker.mjs

@@ -47,6 +47,22 @@ export class DOCKER extends Packager {
     return fields;
   }
 
+  /**
+   * Check for docker presence.
+   * @param {Object} options
+   * @param {Object} variant
+   * @param {string} variant.arch
+   * @returns {Promise<boolean>} true when docker executable is present
+   */
+  static async prepare(options, variant) {
+    try {
+      await execa(this.constructor.name, ["--version"]);
+      return true;
+    } catch {}
+
+    return false;
+  }
+
   async execute(
     sources,
     transformer,

package/types/output/docker.d.mts

@@ -23,6 +23,16 @@ export class DOCKER extends Packager {
             mandatory: boolean;
         };
     };
+    /**
+     * Check for docker presence.
+     * @param {Object} options
+     * @param {Object} variant
+     * @param {string} variant.arch
+     * @returns {Promise<boolean>} true when docker executable is present
+     */
+    static prepare(options: any, variant: {
+        arch: string;
+    }): Promise<boolean>;
     execute(sources: any, transformer: any, dependencies: any, options: any, expander?: (v: any) => any): Promise<string>;
 }
 import { Packager } from "./packager.mjs";