npm-pkgbuild 15.3.36 → 15.4.1

package/README.md

@@ -97,24 +97,23 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [FileContentProvider](#filecontentprovider)
     *   [Parameters](#parameters-1)
     *   [name](#name)
-*   [NFTContentProvider](#nftcontentprovider)
-    *   [Parameters](#parameters-2)
-    *   [name](#name-1)
 *   [utf8StreamOptions](#utf8streamoptions)
     *   [Properties](#properties-1)
-*   [packageNameMapping](#packagenamemapping)
 *   [decodePassword](#decodepassword)
-    *   [Parameters](#parameters-3)
+    *   [Parameters](#parameters-2)
 *   [FunctionDecl](#functiondecl)
     *   [Properties](#properties-2)
 *   [extractFunctions](#extractfunctions)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-3)
 *   [fieldProvider](#fieldprovider)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-4)
 *   [Expander](#expander)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-5)
 *   [copyEntries](#copyentries)
+    *   [Parameters](#parameters-6)
+*   [NFTContentProvider](#nftcontentprovider)
     *   [Parameters](#parameters-7)
+    *   [name](#name-1)
 *   [NodeModulesContentProvider](#nodemodulescontentprovider)
     *   [Parameters](#parameters-8)
     *   [Properties](#properties-3)
@@ -140,37 +139,41 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [OCI](#oci)
 *   [Packager](#packager)
     *   [Parameters](#parameters-12)
+    *   [packageName](#packagename)
+        *   [Parameters](#parameters-13)
     *   [tmpdir](#tmpdir)
     *   [prepare](#prepare-2)
-        *   [Parameters](#parameters-13)
-    *   [create](#create)
         *   [Parameters](#parameters-14)
+    *   [create](#create)
+        *   [Parameters](#parameters-15)
     *   [workspaceLayout](#workspacelayout)
     *   [prepare](#prepare-3)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [Packager](#packager-1)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-17)
+    *   [packageName](#packagename-1)
+        *   [Parameters](#parameters-18)
     *   [tmpdir](#tmpdir-1)
     *   [prepare](#prepare-4)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-19)
     *   [create](#create-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-20)
     *   [workspaceLayout](#workspacelayout-1)
     *   [prepare](#prepare-5)
-        *   [Parameters](#parameters-19)
+        *   [Parameters](#parameters-21)
 *   [Field](#field)
     *   [Properties](#properties-5)
 *   [PublishingDetail](#publishingdetail)
     *   [Properties](#properties-6)
 *   [createPublishingDetails](#createpublishingdetails)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-22)
 *   [publish](#publish)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-23)
 *   [quoteFile](#quotefile)
-    *   [Parameters](#parameters-22)
+    *   [Parameters](#parameters-24)
 *   [RPM](#rpm)
     *   [prepare](#prepare-6)
-        *   [Parameters](#parameters-23)
+        *   [Parameters](#parameters-25)
 
 ## ContentProvider
 
@@ -210,24 +213,6 @@ Content provided form the file system.
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
 
-## NFTContentProvider
-
-**Extends ContentProvider**
-
-Content provided form the file system.
-
-### Parameters
-
-*   `definitions` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))** 
-
-    *   `definitions.pattern` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)**&#x20;
-    *   `definitions.base` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** base directory where to find the files
-*   `entryProperties` &#x20;
-
-### name
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
-
 ## utf8StreamOptions
 
 Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
@@ -236,10 +221,6 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 
 *   `encoding` **BufferEncoding**&#x20;
 
-## packageNameMapping
-
-What is the node name in the package eco-system
-
 ## decodePassword
 
 Decode a password
@@ -299,6 +280,24 @@ Destination paths a generated without leading '/' (as for entry names too).
 *   `destinationDirectory` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 *   `expander` **[Expander](#expander)**  (optional, default `v=>v`)
 
+## NFTContentProvider
+
+**Extends ContentProvider**
+
+Content provided form the file system.
+
+### Parameters
+
+*   `definitions` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))**&#x20;
+
+    *   `definitions.pattern` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)**&#x20;
+    *   `definitions.base` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** base directory where to find the files
+*   `entryProperties` &#x20;
+
+### name
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
+
 ## NodeModulesContentProvider
 
 **Extends ContentProvider**
@@ -422,6 +421,16 @@ Low level OCI compatible packager
 
 *   `properties` &#x20;
 
+### packageName
+
+What is the package name in the package eco-system.
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** package name in the target eco-system
+
 ### tmpdir
 
 Create tmp directory.
@@ -475,6 +484,16 @@ Base Packager
 
 *   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
 
+### packageName
+
+What is the package name in the package eco-system.
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** package name in the target eco-system
+
 ### tmpdir
 
 Create tmp directory.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "15.3.36",
+  "version": "15.4.1",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/extract-from-package.mjs

@@ -261,7 +261,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
 
         if (packageContent.contributors) {
           properties.maintainer = packageContent.contributors.map(
-            c => `${c.name} <${c.email}>`
+            c => c.name + (c.email ? ` <${c.email}>` : '')
           );
         }
 

package/src/output/arch.mjs

@@ -20,7 +20,6 @@ import {
   fieldProvider,
   quote,
   utf8StreamOptions,
-  packageNameMapping,
   filterOutUnwantedDependencies
 } from "../util.mjs";
 
@@ -85,7 +84,7 @@ export class ARCH extends Packager {
 
         function getValue(key) {
           const v = process.env[key];
-          if(v !== undefined) {
+          if (v !== undefined) {
             return v;
           }
 
@@ -117,10 +116,24 @@ export class ARCH extends Packager {
     return `${p.name}-${p.version}-${p.release}-${p.arch}${this.fileNameExtension}`;
   }
 
-  async create(sources, transformer, dependencies, publishingDetails, options, expander) {
-    const { properties, staging, destination } = await this.prepare(
-      options
-    );
+  makeDepends(dependencies) {
+    return Object.entries(dependencies)
+      .filter(filterOutUnwantedDependencies())
+      .map(
+        ([name, version]) =>
+          `${this.packageName(name)}${normalizeExpression(version)}`
+      );
+  }
+
+  async create(
+    sources,
+    transformer,
+    dependencies,
+    publishingDetails,
+    options,
+    expander
+  ) {
+    const { properties, staging, destination } = await this.prepare(options);
 
     if (properties.source) {
       properties.md5sums = ["SKIP"];
@@ -129,10 +142,11 @@ export class ARCH extends Packager {
       properties.install = `${properties.name}.install`;
     }
 
+    const self = this;
     async function* trailingLines() {
       yield `
 package() {
-  depends=(${makeDepends(dependencies)
+  depends=(${self.makeDepends(dependencies)
     .map(v => quote(v))
     .join(" ")})
 
@@ -262,12 +276,3 @@ function normalizeExpression(e) {
 
   return e;
 }
-
-function makeDepends(dependencies) {
-  return Object.entries(dependencies)
-    .filter(filterOutUnwantedDependencies())
-    .map(
-      ([name, version]) =>
-        `${packageNameMapping[name] || name}${normalizeExpression(version)}`
-    );
-}

package/src/output/debian.mjs

@@ -19,7 +19,6 @@ import {
   fieldProvider,
   extractFunctions,
   utf8StreamOptions,
-  packageNameMapping,
   filterOutUnwantedDependencies
 } from "../util.mjs";
 
@@ -86,7 +85,7 @@ export class DEBIAN extends Packager {
           yield new StringContentEntry(
             name,
             f.body.replaceAll(
-              /\{\{(\w+)\}\}/mg,
+              /\{\{(\w+)\}\}/gm,
               (match, key, offset, string) =>
                 properties[key] || "{{" + key + "}}"
             )
@@ -117,12 +116,7 @@ export class DEBIAN extends Packager {
     if (Object.keys(dependencies).length > 0) {
       properties.Depends = Object.entries(dependencies)
         .filter(filterOutUnwantedDependencies())
-        .map(
-          ([name, e]) =>
-            `${
-              packageNameMapping[name] ? packageNameMapping[name] : name
-            } (${e})`
-        );
+        .map(([name, e]) => `${this.packageName(name)} (${e})`);
     }
 
     const fp = fieldProvider(properties, fields);
@@ -153,9 +147,7 @@ export class DEBIAN extends Packager {
     }
 
     if (options.verbose) {
-      console.log(
-        await readFile(join(staging, debianControlName), "utf8")
-      );
+      console.log(await readFile(join(staging, debianControlName), "utf8"));
     }
 
     if (!options.dry) {

package/src/output/packager.mjs

@@ -55,6 +55,18 @@ export class Packager {
     this.#properties = { ...properties, type: this.constructor.name };
   }
 
+  /**
+   * What is the package name in the package eco-system.
+   * @param {string} name
+   * @return {string} package name in the target eco-system
+   */
+  packageName(name) {
+    const mapping = {
+      node: "nodejs"
+    };
+    return mapping[name] || name;
+  }
+
   get fileNameExtension() {
     // @ts-ignore
     return this.constructor.fileNameExtension;

package/src/output/rpm.mjs

@@ -16,7 +16,6 @@ import {
   fieldProvider,
   utf8StreamOptions,
   extractFunctions,
-  packageNameMapping,
   filterOutUnwantedDependencies
 } from "../util.mjs";
 
@@ -41,21 +40,6 @@ const hookMapping = {
   post_upgrade:*/
 };
 
-export function requiresFromDependencies(dependencies) {
-  return Object.entries(dependencies)
-    .filter(filterOutUnwantedDependencies())
-    .map(
-      ([name, e]) =>
-        `${packageNameMapping[name] ? packageNameMapping[name] : name}${e
-          .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
-          .replace(/^\s*$/, "")
-          .replace(
-            /^\s*(<|<=|>|>=|=)\s*(\w+)/,
-            (match, p1, p2) => ` ${p1} ${p2}`
-          )}`
-    );
-}
-
 /**
  * produce rpm packages
  */
@@ -110,6 +94,21 @@ export class RPM extends Packager {
     return false;
   }
 
+  requiresFromDependencies(dependencies) {
+    return Object.entries(dependencies)
+      .filter(filterOutUnwantedDependencies())
+      .map(
+        ([name, e]) =>
+          `${this.packageName(name)}${e
+            .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
+            .replace(/^\s*$/, "")
+            .replace(
+              /^\s*(<|<=|>|>=|=)\s*(\w+)/,
+              (match, p1, p2) => ` ${p1} ${p2}`
+            )}`
+      );
+  }
+
   async create(
     sources,
     transformer,
@@ -122,7 +121,7 @@ export class RPM extends Packager {
       options
     );
 
-    properties.Requires = requiresFromDependencies(dependencies);
+    properties.Requires = this.requiresFromDependencies(dependencies);
 
     if (properties.Packager?.length > 1) {
       // TODO how to write several Packages ?

package/src/util.mjs

@@ -10,13 +10,6 @@ import { ContentEntry } from "content-entry";
  */
 export const utf8StreamOptions = { encoding: "utf8" };
 
-/**
- * What is the node name in the package eco-system
- */
-export const packageNameMapping = {
-  node: "nodejs"
-};
-
 export function filterOutUnwantedDependencies() {
   return ([name, version]) => version !== "-";
 }

package/types/output/arch.d.mts

@@ -120,6 +120,7 @@ export class ARCH extends Packager {
     };
     static prepare(options?: {}, variant?: {}): Promise<boolean>;
     get packageFileName(): string;
+    makeDepends(dependencies: any): string[];
     create(sources: any, transformer: any, dependencies: any, publishingDetails: any, options: any, expander: any): Promise<string>;
 }
 import { Packager } from "./packager.mjs";

package/types/output/packager.d.mts

@@ -32,6 +32,12 @@ export class Packager {
      * @param {Object} properties
      */
     constructor(properties: any);
+    /**
+     * What is the package name in the package eco-system.
+     * @param {string} name
+     * @return {string} package name in the target eco-system
+     */
+    packageName(name: string): string;
     get fileNameExtension(): any;
     get fields(): any;
     get properties(): any;

package/types/output/rpm.d.mts

@@ -1,4 +1,3 @@
-export function requiresFromDependencies(dependencies: any): string[];
 /**
  * produce rpm packages
  */
@@ -85,6 +84,7 @@ export class RPM extends Packager {
         arch: string;
     }): Promise<boolean>;
     get packageFileName(): string;
+    requiresFromDependencies(dependencies: any): string[];
     create(sources: any, transformer: any, dependencies: any, publishingDetails: any, options: any, expander: any): Promise<string>;
 }
 export type PublishingDetail = import("../publish.mjs").PublishingDetail;

package/types/util.d.mts

@@ -44,9 +44,6 @@ export function copyEntries(source: AsyncIterable<ContentEntry>, destinationDire
  * @property {BufferEncoding} encoding
  */
 export const utf8StreamOptions: any;
-export namespace packageNameMapping {
-    let node: string;
-}
 export type FunctionDecl = {
     name: string;
     body: string;