npm-pkgbuild 10.19.2 → 10.19.4

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "npm-pkgbuild",
-  "version": "10.19.2",
+  "version": "10.19.4",
   "publishConfig": {
     "access": "public"
   },
-  "sideEffects": false,
   "exports": {
     ".": "./src/module.mjs"
   },
@@ -43,7 +42,7 @@
     "@npmcli/arborist": "^6.1.6",
     "@vercel/nft": "^0.22.5",
     "aggregate-async-iterator": "^1.1.15",
-    "commander": "^9.5.0",
+    "commander": "^10.0.0",
     "content-entry": "^5.2.16",
     "content-entry-filesystem": "^5.2.13",
     "content-entry-transform": "^1.4.27",
@@ -61,14 +60,14 @@
     "tar-stream": "^3.0.0"
   },
   "devDependencies": {
-    "ava": "^5.1.0",
+    "ava": "^5.1.1",
     "c8": "^7.12.0",
     "documentation": "^14.0.1",
     "semantic-release": "^20.0.2",
     "stream-buffers": "^3.0.2"
   },
   "engines": {
-    "node": ">=16.17.1"
+    "node": ">=16.19.0"
   },
   "repository": {
     "type": "git",

package/src/extract-from-package.mjs

@@ -2,7 +2,7 @@ import { join, resolve } from "node:path";
 import { packageDirectory } from "pkg-dir";
 import { packageWalker } from "npm-package-walker";
 import { createContext } from "expression-expander";
-import { asArray, utf8StreamOptions } from "./util.mjs";
+import { asArray } from "./util.mjs";
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
 import { NodeModulesContentProvider } from "./content/node-modules-content-provider.mjs";
 import { FileContentProvider } from "./content/file-content-provider.mjs";
@@ -191,6 +191,12 @@ export async function* extractFromPackage(options = {}, env = {}) {
       if (modulePath.length >= 1) {
         fragment.parent =
           modulePath.length === 1 ? parent : modulePath[modulePath.length - 2];
+        /*console.log(
+          "FRAGMENT",
+          fragment.name,
+          fragment.parent,
+          fragments[fragment.parent] ? "exists" : "missing"
+        );*/
       } else {
         if (properties.name) {
           properties.name = properties.name.replace(/^\@[^\/]+\//, "");
@@ -218,7 +224,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
       fragment.properties = properties;
       fragment.dir = join(base, ...modulePath.map(p => `node_modules/${p}`));
 
-      fragments[packageContent.name] = fragment;
+      fragments[fragment.name] = fragment;
 
       if (pkgbuild.variant) {
         fragment.priority = 1;
@@ -228,8 +234,8 @@ export async function* extractFromPackage(options = {}, env = {}) {
       if (modulePath.length === 0) {
         root = fragment;
       }
+      parent = fragment.name;
     }
-    parent = packageContent.name;
 
     return true;
   }, await packageDirectory({ cwd: options.dir }));
@@ -237,9 +243,13 @@ export async function* extractFromPackage(options = {}, env = {}) {
   if (root && Object.keys(variants).length === 0) {
     variants.default = root;
   }
+  /*
+  console.log("FRAGMENTS", Object.keys(fragments));
+  console.log("VARIANTS", variants);
+  */
 
   for (const [name, variant] of Object.entries(variants)) {
-    let arch = [...variant.arch];
+    let arch = variant.arch;
     const properties = {};
     const depends = {};
     const output = {};
@@ -262,8 +272,6 @@ export async function* extractFromPackage(options = {}, env = {}) {
       );
     }
 
-    arch = [...arch].sort();
-
     properties.variant = name;
 
     const context = createContext({ properties });
@@ -277,10 +285,19 @@ export async function* extractFromPackage(options = {}, env = {}) {
       properties: context.expand(properties)
     };
 
-    if (arch.length === 0) {
+    console.log(
+      "RESULT",
+      result.variant,
+      result.properties,
+      sources,
+      output,
+      arch
+    );
+
+    if (arch.size === 0) {
       yield result;
     } else {
-      for (const a of arch) {
+      for (const a of [...arch].sort()) {
         if (variant.restrictArch.size && !variant.restrictArch.has(a)) {
           console.log("RESTRICT", a);
         } else {