npm-pkgbuild 10.11.3 → 10.12.2

package/README.md

@@ -1,6 +1,6 @@
 [![npm](https://img.shields.io/npm/v/npm-pkgbuild.svg)](https://www.npmjs.com/package/npm-pkgbuild)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
-[![minified size](https://badgen.net/bundlephobia/min/npm-pkgbuild)](https://bundlephobia.com/result?p=npm-pkgbuild)
+[![Open Bundle](https://bundlejs.com/badge-light.svg)](https://bundlejs.com/?q=npm-pkgbuild)
 [![downloads](http://img.shields.io/npm/dm/npm-pkgbuild.svg?style=flat-square)](https://npmjs.org/package/npm-pkgbuild)
 [![GitHub Issues](https://img.shields.io/github/issues/arlac77/npm-pkgbuild.svg?style=flat-square)](https://github.com/arlac77/npm-pkgbuild/issues)
 [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Farlac77%2Fnpm-pkgbuild%2Fbadge\&style=flat)](https://actions-badge.atrox.dev/arlac77/npm-pkgbuild/goto)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "10.11.3",
+  "version": "10.12.2",
   "publishConfig": {
     "access": "public"
   },
@@ -41,19 +41,19 @@
   },
   "dependencies": {
     "@npmcli/arborist": "^5.3.0",
-    "@vercel/nft": "^0.20.1",
+    "@vercel/nft": "^0.21.0",
     "aggregate-async-iterator": "^1.1.14",
-    "commander": "^9.3.0",
-    "content-entry": "^5.0.7",
+    "commander": "^9.4.0",
+    "content-entry": "^5.0.8",
     "content-entry-filesystem": "^5.0.8",
-    "content-entry-transform": "^1.4.9",
+    "content-entry-transform": "^1.4.10",
     "execa": "^6.1.0",
     "expression-expander": "^7.0.19",
     "globby": "^13.1.2",
     "ini": "^3.0.0",
     "iterable-string-interceptor": "^2.0.4",
     "key-value-transformer": "^3.0.3",
-    "node-fetch": "^3.2.8",
+    "node-fetch": "^3.2.9",
     "npm-package-walker": "^6.0.3",
     "npm-packlist": "^5.1.1",
     "pacote": "^13.6.1",
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "ava": "^4.3.1",
-    "c8": "^7.11.3",
+    "c8": "^7.12.0",
     "documentation": "^13.2.5",
     "semantic-release": "^19.0.3",
     "stream-buffers": "^3.0.2"

package/src/extract-from-package.mjs

@@ -41,8 +41,8 @@ export const npmArchMapping = {
 
 /**
  * Deliver basic properties from the root package
- * @param {Object} json content of root package.json
- * @returns {Object} key value pairs extracted from json
+ * @param {Object} content of root package.json
+ * @returns {Object} key value pairs extracted from package
  */
 function extractFromRootPackage(json) {
   const properties = Object.fromEntries(
@@ -140,13 +140,13 @@ function* content2Sources(content, dir) {
 /**
  * Extract package definition from package.json.
  * - for each architecture deliver a new result
- * - if not architecture is given one result set is provided nethertheless
+ * - if no architecture is given one result set is provided nethertheless
  * - architectures are taken from cpu (node arch ids) and from pkgbuild.arch (raw arch ids)
- * - architecture given in a abstract definition are used to reduce the set of avaliable architectures
+ * - architecture given in a abstract definition are used to restrict the set of avaliable architectures
  * @param {Object} options
  * @param {Object} options.json package.json content
  * @param {string} options.dir where to look for package.json
- * @returns {AsyncIter<PackageDefinition>}
+ * @returns {AsyncIterator<PackageDefinition>}
  */
 export async function* extractFromPackage(options = {}) {
   let variant = "default";

package/src/npm-pkgbuild-cli.mjs

@@ -7,13 +7,14 @@ import {
   createExpressionTransformer,
   nameExtensionMatcher
 } from "content-entry-transform";
-import { utf8StreamOptions, decodePassword } from "./util.mjs";
+import { utf8StreamOptions } from "./util.mjs";
 import {
   FileContentProvider,
   allInputs,
   allOutputs,
   extractFromPackage,
-  publish
+  publish,
+  preparePublish
 } from "npm-pkgbuild";
 
 const { version, description } = JSON.parse(
@@ -51,7 +52,7 @@ program
   )
   .action(async options => {
     try {
-      options.publish = preparePublish(options.publish);
+      options.publish = preparePublish(options.publish, process.env);
 
       for await (const {
         properties,
@@ -136,8 +137,8 @@ program
               context.expand
             );
 
-            for(const p of options.publish) {
-              await publish(fileName, p, output.properties );
+            for (const p of options.publish) {
+              await publish(fileName, p, output.properties);
             }
           } catch (e) {
             handleError(e, options);
@@ -156,24 +157,3 @@ function handleError(e, options) {
     process.exit(-1);
   }
 }
-
-function preparePublish(publish=[]) {
-  const e = process.env["PKGBUILD_PUBLISH"]
-  if(e) {
-    publish.push(e);
-  }
-
-  return publish.map(value => {
-    let values = value.split(/,/);
-    if (values.length > 1) {
-      values = values.map(v => process.env[v] || v);
-      return {
-        url: values[0],
-        user: values[1],
-        password: decodePassword(values[2])
-      };
-    }
-
-    return { url: value };
-  });
-}

package/src/publish.mjs

@@ -1,6 +1,7 @@
 import { basename } from "node:path";
 import { createReadStream } from "node:fs";
 import fetch from "node-fetch";
+import { decodePassword } from "./util.mjs";
 
 export function analysePublish(publish, properties) {
   publish = Object.assign({}, publish);
@@ -33,10 +34,12 @@ export async function publish(fileName, destination, properties) {
       "user-agent": properties["user-agent"] || "npm-pkgbuild"
     };
 
-    if (publish.user) {
+    if (publish.username) {
       headers.authorization =
         "Basic " +
-        Buffer.from(publish.user + ":" + publish.password).toString("base64");
+        Buffer.from(publish.username + ":" + publish.password).toString(
+          "base64"
+        );
     }
 
     const response = await fetch(url, {
@@ -56,3 +59,41 @@ export async function publish(fileName, destination, properties) {
     console.log(`#<CI>publish ${fileName}`);
     */
 }
+
+export function preparePublish(publish = [], env = {}) {
+  function vm(k) {
+    return env[k] || k;
+  }
+
+  const e = env["PKGBUILD_PUBLISH"];
+  if (e) {
+    publish.push(e);
+  }
+
+  return publish.map(value => {
+    let values = value.split(/,/);
+    if (values.length > 1) {
+      values = values.map(v => vm(v));
+      return {
+        url: values[0],
+        user: values[1],
+        password: decodePassword(values[2])
+      };
+    }
+
+    try {
+      const url = new URL(value);
+      let password = vm(url.password);
+      let username = vm(url.username);
+      url.username = "";
+      url.password = "";
+
+      return {
+        url: url.href.replace(/%7B/g,'{').replace(/%7D/g,'}'),
+        ...(username.length ? { username, password } : {})
+      };
+    } catch {
+      return { url: value };
+    }
+  });
+}