[codex] Enforce canonical Node namespace imports (#3238)

Julius Marminge committed 4 months ago

Commit 2fa37ec1 parent db2750271 files · +1205 −952Browse files

Showing the changes to apps/server/src/textGeneration (2 of 71 files). Show all

Unified · Split

2 files

apps/server/src/textGeneration/CursorTextGeneration.test.ts +25 −21
apps/server/src/textGeneration/GrokTextGeneration.test.ts +18 −16

apps/server/src/textGeneration/CursorTextGeneration.test.ts+25−21

 // @effect-diagnostics nodeBuiltinImport:off
-import * as path from "node:path";
+import * as NodePath from "node:path";
-import * as os from "node:os";
+import * as NodeOS from "node:os";
-import { fileURLToPath } from "node:url";
+import * as NodeURL from "node:url";
-import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import * as NodeFS from "node:fs";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
 import { makeCursorTextGeneration } from "./CursorTextGeneration.ts";
 const decodeCursorSettings = Schema.decodeSync(CursorSettings);
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const __dirname = NodePath.dirname(NodeURL.fileURLToPath(import.meta.url));
-const mockAgentPath = path.join(__dirname, "../../scripts/acp-mock-agent.ts");
+const mockAgentPath = NodePath.join(__dirname, "../../scripts/acp-mock-agent.ts");
 function shellSingleQuote(value: string): string {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
 }).pipe(Layer.provideMerge(NodeServices.layer));
 function makeAcpAgentWrapper(dir: string, env: Record<string, string>): string {
-  const binDir = path.join(dir, "bin");
+  const binDir = NodePath.join(dir, "bin");
-  const agentPath = path.join(binDir, "agent");
+  const agentPath = NodePath.join(binDir, "agent");
-  mkdirSync(binDir, { recursive: true });
+  NodeFS.mkdirSync(binDir, { recursive: true });
-  writeFileSync(
+  NodeFS.writeFileSync(
     agentPath,
     [
       "#!/bin/sh",
     ].join("\n"),
     "utf8",
   );
-  chmodSync(agentPath, 0o755);
+  NodeFS.chmodSync(agentPath, 0o755);
   return agentPath;
 }
   effectFn: (textGeneration: TextGeneration.TextGeneration["Service"]) => Effect.Effect<A, E, R>,
 ) {
   return Effect.gen(function* () {
-    const tempDir = mkdtempSync(path.join(os.tmpdir(), "t3code-cursor-text-acp-"));
+    const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3code-cursor-text-acp-"));
     yield* Effect.addFinalizer(() =>
       Effect.sync(() => {
-        rmSync(tempDir, { recursive: true, force: true });
+        NodeFS.rmSync(tempDir, { recursive: true, force: true });
       }),
     );
     const agentPath = makeAcpAgentWrapper(tempDir, env);
   return Effect.gen(function* () {
     const deadline = (yield* Clock.currentTimeMillis) + 5_000;
     for (;;) {
-      const result = yield* Effect.exit(Effect.sync(() => readFileSync(path, "utf8")));
+      const result = yield* Effect.exit(Effect.sync(() => NodeFS.readFileSync(path, "utf8")));
       if (Exit.isSuccess(result)) {
         return result.value;
       }
 it.layer(CursorTextGenerationTestLayer)("CursorTextGeneration", (it) => {
   it.effect("uses ACP model config options instead of raw CLI model ids", () => {
-    const requestLogDir = mkdtempSync(path.join(os.tmpdir(), "t3code-cursor-text-log-"));
+    const requestLogDir = NodeFS.mkdtempSync(
-    const requestLogPath = path.join(requestLogDir, "requests.ndjson");
+      NodePath.join(NodeOS.tmpdir(), "t3code-cursor-text-log-"),
+    );
+    const requestLogPath = NodePath.join(requestLogDir, "requests.ndjson");
     return withFakeAcpAgent(
       {
           expect(generated.subject).toBe("Add generated commit message");
           expect(generated.body).toBe("- verify cursor acp model config path");
-          const requests = readFileSync(requestLogPath, "utf8")
+          const requests = NodeFS.readFileSync(requestLogPath, "utf8")
             .trim()
             .split("\n")
             .filter((line) => line.length > 0)
             ]),
           );
-          rmSync(requestLogDir, { recursive: true, force: true });
+          NodeFS.rmSync(requestLogDir, { recursive: true, force: true });
         }),
     );
   });
   );
   it.effect("closes the ACP child process after text generation completes", () => {
-    const exitLogDir = mkdtempSync(path.join(os.tmpdir(), "t3code-cursor-text-exit-log-"));
+    const exitLogDir = NodeFS.mkdtempSync(
-    const exitLogPath = path.join(exitLogDir, "exit.log");
+      NodePath.join(NodeOS.tmpdir(), "t3code-cursor-text-exit-log-"),
+    );
+    const exitLogPath = NodePath.join(exitLogDir, "exit.log");
     return withFakeAcpAgent(
       {
           const exitLog = yield* waitForFileContent(exitLogPath);
           expect(exitLog).toContain("exit:0");
-          rmSync(exitLogDir, { recursive: true, force: true });
+          NodeFS.rmSync(exitLogDir, { recursive: true, force: true });
         }),
     );
   });

apps/server/src/textGeneration/GrokTextGeneration.test.ts+18−16

 // @effect-diagnostics nodeBuiltinImport:off
-import * as path from "node:path";
+import * as NodePath from "node:path";
-import * as os from "node:os";
+import * as NodeOS from "node:os";
-import { fileURLToPath } from "node:url";
+import * as NodeURL from "node:url";
-import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import * as NodeFS from "node:fs";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
 import { makeGrokTextGeneration } from "./GrokTextGeneration.ts";
 const decodeGrokSettings = Schema.decodeSync(GrokSettings);
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const __dirname = NodePath.dirname(NodeURL.fileURLToPath(import.meta.url));
-const mockAgentPath = path.join(__dirname, "../../scripts/acp-mock-agent.ts");
+const mockAgentPath = NodePath.join(__dirname, "../../scripts/acp-mock-agent.ts");
 function shellSingleQuote(value: string): string {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
 }).pipe(Layer.provideMerge(NodeServices.layer));
 function makeAcpGrokWrapper(dir: string, env: Record<string, string>): string {
-  const binDir = path.join(dir, "bin");
+  const binDir = NodePath.join(dir, "bin");
-  const grokPath = path.join(binDir, "grok");
+  const grokPath = NodePath.join(binDir, "grok");
-  mkdirSync(binDir, { recursive: true });
+  NodeFS.mkdirSync(binDir, { recursive: true });
-  writeFileSync(
+  NodeFS.writeFileSync(
     grokPath,
     [
       "#!/bin/sh",
     ].join("\n"),
     "utf8",
   );
-  chmodSync(grokPath, 0o755);
+  NodeFS.chmodSync(grokPath, 0o755);
   return grokPath;
 }
   effectFn: (textGeneration: TextGeneration.TextGeneration["Service"]) => Effect.Effect<A, E, R>,
 ) {
   return Effect.gen(function* () {
-    const tempDir = mkdtempSync(path.join(os.tmpdir(), "t3code-grok-text-acp-"));
+    const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3code-grok-text-acp-"));
     yield* Effect.addFinalizer(() =>
       Effect.sync(() => {
-        rmSync(tempDir, { recursive: true, force: true });
+        NodeFS.rmSync(tempDir, { recursive: true, force: true });
       }),
     );
     const binaryPath = makeAcpGrokWrapper(tempDir, env);
 function readJsonRpcRequests(
   filePath: string,
 ): ReadonlyArray<{ readonly method?: string; readonly params?: Record<string, unknown> }> {
-  return readFileSync(filePath, "utf8")
+  return NodeFS.readFileSync(filePath, "utf8")
     .trim()
     .split("\n")
     .filter((line) => line.length > 0)
 it.layer(GrokTextGenerationTestLayer)("GrokTextGeneration", (it) => {
   it.effect("uses ACP with disabled tool capabilities and forwards the requested model id", () => {
-    const requestLogDir = mkdtempSync(path.join(os.tmpdir(), "t3code-grok-text-log-"));
+    const requestLogDir = NodeFS.mkdtempSync(
-    const requestLogPath = path.join(requestLogDir, "requests.ndjson");
+      NodePath.join(NodeOS.tmpdir(), "t3code-grok-text-log-"),
+    );
+    const requestLogPath = NodePath.join(requestLogDir, "requests.ndjson");
     return withFakeAcpGrok(
       {