@dbx-tools/projen 0.6.152 → 0.6.153

package/README.md

@@ -104,11 +104,26 @@ removing a crate or `setup_scaffolding!()` marker triggers a full synth. Repos
 without Rust crates start no Rust watcher. When Rust projects are detected,
 Cargo is required and the focused task fails immediately if it is unavailable.
 
-The workspace also generates a `rust-release` workflow from those discovered
-UniFFI crates. It builds Linux x64/arm64, macOS x64/arm64, and Windows x64.
-Node publishes a small facade plus optional OS/CPU packages, so npm installs
-only the matching native library. Python publishes one platform-tagged wheel
-per target, so pip follows the same thin-install model.
+The workspace also generates a `rust-release` workflow from discovered crates,
+UniFFI bindings, and release-enabled binaries. Its matrix has one row per
+target. Each row installs native dependencies and restores Cargo/sccache once,
+builds the Rust workspace once, then packages every discovered output from that
+shared build. Bun and the workspace install are present only when a Node binding
+needs TypeScript generation; uv is present only when a Python wheel is needed.
+A binary-only workspace therefore installs neither.
+
+The Node generator's Rust CLI is cached under one target directory keyed by its
+pinned UBRN version and runner architecture, then prepared before the workspace
+build. Python generation executes the already-built
+`target/<triple>/release/uniffi-bindgen` directly. Artifact packaging therefore
+does no Rust compilation after the main workspace build.
+
+Artifacts identify their crate, target, and type. Download-only publication
+jobs publish native npm platform archives before the facade and publish
+platform-tagged Python wheels without checkout, Bun, or `bun install`.
+Non-private Cargo crates publish from a source-only job with
+`cargo publish --no-verify`; GitHub Release uploads likewise consume prebuilt
+binary artifacts without reinstalling a toolchain.
 
 Set the repository variable `LOCAL_REPOSITORIES=true` to enable the generated
 self-hosted mirror job. Configure `LOCAL_NPM_REGISTRY` and
@@ -119,11 +134,13 @@ detects its OS, architecture, libc, Rust target, and Python wheel tag and builds
 only that native target. Public Cargo crates also publish directly to crates.io
 with `CARGO_REGISTRY_TOKEN`. Override `releaseTargets` only when a consumer has
 additional native runners; ordinary projects inherit the maintained matrix
-automatically.
+automatically. `bun run bump` also accepts repeatable `--os` and `--arch`
+selectors; every selected operating system is crossed with every selected
+architecture. Omit both filters to regenerate the complete maintained matrix.
 
-Private Python projects are marked with `[tool.dbx-tools] private = true`. They
-are excluded from the uv workspace, documentation, and Python release workflow
-until their native artifact publishing matrix is enabled.
+Private Python binding projects are marked with `[tool.dbx-tools] private =
+true`. They stay out of the standard uv/Python release and docs surfaces;
+`rust-release` publishes their prebuilt native wheels directly.
 
 ## Customize Packages With Mixins
 
@@ -318,10 +335,12 @@ Use `--local-registry false` or `--local-pypi false` to disable either local
 publish. An explicit `--local-pypi http://localhost:3141/user/index/` overrides
 auto-detection; `--python-root` defaults to `packages/py`.
 
-The pushed `v*` tag is also the public release boundary: it triggers npm
-publishing, stamps and publishes every Python distribution to PyPI, and rebuilds
-and deploys the documentation site. Ordinary pushes to `main` publish none of
-those surfaces.
+The pushed `v*` tag is also the public release boundary. Available workflow
+stages form the generated chain Rust -> Python -> Node -> docs: Rust builds and
+publishes native artifacts and Cargo crates, Python publishes standard
+distributions, Node publishes standard workspace packages, and docs deploys
+after publication. A stage with no corresponding outputs is omitted. Ordinary
+pushes to `main` publish none of those surfaces.
 
 Members intentionally keep only the tasks that something OTHER than a human
 invokes, so there is no second place to run the same thing:

package/package.json

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

package/src/project-js.ts

