npm-pkgbuild 20.5.0 → 20.6.0

package/README.md

@@ -98,47 +98,47 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
     *   [Properties](#properties)
 *   [extractFromPackage](#extractfrompackage)
     *   [Parameters](#parameters-1)
-*   [BUILDAH](#buildah)
-*   [ContentProvider](#contentprovider)
+*   [NPMPackContentProvider](#npmpackcontentprovider)
     *   [Parameters](#parameters-2)
     *   [Properties](#properties-1)
-    *   [asyncIterator](#asynciterator)
-*   [FileContentProvider](#filecontentprovider)
-    *   [Parameters](#parameters-3)
-    *   [asyncIterator](#asynciterator-1)
     *   [name](#name)
 *   [NodeModulesContentProvider](#nodemodulescontentprovider)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-3)
     *   [Properties](#properties-2)
-    *   [asyncIterator](#asynciterator-2)
+    *   [asyncIterator](#asynciterator)
     *   [name](#name-1)
-*   [NPMPackContentProvider](#npmpackcontentprovider)
-    *   [Parameters](#parameters-5)
-    *   [Properties](#properties-3)
+*   [FileContentProvider](#filecontentprovider)
+    *   [Parameters](#parameters-4)
+    *   [asyncIterator](#asynciterator-1)
     *   [name](#name-2)
 *   [NFTContentProvider](#nftcontentprovider)
+    *   [Parameters](#parameters-5)
+    *   [asyncIterator](#asynciterator-2)
+    *   [name](#name-3)
+*   [ContentProvider](#contentprovider)
     *   [Parameters](#parameters-6)
+    *   [Properties](#properties-3)
     *   [asyncIterator](#asynciterator-3)
-    *   [name](#name-3)
 *   [DEBIAN](#debian)
     *   [hookMapping](#hookmapping)
     *   [attributes](#attributes)
     *   [prepare](#prepare)
         *   [Parameters](#parameters-7)
+*   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
+*   [attributes](#attributes-1)
 *   [quoteFile](#quotefile)
     *   [Parameters](#parameters-8)
 *   [RPM](#rpm)
     *   [hookMapping](#hookmapping-1)
-    *   [attributes](#attributes-1)
+    *   [attributes](#attributes-2)
     *   [prepare](#prepare-1)
         *   [Parameters](#parameters-9)
-*   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
-*   [attributes](#attributes-2)
 *   [OCI](#oci)
 *   [DOCKER](#docker)
     *   [attributes](#attributes-3)
     *   [prepare](#prepare-2)
         *   [Parameters](#parameters-10)
+*   [BUILDAH](#buildah)
 *   [Packager](#packager)
     *   [Parameters](#parameters-11)
     *   [packageName](#packagename)
@@ -256,48 +256,22 @@ Extract package definition from package.json.
 
 Returns **AsyncIterable<[PackageDefinition](#packagedefinition)>**&#x20;
 
-## BUILDAH
-
-**Extends DOCKER**
-
-Use buildah @see <https://buildah.io>
+## NPMPackContentProvider
 
-## ContentProvider
+**Extends ContentProvider**
 
-Source of package content.
+Content from npm pack.
 
 ### Parameters
 
 *   `definitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
-*   `entryProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
-*   `directoryProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
+*   `entryProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** to be set for each entry
+*   `directoryProperties` &#x20;
 
 ### Properties
 
 *   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 
-### asyncIterator
-
-List all entries.
-
-Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
-
-## FileContentProvider
-
-**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;
-*   `entryProperties` &#x20;
-*   `directoryProperties` &#x20;
-
-### asyncIterator
-
-Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
-
 ### name
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
@@ -329,21 +303,21 @@ Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
 
-## NPMPackContentProvider
+## FileContentProvider
 
 **Extends ContentProvider**
 
-Content from npm pack.
+Content provided form the file system.
 
 ### Parameters
 
-*   `definitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
-*   `entryProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** to be set for each entry
+*   `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;
+*   `entryProperties` &#x20;
 *   `directoryProperties` &#x20;
 
-### Properties
+### asyncIterator
 
-*   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
 
 ### name
 
@@ -369,6 +343,26 @@ Returns **AsyncIterable\<ContentEntry>** all entries
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
 
+## ContentProvider
+
+Source of package content.
+
+### Parameters
+
+*   `definitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `entryProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
+*   `directoryProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
+
+### Properties
+
+*   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+### asyncIterator
+
+List all entries.
+
+Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
+
 ## DEBIAN
 
 **Extends Packager**
@@ -395,6 +389,15 @@ Map install hook named from default (arch) to deb.
 
 Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)>**&#x20;
 
+## pkgKeyValuePairOptions
+
+Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+
+## attributes
+
+well known package properties
+<https://www.archlinux.org/pacman/PKGBUILD.5.html>
+
 ## quoteFile
 
 ### Parameters
@@ -428,15 +431,6 @@ Check for rpmbuild presence.
 
 Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)>** true when rpmbuild executable is present
 
-## pkgKeyValuePairOptions
-
-Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
-
-## attributes
-
-well known package properties
-<https://www.archlinux.org/pacman/PKGBUILD.5.html>
-
 ## OCI
 
 **Extends Packager**
@@ -466,6 +460,12 @@ Check for docker presence.
 
 Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)>** true when docker executable is present
 
+## BUILDAH
+
+**Extends DOCKER**
+
+Use buildah @see <https://buildah.io>
+
 ## Packager
 
 ### Parameters

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.5.0",
+  "version": "20.6.0",
   "publishConfig": {
     "access": "public",
     "provenance": false
   },
-  "packageManager": "npm@11.6.4+sha512.1118cab46a05a50aee6bff5b1b4fa1df18afff89d57465620a3518035026955db87c5bdf9d207b07b7487d99f2490d450cb774655ad63ec2cba7bf1d0ad25d45",
+  "packageManager": "npm@11.9.0+sha512.04166853ddba142ca98f86fb57b1258a7c6c59ccb82acb3cf141b77a315898acaaed47395e74f7e0c7b69c486008e68be6a6381ef1aee5a23dd82e0e61decd68",
   "types": "./types/module.d.mts",
   "exports": {
     ".": {
@@ -70,10 +70,10 @@
     "package-directory": "^8.2.0",
     "pacote": "^21.2.0",
     "tar-stream": "^3.1.7",
-    "uti": "^8.10.6"
+    "uti": "^8.11.1"
   },
   "devDependencies": {
-    "@types/node": "^25.2.1",
+    "@types/node": "^25.2.2",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/output/arch.mjs

@@ -2,7 +2,12 @@ import { join } from "node:path";
 import { createWriteStream } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { execa } from "execa";
-import { default_attribute, string_attribute, string_collection_attribute_writable, integer_attribute } from "pacc";
+import {
+  default_attribute,
+  string_attribute,
+  string_collection_attribute_writable,
+  integer_attribute
+} from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import {
@@ -62,7 +67,6 @@ let _prepared;
 let _architecture = "aarch64";
 
 export class ARCH extends Packager {
-
   static get alias() {
     return "alpm";
   }
@@ -84,7 +88,11 @@ export class ARCH extends Packager {
    * https://www.archlinux.org/pacman/PKGBUILD.5.html
    */
   static attributes = {
-    Maintainer: { ...string_collection_attribute_writable, alias: "maintainer", prefix: "# " },
+    Maintainer: {
+      ...string_collection_attribute_writable,
+      alias: "maintainer",
+      prefix: "# "
+    },
     packager: { ...string_collection_attribute_writable, alias: "maintainer" },
     pkgname: { ...pkgbuild_name_attribute, collection: true },
     pkgver: pkgbuild_version_attribute,
@@ -110,9 +118,15 @@ export class ARCH extends Packager {
     sha384sums: string_collection_attribute_writable,
     sha512sums: string_collection_attribute_writable,
     groups: string_collection_attribute_writable,
-    arch: { ...string_collection_attribute_writable, default: ["any"], mandatory: true },
+    arch: {
+      ...string_collection_attribute_writable,
+      default: ["any"],
+      mandatory: true
+    },
     backup: string_collection_attribute_writable,
-    depends: { ...dependency_attribute_collection_writable /*, alias: "dependencies" */ },
+    depends: {
+      ...dependency_attribute_collection_writable /*, alias: "dependencies" */
+    },
     makedepends: dependency_attribute_collection_writable,
     checkdepends: dependency_attribute_collection_writable,
     optdepends: dependency_attribute_collection_writable,
@@ -232,7 +246,10 @@ package() {
     const ownership = [];
 
     for await (const file of copyEntries(
-      transform(aggregateFifo(sources), transformer),
+      transform(
+        aggregateFifo((await Array.fromAsync(sources)).flat()),
+        transformer
+      ),
       join(staging, "src"),
       expander
     )) {
@@ -281,14 +298,10 @@ package() {
         makePackageOptions.push("--log");
       }
 
-      const makepkg = await execa(
-        "makepkg",
-        makePackageOptions,
-        {
-          cwd: staging,
-          env: { PKGDEST: destination, PACKAGER }
-        }
-      );
+      const makepkg = await execa("makepkg", makePackageOptions, {
+        cwd: staging,
+        env: { PKGDEST: destination, PACKAGER }
+      });
 
       if (options.verbose) {
         console.log(makepkg.stdout);

package/src/output/debian.mjs

@@ -167,7 +167,12 @@ export class DEBIAN extends Packager {
     });
 
     for await (const file of copyEntries(
-      transform(aggregateFifo([...sources, this.hookContent()]), transformer),
+      transform(
+        aggregateFifo(
+          [await Array.fromAsync(sources), this.hookContent()].flat()
+        ),
+        transformer
+      ),
       staging,
       expander
     )) {

package/src/output/docker.mjs

@@ -141,7 +141,10 @@ export class DOCKER extends Packager {
     });
 
     for await (const file of copyEntries(
-      transform(aggregateFifo(sources), transformer),
+      transform(
+        aggregateFifo((await Array.fromAsync(sources)).flat()),
+        transformer
+      ),
       staging,
       expander
     )) {

package/src/output/oci.mjs

@@ -119,7 +119,7 @@ export class OCI extends Packager {
 
     let pos = 0;
 
-    for await (const entry of aggregateFifo(sources)) {
+    for await (const entry of aggregateFifo((await Array.fromAsync(sources)).flat())) {
       //      const size = await entry.size;
       const buffer = await entry.buffer;
       const size = buffer.length;

package/src/output/rpm.mjs

@@ -138,9 +138,8 @@ export class RPM extends Packager {
   }
 
   async create(sources, transformer, publishingDetails, options, expander) {
-    const { properties, tmpdir, staging, destination } = await this.prepare(
-      options
-    );
+    const { properties, tmpdir, staging, destination } =
+      await this.prepare(options);
 
     properties.Requires = this.makeDepends(properties.dependencies);
 
@@ -169,7 +168,7 @@ export class RPM extends Packager {
       }
 
       for await (const file of copyEntries(
-        transform(sources, transformer),
+	transform(aggregateFifo((await Array.fromAsync(sources)).flat()), transformer),
         staging,
         expander
       )) {
@@ -183,7 +182,7 @@ export class RPM extends Packager {
     const fp = fieldProvider(properties, this.attributes);
 
     for await (const file of copyEntries(
-      transform(aggregateFifo(sources), [
+      transform(aggregateFifo((await Array.fromAsync(sources)).flat()), [
         {
           match: entry => entry.name === specFileName,
           transform: async entry =>

package/src/utis.mjs

@@ -1,7 +1,7 @@
 export default [
   {
     name: "de.mfelten.backup",
-    conformsTo: "public.shell-script",
+    conformsTo: ["public.shell-script", "public.configuration"],
     fileNameExtension: ".backup"
   }
 ];

package/types/utis.d.mts

@@ -1,6 +1,6 @@
 declare const _default: {
     name: string;
-    conformsTo: string;
+    conformsTo: string[];
     fileNameExtension: string;
 }[];
 export default _default;