npm-pkgbuild 22.0.1 → 22.0.3

package/README.md

@@ -97,49 +97,49 @@ 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)
-    *   [propertiesFor](#propertiesfor)
-        *   [Parameters](#parameters-3)
+    *   [name](#name)
+*   [NodeModulesContentProvider](#nodemodulescontentprovider)
+    *   [Parameters](#parameters-3)
+    *   [Properties](#properties-2)
     *   [asyncIterator](#asynciterator)
+    *   [name](#name-1)
 *   [FileContentProvider](#filecontentprovider)
     *   [Parameters](#parameters-4)
     *   [asyncIterator](#asynciterator-1)
-    *   [name](#name)
-*   [NodeModulesContentProvider](#nodemodulescontentprovider)
+    *   [name](#name-2)
+*   [NFTContentProvider](#nftcontentprovider)
     *   [Parameters](#parameters-5)
-    *   [Properties](#properties-2)
     *   [asyncIterator](#asynciterator-2)
-    *   [name](#name-1)
-*   [NPMPackContentProvider](#npmpackcontentprovider)
+    *   [name](#name-3)
+*   [ContentProvider](#contentprovider)
     *   [Parameters](#parameters-6)
     *   [Properties](#properties-3)
-    *   [name](#name-2)
-*   [NFTContentProvider](#nftcontentprovider)
-    *   [Parameters](#parameters-7)
+    *   [propertiesFor](#propertiesfor)
+        *   [Parameters](#parameters-7)
     *   [asyncIterator](#asynciterator-3)
-    *   [name](#name-3)
 *   [DEBIAN](#debian)
     *   [hookMapping](#hookmapping)
     *   [attributes](#attributes)
     *   [prepare](#prepare)
         *   [Parameters](#parameters-8)
+*   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
+*   [attributes](#attributes-1)
 *   [quoteFile](#quotefile)
     *   [Parameters](#parameters-9)
 *   [RPM](#rpm)
     *   [hookMapping](#hookmapping-1)
-    *   [attributes](#attributes-1)
+    *   [attributes](#attributes-2)
     *   [prepare](#prepare-1)
         *   [Parameters](#parameters-10)
-*   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
-*   [attributes](#attributes-2)
 *   [OCI](#oci)
 *   [DOCKER](#docker)
     *   [attributes](#attributes-3)
     *   [prepare](#prepare-2)
         *   [Parameters](#parameters-11)
+*   [BUILDAH](#buildah)
 *   [Packager](#packager)
     *   [Parameters](#parameters-12)
     *   [packageName](#packagename)
@@ -257,57 +257,21 @@ 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
 
 ### Properties
 
 *   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 
-### propertiesFor
-
-#### Parameters
-
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
-*   `isCollection` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
-
-Returns **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))**&#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
@@ -322,8 +286,6 @@ Requires .npmrc or NPM\_TOKEN environment
 ### Parameters
 
 *   `definitions` &#x20;
-*   `entryProperties` &#x20;
-*   `directoryProperties` &#x20;
 
 ### Properties
 
@@ -339,21 +301,19 @@ 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
-*   `directoryProperties` &#x20;
+*   `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;
 
-### Properties
+### asyncIterator
 
-*   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
 
 ### name
 
@@ -368,8 +328,6 @@ 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` **[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;
 
 ### asyncIterator
 
@@ -379,6 +337,33 @@ 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;
+
+### Properties
+
+*   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+### propertiesFor
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `isCollection` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
+
+Returns **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))**&#x20;
+
+### asyncIterator
+
+List all entries.
+
+Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
+
 ## DEBIAN
 
 **Extends Packager**
@@ -405,6 +390,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
@@ -438,15 +432,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**
@@ -476,6 +461,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": "22.0.1",
+  "version": "22.0.3",
   "publishConfig": {
     "access": "public",
     "provenance": false

package/src/content/content-provider.mjs

@@ -4,9 +4,13 @@ import { ContentEntry, CollectionEntry } from "content-entry";
 /**
  * Source of package content.
  * @property {string} dir
+ * @property {string} destination
+ * @property {Object} defaultProperties
+ * @property {Map<Object,Object>} permissions
  */
 export class ContentProvider {
   dir;
+  defaultProperties;
 
   /**
    *
@@ -25,10 +29,15 @@ export class ContentProvider {
       ) {
         Object.assign(this.defaultProperties, definitions.permissions);
       } else {
+        const entries = definitions.permissions.entries
+          ? definitions.permissions.entries()
+          : Object.entries(definitions.permissions);
+
         this.permissions = new Map(
-          Object.entries(definitions.permissions).map(
-            ([pattern, properties]) => [picomatch(pattern), properties]
-          )
+          entries.map(([pattern, properties]) => [
+            picomatch(pattern),
+            properties
+          ])
         );
       }
     }
@@ -46,12 +55,18 @@ export class ContentProvider {
    *
    * @param {string} name
    * @param {boolean} isCollection
-   * @returns {Object|undefined}
+   * @returns {Object}
    */
   propertiesFor(name, isCollection) {
     if (this.permissions) {
       for (const [matcher, properties] of this.permissions) {
         if (matcher(name)) {
+          /*console.log("A",name, {
+            mode: properties.mode,
+            user: properties.user,
+            group: properties.group,
+            destination: this.destination
+          });*/
           return isCollection && properties.collection
             ? { ...properties.collection, destination: this.destination }
             : { ...properties, destination: this.destination };

package/src/output/alpm.mjs

@@ -241,7 +241,7 @@ package() {
 
   if [ "$(ls -A $srcdir)" ]
   then
-    cp -rp $srcdir/* "$pkgdir"
+    #cp -rp $srcdir/* "$pkgdir"
 ### PERMISSION ###
 
     ${verbose}
@@ -271,48 +271,48 @@ package() {
       createEntryWhenMissing: () => new ContentEntry(PKGBUILD)
     });
 
-    const permissions = [];
+    const install = [];
 
     for await (const file of copyEntries(
       transform(aggregate(sources), transformer),
       join(staging, "src"),
       expander
     )) {
-      if (file.user || file.group || file.mode) {
-        permissions.push(file);
+      const flags = {
+        user: ["-u", value => value],
+        group: ["-g", value => value],
+        mode: ["-m", value => Number(value & 0o7777).toString(8)]
+      };
+
+      const options = [];
+      for (const [name, config] of Object.entries(flags)) {
+        const value = await file[name];
+
+        if (value !== undefined) {
+          options.push(`${config[0]} ${config[1](value)}`);
+        }
       }
+      install.push(
+        `    install ${file.isBlob ? "-D" : "-d"} ${options.join(" ")} \"$srcdir/${file.name}\" \"$pkgdir/${file.destination}\"`
+      );
 
       if (options.verbose) {
         console.log(file.destination);
       }
     }
 
-    if (permissions.length) {
+    if (install.length) {
       const pkgbuild = join(staging, PKGBUILD);
-      let content = await readFile(pkgbuild, utf8StreamOptions);
+      const content = await readFile(pkgbuild, utf8StreamOptions);
       const markerPos = content.indexOf("### PERMISSION ###");
 
-      const flags = {
-        user: ["-u", f => f.user],
-        group: ["-g", f => f.group],
-        mode: ["-m", f => Number(f.mode & 0o7777).toString(8)] // TODO why only 12 bits
-      };
-
-      content =
+      await writeFile(
+        pkgbuild,
         content.substring(0, markerPos) +
-        permissions
-          .filter(f => f.isBlob)
-          .map(f => {
-            const options = Object.keys(flags)
-              .filter(name => f[name])
-              .map(name => `${flags[name][0]} ${flags[name][1](f)}`)
-              .join(" ");
-            return `    install -D ${options} \"$srcdir/${f.name}\" \"$pkgdir/${f.destination}\"`;
-          })
-          .join("\n") +
-        content.substring(markerPos + 18);
-
-      await writeFile(pkgbuild, content, utf8StreamOptions);
+          install.join("\n") +
+          content.substring(markerPos + 18),
+        utf8StreamOptions
+      );
     }
 
     if (options.verbose) {