npm-pkgbuild 20.3.0 → 20.4.1

package/README.md

@@ -143,6 +143,7 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
     *   [Parameters](#parameters-11)
     *   [packageName](#packagename)
         *   [Parameters](#parameters-12)
+    *   [hookContent](#hookcontent)
     *   [dependencyExpression](#dependencyexpression)
         *   [Parameters](#parameters-13)
     *   [tmpdir](#tmpdir)
@@ -157,6 +158,7 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
     *   [Parameters](#parameters-17)
     *   [packageName](#packagename-1)
         *   [Parameters](#parameters-18)
+    *   [hookContent](#hookcontent-1)
     *   [dependencyExpression](#dependencyexpression-1)
         *   [Parameters](#parameters-19)
     *   [tmpdir](#tmpdir-1)
@@ -480,9 +482,15 @@ What is the package name in the package eco-system.
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** package name in the target eco-system
 
+### hookContent
+
+Generate hook content entries
+
+Returns **AsyncIterable\<ContentEntry>**&#x20;
+
 ### dependencyExpression
 
-forms an expression string form name and expression.
+Forms an expression string form name and expression.
 If tere is no valid exression name only is delivered.
 
 #### Parameters
@@ -557,9 +565,15 @@ What is the package name in the package eco-system.
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** package name in the target eco-system
 
+### hookContent
+
+Generate hook content entries
+
+Returns **AsyncIterable\<ContentEntry>**&#x20;
+
 ### dependencyExpression
 
-forms an expression string form name and expression.
+Forms an expression string form name and expression.
 If tere is no valid exression name only is delivered.
 
 #### Parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.3.0",
+  "version": "20.4.1",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -66,7 +66,7 @@
     "key-value-transformer": "^3.3.1",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^10.0.3",
-    "pacc": "^8.6.2",
+    "pacc": "^8.7.0",
     "package-directory": "^8.2.0",
     "pacote": "^21.1.0",
     "tar-stream": "^3.1.7",

package/src/output/debian.mjs

@@ -1,7 +1,11 @@
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
 import { execa } from "execa";
-import { integer_attribute_writable, yesno_attribute_writable, string_attribute_writable } from "pacc";
+import {
+  integer_attribute_writable,
+  yesno_attribute_writable,
+  string_attribute_writable
+} from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import {
   transform,
@@ -18,12 +22,13 @@ import {
 } from "./packager.mjs";
 import { copyEntries, fieldProvider } from "../util.mjs";
 
-const debian_dependency_attribute_collection_writable =
-{
+const debian_dependency_attribute_collection_writable = {
   ...dependency_attribute_collection_writable,
   separator: ","
 };
 
+const CONTROL_NAME = "DEBIAN/control";
+
 /**
  * Create .deb packages
  */
@@ -50,7 +55,11 @@ export class DEBIAN extends Packager {
       set: v => v.toLowerCase()
     },
     Version: pkgbuild_version_attribute,
-    Maintainer: { ...string_attribute_writable, alias: "maintainer", mandatory: true },
+    Maintainer: {
+      ...string_attribute_writable,
+      alias: "maintainer",
+      mandatory: true
+    },
     Description: pkgbuild_description_attribute,
     Section: { ...string_attribute_writable, alias: "groups" },
     Priority: string_attribute_writable,
@@ -129,9 +138,11 @@ export class DEBIAN extends Packager {
   async create(sources, transformer, publishingDetails, options, expander) {
     const { properties, staging, destination } = await this.prepare(options);
 
+    const hooks = new Set(Object.values(this.hookMapping));
+
     transformer.push(
       createPropertiesTransformer(
-        entry => (entry.name.match(/DEBIAN\/.*(inst|rm)/) ? true : false),
+        entry => hooks.has(entry.name),
         { mode: { value: 0o775 } },
         "mode"
       )
@@ -143,17 +154,16 @@ export class DEBIAN extends Packager {
     }
 
     const fp = fieldProvider(properties, this.attributes);
-    const debianControlName = "DEBIAN/control";
 
     transformer.push({
-      match: entry => entry.name === debianControlName,
+      match: entry => entry.name === CONTROL_NAME,
       transform: async entry =>
         new IteratorContentEntry(
           entry.name,
           undefined,
           keyValueTransformer(Uint8ArraysToLines(await entry.readStream), fp)
         ),
-      createEntryWhenMissing: () => new ContentEntry(debianControlName)
+      createEntryWhenMissing: () => new ContentEntry(CONTROL_NAME)
     });
 
     for await (const file of copyEntries(
@@ -168,7 +178,7 @@ export class DEBIAN extends Packager {
     }
 
     if (options.verbose) {
-      console.log(await readFile(join(staging, debianControlName), "utf8"));
+      console.log(await readFile(join(staging, CONTROL_NAME), "utf8"));
     }
 
     if (!options.dry) {

package/src/output/packager.mjs

@@ -3,6 +3,8 @@ import { tmpdir } from "node:os";
 import { mkdtemp, mkdir } from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import {
+  expand,
+  expandContextDoubbleCurly,
   string_attribute,
   description_attribute,
   version_attribute_writable
@@ -82,9 +84,20 @@ export class Packager {
     return {};
   }
 
+  /**
+   * Generate hook content entries
+   * @return {AsyncIterable<ContentEntry>}
+   */
   async *hookContent() {
     const properties = this.properties;
 
+    const context = {
+      ...expandContextDoubbleCurly,
+      root: properties
+    };
+
+    const entryProps = { mode: 0o775 };
+
     switch (typeof properties.hooks) {
       case "string":
         for await (const f of extractFunctions(
@@ -94,12 +107,8 @@ export class Packager {
           if (name) {
             yield new StringContentEntry(
               name,
-              undefined,
-              f.body.replaceAll(
-                /\{\{(\w+)\}\}/gm,
-                (match, key, offset, string) =>
-                  properties[key] || "{{" + key + "}}"
-              )
+              entryProps,
+              expand(f.body, context)
             );
           }
         }
@@ -108,20 +117,16 @@ export class Packager {
       case "object":
         for (const [name, content] of Object.entries(properties.hooks)) {
           yield new StringContentEntry(
-            name,
-            undefined,
-            content.replaceAll(
-              /\{\{(\w+)\}\}/gm,
-              (match, key, offset, string) =>
-                properties[key] || "{{" + key + "}}"
-            )
+            this.hookMapping[name] || name,
+            entryProps,
+            expand(content, context)
           );
         }
     }
   }
 
   /**
-   * forms an expression string form name and expression.
+   * Forms an expression string form name and expression.
    * If tere is no valid exression name only is delivered.
    * @param {string} name
    * @param {string|boolean|undefined} expression
@@ -290,10 +295,9 @@ export const dependency_type = {
       return value;
     }
 
-    return Object.entries(value)
-      .map(([name, expression]) =>
-        typeof expression === "string" ? `${name}${expression}` : name
-      );
+    return Object.entries(value).map(([name, expression]) =>
+      typeof expression === "string" ? `${name}${expression}` : name
+    );
   }
 };
 

package/types/output/packager.d.mts

@@ -39,9 +39,13 @@ export class Packager {
      */
     packageName(name: string): string;
     get hookMapping(): {};
-    hookContent(): AsyncGenerator<StringContentEntry, void, unknown>;
     /**
-     * forms an expression string form name and expression.
+     * Generate hook content entries
+     * @return {AsyncIterable<ContentEntry>}
+     */
+    hookContent(): AsyncIterable<ContentEntry>;
+    /**
+     * Forms an expression string form name and expression.
      * If tere is no valid exression name only is delivered.
      * @param {string} name
      * @param {string|boolean|undefined} expression
@@ -200,4 +204,3 @@ export type Field = {
     default: any;
     mandatory: boolean;
 };
-import { StringContentEntry } from "content-entry";