@dbx-tools/projen 0.6.182 → 0.6.183

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/projen";
-export const PACKAGE_VERSION = "0.6.181";
+export const PACKAGE_VERSION = "0.6.182";
 export * as barrels from "./src/barrels.ts";
 export * as bunApp from "./src/bun-app.ts";
 export * as bunWorkflow from "./src/bun-workflow.ts";

package/package.json

@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@dbx-tools/core": "0.6.182",
-    "@dbx-tools/path": "0.6.182",
-    "@dbx-tools/shared-core": "0.6.182",
+    "@dbx-tools/core": "0.6.183",
+    "@dbx-tools/path": "0.6.183",
+    "@dbx-tools/shared-core": "0.6.183",
     "commander": "^15.0.0",
     "concurrently": "^10.0.3",
     "constructs": "^10.6.0",
@@ -47,7 +47,7 @@
   },
   "main": "index.ts",
   "license": "Apache-2.0",
-  "version": "0.6.182",
+  "version": "0.6.183",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/project-rs.ts

@@ -444,6 +444,34 @@ export class DBXToolsRustProject extends Project implements DBXToolsProject {
   }
 }
 
+function rustPackageDependencies(
+  packages: readonly DBXToolsRustProject[],
+  pkg: DBXToolsRustProject,
+  root: string,
+  workspaceDependencies: Readonly<Record<string, CargoDependency>> | undefined,
+): DBXToolsRustProject[] {
+  return packages.filter(
+    (dependency) =>
+      dependency !== pkg &&
+      Object.entries(pkg.packageOptions.dependencies ?? {}).some(([name, value]) => {
+        const resolved =
+          typeof value === "object" && value.workspace
+            ? (workspaceDependencies?.[name] ?? value)
+            : value;
+        return (
+          name === dependency.crateName ||
+          (typeof resolved === "object" &&
+            (resolved.package === dependency.crateName ||
+              (resolved.path !== undefined &&
+                resolve(
+                  typeof value === "object" && value.workspace ? root : pkg.outdir,
+                  resolved.path,
+                ) === dependency.outdir)))
+        );
+      }),
+  );
+}
+
 /** Generated Rust workspace plus convention-derived UniFFI facade packages. */
 export class DBXToolsRustWorkspace {
   readonly packages: readonly DBXToolsRustProject[];
@@ -473,27 +501,13 @@ export class DBXToolsRustWorkspace {
     );
 
     const bindings = this.packages.filter((pkg) => pkg.uniffi);
+    const packageDependencies = (pkg: DBXToolsRustProject) =>
+      rustPackageDependencies(this.packages, pkg, project.outdir, options.workspaceDependencies);
     const bindingDependencies = (pkg: DBXToolsRustProject, language: "node" | "python") =>
       bindings.filter(
         (dependency) =>
-          dependency !== pkg &&
           (dependency.packageOptions.bindings ?? ["node", "python"]).includes(language) &&
-          Object.entries(pkg.packageOptions.dependencies ?? {}).some(([name, value]) => {
-            const resolved =
-              typeof value === "object" && value.workspace
-                ? (options.workspaceDependencies?.[name] ?? value)
-                : value;
-            return (
-              name === dependency.crateName ||
-              (typeof resolved === "object" &&
-                (resolved.package === dependency.crateName ||
-                  (resolved.path !== undefined &&
-                    resolve(
-                      typeof value === "object" && value.workspace ? project.outdir : pkg.outdir,
-                      resolved.path,
-                    ) === dependency.outdir)))
-            );
-          }),
+          packageDependencies(pkg).includes(dependency),
       );
     this.bindingMappings = orderRustBindings(
       bindings.map((pkg) => {
@@ -732,18 +746,20 @@ export class DBXToolsRustWorkspace {
         crate: pkg.crateName,
         binary: pkg.packageOptions.binaryName ?? pkg.crateName,
       }));
-    const orderedBindingCrates = this.bindingMappings.map((binding) => binding.crate);
-    const publicCrates = this.packages
-      .filter((pkg) => !pkg.packageOptions.private)
-      .sort((first, second) => {
-        // Binding crates publish in topological order before release-only crates that may consume them.
-        const firstIndex = orderedBindingCrates.indexOf(first.crateName);
-        const secondIndex = orderedBindingCrates.indexOf(second.crateName);
-        if (firstIndex < 0) return secondIndex < 0 ? 0 : 1;
-        if (secondIndex < 0) return -1;
-        return firstIndex - secondIndex;
-      })
-      .map((pkg) => pkg.crateName);
+    const publicCrates = orderRustBindings(
+      this.packages
+        .filter((pkg) => !pkg.packageOptions.private)
+        .map((pkg) => ({
+          crate: pkg.crateName,
+          rust: pkg.outdir,
+          dependencies: rustPackageDependencies(
+            this.packages,
+            pkg,
+            project.outdir,
+            options.workspaceDependencies,
+          ).map((dependency) => dependency.crateName),
+        })),
+    ).map((pkg) => pkg.crate);
     const targetMatrix = targets.map((target) => ({ ...target }));
     const hasPythonBindings = bindings.some((binding) => binding.python);
     const usePreinstalledWindowsRust = releaseRustVersion === "stable";