Fix packaged CLI node_modules resolution

Rhys Sullivan committed 7 months ago

Commit 1f9eeef1 parent c1292971 file · +34 −20Browse files

Unified · Split

packages/platform/control-plane/src/runtime/local/tools.ts+34−20

 import { createHash } from "node:crypto";
-import { createRequire } from "node:module";
+import { dirname, extname, join, relative, resolve, sep } from "node:path";
-import { basename, dirname, extname, join, relative, resolve, sep } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
-import { pathToFileURL } from "node:url";
 import { FileSystem } from "@effect/platform";
 import {
   createToolCatalogFromTools,
     return rewriteRelativeImportSpecifiers(transpiled.outputText);
   });
-const resolveExecutorNodeModulesDirectory = (): string | null => {
+const resolveExecutorNodeModulesDirectory = (): Effect.Effect<
-  const require = createRequire(import.meta.url);
+  string | null,
-  let current = dirname(require.resolve("typescript"));
+  LocalFileSystemError,
+  FileSystem.FileSystem
+> =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    let current = dirname(fileURLToPath(import.meta.url));
-  while (true) {
+    while (true) {
-    if (basename(current) === "node_modules") {
+      const candidate = join(current, "node_modules");
-      return current;
+      const exists = yield* fs
-    }
+        .exists(candidate)
+        .pipe(
+          Effect.mapError(
+            mapFileSystemError(
+              candidate,
+              "check executor node_modules directory",
+            ),
+          ),
+        );
+      if (exists) {
+        return candidate;
+      }
-    const parent = dirname(current);
+      const parent = dirname(current);
-    if (parent === current) {
+      if (parent === current) {
-      return null;
+        return null;
+      }
+      current = parent;
     }
-    current = parent;
+  });
-  }
-};
-const EXECUTOR_NODE_MODULES_DIRECTORY = resolveExecutorNodeModulesDirectory();
 const ensureArtifactNodeModulesLink = (artifactRoot: string) =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const linkPath = join(artifactRoot, "node_modules");
+    const executorNodeModulesDirectory = yield* resolveExecutorNodeModulesDirectory();
     const exists = yield* fs
       .exists(linkPath)
       .pipe(
       return;
     }
-    if (EXECUTOR_NODE_MODULES_DIRECTORY === null) {
+    if (executorNodeModulesDirectory === null) {
       return;
     }
     yield* fs
-      .symlink(EXECUTOR_NODE_MODULES_DIRECTORY, linkPath)
+      .symlink(executorNodeModulesDirectory, linkPath)
       .pipe(
         Effect.mapError(
           mapFileSystemError(linkPath, "create local tool node_modules link"),