npm-pkgbuild 10.4.0 → 10.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "10.4.0",
+  "version": "10.5.0",
   "publishConfig": {
     "access": "public"
   },

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

@@ -37,94 +37,90 @@ export class NodeModulesContentProvider extends ContentProvider {
 
   async *[Symbol.asyncIterator]() {
     try {
-    let pkgSourceDir = this.dir;
-
-    if (this.withoutDevelpmentDependencies) {
-      pkgSourceDir = await mkdtemp(join(tmpdir(), "node-modules"));
-
-      const json = JSON.parse(
-        await readFile(join(this.dir, "package.json"), utf8StreamOptions)
-      );
-      delete json.devDependencies;
-      await writeFile(
-        join(pkgSourceDir, "package.json"),
-        JSON.stringify(json),
-        utf8StreamOptions
-      );
-
-      let npmrcContent;
-
-      const searchDirs = [pkgSourceDir, homedir()];
-      for(const d of searchDirs) {
-        try {
-          npmrcContent = await readFile(join(d, ".npmrc"), utf8StreamOptions);
-          break;
-        }
-        catch {}
-      }
+      let pkgSourceDir = this.dir;
 
-      let npmrc = {};
-      
-      if(npmrcContent) {
-        npmrc = parse(npmrcContent);
-      }
-      else {
-        if(process.env.NPM_TOKEN) {
-          npmrc['_authToken'] = process.env.NPM_TOKEN;
+      if (this.withoutDevelpmentDependencies) {
+        pkgSourceDir = await mkdtemp(join(tmpdir(), "node-modules"));
+
+        const json = JSON.parse(
+          await readFile(join(this.dir, "package.json"), utf8StreamOptions)
+        );
+        delete json.devDependencies;
+        await writeFile(
+          join(pkgSourceDir, "package.json"),
+          JSON.stringify(json),
+          utf8StreamOptions
+        );
+
+        let npmrcContent;
+
+        const searchDirs = [pkgSourceDir, homedir()];
+        for (const d of searchDirs) {
+          try {
+            npmrcContent = await readFile(join(d, ".npmrc"), utf8StreamOptions);
+            break;
+          } catch {}
         }
-        else {
-          throw new Error(`.npmrc not found in ${searchDirs}`);
+
+        let npmrc = {};
+
+        if (npmrcContent) {
+          npmrc = parse(npmrcContent);
+        } else {
+          if (process.env.NPM_TOKEN) {
+            npmrc["_authToken"] = process.env.NPM_TOKEN;
+          } else {
+            throw new Error(`.npmrc not found in ${searchDirs}`);
+          }
         }
+
+        const arb = new Arborist({ path: pkgSourceDir, ...npmrc });
+        await arb.buildIdealTree({
+          update: true,
+          prune: true,
+          saveType: "prod"
+        });
+        await arb.prune({ saveType: "prod" });
+        await arb.reify({ save: true });
       }
-      
-      const arb = new Arborist({ path: pkgSourceDir, ...npmrc });
-      await arb.buildIdealTree({
-        update: true,
-        prune: true,
-        saveType: "prod"
-      });
-      await arb.prune({ saveType: "prod" });
-      await arb.reify({ save: true });
-    }
 
-    for (const name of await globby("node_modules/**/*", {
-      cwd: pkgSourceDir
-    })) {
-      if (!toBeSkipped.test(name)) {
-        if (name.endsWith("package.json")) {
-          try {
-            const json = shrinkNPM(
-              JSON.parse(
-                await readFile(join(pkgSourceDir, name), utf8StreamOptions)
-              ),
-              {}
-            );
-
-            if (json) {
-              yield Object.assign(
-                new StringContentEntry(name, JSON.stringify(json)),
-                this.entryProperties
+      for (const name of await globby("node_modules/**/*", {
+        cwd: pkgSourceDir
+      })) {
+        if (!toBeSkipped.test(name)) {
+          if (name.endsWith("package.json")) {
+            try {
+              const json = shrinkNPM(
+                JSON.parse(
+                  await readFile(join(pkgSourceDir, name), utf8StreamOptions)
+                ),
+                {}
               );
-            }
 
-            continue;
-          } catch (e) {
-            console.error(e, name);
+              if (json) {
+                yield Object.assign(
+                  new StringContentEntry(name, JSON.stringify(json)),
+                  this.entryProperties
+                );
+              }
+
+              continue;
+            } catch (e) {
+              console.error(e, name);
+            }
           }
+
+          yield Object.assign(
+            new FileSystemEntry(name, pkgSourceDir),
+            this.entryProperties
+          );
         }
-        
-        yield Object.assign(
-          new FileSystemEntry(name, pkgSourceDir),
-          this.entryProperties
-        );
       }
+    } catch (e) {
+      console.error(e);
+      throw e;
     }
   }
-  catch(e) {
-    console.error(e);
-  	throw e;
-  }
-  }
 }
 
 const toBeSkipped = new RegExp(

package/src/extract-from-package.mjs

@@ -31,7 +31,7 @@ export const npmArchMapping = {
 const entryAttributeNames = ["owner", "group", "mode"];
 
 /**
- * @typedef {Object} PackageDefinition 
+ * @typedef {Object} PackageDefinition
  * @property {Object} properties values describing the package attributes
  * @property {ContentProvider[]} sources content providers
  * @property {Object} dependencies
@@ -44,12 +44,13 @@ const entryAttributeNames = ["owner", "group", "mode"];
  * - for each architecture deliver a new result
  * - if not architecture is given one result set is provided nethertheless
  * - architectures are taken from cpu (node arch ids) and from pkgbuild.arch (raw arch ids)
- * - architecture given in a abstract definition are used to reduce the set of avaliable architectures 
+ * - architecture given in a abstract definition are used to reduce the set of avaliable architectures
  * @param {Object} pkg package.json content
  * @param {string} dir
+ * @param {Object} options
  * @returns {AsyncIter<PackageDefinition>}
  */
-export async function* extractFromPackage(json, dir) {
+export async function* extractFromPackage(json, dir, options = {}) {
   const properties = Object.fromEntries(
     ["name", "version", "description", "homepage", "license"]
       .map(key => [key, json[key]])
@@ -98,24 +99,24 @@ export async function* extractFromPackage(json, dir) {
   let output = {};
   let arch = new Set();
   let restrictArch = new Set();
-  
+
   const processPkg = (json, dir, modulePath) => {
     const pkg = json.pkgbuild;
 
     if (pkg) {
-      if(!modulePath) {
+      if (!modulePath) {
         if (json.cpu) {
           for (const a of asArray(json.cpu)) {
             arch.add(npmArchMapping[a]);
           }
         }
-        if(pkg.arch) {
-        	for(const a of asArray(pkg.arch)) {
-        	  arch.add(a);
-        	}
+        if (pkg.arch) {
+          for (const a of asArray(pkg.arch)) {
+            arch.add(a);
+          }
         }
       }
-      
+
       if (pkg.abstract || !modulePath) {
         if (pkg.variant) {
           variant = pkg.variant;
@@ -186,12 +187,23 @@ export async function* extractFromPackage(json, dir) {
 
   if (arch.size > 0) {
     // provide each arch separadly
+
+    let numberOfArchs = 0;
+
     for (const a of arch) {
-      if(!restrictArch.size || restrictArch.has(a)) {
-        properties.arch = [a];
-        yield { properties, sources, dependencies, output, variant };
+      if (!restrictArch.size || restrictArch.has(a)) {
+        if (options.available && npmArchMapping[process.arch] !== a) {
+          break;
+        } else {
+          numberOfArchs++;
+          properties.arch = [a];
+          yield { properties, sources, dependencies, output, variant };
+        }
       }
     }
+    if (numberOfArchs === 0) {
+      console.warn(`No matching arch remaining was ${[...arch]}`);
+    }
   } else {
     // or one set if no arch is given
     yield { properties, sources, dependencies, output, variant };

package/src/npm-pkgbuild-cli.mjs

@@ -38,7 +38,7 @@ program
     Object.assign(former, Object.fromEntries([str.split(/=/)]))
   )
   .option("-p --pkgdir <dir>", "which package to use", process.cwd())
-  .option("-a --available", "only excute availabe output methods", false)
+  .option("-a --available", "only execute availabe output methods", false)
   .option("--continue", "continue on error")
   .option(
     "-c --content <dir>",
@@ -85,7 +85,8 @@ program
         JSON.parse(
           await readFile(join(pkgDir, "package.json"), utf8StreamOptions)
         ),
-        pkgDir
+        pkgDir,
+        options
       )) {
         for (const inputFactory of allInputs.filter(
           inputFactory => options[inputFactory.name] === true