npm-pkgbuild 16.1.1 → 17.0.0

package/README.md

@@ -99,25 +99,24 @@ 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)
     *   [name](#name)
 *   [NodeModulesContentProvider](#nodemodulescontentprovider)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-3)
     *   [Properties](#properties-2)
     *   [name](#name-1)
-*   [NPMPackContentProvider](#npmpackcontentprovider)
-    *   [Parameters](#parameters-5)
-    *   [Properties](#properties-3)
+*   [FileContentProvider](#filecontentprovider)
+    *   [Parameters](#parameters-4)
     *   [name](#name-2)
 *   [NFTContentProvider](#nftcontentprovider)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-5)
     *   [name](#name-3)
+*   [ContentProvider](#contentprovider)
+    *   [Parameters](#parameters-6)
+    *   [Properties](#properties-3)
+    *   [asyncIterator](#asynciterator)
 *   [hookMapping](#hookmapping)
 *   [hookMapping](#hookmapping-1)
 *   [DEBIAN](#debian)
@@ -127,16 +126,17 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [fields](#fields-1)
 *   [fields](#fields-2)
 *   [fields](#fields-3)
+*   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
 *   [quoteFile](#quotefile)
     *   [Parameters](#parameters-8)
 *   [RPM](#rpm)
     *   [prepare](#prepare-1)
         *   [Parameters](#parameters-9)
-*   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
 *   [OCI](#oci)
 *   [DOCKER](#docker)
     *   [prepare](#prepare-2)
         *   [Parameters](#parameters-10)
+*   [BUILDAH](#buildah)
 *   [Packager](#packager)
     *   [Parameters](#parameters-11)
     *   [packageName](#packagename)
@@ -172,11 +172,10 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [publish](#publish)
     *   [Parameters](#parameters-23)
 *   [utf8StreamOptions](#utf8streamoptions)
-    *   [Properties](#properties-6)
 *   [decodePassword](#decodepassword)
     *   [Parameters](#parameters-24)
 *   [FunctionDecl](#functiondecl)
-    *   [Properties](#properties-7)
+    *   [Properties](#properties-6)
 *   [extractFunctions](#extractfunctions)
     *   [Parameters](#parameters-25)
 *   [fieldProvider](#fieldprovider)
@@ -245,45 +244,20 @@ 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` &#x20;
-*   `entryProperties` &#x20;
+*   `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
 
 ### Properties
 
 *   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
-*   `transformer` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<Transformer>**&#x20;
-
-### asyncIterator
-
-List all entries.
-
-Returns **AsyncIterable\<ContentEntry>** 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;
-
-    *   `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
 
@@ -309,20 +283,19 @@ Requires .npmrc or NPM\_TOKEN environment
 
 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
-
-### Properties
+*   `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;
 
-*   `dir` **[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
 
@@ -346,6 +319,26 @@ Content provided form the file system.
 
 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` &#x20;
+*   `entryProperties` &#x20;
+
+### Properties
+
+*   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `transformer` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<Transformer>**&#x20;
+
+### asyncIterator
+
+List all entries.
+
+Returns **AsyncIterable\<ContentEntry>** all entries
+
 ## hookMapping
 
 map install hook named from arch to deb
@@ -378,17 +371,21 @@ Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/
 
 ## fields
 
-*   **See**: <https://rpm-packaging-guide.github.io>
+well known package properties
+<https://www.archlinux.org/pacman/PKGBUILD.5.html>
 
 ## fields
 
-well known package properties
-<https://www.archlinux.org/pacman/PKGBUILD.5.html>
+*   **See**: <https://rpm-packaging-guide.github.io>
 
 ## fields
 
 *   **See**: <https://docs.docker.com/engine/reference/builder/>
 
+## pkgKeyValuePairOptions
+
+Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+
 ## quoteFile
 
 ### Parameters
@@ -414,10 +411,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)
-
 ## OCI
 
 **Extends Packager**
@@ -443,6 +436,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
@@ -622,11 +621,7 @@ Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Gl
 
 ## utf8StreamOptions
 
-Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
-
-### Properties
-
-*   `encoding` **BufferEncoding**&#x20;
+Type: BufferEncoding
 
 ## decodePassword
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "16.1.1",
+  "version": "17.0.0",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -65,7 +65,7 @@
     "ini": "^5.0.0",
     "iterable-string-interceptor": "^3.0.0",
     "key-value-transformer": "^3.2.3",
-    "npm-package-walker": "^7.0.7",
+    "npm-package-walker": "^8.0.0",
     "npm-packlist": "^10.0.0",
     "pacote": "^21.0.0",
     "pkg-dir": "^8.0.0",

package/src/output/arch.mjs

@@ -117,6 +117,12 @@ export class ARCH extends Packager {
   }
 
   makeDepends(dependencies={}) {
+    if(Array.isArray(dependencies)) {
+      dependencies = Object.fromEntries(dependencies.map(d => {
+        const m = d.match(/^([^=<>]+)(.*)/)
+        return [m[1],m[2]];
+      }));
+    }
     return Object.entries(dependencies)
       .filter(filterOutUnwantedDependencies())
       .map(
@@ -146,7 +152,7 @@ export class ARCH extends Packager {
       yield `
 package() {
   depends=(${self
-    .makeDepends(properties.dependencies)
+    .makeDepends(properties.depends)
     .map(v => quote(v))
     .join(" ")})
 
@@ -267,7 +273,7 @@ const fields = {
   groups: default_array_attribute,
   arch: { ...default_array_attribute, default: ["any"], mandatory: true },
   backup: default_array_attribute,
-  depends: default_array_attribute,
+  //depends: default_array_attribute,
   makedepends: default_attribute,
   checkdepends: default_attribute,
   optdepends: default_attribute,

package/types/output/arch.d.mts

@@ -94,9 +94,6 @@ export class ARCH extends Packager {
         backup: {
             type: string;
         };
-        depends: {
-            type: string;
-        };
         makedepends: {
             type: string;
         };