Merge branch 'master' into track-diagnostics

Author: nojaf

CHANGELOG.md

@@ -10,6 +10,12 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
+## [Unreleased]
+
+#### :nail_care: Polish
+
+- Resolve symlinks when finding platform binaries. https://github.com/rescript-lang/rescript-vscode/pull/1154
+
 ## 1.70.0
 
 #### :bug: Bug fix

server/src/find-runtime.ts

@@ -154,23 +154,14 @@ async function findRuntimePath(
   );
 }
 
-function findRuntimeCached(): (
-  project: NormalizedPath,
-) => Promise<NormalizedPath[]> {
-  const cache = new Map<NormalizedPath, NormalizedPath[]>();
-  return async (project: NormalizedPath) => {
-    if (cache.has(project)) {
-      return cache.get(project)!;
-    }
-    const runtimes = await findRuntimePath(project);
-    cache.set(project, runtimes);
-    return runtimes;
-  };
-}
-
 /**
  * Find all installed @rescript/runtime directories in the given project path.
  * In a perfect world, there should be exactly one.
- * This function is cached per project path.
+ * Note: This function is not cached here. Caching is handled by the caller
+ * (see getRuntimePathFromWorkspaceRoot in utils.ts).
  */
-export const findRescriptRuntimesInProject = findRuntimeCached();
+export async function findRescriptRuntimesInProject(
+  project: NormalizedPath,
+): Promise<NormalizedPath[]> {
+  return await findRuntimePath(project);
+}

server/src/server.ts

@@ -1580,6 +1580,7 @@ async function onMessage(msg: p.Message) {
           config: config.extensionConfiguration,
           projects,
           workspaceFolders: Array.from(workspaceFolders),
+          runtimePathCache: utils.getRuntimePathCacheSnapshot(),
         };
 
         let response: p.ResponseMessage = {

server/src/utils.ts

@@ -226,8 +226,10 @@ let findBinary = async (
     // TODO: export `binPaths` from `rescript` package so that we don't need to
     // copy the logic for figuring out `target`.
     const target = `${process.platform}-${process.arch}`;
+    // Use realpathSync to resolve symlinks, which is necessary for package
+    // managers like Deno and pnpm that use symlinked node_modules structures.
     const targetPackagePath = path.join(
-      rescriptDir,
+      fs.realpathSync(rescriptDir),
       "..",
       `@rescript/${target}/bin.js`,
     );
@@ -570,6 +572,14 @@ export async function getRuntimePathFromProjectRoot(
   return result;
 }
 
+/**
+ * Returns a snapshot of the runtime path cache as a plain object.
+ * Useful for debugging and state dumps.
+ */
+export function getRuntimePathCacheSnapshot(): Record<string, string | null> {
+  return Object.fromEntries(runtimePathCache);
+}
+
 export const getNamespaceNameFromConfigFile = (
   projDir: NormalizedPath,
 ): execResult<string> => {