ttsc 0.8.1 → 0.10.0

package/src/compiler/internal/transformProjectInMemory.ts

@@ -1,11 +1,13 @@
 import { spawnSync } from "node:child_process";
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
-import { loadProjectPlugins } from "../../plugin/internal/loadProjectPlugins";
+import {
+  hasProjectPluginEntries,
+  loadProjectPlugins,
+} from "../../plugin/internal/loadProjectPlugins";
 import type { ITtscCompilerContext } from "../../structures/ITtscCompilerContext";
 import type { ITtscCompilerDiagnostic } from "../../structures/ITtscCompilerDiagnostic";
-import type { ITtscProjectPluginConfig } from "../../structures/ITtscProjectPluginConfig";
 import type { ITtscLoadedNativePlugin } from "../../structures/internal/ITtscLoadedNativePlugin";
 import type { ITtscParsedProjectConfig } from "../../structures/internal/ITtscParsedProjectConfig";
 import type { TtscBuildResult } from "../../structures/internal/TtscBuildResult";
@@ -13,6 +15,7 @@ import { buildNativeCompiler } from "./buildNativeCompiler";
 import { readProjectConfig } from "./project/readProjectConfig";
 import { resolveBinary } from "./resolveBinary";
 import { resolveTsgo } from "./resolveTsgo";
