ttsc 0.24.0 → 0.26.0

package/src/launcher/internal/runTtscserver.ts

@@ -8,6 +8,7 @@ import { createNativeProjectContextArgs } from "../../compiler/internal/project/
 import { readProjectConfig } from "../../compiler/internal/project/readProjectConfig";
 import { resolveBinary } from "../../compiler/internal/resolveBinary";
 import { resolveTsgo } from "../../compiler/internal/resolveTsgo";
+import { outputText, spawnNative } from "../../compiler/internal/spawnNative";
 import {
   type ProjectInputPathIdentityContext,
   createProjectInputPathIdentityContext,
@@ -43,8 +44,6 @@ type TtscserverEnvironment = {
 };
 
 const LSP_SELECTION_STABILITY_ATTEMPTS = 3;
-const LSP_PROJECT_INPUT_TIMEOUT_MS = 30_000;
-const LSP_PROJECT_INPUT_MAX_BUFFER = 4 * 1024 * 1024;
 
 /**
  * Drive the ttscserver native binary from a node launcher. The launcher is
@@ -359,22 +358,18 @@ function captureInitialLSPProjectInputs(options: {
       pluginConfigOrigin: options.pluginConfigOrigin,
       tsgoBinary: options.tsgoBinary,
     });
-    const result = spawnSync(plugin.binary, args, {
+    const result = spawnNative(plugin.binary, args, {
       cwd: options.project.root,
-      encoding: "utf8",
       env,
-      maxBuffer: LSP_PROJECT_INPUT_MAX_BUFFER,
-      timeout: LSP_PROJECT_INPUT_TIMEOUT_MS,
-      windowsHide: true,
     });
     if (result.error) {
       throw new Error(
         `ttscserver: ${plugin.name ?? plugin.binary} project-inputs failed: ${result.error.message}`,
       );
     }
-    const stdout = result.stdout.trim();
+    const stdout = outputText(result.stdout).trim();
     if (result.status !== 0) {
-      const detail = result.stderr.trim() || stdout;
+      const detail = outputText(result.stderr).trim() || stdout;
       throw new Error(
         `ttscserver: ${plugin.name ?? plugin.binary} project-inputs failed${detail ? `: ${detail}` : ""}`,
       );

package/src/launcher/internal/runTtsx.ts

@@ -276,7 +276,7 @@ function runPreparedEntry(
         depCacheDir,
         emitDir: execution.emitDir,
         emittedFiles: execution.emittedFiles,
-        moduleOption: execution.moduleOption,
+        moduleOptions: execution.moduleOptions,
         projectRoot: execution.projectRoot,
         rootDir: execution.rootDir,
       }),
@@ -299,7 +299,6 @@ function runPreparedEntry(
       sourceEntry,
       ...parsed.passthrough,
     ];
-    const evaluatorBoundary = readEvaluatorBoundary(process.env);
     const runtimeEnv: NodeJS.ProcessEnv = {
       ...process.env,
       NODE_OPTIONS: appendNodeOption(
@@ -309,42 +308,12 @@ function runPreparedEntry(
       TTSC_TSGO_BINARY: process.env.TTSC_TSGO_BINARY ?? tsgo,
       TTSX_RUNTIME_MANIFEST: manifestPath,
     };
-    delete runtimeEnv[TTSC_TTSX_EVALUATOR_DEADLINE_ENV];
-    delete runtimeEnv[TTSC_TTSX_EVALUATOR_MAX_BUFFER_ENV];
-    delete runtimeEnv[TTSC_TTSX_EVALUATOR_STATUS_FD_ENV];
-
     const result = spawnSync(process.execPath, args, {
       cwd,
       env: runtimeEnv,
-      ...(evaluatorBoundary
-        ? {
-            killSignal: "SIGKILL" as const,
-            timeout: Math.max(
-              1,
-              Math.min(
-                MAX_CHILD_PROCESS_TIMEOUT_MS,
-                evaluatorBoundary.deadlineMs - Date.now(),
-              ),
-            ),
-            maxBuffer: evaluatorBoundary.maxBuffer,
-            stdio: ["inherit", "pipe", "pipe"] as const,
-          }
-        : { stdio: "inherit" as const }),
+      stdio: "inherit",
       windowsHide: true,
     });
-    const nestedCode = (result.error as NodeJS.ErrnoException | undefined)
-      ?.code;
-    if (
-      evaluatorBoundary &&
-      (nestedCode === "ETIMEDOUT" || nestedCode === "ENOBUFS")
-    ) {
-      reportEvaluatorFailure(evaluatorBoundary.statusFd, nestedCode);
-      return 1;
-    }
-    if (evaluatorBoundary) {
-      if (result.stdout) process.stdout.write(result.stdout);
-      if (result.stderr) process.stderr.write(result.stderr);
-    }
     if (result.error) {
       process.stderr.write(`${result.error.message}\n`);
       return 1;
@@ -355,51 +324,6 @@ function runPreparedEntry(
   }
 }
 
-interface TtsxEvaluatorBoundary {
-  deadlineMs: number;
-  maxBuffer: number;
-  statusFd: number;
-}
-
-const TTSC_TTSX_EVALUATOR_DEADLINE_ENV = "TTSC_TTSX_EVALUATOR_DEADLINE_MS";
-const TTSC_TTSX_EVALUATOR_MAX_BUFFER_ENV =
-  "TTSC_TTSX_EVALUATOR_MAX_BUFFER_BYTES";
-const TTSC_TTSX_EVALUATOR_STATUS_FD_ENV = "TTSC_TTSX_EVALUATOR_STATUS_FD";
-const TTSC_TTSX_EVALUATOR_STATUS_FD = 3;
-const MAX_CHILD_PROCESS_TIMEOUT_MS = 2_147_483_647;
-
-function readEvaluatorBoundary(
-  env: NodeJS.ProcessEnv,
-): TtsxEvaluatorBoundary | undefined {
-  const deadlineMs = Number(env[TTSC_TTSX_EVALUATOR_DEADLINE_ENV]);
-  const maxBuffer = Number(env[TTSC_TTSX_EVALUATOR_MAX_BUFFER_ENV]);
-  const statusFd = Number(env[TTSC_TTSX_EVALUATOR_STATUS_FD_ENV]);
-  if (
-    !Number.isSafeInteger(deadlineMs) ||
-    deadlineMs <= 0 ||
-    !Number.isSafeInteger(maxBuffer) ||
-    maxBuffer <= 0 ||
-    maxBuffer > MAX_CHILD_PROCESS_TIMEOUT_MS ||
-    statusFd !== TTSC_TTSX_EVALUATOR_STATUS_FD
-  ) {
-    return undefined;
-  }
-  return { deadlineMs, maxBuffer, statusFd };
-}
-
-function reportEvaluatorFailure(
-  statusFd: number,
-  code: "ENOBUFS" | "ETIMEDOUT",
-): void {
-  try {
-    fs.writeSync(statusFd, code);
-  } catch {
-    // The boundary is an internal parent/child protocol. If a standalone ttsx
-    // caller supplied only the environment variables, preserve the ordinary
-    // non-zero bounded-process result instead of replacing it with an fd error.
-  }
-}
-
 function removeRuntimeOutput(directory: string): void {
   try {
     fs.rmSync(directory, { force: true, recursive: true });