npm-pkgbuild 15.3.18 → 15.3.20

package/README.md

@@ -97,24 +97,24 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [FileContentProvider](#filecontentprovider)
     *   [Parameters](#parameters-1)
     *   [name](#name)
-*   [NFTContentProvider](#nftcontentprovider)
-    *   [Parameters](#parameters-2)
-    *   [name](#name-1)
 *   [utf8StreamOptions](#utf8streamoptions)
     *   [Properties](#properties-1)
 *   [packageNameMapping](#packagenamemapping)
 *   [decodePassword](#decodepassword)
-    *   [Parameters](#parameters-3)
+    *   [Parameters](#parameters-2)
 *   [FunctionDecl](#functiondecl)
     *   [Properties](#properties-2)
 *   [extractFunctions](#extractfunctions)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-3)
 *   [fieldProvider](#fieldprovider)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-4)
 *   [Expander](#expander)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-5)
 *   [copyEntries](#copyentries)
+    *   [Parameters](#parameters-6)
+*   [NFTContentProvider](#nftcontentprovider)
     *   [Parameters](#parameters-7)
+    *   [name](#name-1)
 *   [NodeModulesContentProvider](#nodemodulescontentprovider)
     *   [Parameters](#parameters-8)
     *   [Properties](#properties-3)
@@ -210,24 +210,6 @@ Content provided form the file system.
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
 
-## NFTContentProvider
-
-**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))** 
-
-    *   `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
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
-
 ## utf8StreamOptions
 
 Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
@@ -299,6 +281,24 @@ Destination paths a generated without leading '/' (as for entry names too).
 *   `destinationDirectory` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 *   `expander` **[Expander](#expander)**  (optional, default `v=>v`)
 
+## NFTContentProvider
+
+**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
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
+
 ## NodeModulesContentProvider
 
 **Extends ContentProvider**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "15.3.18",
+  "version": "15.3.20",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -82,8 +82,8 @@
     "typescript": "^5.4.5"
   },
   "engines": {
-    "node": ">=20.12.2",
-    "bun": ">=1.0"
+    "node": ">=20.14.0",
+    "bun": ">=1.1"
   },
   "repository": {
     "type": "git",

package/src/content/node-modules-content-provider.mjs

@@ -2,7 +2,6 @@ import { tmpdir, homedir } from "node:os";
 import { join } from "node:path";
 import { mkdtemp, readFile, writeFile } from "node:fs/promises";
 import { globby } from "globby";
-import { execa } from "execa";
 import Arborist from "@npmcli/arborist";
 import { parse } from "ini";
 import { StringContentEntry } from "content-entry";
@@ -116,14 +115,6 @@ export class NodeModulesContentProvider extends ContentProvider {
               console.error(e, name);
             }
           }
-          if (name.endsWith(".node")) {
-            const proc = await execa("file", ["-b", name], {
-              cwd: pkgSourceDir
-            });
-            const arch = proc.stdout.split(/\s*,\s*/)[1];
-            console.log(name, arch);
-          }
-
           yield Object.assign(
             new FileSystemEntry(name, pkgSourceDir),
             this.entryProperties

package/src/extract-from-package.mjs

@@ -85,13 +85,20 @@ function* content2Sources(content, dir) {
           delete definition.type;
           yield new type({ ...definition, dir }, entryProperties);
         } else {
-          console.error(`Unknown content provider '${type}'`);
+          throw new Error(`Unknown content provider '${type}'`);
         }
       } else {
-        if (typeof definition === "object") {
-          definition.base = definition.base ? join(dir, definition.base) : dir;
-        } else {
-          definition = join(dir, definition);
+        switch (typeof definition) {
+          case "object":
+            definition.base = definition.base
+              ? join(dir, definition.base)
+              : dir;
+            break;
+          case "string":
+            definition = join(dir, definition);
+            break;
+          default:
+            throw new Error(`Unsupported content value '${definition}'`);
         }
         yield new FileContentProvider(definition, entryProperties);
       }
@@ -253,7 +260,9 @@ export async function* extractFromPackage(options = {}, env = {}) {
         }
 
         if (packageContent.contributors) {
-          properties.maintainer = packageContent.contributors.map(c => `${c.name} <${c.email}>`);
+          properties.maintainer = packageContent.contributors.map(
+            c => `${c.name} <${c.email}>`
+          );
         }
 
         if (typeof packageContent.repository === "string") {

package/src/npm-pkgbuild-cli.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env -S node --no-warnings --title npm-pkgbuild
 
 import { program, Option } from "commander";
+import { execa } from "execa";
 import { createExpressionTransformer } from "content-entry-transform";
 import { UTIController } from "uti";
 import additionalUTIs from "./utis.mjs";
@@ -104,6 +105,23 @@ program
 
             const o = new outputFactory(context.expand(properties));
             const transformer = [
+              {
+                name: "skip-architecutes",
+                match: (entry) => entry.name.endsWith(".node"),
+                async transform(entry) {                  
+                  const proc = await execa("file", ["-b", entry.name], {
+                    cwd: options.dir
+                  });
+                  const arch = proc.stdout.split(/\s*,\s*/)[1];
+      
+                  if(arch === 'ARM aarch64') {
+                    return entry;
+                  }
+
+                  console.log('skip',entry.name, arch);
+                  return entry;
+                }
+              },
               createExpressionTransformer(
                 entry => uc.fileNameConformsTo(entry.name, "public.text") && !uc.fileNameConformsTo(entry.name, "com.netscape.javascript-source"),
                 properties