npm-pkgbuild 20.1.2 → 20.2.1

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)
@@ -226,6 +226,8 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 *   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** values describing the package attributes
 
     *   `properties.dependencies` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+    *   `properties.replaces` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+    *   `properties.conficts` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 *   `sources` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[ContentProvider](#contentprovider)>** content providers
 *   `output` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** package type
 *   `variant` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** identifier of the variant
@@ -252,48 +254,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
@@ -325,21 +301,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
 
@@ -365,6 +341,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**
@@ -391,6 +387,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
@@ -424,15 +429,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**
@@ -462,6 +458,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,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.1.2",
+  "version": "20.2.1",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -59,19 +59,19 @@
     "compare-versions": "^6.1.1",
     "content-entry": "^14.2.7",
     "content-entry-filesystem": "^9.0.14",
-    "content-entry-transform": "^1.6.0",
+    "content-entry-transform": "^1.6.1",
     "execa": "^9.6.0",
     "expression-expander": "^7.2.8",
     "ini": "^6.0.0",
-    "iterable-string-interceptor": "^3.0.5",
+    "iterable-string-interceptor": "^3.0.6",
     "key-value-transformer": "^3.3.1",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^10.0.3",
-    "pacc": "^8.0.3",
+    "pacc": "^8.0.4",
     "package-directory": "^8.1.0",
     "pacote": "^21.0.4",
     "tar-stream": "^3.1.7",
-    "uti": "^8.10.3"
+    "uti": "^8.10.5"
   },
   "devDependencies": {
     "@types/node": "^25.0.9",

package/src/content/file-content-provider.mjs

@@ -28,8 +28,8 @@ export class FileContentProvider extends ContentProvider {
   /**
    * Content provided form the file system.
    * @param {Object|string} definitions
-   * @param {string|string[]} [definitions.pattern]
    * @param {string} [definitions.dir] base directory where to find the files
+   * @param {string|string[]} [definitions.pattern]
    */
   constructor(definitions, entryProperties, directoryProperties) {
     super(definitions, entryProperties, directoryProperties);

package/src/extract-from-package.mjs

@@ -109,6 +109,7 @@ function* content2Sources(content, dir) {
  * @property {Object} properties values describing the package attributes
  * @property {Object} properties.dependencies
  * @property {Object} properties.replaces
+ * @property {Object} properties.conficts
  * @property {ContentProvider[]} sources content providers
  * @property {Object} output package type
  * @property {Object} variant identifier of the variant
@@ -154,6 +155,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
           priority: 1,
           dependencies: packageContent.engines || {},
           replaces: {},
+          conflicts: {},
           arch: new Set(),
           restrictArch: new Set()
         };
@@ -223,7 +225,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
           }
         }
 
-        for (const k of ["output", "content", "dependencies", "replaces"]) {
+        for (const k of ["output", "content", "dependencies", "replaces", "conflicts"]) {
           if (pkgbuild[k]) {
             fragment[k] = pkgbuild[k];
             delete pkgbuild[k];
@@ -308,6 +310,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
     let properties = {};
     let dependencies = {};
     let replaces = {};
+    let conflicts = {};
     const output = {};
     const content = [];
 
@@ -340,6 +343,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
         properties = { ...fragment.properties, ...properties };
         dependencies = mergeDependencies(dependencies, fragment.dependencies);
         replaces = mergeDependencies(replaces, fragment.replaces);
+        conflicts = mergeDependencies(conflicts, fragment.conflicts);
         Object.assign(output, fragment.output);
         for (const def of Object.values(output)) {
           if (def.content && !def.dir) {
@@ -358,6 +362,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
     Object.assign(properties, root.properties);
     delete properties.dependencies;
     delete properties.replaces;
+    delete properties.conflicts;
 
     properties.variant = name;
 
@@ -367,6 +372,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
       output,
       dependencies,
       replaces,
+      conflicts,
       properties
     };
 
@@ -399,7 +405,8 @@ export async function* extractFromPackage(options = {}, env = {}) {
             result.dependencies,
             output.dependencies
           ),
-          replaces: mergeDependencies(result.replaces, output.replaces)
+          replaces: mergeDependencies(result.replaces, output.replaces),
+          conflicts: mergeDependencies(result.conflicts, output.conflicts)
         };
 
         const context = createContext({ properties });

package/src/output/packager.mjs

@@ -286,19 +286,14 @@ export const dependency_type = {
         return value;
     }
 
-    if (value === undefined) {
-      return undefined;
-    }
-
     if (Array.isArray(value)) {
-      return value.join(attribute.separator);
+      return value;
     }
 
     return Object.entries(value)
       .map(([name, expression]) =>
         typeof expression === "string" ? `${name}${expression}` : name
-      )
-      .join(attribute.separator);
+      );
   }
 };
 

package/types/content/file-content-provider.d.mts

@@ -6,8 +6,8 @@ export class FileContentProvider extends ContentProvider {
     /**
      * Content provided form the file system.
      * @param {Object|string} definitions
-     * @param {string|string[]} [definitions.pattern]
      * @param {string} [definitions.dir] base directory where to find the files
+     * @param {string|string[]} [definitions.pattern]
      */
     constructor(definitions: any | string, entryProperties: any, directoryProperties: any);
     pattern: string[];

package/types/extract-from-package.d.mts

@@ -3,6 +3,7 @@
  * @property {Object} properties values describing the package attributes
  * @property {Object} properties.dependencies
  * @property {Object} properties.replaces
+ * @property {Object} properties.conficts
  * @property {ContentProvider[]} sources content providers
  * @property {Object} output package type
  * @property {Object} variant identifier of the variant
@@ -52,6 +53,7 @@ export type PackageDefinition = {
     properties: {
         dependencies: any;
         replaces: any;
+        conficts: any;
     };
     /**
      * content providers

package/types/output/arch.d.mts

@@ -248,7 +248,7 @@ export class ARCH extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -275,7 +275,7 @@ export class ARCH extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -302,7 +302,7 @@ export class ARCH extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -329,7 +329,7 @@ export class ARCH extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -356,7 +356,7 @@ export class ARCH extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -383,7 +383,7 @@ export class ARCH extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -410,7 +410,7 @@ export class ARCH extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;

package/types/output/debian.d.mts

@@ -199,7 +199,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -226,7 +226,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -253,7 +253,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -280,7 +280,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -307,7 +307,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -334,7 +334,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -361,7 +361,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -388,7 +388,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -415,7 +415,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;
@@ -442,7 +442,7 @@ export class DEBIAN extends Packager {
             type: {
                 name: string;
                 primitive: boolean;
-                toExternal: (value: any, attribute: any) => string;
+                toExternal: (value: any, attribute: any) => string | any[];
             };
             writable: boolean;
             collection: boolean;

package/types/output/packager.d.mts

@@ -113,13 +113,13 @@ export const pkgbuild_name_attribute: {
 export namespace dependency_type {
     let name: string;
     let primitive: boolean;
-    function toExternal(value: any, attribute: any): string;
+    function toExternal(value: any, attribute: any): string | any[];
 }
 export const dependency_attribute_collection_writable: {
     type: {
         name: string;
         primitive: boolean;
-        toExternal: (value: any, attribute: any) => string;
+        toExternal: (value: any, attribute: any) => string | any[];
     };
     writable: boolean;
     collection: boolean;