@@ -379,6 +379,7 @@ function defaultProjectOptions(
     // provider. See {@link DBXToolsRelease}.
     ...(isRoot ? {} : { npmAccess: javascript.NpmAccess.PUBLIC }),
     buildWorkflow: false,
+    workflowPackageCache: false,
     release: false,
     // The root build validates the whole workspace and must not also pack every
     // member into unused `dist/js` tarballs. Child projects keep projen's package
@@ -518,7 +519,7 @@ export interface DBXToolsJavaScriptProjectOptions
   /** Workflow that must finish successfully before the main Node release runs. */
   readonly releaseUpstreamWorkflow?: string;
   /** Main Node release workflow name. Defaults to `node-release`. */
-  readonly releaseWorkflowName?: string | false;
+  readonly nodeReleaseWorkflowName?: string | false;
   /**
    * Extra workspace member paths (repo-relative, POSIX) to list in the workspace
    * config ALONGSIDE the discovered `packageRoots` members - for a package that
@@ -1188,7 +1189,7 @@ function initProject(
     tagPrefix: options.releaseTagPrefix,
     standaloneReleases: options.standaloneReleases,
     upstreamWorkflow: options.releaseUpstreamWorkflow,
-    workflowName: options.releaseWorkflowName,
+    workflowName: options.nodeReleaseWorkflowName ?? options.releaseWorkflowName,
   });
 }
 

package/src/project-rs.ts

@@ -139,6 +139,7 @@ const RUST_CACHE_ENV = {
   RUSTC_WRAPPER: "sccache",
   SCCACHE_GHA_ENABLED: "true",
 } as const;
+const UBRN_VERSION = "0.31.0-5";
 
 function rustCacheSteps(sharedKey: string): readonly Record<string, unknown>[] {
   return [
@@ -473,7 +474,7 @@ export class DBXToolsRustWorkspace {
       if (binding.packageOptions.nodeDependencies?.length) {
         node.addDeps(...binding.packageOptions.nodeDependencies);
       }
-      node.addDevDeps("uniffi-bindgen-react-native@0.31.0-5");
+      node.addDevDeps(`uniffi-bindgen-react-native@${UBRN_VERSION}`);
       if (binding.packageOptions.nodeDevDependencies?.length) {
         node.addDevDeps(...binding.packageOptions.nodeDevDependencies);
       }
@@ -537,9 +538,7 @@ export class DBXToolsRustWorkspace {
     if (
       (options.release ?? true) &&
       (this.bindingMappings.length > 0 ||
-        this.packages.some(
-          (pkg) => pkg.packageOptions.release || !pkg.packageOptions.private,
-        ))
+        this.packages.some((pkg) => pkg.packageOptions.release || !pkg.packageOptions.private))
     ) {
       this.addReleaseWorkflow(project, options, releaseTargets(options));
     }
@@ -680,21 +679,42 @@ export class DBXToolsRustWorkspace {
               },
             ]
           : []),
-        ...(hasPythonBindings
-          ? [{ name: "Setup uv", uses: "astral-sh/setup-uv@v7" }]
-          : []),
+        ...(hasPythonBindings ? [{ name: "Setup uv", uses: "astral-sh/setup-uv@v7" }] : []),
         {
           name: "Setup Rust",
           uses: "dtolnay/rust-toolchain@stable",
           with: { targets: "${{ matrix.target.cargo }}" },
         },
         ...rustCacheSteps("release-${{ matrix.target.cargo }}"),
+        ...(hasNodeBindings
+          ? [
+              {
+                name: "Cache UBRN generator",
+                uses: "actions/cache@v5",
+                with: {
+                  path: "target/ubrn",
+                  key: `ubrn-\${{ runner.os }}-\${{ runner.arch }}-${UBRN_VERSION}`,
+                },
+              },
+            ]
+          : []),
         {
           name: "Install Linux native dependencies",
           if: "${{ matrix.target.os == 'linux' }}",
           run: "sudo apt-get update && sudo apt-get install --yes libdbus-1-dev pkg-config",
         },
         ...(hasNodeBindings ? [{ name: "Install Node tooling", run: "bun install" }] : []),
+        ...(hasNodeBindings
+          ? [
+              {
+                name: "Prepare UBRN generator",
+                env: {
+                  CARGO_TARGET_DIR: "${{ github.workspace }}/target/ubrn",
+                },
+                run: "cargo build --manifest-path node_modules/uniffi-bindgen-react-native/crates/ubrn_cli/Cargo.toml",
+              },
+            ]
+          : []),
         {
           name: "Build Rust outputs",
           run: 'cargo build --release --workspace --target "${{ matrix.target.cargo }}"',
@@ -705,7 +725,13 @@ export class DBXToolsRustWorkspace {
                 name: "Package UniFFI outputs",
                 shell: "bash",
                 env: {
-                  VERSION: "${{ github.event_name == 'push' && github.ref_name || inputs.version }}",
+                  VERSION:
+                    "${{ github.event_name == 'push' && github.ref_name || inputs.version }}",
+                  ...(hasNodeBindings
+                    ? {
+                        CARGO_TARGET_DIR: "${{ github.workspace }}/target/ubrn",
+                      }
+                    : {}),
                 },
                 run: bindingCommands.join("\n"),
               },
@@ -734,9 +760,7 @@ export class DBXToolsRustWorkspace {
             contents: "read",
             ...(binding.python ? { "id-token": "write" } : {}),
           },
-          ...(binding.python
-            ? { environment: { name: `pypi-${binding.crate}` } }
-            : {}),
+          ...(binding.python ? { environment: { name: `pypi-${binding.crate}` } } : {}),
           steps: [
             ...(binding.node
               ? [

package/tasks/uniffi-release.mjs

@@ -77,7 +77,7 @@ const packageNode = ({
   cpu,
   version,
   facade,
-    nodeGenerator,
+  nodeGenerator,
 }) => {
   const libraryFile = basename(library);
   const nativePackage = resolve(output, "native-node");
@@ -119,9 +119,7 @@ const packageNode = ({
   manifest.dependencies = Object.fromEntries(
     Object.entries(manifest.dependencies ?? {}).map(([name, dependency]) => [
       name,
-      typeof dependency === "string" && dependency.startsWith("workspace:")
-        ? version
-        : dependency,
+      typeof dependency === "string" && dependency.startsWith("workspace:") ? version : dependency,
     ]),
   );
   delete manifest.scripts;
@@ -142,11 +140,7 @@ const packageNode = ({
     "--skip-build",
   ]);
   mkdirSync(resolve(output, "npm-facade"), { recursive: true });
-  run(
-    "npm",
-    ["pack", "--pack-destination", resolve(output, "npm-facade")],
-    facadeDirectory,
-  );
+  run("npm", ["pack", "--pack-destination", resolve(output, "npm-facade")], facadeDirectory);
 };
 
 const packagePython = ({
@@ -156,6 +150,8 @@ const packagePython = ({
   pythonDirectory,
   pythonTag,
   version,
+  cargoTarget,
+  os,
 }) => {
   const pythonRoot = resolve(output, "python-root");
   cpSync(resolve(root, pythonDirectory), pythonRoot, { recursive: true });
@@ -166,21 +162,15 @@ const packagePython = ({
   const packageName = crate.replace(/^dbx-tools-/, "").replaceAll("-", "_");
   const packageDirectory = resolve(pythonRoot, "src", "dbx_tools", packageName);
   const generatedDirectory = mkdtempSync(join(tmpdir(), `${packageName}-python-`));
-  run("cargo", [
-    "run",
-    "--release",
-    "--package",
-    crate,
-    "--bin",
-    "uniffi-bindgen",
-    "--",
-    "generate",
-    "--language",
-    "python",
-    "--out-dir",
-    generatedDirectory,
-    library,
-  ]);
+  const generator = resolve(
+    root,
+    "target",
+    cargoTarget,
+    "release",
+    `uniffi-bindgen${os === "win32" ? ".exe" : ""}`,
+  );
+  if (!existsSync(generator)) throw new Error(`Missing UniFFI generator ${generator}`);
+  run(generator, ["generate", "--language", "python", "--out-dir", generatedDirectory, library]);
   const bindings = join(packageDirectory, "bindings.py");
   writable(bindings);
   const body = readFileSync(join(generatedDirectory, `${crate.replaceAll("-", "_")}.py`), "utf8");
@@ -259,6 +249,8 @@ const build = () => {
       pythonDirectory,
       pythonTag,
       version,
+      cargoTarget,
+      os,
     });
   }
 };

package/tasks/uniffi.ts

@@ -64,7 +64,8 @@ const run = (command: string, args: string[]) => {
 
 const replaceGenerated = (source: string, destination: string): void => {
   const deadline = Date.now() + 5_000;
-  while (!existsSync(source) && Date.now() < deadline) Bun.sleepSync(25);
+  const signal = new Int32Array(new SharedArrayBuffer(4));
+  while (!existsSync(source) && Date.now() < deadline) Atomics.wait(signal, 0, 0, 25);
   if (!existsSync(source)) throw new Error(`Missing generated binding: ${source}`);
   mkdirSync(dirname(destination), { recursive: true });
   makeWritable(destination);