npm-pkgbuild 13.3.0 → 13.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -39,7 +39,8 @@
     "npm-pkgbuild": "src/npm-pkgbuild-cli.mjs"
   },
   "scripts": {
-    "prepare": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types -t esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
+    "prepare": "npm run prepare:typescript",
+    "prepare:typescript": "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/npm-pkgbuild-cli.mjs

@@ -1,11 +1,8 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --no-warnings
 
-import { readFileSync } from "node:fs";
-import { fileURLToPath } from "node:url";
 import { program, Option } from "commander";
 import { createExpressionTransformer } from "content-entry-transform";
 import { UTIController } from "uti";
-import { utf8StreamOptions } from "./util.mjs";
 import additionalUTIs from "./utis.mjs";
 import {
   FileContentProvider,
@@ -14,15 +11,9 @@ import {
   extractFromPackage,
   preparePublish
 } from "npm-pkgbuild";
+import pkg from "../package.json" assert { type: "json" };
 
-const { version, description } = JSON.parse(
-  readFileSync(
-    fileURLToPath(new URL("../package.json", import.meta.url)),
-    utf8StreamOptions
-  )
-);
-
-program.description(description).version(version);
+program.description(pkg.description).version(pkg.version);
 
 allOutputs.forEach(o => {
   program.option(`--${o.name}`, o.description);
@@ -97,7 +88,7 @@ program
               output?.[outputFactory.name]?.properties,
               {
                 type: outputFactory.name,
-                "user-agent": `npm-pkgbuild-${version}`
+                "user-agent": `npm-pkgbuild-${pkg.version}`
               },
               options.define
             );
@@ -147,9 +138,7 @@ program
             );
 
             if (!options.dry) {
-              for (const p of options.publish) {
-                await o.publish(artifact, p, o.properties);
-              }
+              await Promise.all(options.publish.map(pl => o.publish(artifact, pl, o.properties)));
             }
           } catch (e) {
             handleError(e, options);

package/src/output/docker.mjs

@@ -166,7 +166,7 @@ export class DOCKER extends Packager {
     return image;
   }
 
-  async publish(artifact, destination, properties,logger) {
+  async publish(artifact, destination, properties,logger=console.log) {
 
     const publish = analysePublish(destination, properties);
   

package/src/output/packager.mjs

@@ -112,7 +112,7 @@ export class Packager {
 
         out.destination = publish.scheme === "file:" ? publish.url : tmpdir;
 
-        await mkdir(out.destination, { recursive: true });
+        await mkdir(out.destination, mdo);
       }
     }
 

package/src/publish.mjs

@@ -4,7 +4,7 @@ import { mkdir, copyFile } from "node:fs/promises";
 import { decodePassword } from "./util.mjs";
 
 export function analysePublish(publish, properties) {
-  publish = Object.assign({}, publish);
+  publish = { ...publish };
 
   publish.url = publish.url.replace(
     /\{\{(\w+)\}\}/gm,
@@ -18,7 +18,12 @@ export function analysePublish(publish, properties) {
   return publish;
 }
 
-export async function publish(fileName, destination, properties, logger=console.log) {
+export async function publish(
+  fileName,
+  destination,
+  properties,
+  logger = console.log
+) {
   if (!destination) {
     return;
   }
@@ -52,7 +57,7 @@ export async function publish(fileName, destination, properties, logger=console.
       const response = await fetch(url, {
         method: "PUT",
         headers,
-        duplex: 'half',
+        duplex: "half",
         body: createReadStream(fileName)
       });
 
@@ -66,15 +71,13 @@ export async function publish(fileName, destination, properties, logger=console.
 }
 
 export function preparePublish(publish = [], env = {}) {
-  function vm(k) {
-    return env[k] || k;
-  }
-
   const e = env["PKGBUILD_PUBLISH"];
   if (e) {
     publish.push(e);
   }
 
+  const vm = k => env[k] || k;
+
   return publish.map(value => {
     let values = value.split(/,/);
     if (values.length > 1) {

package/types/npm-pkgbuild-cli.d.mts

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --no-warnings
 export {};

package/types/output/docker.d.mts

@@ -34,5 +34,9 @@ export class DOCKER extends Packager {
         arch: string;
     }): Promise<boolean>;
     execute(sources: any, transformer: any, dependencies: any, options: any, expander?: (v: any) => any): Promise<string>;
+    publish(artifact: any, destination: any, properties: any, logger?: {
+        (...data: any[]): void;
+        (message?: any, ...optionalParams: any[]): void;
+    }): Promise<void>;
 }
 import { Packager } from "./packager.mjs";