@joshmossas/nx-cargo 0.6.3 → 0.6.5

package/dist/index.cjs

@@ -1,12 +1,10 @@
 'use strict';
 
 const devkit = require('@nx/devkit');
-const fs = require('node:fs');
-const cp = require('node:child_process');
-const os = require('node:os');
-const path = require('node:path');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+const cp = require('child_process');
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
 
 function _interopNamespaceCompat(e) {
 	if (e && typeof e === 'object' && 'default' in e) return e;
@@ -20,40 +18,47 @@ function _interopNamespaceCompat(e) {
 	return n;
 }
 
-const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const cp__namespace = /*#__PURE__*/_interopNamespaceCompat(cp);
 const os__namespace = /*#__PURE__*/_interopNamespaceCompat(os);
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
+const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs);
 
 function createDependencies(_, ctx) {
   const allDependencies = [];
-  const processedWorkspaceRoots = /* @__PURE__ */ new Set();
-  const cargoConfigPaths = Object.values(ctx.projects).map((p) => path__namespace.join(ctx.workspaceRoot, p.root, "Cargo.toml")).filter((p) => fs__default.existsSync(p));
-  for (const configPath of cargoConfigPaths) {
-    const configDir = path__namespace.dirname(configPath);
-    const metadata = getCargoMetadata(configDir);
-    if (processedWorkspaceRoots.has(metadata.workspace_root)) {
+  const seenManifestPaths = /* @__PURE__ */ new Set();
+  const sortedManifests = Object.values(ctx.projects).map((project) => {
+    const filepath = path__namespace.resolve(ctx.workspaceRoot, project.root, "Cargo.toml");
+    const depth = filepath.split(path__namespace.sep).length;
+    return { filepath, depth };
+  }).filter((manifest) => fs__namespace.existsSync(manifest.filepath)).sort((a, b) => a.depth - b.depth);
+  for (const { filepath } of sortedManifests) {
+    if (seenManifestPaths.has(filepath)) {
       continue;
     }
-    processedWorkspaceRoots.add(metadata.workspace_root);
-    const workspaceDeps = processWorkspaceMetadata(ctx, metadata);
-    allDependencies.push(...workspaceDeps);
+    try {
+      const metadata = getCargoMetadata(path__namespace.dirname(filepath));
+      for (const pkg of metadata.packages) {
+        seenManifestPaths.add(path__namespace.resolve(pkg.manifest_path));
+      }
+      const workspaceDeps = processWorkspaceMetadata(ctx, metadata);
+      allDependencies.push(...workspaceDeps);
+    } catch (e) {
+      console.warn(
+        `[nx-rust] Skipping ${filepath} due to error:`,
+        e instanceof Error ? e.message : e
+      );
+    }
   }
   return allDependencies;
 }
 function processWorkspaceMetadata(ctx, metadata) {
-  const {
-    packages,
-    workspace_members: cargoWsMembers,
-    resolve: cargoResolve
-  } = metadata;
+  const { packages, resolve } = metadata;
   const workspacePackages = /* @__PURE__ */ new Map();
-  for (const id of cargoWsMembers) {
-    const pkg = packages.find((p) => p.id === id);
-    if (pkg) workspacePackages.set(id, pkg);
+  for (const pkg of packages) {
+    workspacePackages.set(pkg.id, pkg);
   }
   const nxData = mapCargoProjects(ctx, workspacePackages);
-  return cargoResolve.nodes.filter(({ id }) => nxData.has(id)).flatMap(({ id: sourceId, dependencies }) => {
+  return (resolve?.nodes ?? []).filter(({ id }) => nxData.has(id)).flatMap(({ id: sourceId, dependencies }) => {
     const sourceProject = nxData.get(sourceId);
     const cargoPackage = workspacePackages.get(sourceId);
     const sourceManifest = path__namespace.relative(ctx.workspaceRoot, cargoPackage.manifest_path).replace(/\\/g, "/");
@@ -65,29 +70,16 @@ function processWorkspaceMetadata(ctx, metadata) {
     }));
   });
 }
-function getCargoMetadata(cwd) {
-  const availableMemory = os__namespace.freemem();
-  const metadata = cp__namespace.execSync("cargo metadata --format-version=1", {
-    encoding: "utf8",
-    maxBuffer: availableMemory,
-    cwd
-    // Crucial: run in the workspace directory
-  });
-  return JSON.parse(metadata);
-}
 function mapCargoProjects(ctx, packages) {
-  let result = /* @__PURE__ */ new Map();
-  for (let [cargoId, cargoPackage] of packages) {
-    if (!cargoPackage.manifest_path) {
-      throw new Error("Expected cargo package's `manifest_path` to exist");
-    }
-    let manifestDir = path__namespace.dirname(cargoPackage.manifest_path);
-    let projectDir = path__namespace.relative(ctx.workspaceRoot, manifestDir).replace(/\\/g, "/");
-    let found = Object.entries(ctx.projects).find(
+  const result = /* @__PURE__ */ new Map();
+  for (const [cargoId, cargoPackage] of packages) {
+    const manifestDir = path__namespace.dirname(cargoPackage.manifest_path);
+    const projectDir = path__namespace.relative(ctx.workspaceRoot, manifestDir).replace(/\\/g, "/");
+    const found = Object.entries(ctx.projects).find(
       ([, config]) => config.root === projectDir
     );
     if (found) {
-      let [projectName, projectConfig] = found;
+      const [projectName, projectConfig] = found;
       result.set(cargoId, {
         ...projectConfig,
         name: projectName
@@ -96,5 +88,18 @@ function mapCargoProjects(ctx, packages) {
   }
   return result;
 }
+function getCargoMetadata(cwd) {
+  const availableMemory = os__namespace.freemem();
+  const cmd = "cargo metadata --format-version=1 --no-deps";
+  console.info(`[nx-json] Executing: "${cmd}"`);
+  const metadata = cp__namespace.execSync("cargo metadata --format-version=1 --no-deps", {
+    encoding: "utf8",
+    maxBuffer: availableMemory,
+    cwd,
+    env: { ...process.env },
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  return JSON.parse(metadata);
+}
 
 exports.createDependencies = createDependencies;

package/dist/index.d.cts

@@ -1,5 +1,8 @@
 import { CreateDependenciesContext, RawProjectGraphDependency } from '@nx/devkit';
 
+/**
+ * Main Nx Dependency Creator
+ */
 declare function createDependencies(_: unknown, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
 
 export { createDependencies };

package/dist/index.d.mts

@@ -1,5 +1,8 @@
 import { CreateDependenciesContext, RawProjectGraphDependency } from '@nx/devkit';
 
+/**
+ * Main Nx Dependency Creator
+ */
 declare function createDependencies(_: unknown, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
 
 export { createDependencies };

package/dist/index.d.ts

@@ -1,5 +1,8 @@
 import { CreateDependenciesContext, RawProjectGraphDependency } from '@nx/devkit';
 
+/**
+ * Main Nx Dependency Creator
+ */
 declare function createDependencies(_: unknown, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
 
 export { createDependencies };

package/dist/index.mjs

@@ -1,38 +1,45 @@
 import { DependencyType } from '@nx/devkit';
-import fs from 'node:fs';
-import * as cp from 'node:child_process';
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as cp from 'child_process';
+import * as os from 'os';
+import * as path from 'path';
+import * as fs from 'fs';
 
 function createDependencies(_, ctx) {
   const allDependencies = [];
-  const processedWorkspaceRoots = /* @__PURE__ */ new Set();
-  const cargoConfigPaths = Object.values(ctx.projects).map((p) => path.join(ctx.workspaceRoot, p.root, "Cargo.toml")).filter((p) => fs.existsSync(p));
-  for (const configPath of cargoConfigPaths) {
-    const configDir = path.dirname(configPath);
-    const metadata = getCargoMetadata(configDir);
-    if (processedWorkspaceRoots.has(metadata.workspace_root)) {
+  const seenManifestPaths = /* @__PURE__ */ new Set();
+  const sortedManifests = Object.values(ctx.projects).map((project) => {
+    const filepath = path.resolve(ctx.workspaceRoot, project.root, "Cargo.toml");
+    const depth = filepath.split(path.sep).length;
+    return { filepath, depth };
+  }).filter((manifest) => fs.existsSync(manifest.filepath)).sort((a, b) => a.depth - b.depth);
+  for (const { filepath } of sortedManifests) {
+    if (seenManifestPaths.has(filepath)) {
       continue;
     }
-    processedWorkspaceRoots.add(metadata.workspace_root);
-    const workspaceDeps = processWorkspaceMetadata(ctx, metadata);
-    allDependencies.push(...workspaceDeps);
+    try {
+      const metadata = getCargoMetadata(path.dirname(filepath));
+      for (const pkg of metadata.packages) {
+        seenManifestPaths.add(path.resolve(pkg.manifest_path));
+      }
+      const workspaceDeps = processWorkspaceMetadata(ctx, metadata);
+      allDependencies.push(...workspaceDeps);
+    } catch (e) {
+      console.warn(
+        `[nx-rust] Skipping ${filepath} due to error:`,
+        e instanceof Error ? e.message : e
+      );
+    }
   }
   return allDependencies;
 }
 function processWorkspaceMetadata(ctx, metadata) {
-  const {
-    packages,
-    workspace_members: cargoWsMembers,
-    resolve: cargoResolve
-  } = metadata;
+  const { packages, resolve } = metadata;
   const workspacePackages = /* @__PURE__ */ new Map();
-  for (const id of cargoWsMembers) {
-    const pkg = packages.find((p) => p.id === id);
-    if (pkg) workspacePackages.set(id, pkg);
+  for (const pkg of packages) {
+    workspacePackages.set(pkg.id, pkg);
   }
   const nxData = mapCargoProjects(ctx, workspacePackages);
-  return cargoResolve.nodes.filter(({ id }) => nxData.has(id)).flatMap(({ id: sourceId, dependencies }) => {
+  return (resolve?.nodes ?? []).filter(({ id }) => nxData.has(id)).flatMap(({ id: sourceId, dependencies }) => {
     const sourceProject = nxData.get(sourceId);
     const cargoPackage = workspacePackages.get(sourceId);
     const sourceManifest = path.relative(ctx.workspaceRoot, cargoPackage.manifest_path).replace(/\\/g, "/");
@@ -44,29 +51,16 @@ function processWorkspaceMetadata(ctx, metadata) {
     }));
   });
 }
-function getCargoMetadata(cwd) {
-  const availableMemory = os.freemem();
-  const metadata = cp.execSync("cargo metadata --format-version=1", {
-    encoding: "utf8",
-    maxBuffer: availableMemory,
-    cwd
-    // Crucial: run in the workspace directory
-  });
-  return JSON.parse(metadata);
-}
 function mapCargoProjects(ctx, packages) {
-  let result = /* @__PURE__ */ new Map();
-  for (let [cargoId, cargoPackage] of packages) {
-    if (!cargoPackage.manifest_path) {
-      throw new Error("Expected cargo package's `manifest_path` to exist");
-    }
-    let manifestDir = path.dirname(cargoPackage.manifest_path);
-    let projectDir = path.relative(ctx.workspaceRoot, manifestDir).replace(/\\/g, "/");
-    let found = Object.entries(ctx.projects).find(
+  const result = /* @__PURE__ */ new Map();
+  for (const [cargoId, cargoPackage] of packages) {
+    const manifestDir = path.dirname(cargoPackage.manifest_path);
+    const projectDir = path.relative(ctx.workspaceRoot, manifestDir).replace(/\\/g, "/");
+    const found = Object.entries(ctx.projects).find(
       ([, config]) => config.root === projectDir
     );
     if (found) {
-      let [projectName, projectConfig] = found;
+      const [projectName, projectConfig] = found;
       result.set(cargoId, {
         ...projectConfig,
         name: projectName
@@ -75,5 +69,18 @@ function mapCargoProjects(ctx, packages) {
   }
   return result;
 }
+function getCargoMetadata(cwd) {
+  const availableMemory = os.freemem();
+  const cmd = "cargo metadata --format-version=1 --no-deps";
+  console.info(`[nx-json] Executing: "${cmd}"`);
+  const metadata = cp.execSync("cargo metadata --format-version=1 --no-deps", {
+    encoding: "utf8",
+    maxBuffer: availableMemory,
+    cwd,
+    env: { ...process.env },
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  return JSON.parse(metadata);
+}
 
 export { createDependencies };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joshmossas/nx-cargo",
   "private": false,
-  "version": "0.6.3",
+  "version": "0.6.5",
   "license": "MIT",
   "main": "dist/index.mjs",
   "repository": {

package/src/graph/index.ts

@@ -160,10 +160,14 @@ function mapCargoProjects(ctx: Context, packages: Map<CargoId, CargoPackage>) {
  */
 function getCargoMetadata(cwd: string): CargoMetadata {
 	const availableMemory = os.freemem();
+	const cmd = "cargo metadata --format-version=1 --no-deps";
+	console.info(`[nx-json] Executing: "${cmd}"`);
 	const metadata = cp.execSync("cargo metadata --format-version=1 --no-deps", {
 		encoding: "utf8",
 		maxBuffer: availableMemory,
 		cwd: cwd,
+		env: { ...process.env },
+		stdio: ["ignore", "pipe", "pipe"],
 	});
 
 	return JSON.parse(metadata);