Explicit clang-format dependency and prioritize brew

Author: kraenhansen

package-lock.json

@@ -64,6 +64,7 @@
     "@tsconfig/node22": "^22.0.0",
     "@tsconfig/react-native": "3.0.6",
     "@types/node": "^22",
+    "clang-format": "1.8.0",
     "depcheck": "^1.4.7",
     "eslint": "^9.32.0",
     "eslint-config-prettier": "^10.1.8",

package.json

@@ -1,3 +1,4 @@
+import assert from "node:assert/strict";
 import fs from "node:fs";
 import path from "node:path";
 import cp from "node:child_process";
@@ -22,6 +23,32 @@ const IMPLEMENTED_RUNTIME_FUNCTIONS = [
   "napi_get_version",
 ];
 
+const { PATH } = process.env;
+const BREW_BIN_PATH = "/opt/homebrew/bin";
+
+function getBrewPrioritizedPath() {
+  if (process.platform === "darwin" && PATH && fs.existsSync(BREW_BIN_PATH)) {
+    return [BREW_BIN_PATH, ...PATH.split(path.delimiter)].join(path.delimiter);
+  } else {
+    return PATH;
+  }
+}
+
+function clangFormat(filePath: string) {
+  const { status, stderr = "No error output" } = cp.spawnSync(
+    "clang-format",
+    ["-i", filePath],
+    {
+      encoding: "utf8",
+      env: {
+        ...process.env,
+        PATH: getBrewPrioritizedPath(),
+      },
+    },
+  );
+  assert.equal(status, 0, `Failed to format ${filePath}: ${stderr}`);
+}
+
 /**
  * Generates source code which injects the Node API functions from the host.
  */
@@ -80,7 +107,7 @@ async function run() {
   const source = generateSource(nodeApiFunctions);
   const sourcePath = path.join(CPP_SOURCE_PATH, "WeakNodeApiInjector.cpp");
   await fs.promises.writeFile(sourcePath, source, "utf-8");
-  cp.spawnSync("clang-format", ["-i", sourcePath], { stdio: "inherit" });
+  clangFormat(sourcePath);
 }
 
 run().catch((err) => {

packages/host/scripts/generate-injector.mts

@@ -13,6 +13,32 @@ import * as hostGenerator from "./generators/NodeApiHost.js";
 
 export const OUTPUT_PATH = path.join(import.meta.dirname, "../generated");
 
+const { PATH } = process.env;
+const BREW_BIN_PATH = "/opt/homebrew/bin";
+
+function getBrewPrioritizedPath() {
+  if (process.platform === "darwin" && PATH && fs.existsSync(BREW_BIN_PATH)) {
+    return [BREW_BIN_PATH, ...PATH.split(path.delimiter)].join(path.delimiter);
+  } else {
+    return PATH;
+  }
+}
+
+function clangFormat(filePath: string) {
+  const { status, stderr = "No error output" } = cp.spawnSync(
+    "clang-format",
+    ["-i", filePath],
+    {
+      encoding: "utf8",
+      env: {
+        ...process.env,
+        PATH: getBrewPrioritizedPath(),
+      },
+    },
+  );
+  assert.equal(status, 0, `Failed to format ${filePath}: ${stderr}`);
+}
+
 type GenerateFileOptions = {
   functions: FunctionDecl[];
   fileName: string;
@@ -43,14 +69,7 @@ async function generateFile({
   `;
   const outputPath = path.join(OUTPUT_PATH, fileName);
   await fs.promises.writeFile(outputPath, output.trim(), "utf-8");
-  const { status, stderr = "No error output" } = cp.spawnSync(
-    "clang-format",
-    ["-i", outputPath],
-    {
-      encoding: "utf8",
-    },
-  );
-  assert.equal(status, 0, `Failed to format ${fileName}: ${stderr}`);
+  clangFormat(outputPath);
 }
 
 async function run() {