@dbx-tools/projen 0.9.12 → 0.9.17

package/tasks/rust-release.mjs

@@ -1248,7 +1248,7 @@ function stringify(obj, { maxDepth = 1000, numbersAsFloat = false } = {}) {
  */
 
 // src/_rust-release.ts
-var FINGERPRINT_SCHEMA = 3;
+var FINGERPRINT_SCHEMA = 4;
 var VERSION_SLOT_SCHEMA = 1;
 var VERSION_CAPACITY = 64;
 var MAGIC = Buffer.from("DBXVERSION\x00\x00", "binary");
@@ -1337,9 +1337,9 @@ function workspaceVersion(root) {
 function toPosix(path) {
   return path.split(sep).join("/");
 }
-function sourceRoots(root, metadata, sources) {
+function sourceRoots(root, metadata, sources, includeWorkspace) {
   const members = new Set(metadata.workspace_members);
-  const discovered = metadata.packages.filter((candidate) => members.has(candidate.id)).map((candidate) => dirname(candidate.manifest_path));
+  const discovered = includeWorkspace ? metadata.packages.filter((candidate) => members.has(candidate.id)).map((candidate) => dirname(candidate.manifest_path)) : [];
   return [...new Set([...discovered, ...sources.map((source) => resolve(root, source))])].map((path) => toPosix(relative(root, path)) || ".").sort();
 }
 function ignoredInput(path) {
@@ -1397,13 +1397,13 @@ function normalizedInput(root, file, content, packageNames) {
   }
   return content;
 }
-function sourceHash(root, sources = []) {
+function sourceHash(root, sources = [], includeWorkspace = true) {
   const resolvedRoot = resolve(root);
   const metadata = cargoMetadata(resolvedRoot);
   const members = new Set(metadata.workspace_members);
   const packageNames = new Set(metadata.packages.filter((candidate) => members.has(candidate.id)).map((candidate) => candidate.name));
   const hash = createHash("sha256");
-  for (const file of inputFiles(resolvedRoot, sourceRoots(resolvedRoot, metadata, sources))) {
+  for (const file of inputFiles(resolvedRoot, sourceRoots(resolvedRoot, metadata, sources, includeWorkspace))) {
     const absolute = join(resolvedRoot, file);
     const stat = lstatSync(absolute);
     hash.update(file);
@@ -1426,6 +1426,7 @@ function linkerIdentity(target) {
 }
 function targetKey({
   rustSourceHash,
+  namespace = "workspace",
   target,
   targetConfig = "",
   toolchain = "stable",
@@ -1435,6 +1436,7 @@ function targetKey({
   for (const value of [
     String(FINGERPRINT_SCHEMA),
     String(VERSION_SLOT_SCHEMA),
+    namespace,
     rustSourceHash,
     target,
     targetConfig,
@@ -1460,12 +1462,14 @@ function fingerprint({
   targets,
   toolchain = "stable",
   portable = false,
-  sources = []
+  sources = [],
+  sourceOnly = false,
+  namespace = "workspace"
 }) {
   if (!targets.length)
     throw new Error("at least one --target is required");
   const resolvedRoot = resolve(root);
-  const rustSourceHash = sourceHash(resolvedRoot, sources);
+  const rustSourceHash = sourceHash(resolvedRoot, sources, !sourceOnly);
   const rustc = portable ? undefined : rustcIdentity();
   const targetEntries = targets.map((specification) => {
     const separator = specification.indexOf("|");
@@ -1473,12 +1477,13 @@ function fingerprint({
     const targetConfig = separator < 0 ? "" : specification.slice(separator + 1);
     return [
       target,
-      targetKey({ rustSourceHash, target, targetConfig, toolchain, rustc })
+      targetKey({ rustSourceHash, namespace, target, targetConfig, toolchain, rustc })
     ];
   }).sort(([left], [right]) => left.localeCompare(right));
   const manifest = {
     schemaVersion: FINGERPRINT_SCHEMA,
     versionSlotSchema: VERSION_SLOT_SCHEMA,
+    namespace,
     rustSourceHash,
     targets: Object.fromEntries(targetEntries)
   };
@@ -1486,7 +1491,7 @@ function fingerprint({
   if (check) {
     const current = JSON.parse(readFileSync(outputPath, "utf8"));
     const targetsMatch = targetEntries.every(([target, key]) => current.targets?.[target] === key);
-    if (current.schemaVersion !== manifest.schemaVersion || current.versionSlotSchema !== manifest.versionSlotSchema || current.rustSourceHash !== manifest.rustSourceHash || !targetsMatch) {
+    if (current.schemaVersion !== manifest.schemaVersion || current.versionSlotSchema !== manifest.versionSlotSchema || current.namespace !== manifest.namespace || current.rustSourceHash !== manifest.rustSourceHash || !targetsMatch) {
       throw new Error(`${outputPath} does not match current Rust inputs`);
     }
   } else {
@@ -1635,7 +1640,9 @@ function fingerprintCommand(args) {
       target: { type: "string", multiple: true },
       toolchain: { type: "string", default: "stable" },
       portable: { type: "boolean", default: false },
-      source: { type: "string", multiple: true }
+      source: { type: "string", multiple: true },
+      "source-only": { type: "boolean", default: false },
+      namespace: { type: "string", default: "workspace" }
     },
     strict: true
   });
@@ -1646,7 +1653,9 @@ function fingerprintCommand(args) {
     targets: values.target ?? [],
     toolchain: values.toolchain,
     portable: values.portable,
-    sources: values.source ?? []
+    sources: values.source ?? [],
+    sourceOnly: values["source-only"],
+    namespace: values.namespace
   });
 }
 function stampCommand(args) {

package/tasks/rust.ts

@@ -3,7 +3,7 @@ import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { dirname, isAbsolute, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-import { log } from "@dbx-tools/shared-core";
+import { log, object } from "@dbx-tools/shared-core";
 import { readDbxToolsConfig, repoRoot } from "../src/packages.ts";
 import {
   discoverRustCrates,
@@ -40,7 +40,7 @@ function currentStructure(config: RustWorkspaceMapping): RustWorkspaceMapping {
     const binding = recorded.get(rust);
     return binding ? [binding] : [{ crate: "", rust }];
   });
-  return { root: config.root, crates, bindings, binaries: config.binaries ?? [] };
+  return { ...config, crates, bindings };
 }
 
 /** Whether discovered crate membership or UniFFI marker membership changed. */
@@ -87,18 +87,47 @@ function generate(binding: RustBindingMapping): void {
   if (result.status !== 0) throw new Error(`binding generation exited with ${result.status}`);
 }
 
-export function affectedRustBindings(
+function* iterateAffectedRustBindings(
   bindings: readonly RustBindingMapping[],
   changed: ReadonlySet<string>,
-): RustBindingMapping[] {
+): Generator<RustBindingMapping> {
   const affected = new Set(changed);
-  const ordered = orderRustBindings(bindings);
-  for (const binding of ordered) {
+  for (const binding of orderRustBindings(bindings)) {
     if (binding.dependencies?.some((dependency) => affected.has(dependency))) {
       affected.add(binding.crate);
     }
+    if (affected.has(binding.crate)) yield binding;
   }
-  return ordered.filter((binding) => affected.has(binding.crate));
+}
+
+export function affectedRustBindings(
+  bindings: readonly RustBindingMapping[],
+  changed: ReadonlySet<string>,
+): RustBindingMapping[] {
+  return [...iterateAffectedRustBindings(bindings, changed)];
+}
+
+/**
+ * Lazily resolve direct binding owners so lock checks stop at the first match.
+ */
+export function changedRustOwners(
+  config: RustWorkspaceMapping,
+  changed: readonly string[],
+): object.Sequence<RustBindingMapping> {
+  return object
+    .sequence(changed)
+    .map((path) => ownerBinding(path, config.bindings))
+    .nonNull()
+    .distinct();
+}
+
+/** Collect direct owners, then lazily yield them and their dependents in order. */
+export function changedRustBindings(
+  config: RustWorkspaceMapping,
+  changed: readonly string[],
+): object.Sequence<RustBindingMapping> {
+  const targets = new Set(changedRustOwners(config, changed).map((binding) => binding.crate));
+  return object.sequence(iterateAffectedRustBindings(config.bindings, targets));
 }
 
 const config = rustConfig();
@@ -113,37 +142,37 @@ async function main(): Promise<void> {
     return;
   }
 
-  watchLoop("rust", [resolve(repoRoot, config.root)], (changed) => {
-    const latest = rustConfig() ?? config;
-    if (rustStructureChanged(latest)) {
-      logger.start("Rust project structure changed - re-synthesizing (+install)");
-      runSynth({ post: true });
-      logger.success("Rust project structure synchronized");
-      const refreshed = rustConfig();
-      if (!refreshed) return;
-      const targets = new Map<string, RustBindingMapping>();
-      for (const path of changed) {
-        const binding = ownerBinding(path, refreshed.bindings);
-        if (binding) targets.set(binding.crate, binding);
+  watchLoop(
+    "rust",
+    [resolve(repoRoot, config.root)],
+    (changed) => {
+      const latest = rustConfig() ?? config;
+      if (rustStructureChanged(latest)) {
+        logger.start("Rust project structure changed - re-synthesizing (+install)");
+        runSynth({ post: true });
+        logger.success("Rust project structure synchronized");
+        const refreshed = rustConfig();
+        if (!refreshed) return;
+        for (const binding of changedRustBindings(refreshed, changed)) {
+          logger.start(`generating ${binding.crate} bindings`);
+          generate(binding);
+          logger.success(`generated ${binding.crate} bindings`);
+        }
+        return;
       }
-      for (const binding of affectedRustBindings(refreshed.bindings, new Set(targets.keys()))) {
+      for (const binding of changedRustBindings(latest, changed)) {
         logger.start(`generating ${binding.crate} bindings`);
         generate(binding);
         logger.success(`generated ${binding.crate} bindings`);
       }
-      return;
-    }
-    const targets = new Map<string, RustBindingMapping>();
-    for (const path of changed) {
-      const binding = ownerBinding(path, latest.bindings);
-      if (binding) targets.set(binding.crate, binding);
-    }
-    for (const binding of affectedRustBindings(latest.bindings, new Set(targets.keys()))) {
-      logger.start(`generating ${binding.crate} bindings`);
-      generate(binding);
-      logger.success(`generated ${binding.crate} bindings`);
-    }
-  });
+    },
+    {
+      check: (changed) => {
+        const latest = rustConfig() ?? config;
+        return changedRustOwners(latest, changed).some(() => true) || rustStructureChanged(latest);
+      },
+    },
+  );
 }
 
 if (import.meta.main) await main();

package/tasks/uniffi-release.mjs

@@ -227,7 +227,9 @@ const facadeDependency = (name, dependency, catalog, workspaceVersions) => {
   if (dependency.startsWith("workspace:")) {
     const version = workspaceVersions.get(name);
     if (!version) throw new Error(`Missing workspace version for ${name}`);
-    return dependency === "workspace:*" ? version : `${dependency.slice("workspace:".length)}${version}`;
+    return dependency === "workspace:*"
+      ? version
+      : `${dependency.slice("workspace:".length)}${version}`;
   }
   if (!dependency.startsWith("catalog:")) return dependency;
   const resolved = catalog[name];
@@ -481,6 +483,8 @@ const build = () => {
       ...(existsSync(resolve(root, "Cargo.lock")) ? ["--locked"] : []),
       "--package",
       crate,
+      "--features",
+      "uniffi-bindgen",
       "--target",
       cargoTarget,
     ]);

package/tasks/uniffi.ts

@@ -119,6 +119,8 @@ if (!values["skip-build"]) {
     ...(existsSync(join(root, "Cargo.lock")) ? ["--locked"] : []),
     "--package",
     crate,
+    "--features",
+    "uniffi-bindgen",
     ...(values["cargo-target"] ? ["--target", values["cargo-target"]] : []),
   ]);
 }