npm-pkgbuild 7.26.2 → 7.26.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.26.2",
+  "version": "7.26.3",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "@npmcli/arborist": "^5.0.0",
+    "@npmcli/arborist": "^5.0.2",
     "aggregate-async-iterator": "^1.1.9",
     "commander": "^9.0.0",
     "content-entry": "^4.1.7",
@@ -52,7 +52,7 @@
     "node-fetch": "^3.2.3",
     "npm-package-walker": "^5.0.5",
     "npm-packlist": "^4.0.0",
-    "pacote": "^13.0.2",
+    "pacote": "^13.0.4",
     "pkg-dir": "^6.0.1",
     "tar-stream": "^2.2.0"
   },

package/src/npm-pkgbuild-cli.mjs

@@ -11,7 +11,7 @@ import {
   createExpressionTransformer,
   nameExtensionMatcher
 } from "content-entry-transform";
-import { utf8StreamOptions } from "./util.mjs";
+import { utf8StreamOptions, decodePassword } from "./util.mjs";
 import {
   FileContentProvider,
   allInputs,
@@ -51,19 +51,7 @@ program
         let values = value.split(/,/);
         if (values.length > 1) {
           values = values.map(v => process.env[v] || v);
-          let password = values[2];
-          const m = password.match(/\{([^\}]+)\}(.*)/);
-          if (m) {
-            switch (m[1]) {
-              case "BASE64":
-                password = Buffer.from(m[2], "base64").toString("utf8");
-                break;
-              default:
-                console.log(`Unknown algorithm ${m[1]}`);
-            }
-          }
-
-          return { url: values[0], user: values[1], password };
+          return { url: values[0], user: values[1], password: decodePassword(values[2]) };
         }
 
         return { url: value };

package/src/util.mjs

@@ -5,6 +5,26 @@ import { createWriteStream } from "fs";
 
 export const utf8StreamOptions = { encoding: "utf8" };
 
+/**
+ * Decode a password
+ * @param {string} password 
+ * @returns {string} plaintext password
+ */
+export function decodePassword(password)
+{
+  const m = password.match(/\{([^\}]+)\}(.*)/);
+  if (m) {
+    switch (m[1]) {
+      case "BASE64":
+        return Buffer.from(m[2], "base64").toString("utf8");
+        break;
+      default:
+        throw new Error(`Unknown algorithm ${m[1]}`);
+    }
+  }
+  return password;
+}
+
 /**
  * Extract shell functions from a given text
  * @param {AsyncIterator<string>} source