+import { appendBuildOutput, normalizeBuildOutput } from "./runBuild";
 
 /** Transform a project and capture TypeScript source output in memory. */
 export function transformProjectInMemory(options: ITtscCompilerContext): {
@@ -22,23 +25,20 @@ export function transformProjectInMemory(options: ITtscCompilerContext): {
   const cwd = path.resolve(options.cwd ?? process.cwd());
   const project = readProjectConfig({
     cwd,
+    projectRoot: options.projectRoot,
     tsconfig: options.tsconfig,
   });
-  if (configuredPlugins(options, project).length !== 0) {
+  if (hasConfiguredPlugins(options, project)) {
     return transformProjectWithPlugins(options, cwd, project);
   }
   return transformProjectWithNativeHost(options, project);
 }
 
-function configuredPlugins(
+function hasConfiguredPlugins(
   options: ITtscCompilerContext,
   project: ITtscParsedProjectConfig,
-): ITtscProjectPluginConfig[] {
-  if (options.plugins === false) {
-    return [];
-  }
-  const entries = options.plugins ?? project.compilerOptions.plugins;
-  return entries.filter((entry) => entry.enabled !== false);
+): boolean {
+  return hasProjectPluginEntries(project, options.plugins);
 }
 
 function transformProjectWithNativeHost(
@@ -95,6 +95,7 @@ function transformProjectWithPlugins(
     cacheDir: options.cacheDir ?? options.env?.TTSC_CACHE_DIR,
     cwd,
     entries: options.plugins,
+    projectRoot: options.projectRoot,
     tsconfig: project.path,
   });
   const checks = loaded.nativePlugins.filter(
@@ -116,7 +117,11 @@ function transformProjectWithPlugins(
     };
   }
   if (transformers.length === 0) {
-    return transformProjectWithNativeHost(options, project);
+    const transformed = transformProjectWithNativeHost(options, project);
+    return {
+      result: appendBuildOutput(checked, transformed.result),
+      typescript: transformed.typescript,
+    };
   }
   assertTransformHostCompatibility(transformers);
 
@@ -138,13 +143,14 @@ function transformProjectWithPlugins(
     outputText(res.stdout),
     outputText(res.stderr),
   );
+  const result = {
+    diagnostics: output.diagnostics,
+    status: res.status ?? 1,
+    stdout: "",
+    stderr: outputText(res.stderr),
+  };
   return {
-    result: {
-      diagnostics: output.diagnostics,
-      status: res.status ?? 1,
-      stdout: "",
-      stderr: outputText(res.stderr),
-    },
+    result: appendBuildOutput(checked, result),
     typescript: output.typescript,
   };
 }
@@ -175,12 +181,17 @@ function runNativeChecks(
         `ttsc.transform.check: failed to spawn ${plugin.binary}: ${res.error.message}`,
       );
     }
-    result = appendBuildResult(result, {
-      diagnostics: [],
-      status: res.status ?? 1,
-      stdout: outputText(res.stdout),
-      stderr: outputText(res.stderr),
-    });
+    result = appendBuildOutput(
+      result,
+      normalizeBuildOutput(
+        {
+          status: res.status ?? 1,
+          stdout: outputText(res.stdout),
+          stderr: outputText(res.stderr),
+        },
+        project.root,
+      ),
+    );
     if (result.status !== 0) {
       return result;
     }
@@ -279,18 +290,6 @@ function readNearestPackageManifest(
   return undefined;
 }
 
-function appendBuildResult(
-  left: TtscBuildResult,
-  right: TtscBuildResult,
-): TtscBuildResult {
-  return {
-    diagnostics: [...left.diagnostics, ...right.diagnostics],
-    status: right.status !== 0 ? right.status : left.status,
-    stdout: left.stdout + right.stdout,
-    stderr: left.stderr + right.stderr,
-  };
-}
-
 function nativePluginEnv(
   options: ITtscCompilerContext,
   projectRoot: string,
@@ -390,6 +389,7 @@ function isTextRecord(value: unknown): value is Record<string, string> {
   return (
     typeof value === "object" &&
     value !== null &&
+    !Array.isArray(value) &&
     Object.values(value).every((entry) => typeof entry === "string")
   );
 }

package/src/launcher/internal/getCompilerVersionText.ts

@@ -1,6 +1,6 @@
 import { spawnSync } from "node:child_process";
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
 import { resolveTsgo } from "../../compiler/internal/resolveTsgo";
 import type { TtscCommonOptions } from "../../structures/internal/TtscCommonOptions";

package/src/launcher/internal/prepareExecution.ts

@@ -1,6 +1,6 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 
 import { resolveEmittedJavaScript } from "../../compiler/internal/resolveEmittedJavaScript";
 import { runBuild } from "../../compiler/internal/runBuild";
@@ -57,8 +57,9 @@ function createProjectContext(
   );
   const tsconfig = project.path;
   const root = project.root;
+  const explicitCacheDir = resolveCacheDir(cwd, options.cacheDir);
   const cacheDir =
-    options.cacheDir ??
+    explicitCacheDir ??
     path.join(root, "node_modules", ".cache", "ttsc", "ttsx");
   const processDir = path.join(cacheDir, "project", PROCESS_CACHE_KEY);
   const virtualRoot = path.join(processDir, "fs");
@@ -67,6 +68,7 @@ function createProjectContext(
     root,
     cacheDir,
     processDir,
+    pluginCacheDir: explicitCacheDir,
     virtualRoot,
     emitDir: project.compilerOptions.outDir
       ? virtualPath(virtualRoot, project.compilerOptions.outDir)
@@ -104,6 +106,7 @@ function buildProject(
     emit: true,
     env: options.env,
     forceListEmittedFiles: true,
+    cacheDir: context.pluginCacheDir,
     outDir: context.emitDir,
     plugins: options.plugins,
     quiet: true,
@@ -129,6 +132,13 @@ function buildProject(
   throw new Error(detail);
 }
 
+function resolveCacheDir(cwd: string, cacheDir?: string): string | undefined {
+  if (!cacheDir) {
+    return undefined;
+  }
+  return path.isAbsolute(cacheDir) ? cacheDir : path.resolve(cwd, cacheDir);
+}
+
 function linkVirtualProjectLayout(
   context: ReturnType<typeof createProjectContext>,
 ): void {

package/src/launcher/internal/runTtsc.ts

@@ -1,6 +1,6 @@
 import { spawnSync } from "node:child_process";
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
 import { TtscCompiler } from "../../TtscCompiler";
 import { resolveBinary } from "../../compiler/internal/resolveBinary";
@@ -72,7 +72,7 @@ function runCompatibleBuild(
   argv: readonly string[],
   checkOnly: boolean,
 ): number {
-  const options = parseBuildArgs(argv, checkOnly);
+  const options = normalizeBuildOptions(parseBuildArgs(argv, checkOnly));
   if (options.watch) {
     return runWatch(options, checkOnly);
   }
@@ -85,6 +85,17 @@ function runCompatibleBuild(
   return result.status;
 }
 
+function normalizeBuildOptions(
+  options: ReturnType<typeof parseBuildArgs>,
+): ReturnType<typeof parseBuildArgs> {
+  const cwd = path.resolve(options.cwd ?? process.cwd());
+  return {
+    ...options,
+    cacheDir: resolveCacheDir(cwd, options.cacheDir),
+    cwd,
+  };
+}
+
 function runPrepare(argv: readonly string[]): number {
   const options = parseProjectArgs(argv);
   const cwd = path.resolve(options.cwd ?? process.cwd());
@@ -153,12 +164,20 @@ function resolveCleanProjectRoot(cwd: string, tsconfig?: string): string {
 
 function formatProjectPath(cwd: string, target: string): string {
   const relative = path.relative(cwd, target);
-  if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) {
+  if (!relative || isOutsideRelativePath(relative)) {
     return target;
   }
   return relative;
 }
 
+function isOutsideRelativePath(relative: string): boolean {
+  return (
+    relative === ".." ||
+    relative.startsWith(`..${path.sep}`) ||
+    path.isAbsolute(relative)
+  );
+}
+
 function delegateToNative(argv: readonly string[]): number {
   const bin = resolveBinary();
   if (!bin) {
@@ -498,6 +517,13 @@ function runWatch(
   return 0;
 }
 
+function resolveCacheDir(cwd: string, cacheDir?: string): string | undefined {
+  if (!cacheDir) {
+    return undefined;
+  }
+  return path.isAbsolute(cacheDir) ? cacheDir : path.resolve(cwd, cacheDir);
+}
+
 function collectWatchDirectories(root: string): string[] {
   const out: string[] = [];
   const stack: string[] = [root];