npm-pkgbuild 13.0.21 → 13.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "13.0.21",
+  "version": "13.1.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -39,7 +39,7 @@
     "npm-pkgbuild": "src/npm-pkgbuild-cli.mjs"
   },
   "scripts": {
-    "prepare": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types -t esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs --rootDir src",
+    "prepare": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types -t esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
     "test": "npm run test:ava",
     "test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",

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

@@ -11,8 +11,8 @@ import { utf8StreamOptions } from "../util.mjs";
 import { shrinkNPM } from "../npm-shrink.mjs";
 
 /**
- * Content from node_modules
- * 
+ * Content from node_modules.
+ * Requires .npmrc or NPM_TOKEN environment
  * @property {boolean} withoutDevelpmentDependencies
  */
 export class NodeModulesContentProvider extends ContentProvider {
@@ -71,7 +71,7 @@ export class NodeModulesContentProvider extends ContentProvider {
           if (process.env.NPM_TOKEN) {
             npmrc["_authToken"] = process.env.NPM_TOKEN;
           } else {
-            throw new Error(`.npmrc not found in ${searchDirs}`);
+            throw new Error(`.npmrc not found in ${searchDirs} (neither NPM_TOKEN in envinronment)`);
           }
         }
 

package/src/extract-from-package.mjs

@@ -350,14 +350,29 @@ export async function* extractFromPackage(options = {}, env = {}) {
       arch
     );*/
 
+    function* forEachOutput(result) {
+      if (Object.entries(result.output).length === 0) {
+        yield result;
+      }
+
+      for (const [name, output] of Object.entries(result.output)) {
+        yield {
+          ...result,
+          variant: { ...result.variant, output: name },
+          output: { [name]: output },
+          properties: { ...result.properties, ...output.properties }
+        };
+      }
+    }
+
     if (arch.size === 0) {
-      yield result;
+      yield* forEachOutput(result);
     } else {
       for (const a of [...arch].sort()) {
         if (variant.restrictArch.size === 0 || variant.restrictArch.has(a)) {
           result.variant.arch = a;
           result.properties.arch = [a];
-          yield result;
+          yield* forEachOutput(result);
         }
       }
     }

package/src/npm-pkgbuild-cli.mjs

@@ -88,7 +88,7 @@ program
           try {
             Object.assign(
               properties,
-              output[outputFactory.name],
+              output?.[outputFactory.name]?.properties,
               {
                 type: outputFactory.name,
                 "user-agent": `npm-pkgbuild-${version}`
@@ -130,7 +130,7 @@ program
               console.log("  " + sources.join("\n  "));
               console.log("dependencies:");
               console.log(kv(dependencies, "  "));
-              console.log(kv(output.properties));
+              console.log(kv(output));
             }
 
             const fileName = await o.execute(

package/types/content/node-modules-content-provider.d.mts

@@ -1,6 +1,6 @@
 /**
- * Content from node_modules
- *
+ * Content from node_modules.
+ * Requires .npmrc or NPM_TOKEN environment
  * @property {boolean} withoutDevelpmentDependencies
  */
 export class NodeModulesContentProvider extends ContentProvider {