npm-pkgbuild 8.1.2 → 8.2.2

package/README.md

@@ -36,7 +36,8 @@ You can specify the package content in package.json.
                 "type": "npm-pack"
                 },
                 {
-                "type": "node-modules"
+                "type": "node-modules",
+                "withoutDevelpmentDependencies": true
                 }
             ]
 		},
@@ -65,6 +66,10 @@ content as provided by npm pack
 
 content of all (production) dependencies
 
+options:
+    - withoutDevelpmentDependencies when to stip away dev dependencies
+
+
 # API
 
 <!-- Generated by documentation.js. Update this documentation by updating the source code. -->

package/package.json

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

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

@@ -27,7 +27,7 @@ export class NodeModulesContentProvider extends ContentProvider {
 
   constructor(definitions, entryProperties) {
     super();
-    Object.assign(this, definitions);
+    Object.assign(this, { withoutDevelpmentDependencies: true }, definitions);
     this.entryProperties = entryProperties;
   }
 
@@ -36,51 +36,65 @@ export class NodeModulesContentProvider extends ContentProvider {
   }
 
   async *[Symbol.asyncIterator]() {
-    const tmp = await mkdtemp(join(tmpdir(), "node-modules"));
+    let pkgSourceDir = this.dir;
 
-    const json = JSON.parse(
-      await readFile(join(this.dir, "package.json"), utf8StreamOptions)
-    );
-    delete json.devDependencies;
-    await writeFile(
-      join(tmp, "package.json"),
-      JSON.stringify(json),
-      utf8StreamOptions
-    );
+    if (this.withoutDevelpmentDependencies) {
+      pkgSourceDir = await mkdtemp(join(tmpdir(), "node-modules"));
 
-    // TODO find .npmrc
-    const npmrc = parse(await readFile(join(homedir(), ".npmrc"), utf8StreamOptions));
-    const arb = new Arborist({ path: tmp, ...npmrc });
-    await arb.buildIdealTree({
-      update: true,
-      prune: true,
-      saveType: "prod"
-    });
-    await arb.prune({ saveType: "prod" });
-    await arb.reify({ save: true });
+      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
+      );
+
+      // TODO find .npmrc
+      const npmrc = parse(
+        await readFile(join(homedir(), ".npmrc"), utf8StreamOptions)
+      );
+      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: tmp
+      cwd: pkgSourceDir
     })) {
       if (!toBeSkipped.test(name)) {
         if (name.endsWith("package.json")) {
-          const json = shrinkNPM(
-            JSON.parse(await readFile(join(tmp, name), utf8StreamOptions)),
-            {}
-          );
-
-          if (json) {
-            yield Object.assign(
-              new StringContentEntry(name, JSON.stringify(json)),
-              this.entryProperties
+          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
+              );
+            }
+
+            continue;
+          } catch (e) {
+            console.error(e, name);
           }
-        } else {
-          yield Object.assign(
-            new FileSystemEntry(name, tmp),
-            this.entryProperties
-          );
         }
+        
+        yield Object.assign(
+          new FileSystemEntry(name, pkgSourceDir),
+          this.entryProperties
+        );
       }
     }
   }

package/src/output/arch.mjs

@@ -18,7 +18,8 @@ import {
   copyEntries,
   fieldProvider,
   quote,
-  utf8StreamOptions
+  utf8StreamOptions,
+  packageNameMapping
 } from "../util.mjs";
 
 /**
@@ -200,9 +201,6 @@ const fields = {
   options: { type: "string[]" }
 };
 
-const mapping = {
-  node: "nodejs"
-};
 
 function normalizeExpression(e) {
   e = e.replace(/\-([\w\d]+)$/, "");
@@ -216,6 +214,6 @@ function normalizeExpression(e) {
 function makeDepends(dependencies) {
   return Object.entries(dependencies).map(
     ([name, version]) =>
-      `${mapping[name] ? mapping[name] : name}${normalizeExpression(version)}`
+      `${packageNameMapping[name] ? packageNameMapping[name] : name}${normalizeExpression(version)}`
   );
 }

package/src/output/debian.mjs

@@ -17,7 +17,8 @@ import {
   copyEntries,
   fieldProvider,
   extractFunctions,
-  utf8StreamOptions
+  utf8StreamOptions,
+  packageNameMapping
 } from "../util.mjs";
 
 /**
@@ -93,7 +94,7 @@ export class DEBIAN extends Packager {
     );
 
     properties.Depends = Object.entries(dependencies).map(
-      ([n, e]) => `${n} (${e})`
+      ([name, e]) => `${packageNameMapping[name] ? packageNameMapping[name] : name} (${e})`
     );
 
     const fp = fieldProvider(properties, fields);

package/src/output/rpm.mjs

@@ -14,7 +14,8 @@ import {
   copyEntries,
   fieldProvider,
   utf8StreamOptions,
-  extractFunctions
+  extractFunctions,
+  packageNameMapping
 } from "../util.mjs";
 
 /**
@@ -76,7 +77,9 @@ export class RPM extends Packager {
 
     properties.Requires = Object.entries(dependencies).map(
       ([name, e]) =>
-        `${name} ${e.replace(/([<=>])\d/, (match, p1) => `${p1} `)}`
+        `${
+          packageNameMapping[name] ? packageNameMapping[name] : name
+        } ${e.replace(/([<=>])\d/, (match, p1) => `${p1} `)}`
     );
 
     const specFileName = `${properties.name}.spec`;
@@ -169,7 +172,6 @@ export class RPM extends Packager {
   }
 }
 
-
 const pkglist = { type: "string[]" };
 /**
  * @see https://rpm-packaging-guide.github.io
@@ -195,4 +197,3 @@ const fields = {
   Obsoletes: pkglist,
   Conflicts: pkglist
 };
-

package/src/util.mjs

@@ -5,6 +5,13 @@ import { createWriteStream } from "fs";
 
 export const utf8StreamOptions = { encoding: "utf8" };
 
+/**
+ * what is the node name in the package eco-system
+ */
+ export const packageNameMapping = {
+  node: "nodejs"
+};
+
 /**
  * Decode a password
  * @param {string} password