npm-pkgbuild 7.26.2 → 7.28.0

package/README.md

@@ -53,14 +53,16 @@ The resulting pkg will contain the package dist content and all production depen
     *   [execute](#execute)
         *   [Parameters](#parameters-4)
 *   [hookMapping](#hookmapping)
-*   [extractFunctions](#extractfunctions)
+*   [decodePassword](#decodepassword)
     *   [Parameters](#parameters-5)
-*   [fieldProvider](#fieldprovider)
+*   [extractFunctions](#extractfunctions)
     *   [Parameters](#parameters-6)
-*   [Expander](#expander)
+*   [fieldProvider](#fieldprovider)
     *   [Parameters](#parameters-7)
-*   [copyEntries](#copyentries)
+*   [Expander](#expander)
     *   [Parameters](#parameters-8)
+*   [copyEntries](#copyentries)
+    *   [Parameters](#parameters-9)
 
 ## ContentProvider
 
@@ -175,6 +177,16 @@ Execute package generation
 
 map install hook named from arch to rpm
 
+## decodePassword
+
+Decode a password
+
+### Parameters
+
+*   `password` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** plaintext password
+
 ## extractFunctions
 
 Extract shell functions from a given text

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.26.2",
+  "version": "7.28.0",
   "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 };
@@ -98,7 +86,7 @@ program
           continute;
         }
 
-        Object.assign(properties, options.define);
+        Object.assign(properties, { type: outputFactory.name }, options.define);
 
         for (const [k, v] of Object.entries(properties)) {
           if (typeof v === "string") {

package/src/output/deb.mjs

@@ -1,6 +1,6 @@
 import { join } from "path";
 import { execa } from "execa";
-import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { EmptyContentEntry, ReadableStreamContentEntry, StringContentEntry } from "content-entry";
 import {
   transform,
   createPropertiesTransformer
@@ -9,6 +9,14 @@ import { keyValueTransformer } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
 import { copyEntries, fieldProvider } from "../util.mjs";
 
+/**
+ * map install hook named from arch to deb
+ */
+const hookMapping = {
+  post_install: "DEBIAN/postinst",
+  post_remove: "DEBIAN/postrm"
+};
+
 export class DEB extends Packager {
   static get name() {
     return "deb";
@@ -41,7 +49,9 @@ export class DEB extends Packager {
   }
 
   async execute(sources, transformer, dependencies, options, expander) {
-    const { properties, staging, destination } = await this.prepareExecute(options);
+    const { properties, staging, destination } = await this.prepareExecute(
+      options
+    );
 
     transformer.push(
       createPropertiesTransformer(
@@ -51,6 +61,33 @@ export class DEB extends Packager {
       )
     );
 
+    if (properties.hooks) {
+      for await (const f of extractFunctions(
+        createReadStream(properties.hooks, utf8StreamOptions)
+      )) {
+        const name = hookMapping[f.name];
+        if (name) {
+          transformer.push({
+            match: entry => entry.name === name,
+            transform: async entry =>
+              new ReadableStreamContentEntry(
+                entry.name,
+                keyValueTransformer(await entry.readStream, fp)
+              ),
+            createEntryWhenMissing: () =>
+              new StringContentEntry(
+                name,
+                f.body.replace(
+                  /\{\{(\w+)\}\}/m,
+                  (match, key, offset, string) =>
+                    properties[key] || "{{" + key + "}}"
+                )
+              )
+          });
+        }
+      }
+    }
+
     const fp = fieldProvider(properties, fields);
     const debianControlName = "DEBIAN/control";
 

package/src/output/rpm.mjs

@@ -20,7 +20,7 @@ import {
  * map install hook named from arch to rpm
  */
 const hookMapping = {
-  pre_instll: "pre",
+  pre_install: "pre",
   post_install: "post",
   pre_remove: "preun",
   post_remove: "postun"

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