@dbx-tools/projen 0.6.174 → 0.6.176

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.173";
+export const PACKAGE_VERSION = "0.6.175";
 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.174",
-    "@dbx-tools/path": "0.6.174",
-    "@dbx-tools/shared-core": "0.6.174",
+    "@dbx-tools/core": "0.6.176",
+    "@dbx-tools/path": "0.6.176",
+    "@dbx-tools/shared-core": "0.6.176",
     "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.174",
+  "version": "0.6.176",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/tasks/uniffi-release.mjs

@@ -64,6 +64,26 @@ const run = (command, args, cwd = root) => {
   if (result.status !== 0) throw new Error(`${invocation.command} exited with ${result.status}`);
 };
 
+const runWithRetry = (command, args, cwd = root, attempts = 6) => {
+  const signal = new Int32Array(new SharedArrayBuffer(4));
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    const invocation = commandInvocation(command, args);
+    const result = spawnSync(invocation.command, invocation.args, { cwd, stdio: "inherit" });
+    if (result.error) {
+      throw new Error(`${invocation.command} failed: ${result.error.message}`, {
+        cause: result.error,
+      });
+    }
+    if (result.status === 0) return;
+    if (attempt === attempts) {
+      throw new Error(
+        `${invocation.command} exited with ${result.status} after ${attempts} attempts`,
+      );
+    }
+    Atomics.wait(signal, 0, 0, 10_000);
+  }
+};
+
 const singlePackage = (directory) => {
   const packages = readdirSync(directory)
     .filter((file) => file.endsWith(".tgz"))
@@ -131,6 +151,16 @@ const testNodeFacade = ({
       if (!workspaceVersion) return [];
       const binding = bindings.find((binding) => binding.nodePackage === name);
       if (binding) {
+        const stagedFacade = resolve(root, "dist/uniffi/facades", binding.crate, "npm-facade");
+        const stagedNative = resolve(root, "dist/uniffi/native");
+        const nativeName = existsSync(stagedNative)
+          ? readdirSync(stagedNative).find((file) =>
+              file.startsWith(`${binding.crate}-${required("node-triple")}-`),
+            )
+          : undefined;
+        if (existsSync(stagedFacade) && nativeName) {
+          return [singlePackage(stagedFacade), join(stagedNative, nativeName)];
+        }
         const output = resolve(root, "dist/release", binding.crate, required("node-triple"));
         if (existsSync(join(output, "npm-facade")) && existsSync(join(output, "npm"))) {
           return [singlePackage(join(output, "npm-facade")), singlePackage(join(output, "npm"))];
@@ -164,7 +194,7 @@ const testNodeFacade = ({
       join(installDirectory, "package.json"),
       `${JSON.stringify({ private: true, type: "module" })}\n`,
     );
-    run(
+    runWithRetry(
       "npm",
       [
         "install",
@@ -277,6 +307,17 @@ const packageNodeFacade = ({ output, nodeDirectory, nodePackage, version, native
       rmSync(join(facadeDirectory, "src", file), { force: true });
     }
   }
+  const ffiBindings = join(facadeDirectory, "src", "_bindings-ffi.ts");
+  writable(ffiBindings);
+  const ffiSource = readFileSync(ffiBindings, "utf8");
+  const packageSource = ffiSource.replace(
+    /(\s+callerUrl: import\.meta\.url,\n)(\s+\}\);)/,
+    `$1      npmPackageBase: ${JSON.stringify(`${nodePackage}-`)},\n      tripleStyle: "node",\n$2`,
+  );
+  if (packageSource === ffiSource) {
+    throw new Error(`Could not configure native package lookup in ${ffiBindings}`);
+  }
+  writeFileSync(ffiBindings, packageSource);
   const manifestPath = join(facadeDirectory, "package.json");
   writable(manifestPath);
   const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));