node-modules-tools 0.2.0 → 0.2.2

package/dist/chunks/index.mjs

@@ -3,15 +3,24 @@ import { x } from 'tinyexec';
 
 async function resolveRoot(options) {
   let raw;
-  try {
-    raw = (await x("pnpm", ["root", "-w"], { throwOnError: true, nodeOptions: { cwd: options.cwd } })).stdout.trim();
-  } catch {
+  if (options.workspace === false) {
     try {
       raw = (await x("pnpm", ["root"], { throwOnError: true, nodeOptions: { cwd: options.cwd } })).stdout.trim();
     } catch (err) {
       console.error("Failed to resolve root directory");
       console.error(err);
     }
+  } else {
+    try {
+      raw = (await x("pnpm", ["root", "-w"], { throwOnError: true, nodeOptions: { cwd: options.cwd } })).stdout.trim();
+    } catch {
+      try {
+        raw = (await x("pnpm", ["root"], { throwOnError: true, nodeOptions: { cwd: options.cwd } })).stdout.trim();
+      } catch (err) {
+        console.error("Failed to resolve root directory");
+        console.error(err);
+      }
+    }
   }
   return raw ? dirname(raw) : options.cwd;
 }
@@ -29,6 +38,8 @@ async function getDependenciesTree(options) {
   const args = ["ls", "--json", "--no-optional", "--depth", String(options.depth)];
   if (options.monorepo)
     args.push("--recursive");
+  if (options.workspace === false)
+    args.push("--ignore-workspace");
   const process = x("pnpm", args, {
     throwOnError: true,
     nodeOptions: {
@@ -36,7 +47,7 @@ async function getDependenciesTree(options) {
       cwd: options.cwd
     }
   });
-  const json = await import('./json-parse-stream.mjs').then((r) => r.parseJsonStream(process.process.stdout));
+  const json = await import('./json-parse-stream.mjs').then((r) => r.parseJsonStreamWithConcatArrays(process.process.stdout));
   if (!Array.isArray(json))
     throw new Error(`Failed to parse \`pnpm ls\` output, expected an array but got: ${String(json)}`);
   return json;

package/dist/chunks/json-parse-stream.mjs

@@ -833,5 +833,26 @@ function parseJsonStream(stream) {
     });
   });
 }
+function parseJsonStreamWithConcatArrays(stream) {
+  const assembler = new Assembler();
+  const parser = StreamJSON.parser({
+    jsonStreaming: true
+  });
+  const values = [];
+  return new Promise((resolve) => {
+    parser.on("data", (chunk) => {
+      assembler[chunk.name]?.(chunk.value);
+      if (assembler.done) {
+        if (!Array.isArray(assembler.current))
+          throw new Error(`Expected an array but got: ${String(assembler.current)}`);
+        values.push(...assembler.current);
+      }
+    });
+    stream.pipe(parser);
+    parser.on("end", () => {
+      resolve(values);
+    });
+  });
+}
 
-export { parseJsonStream };
+export { parseJsonStream, parseJsonStreamWithConcatArrays };

package/dist/index.d.mts

@@ -57,7 +57,10 @@ interface PackageNode extends PackageNodeBase {
         license?: string;
         author?: string;
         repository?: string;
-        funding?: string;
+        funding?: {
+            url?: string;
+            type?: string;
+        };
         homepage?: string;
         engines?: Record<string, string>;
         installSize?: PackageInstallSizeInfo;
@@ -78,6 +81,10 @@ interface ListPackageDependenciesOptions extends BaseOptions {
      * Filter if a package should be included and continue traversing
      */
     traverseFilter?: (node: PackageNodeRaw) => boolean;
+    /**
+     * Filter if workspace should be recognized
+     */
+    workspace?: boolean;
     /**
      * Filter whether a package's dependencies should be included
      */

package/dist/index.d.ts

@@ -57,7 +57,10 @@ interface PackageNode extends PackageNodeBase {
         license?: string;
         author?: string;
         repository?: string;
-        funding?: string;
+        funding?: {
+            url?: string;
+            type?: string;
+        };
         homepage?: string;
         engines?: Record<string, string>;
         installSize?: PackageInstallSizeInfo;
@@ -78,6 +81,10 @@ interface ListPackageDependenciesOptions extends BaseOptions {
      * Filter if a package should be included and continue traversing
      */
     traverseFilter?: (node: PackageNodeRaw) => boolean;
+    /**
+     * Filter if workspace should be recognized
+     */
+    workspace?: boolean;
     /**
      * Filter whether a package's dependencies should be included
      */

package/dist/index.mjs

@@ -298,12 +298,15 @@ async function resolvePackage(_packageManager, pkg, _options) {
     repository = `https://${repository.slice(6)}`;
   if (json.repository && typeof json.repository !== "string" && json.repository.directory)
     repository += `/tree/HEAD/${json.repository.directory}`;
+  let funding = json.funding;
+  if (typeof funding === "string")
+    funding = { url: funding };
   _pkg.resolved = {
     module: analyzePackageModuleType(json),
     engines: json.engines,
     license: json.license,
     author: typeof json.author === "string" ? json.author : json.author?.url,
-    funding: json.funding,
+    funding,
     repository,
     homepage: json.homepage,
     installSize: await getPackageInstallSize(_pkg)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-modules-tools",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Tools for inspecting node_modules",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -27,18 +27,18 @@
   ],
   "dependencies": {
     "p-limit": "^6.2.0",
-    "package-manager-detector": "^0.2.9",
+    "package-manager-detector": "^0.2.10",
     "pathe": "^2.0.3",
     "semver": "^7.7.1",
     "tinyexec": "^0.3.2"
   },
   "devDependencies": {
-    "@pnpm/list": "^1000.0.8",
-    "@pnpm/types": "^1000.1.1",
+    "@pnpm/list": "^1000.0.9",
+    "@pnpm/types": "^1000.2.0",
     "@types/stream-json": "^1.7.8",
-    "pkg-types": "^1.3.1",
+    "pkg-types": "^2.0.0",
     "stream-json": "^1.9.1",
-    "unbuild": "^3.3.1"
+    "unbuild": "^3.5.0"
   },
   "scripts": {
     "build": "unbuild",