npm-pkgbuild 20.4.2 → 20.5.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)
-*   [NPMPackContentProvider](#npmpackcontentprovider)
+*   [BUILDAH](#buildah)
+*   [ContentProvider](#contentprovider)
     *   [Parameters](#parameters-2)
     *   [Properties](#properties-1)
+    *   [asyncIterator](#asynciterator)
+*   [FileContentProvider](#filecontentprovider)
+    *   [Parameters](#parameters-3)
+    *   [asyncIterator](#asynciterator-1)
     *   [name](#name)
 *   [NodeModulesContentProvider](#nodemodulescontentprovider)
-    *   [Parameters](#parameters-3)
+    *   [Parameters](#parameters-4)
     *   [Properties](#properties-2)
-    *   [asyncIterator](#asynciterator)
+    *   [asyncIterator](#asynciterator-2)
     *   [name](#name-1)
-*   [FileContentProvider](#filecontentprovider)
-    *   [Parameters](#parameters-4)
-    *   [asyncIterator](#asynciterator-1)
+*   [NPMPackContentProvider](#npmpackcontentprovider)
+    *   [Parameters](#parameters-5)
+    *   [Properties](#properties-3)
     *   [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-2)
+    *   [attributes](#attributes-1)
     *   [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,22 +256,48 @@ Extract package definition from package.json.
 
 Returns **AsyncIterable<[PackageDefinition](#packagedefinition)>**&#x20;
 
-## NPMPackContentProvider
+## BUILDAH
 
-**Extends ContentProvider**
+**Extends DOCKER**
 
-Content from npm pack.
+Use buildah @see <https://buildah.io>
+
+## 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)** to be set for each entry
-*   `directoryProperties` &#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
+
+## 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
@@ -303,21 +329,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
 
-## FileContentProvider
+## NPMPackContentProvider
 
 **Extends ContentProvider**
 
-Content provided form the file system.
+Content from npm pack.
 
 ### 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;
+*   `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;
 
-### asyncIterator
+### Properties
 
-Returns **AsyncIterable<(ContentEntry | CollectionEntry)>** all entries
+*   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 
 ### name
 
@@ -343,26 +369,6 @@ 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**
@@ -389,15 +395,6 @@ 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
@@ -431,6 +428,15 @@ 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**
@@ -460,12 +466,6 @@ 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
@@ -486,7 +486,7 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Generate hook content entries
 
-Returns **AsyncIterable\<ContentEntry>**&#x20;
+Returns **AsyncIterable\<StringContentEntry>**&#x20;
 
 ### dependencyExpression
 
@@ -569,7 +569,7 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Generate hook content entries
 
-Returns **AsyncIterable\<ContentEntry>**&#x20;
+Returns **AsyncIterable\<StringContentEntry>**&#x20;
 
 ### dependencyExpression
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.4.2",
+  "version": "20.5.0",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -59,7 +59,7 @@
     "compare-versions": "^6.1.1",
     "content-entry": "^14.2.7",
     "content-entry-filesystem": "^9.0.14",
-    "content-entry-transform": "^1.6.3",
+    "content-entry-transform": "^1.6.4",
     "execa": "^9.6.0",
     "ini": "^6.0.0",
     "iterable-string-interceptor": "^3.0.6",
@@ -68,12 +68,12 @@
     "npm-packlist": "^10.0.3",
     "pacc": "^8.7.0",
     "package-directory": "^8.2.0",
-    "pacote": "^21.1.0",
+    "pacote": "^21.2.0",
     "tar-stream": "^3.1.7",
-    "uti": "^8.10.5"
+    "uti": "^8.10.6"
   },
   "devDependencies": {
-    "@types/node": "^25.2.0",
+    "@types/node": "^25.2.1",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/npm-pkgbuild-cli.mjs

@@ -18,8 +18,8 @@ import pkg from "../package.json" with { type: "json" };
 program.description(pkg.description).version(pkg.version);
 
 allOutputs.forEach(o => {
-  for(const name of [o.name,o.alias]) {
-    if(name) {
+  for (const name of [o.name, o.alias]) {
+    if (name) {
       program.option(`--${name}`, o.description);
       program.option(`--no-${name}`, `do not ${o.description} output`);
     }
@@ -33,7 +33,7 @@ allInputs.forEach(i => {
 program
   .option("--verbose", "be more verbose", false)
   .option("--dry", "do not execute, only print definitions", false)
-  .option("--staging <dir>","directory where to start packaging process")
+  .option("--staging <dir>", "directory where to start packaging process")
   .option("-D --define <a=b>", "define property", (str, former = {}) =>
     Object.assign(former, Object.fromEntries([str.split(/=/)]))
   )
@@ -61,7 +61,7 @@ program
         properties,
         sources,
         output,
-        variant,
+        variant
       } of extractFromPackage(options, process.env)) {
         for (const inputFactory of allInputs.filter(
           inputFactory => options[inputFactory.name] === true
@@ -111,35 +111,50 @@ program
 
             const o = new outputFactory(expand(properties, context));
             const transformer = [
-              { name: "skip-bare-modules",
-                match: entry => entry.isBlob && uc.fileNameConformsTo(entry.name, "public.bare-dynamic-link-library"),
+              {
+                name: "skip-bare-modules",
+                match: entry =>
+                  entry.isBlob &&
+                  uc.fileNameConformsTo(
+                    entry.name,
+                    "public.bare-dynamic-link-library"
+                  ),
                 async transform(entry) {}
               },
               {
-                name: "skip-architecutes",
-                match: (entry) => entry.name.endsWith(".node") && entry.filename,
-                async transform(entry) {                  
-                  const proc = await execa("file", ["-b", entry.filename], {
-                    cwd: options.dir
-                  });
-                  const parts = proc.stdout.split(/\s*,\s*/);
-      
-                  if(parts.length < 4 || (parts.length > 4 && !parts[4].match(/Android/i))) {
-                    let arch = parts[1];
-      
-                    const archs = { "ARM aarch64" : "aarch64" };
-                    arch = archs[arch] || arch;
-
-                    if(properties.arch.indexOf(arch) >= 0) {
-                      return entry;
+                name: "skip-architectures",
+                match: entry => entry.name.endsWith(".node") && entry.filename,
+                async transform(entry) {
+                  if (properties.arch) {
+                    const proc = await execa("file", ["-b", entry.filename], {
+                      cwd: options.dir
+                    });
+                    const parts = proc.stdout.split(/\s*,\s*/);
+
+                    if (
+                      parts.length < 4 ||
+                      (parts.length > 4 && !parts[4].match(/Android/i))
+                    ) {
+                      let arch = parts[1];
+
+                      const archs = { "ARM aarch64": "aarch64" };
+                      arch = archs[arch] || arch;
+
+                      if (properties.arch.indexOf(arch) >= 0) {
+                        return entry;
+                      }
                     }
                   }
-  
+
                   //console.log("skip", entry.filename);
                 }
               },
               createExpressionTransformer(
-                entry => entry.isBlob && uc.fileNameConformsTo(entry.name, "public.text") && !uc.fileNameConformsTo(entry.name, "com.netscape.javascript-source"),
+                entry =>
+                  entry.isBlob &&
+                  uc.fileNameConformsTo(entry.name, "public.text") &&
+                  (!uc.fileNameConformsTo(entry.name, "public.source-code") ||
+                    uc.fileNameConformsTo(entry.name, "public.configuration")),
                 properties
               )
             ];
@@ -156,7 +171,10 @@ program
               console.log("  " + sources.join("\n  "));
               console.log("dependencies:");
               console.log(kv(properties.dependencies, "  "));
-              console.log("publish:", publishingDetails.map(pd=>pd.url));
+              console.log(
+                "publish:",
+                publishingDetails.map(pd => pd.url)
+              );
             }
 
             const artifact = await o.create(
@@ -164,7 +182,7 @@ program
               transformer,
               publishingDetails,
               options,
-              (object) => expand(object, context)
+              object => expand(object, context)
             );
 
             if (!options.dry) {

package/src/output/arch.mjs

@@ -255,7 +255,7 @@ package() {
         ownership
           .map(
             f =>
-              `    chown ${[f.owner || "", f.group || ""].join(
+              `    chown ${[f.owner ?? "", f.group ?? ""].join(
                 ":"
               )} \"$pkgdir/${f.destination}\"`
           )