ttsc 0.8.1 → 0.10.0

package/src/TtscCompiler.ts

@@ -1,5 +1,5 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
 import { compileProjectInMemory } from "./compiler/internal/compileProjectInMemory";
 import { resolveProjectConfig } from "./compiler/internal/project/resolveProjectConfig";
@@ -66,6 +66,7 @@ export class TtscCompiler {
       cacheDir: this.resolvePluginCacheDir(),
       cwd: execution.cwd,
       entries: this.context.plugins,
+      projectRoot: execution.projectRoot,
       tsconfig: execution.tsconfig,
     });
     return loaded.nativePlugins.map((plugin) => plugin.binary);
@@ -161,7 +162,9 @@ export class TtscCompiler {
     });
     return {
       cwd,
-      projectRoot: path.dirname(tsconfig),
+      projectRoot: this.context.projectRoot
+        ? path.resolve(cwd, this.context.projectRoot)
+        : path.dirname(tsconfig),
       tsconfig,
     };
   }
@@ -243,8 +246,11 @@ function runTransformation(
 
 function toCompilerResult(project: ProjectResult): ITtscCompilerResult {
   const { output, result } = project;
-  if (result.status === 0 && result.diagnostics.length === 0) {
+  if (result.status === 0 && !hasErrorDiagnostics(result.diagnostics)) {
     return {
+      ...(result.diagnostics.length === 0
+        ? {}
+        : { diagnostics: result.diagnostics }),
       output,
       type: "success",
     };
@@ -277,8 +283,11 @@ function toCompilerTransformation(
   project: ProjectTransformation,
 ): ITtscCompilerTransformation {
   const { result, typescript } = project;
-  if (result.status === 0 && result.diagnostics.length === 0) {
+  if (result.status === 0 && !hasErrorDiagnostics(result.diagnostics)) {
     return {
+      ...(result.diagnostics.length === 0
+        ? {}
+        : { diagnostics: result.diagnostics }),
       type: "success",
       typescript,
     };
@@ -293,6 +302,12 @@ function toCompilerTransformation(
   };
 }
 
+function hasErrorDiagnostics(
+  diagnostics: readonly ITtscCompilerDiagnostic[],
+): boolean {
+  return diagnostics.some((diagnostic) => diagnostic.category === "error");
+}
+
 function normalizeError(error: unknown): unknown {
   if (!(error instanceof Error)) {
     return error;

package/src/compiler/internal/buildNativeCompiler.ts

@@ -1,5 +1,5 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
 import { buildSourcePlugin } from "../../plugin/internal/buildSourcePlugin";
 

package/src/compiler/internal/compileProjectInMemory.ts

@@ -1,11 +1,11 @@
 import { spawnSync } from "node:child_process";
-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 { hasProjectPluginEntries } from "../../plugin/internal/loadProjectPlugins";
 import type { ITtscCompilerContext } from "../../structures/ITtscCompilerContext";
 import type { ITtscCompilerDiagnostic } from "../../structures/ITtscCompilerDiagnostic";
-import type { ITtscProjectPluginConfig } from "../../structures/ITtscProjectPluginConfig";
 import type { ITtscParsedProjectConfig } from "../../structures/internal/ITtscParsedProjectConfig";
 import type { TtscBuildResult } from "../../structures/internal/TtscBuildResult";
 import { buildNativeCompiler } from "./buildNativeCompiler";
@@ -20,22 +20,23 @@ export function compileProjectInMemory(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 compileProjectWithPlugins(options, cwd, project);
   }
   const tsconfig = project.path;
   const binary = buildNativeCompiler({
-    cacheBaseDir: path.dirname(tsconfig),
+    cacheBaseDir: project.root,
     cacheDir: options.cacheDir,
     packageRoot: packageRootDir(),
   });
   const res = spawnSync(
     binary,
-    ["api-compile", "--cwd", path.dirname(tsconfig), "--tsconfig", tsconfig],
+    ["api-compile", "--cwd", project.root, "--tsconfig", tsconfig],
     {
-      cwd: path.dirname(tsconfig),
+      cwd: project.root,
       encoding: "utf8",
       env: { ...process.env, ...options.env },
       maxBuffer: 1024 * 1024 * 256,
@@ -60,15 +61,11 @@ export function compileProjectInMemory(options: ITtscCompilerContext): {
   };
 }
 
-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 compileProjectWithPlugins(
@@ -109,13 +106,21 @@ function outputKeyMapper(
     return (relativePath) => relativePath;
   }
   const relativeOutDir = path.relative(project.root, outDir);
-  if (relativeOutDir !== "" && !relativeOutDir.startsWith("..")) {
+  if (relativeOutDir !== "" && !isOutsideRelativePath(relativeOutDir)) {
     const prefix = pathToKey(relativeOutDir);
     return (relativePath) => path.posix.join(prefix, relativePath);
   }
   return (relativePath) => pathToKey(path.join(outDir, relativePath));
 }
 
+function isOutsideRelativePath(relative: string): boolean {
+  return (
+    relative === ".." ||
+    relative.startsWith(`..${path.sep}`) ||
+    path.isAbsolute(relative)
+  );
+}
+
 function readOutputDirectory(
   directory: string,
   keyOf: (relativePath: string) => string,

package/src/compiler/internal/project/readProjectConfig.ts

@@ -1,6 +1,6 @@
-import * as fs from "node:fs";
+import fs from "node:fs";
 import { createRequire } from "node:module";
-import * as path from "node:path";
+import path from "node:path";
 
 import type { ITtscProjectPluginConfig } from "../../../structures/ITtscProjectPluginConfig";
 import type { ITtscParsedProjectConfig } from "../../../structures/internal/ITtscParsedProjectConfig";
@@ -8,12 +8,25 @@ import type { ITtscProjectLocatorOptions } from "../../../structures/internal/IT
 
 import { resolveProjectConfig } from "./resolveProjectConfig";
 
+const PATH_OPTIONS = new Set(["baseUrl", "declarationDir", "rootDir"]);
+
+type ResolvedCompilerOptions = {
+  options: Record<string, unknown>;
+  optionBaseDirs: Record<string, string>;
+  outDir?: string;
+  pluginBaseDirs: string[];
+  pluginsDeclared: boolean;
+  plugins: ITtscProjectPluginConfig[];
+};
+
 /** Read the resolved project config subset used by ttsc. */
 export function readProjectConfig(
   opts: ITtscProjectLocatorOptions = {},
 ): ITtscParsedProjectConfig {
   const tsconfig = resolveProjectConfig(opts);
-  const root = path.dirname(tsconfig);
+  const root = opts.projectRoot
+    ? path.resolve(opts.cwd ?? process.cwd(), opts.projectRoot)
+    : path.dirname(tsconfig);
   const compilerOptions = readResolvedCompilerOptions(tsconfig);
   return {
     compilerOptions: {
@@ -22,6 +35,7 @@ export function readProjectConfig(
       plugins: compilerOptions.plugins,
     },
     path: tsconfig,
+    pluginBaseDirs: compilerOptions.pluginBaseDirs,
     root,
   };
 }
@@ -47,46 +61,131 @@ function resolveAbsolutePath(cwd: string, target: string): string {
 function readResolvedCompilerOptions(
   tsconfig: string,
   seen: Set<string> = new Set(),
-): {
-  options: Record<string, unknown>;
-  outDir?: string;
-  plugins: ITtscProjectPluginConfig[];
-} {
+): ResolvedCompilerOptions {
   const canonical = resolveRealPath(tsconfig);
   if (seen.has(canonical)) {
     throw new Error(`ttsc: circular tsconfig extends detected: ${canonical}`);
   }
   seen.add(canonical);
+  try {
+    const parsed = parseJsonc(fs.readFileSync(canonical, "utf8")) as {
+      extends?: unknown;
+      compilerOptions?: Record<string, unknown> & {
+        outDir?: unknown;
+        plugins?: unknown;
+      };
+    };
+    const own = parsed.compilerOptions;
+    const base = resolveBaseCompilerOptions(canonical, parsed.extends, seen);
+    const ownBaseDir = path.dirname(canonical);
+    const ownOptionBaseDirs =
+      own === undefined
+        ? {}
+        : Object.fromEntries(
+            Object.keys(own).map((key) => [key, ownBaseDir] as const),
+          );
+    const optionBaseDirs = {
+      ...base.optionBaseDirs,
+      ...ownOptionBaseDirs,
+    };
+    const options = resolvePathOptions(
+      {
+        ...base.options,
+        ...(own ?? {}),
+      },
+      optionBaseDirs,
+    );
+    const ownPlugins = own?.plugins;
+    const pluginsDeclared = Array.isArray(ownPlugins);
+    const plugins = pluginsDeclared
+      ? ownPlugins.filter(isProjectPluginConfig)
+      : base.plugins;
+    return {
+      optionBaseDirs,
+      options,
+      outDir:
+        typeof own?.outDir === "string"
+          ? resolveAbsolutePath(ownBaseDir, own.outDir)
+          : base.outDir,
+      pluginBaseDirs: pluginsDeclared
+        ? plugins.map(() => ownBaseDir)
+        : base.pluginBaseDirs,
+      pluginsDeclared: pluginsDeclared || base.pluginsDeclared,
+      plugins,
+    };
+  } finally {
+    seen.delete(canonical);
+  }
+}
 
-  const parsed = parseJsonc(fs.readFileSync(canonical, "utf8")) as {
-    extends?: unknown;
-    compilerOptions?: Record<string, unknown> & {
-      outDir?: unknown;
-      plugins?: unknown;
+function resolveBaseCompilerOptions(
+  tsconfig: string,
+  extended: unknown,
+  seen: Set<string>,
+): ResolvedCompilerOptions {
+  if (typeof extended === "string") {
+    return readResolvedCompilerOptions(
+      resolveExtendsConfig(tsconfig, extended),
+      seen,
+    );
+  }
+  if (!Array.isArray(extended)) {
+    return {
+      optionBaseDirs: {},
+      options: {},
+      pluginBaseDirs: [],
+      pluginsDeclared: false,
+      plugins: [],
     };
+  }
+  let merged: ResolvedCompilerOptions = {
+    optionBaseDirs: {},
+    options: {},
+    pluginBaseDirs: [],
+    pluginsDeclared: false,
+    plugins: [],
   };
-  const own = parsed.compilerOptions;
-  const base =
-    typeof parsed.extends === "string"
-      ? readResolvedCompilerOptions(
-          resolveExtendsConfig(canonical, parsed.extends),
-          seen,
-        )
-      : { options: {}, plugins: [] };
-  const options = {
-    ...base.options,
-    ...(own ?? {}),
-  };
-  return {
-    options,
-    outDir:
-      typeof own?.outDir === "string"
-        ? resolveAbsolutePath(path.dirname(canonical), own.outDir)
-        : base.outDir,
-    plugins: Array.isArray(own?.plugins)
-      ? own.plugins.filter(isProjectPluginConfig)
-      : base.plugins,
-  };
+  for (const specifier of extended) {
+    if (typeof specifier !== "string") {
+      continue;
+    }
+    const current = readResolvedCompilerOptions(
+      resolveExtendsConfig(tsconfig, specifier),
+      seen,
+    );
+    merged = {
+      optionBaseDirs: {
+        ...merged.optionBaseDirs,
+        ...current.optionBaseDirs,
+      },
+      options: {
+        ...merged.options,
+        ...current.options,
+      },
+      outDir: current.outDir ?? merged.outDir,
+      pluginBaseDirs: current.pluginsDeclared
+        ? current.pluginBaseDirs
+        : merged.pluginBaseDirs,
+      plugins: current.pluginsDeclared ? current.plugins : merged.plugins,
+      pluginsDeclared: merged.pluginsDeclared || current.pluginsDeclared,
+    };
+  }
+  return merged;
+}
+
+function resolvePathOptions(
+  options: Record<string, unknown>,
+  baseDirs: Record<string, string>,
+): Record<string, unknown> {
+  const resolved = { ...options };
+  for (const key of PATH_OPTIONS) {
+    const value = resolved[key];
+    const baseDir = baseDirs[key];
+    if (typeof value === "string" && baseDir !== undefined) {
+      resolved[key] = resolveAbsolutePath(baseDir, value);
+    }
+  }
+  return resolved;
 }
 
 function resolveExtendsConfig(tsconfig: string, specifier: string): string {

package/src/compiler/internal/project/resolveProjectConfig.ts

@@ -1,5 +1,5 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
 import type { ITtscProjectLocatorOptions } from "../../../structures/internal/ITtscProjectLocatorOptions";
 

package/src/compiler/internal/resolveBinary.ts

@@ -1,5 +1,5 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
 /** Resolve the ttsc helper binary path, or null when unavailable. */
 export function resolveBinary(

package/src/compiler/internal/resolveEmittedJavaScript.ts

@@ -1,5 +1,5 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
+import fs from "node:fs";
+import path from "node:path";
 
 /** Locate the JavaScript file emitted for a TypeScript source file. */
 export function resolveEmittedJavaScript(options: {
@@ -37,11 +37,7 @@ function resolveExactEmittedFile(
   sourceFile: string,
 ): string | null {
   const relative = path.relative(projectRoot, sourceFile);
-  if (
-    relative === "" ||
-    relative.startsWith("..") ||
-    path.isAbsolute(relative)
-  ) {
+  if (relative === "" || isOutsideRelativePath(relative)) {
     return null;
   }
   return path.resolve(
@@ -87,6 +83,14 @@ function sharedSourceStemSegments(outPath: string, srcPath: string): number {
   return shared;
 }
 
+function isOutsideRelativePath(relative: string): boolean {
+  return (
+    relative === ".." ||
+    relative.startsWith(`..${path.sep}`) ||
+    path.isAbsolute(relative)
+  );
+}
+
 function emittedJavaScriptExtension(filename: string): string {
   switch (path.extname(filename).toLowerCase()) {
     case ".mts":

package/src/compiler/internal/resolveTsgo.ts

@@ -1,6 +1,6 @@
-import * as fs from "node:fs";
+import fs from "node:fs";
 import { createRequire } from "node:module";
-import * as path from "node:path";
+import path from "node:path";
 
 /** Resolve the consumer project's TypeScript-Go preview binary. */
 export function resolveTsgo(

package/src/compiler/internal/runBuild.ts

@@ -1,7 +1,7 @@
 import { spawnSync } from "node:child_process";
-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 { loadProjectPlugins } from "../../plugin/internal/loadProjectPlugins";
 import type { ITtscCompilerDiagnostic } from "../../structures/ITtscCompilerDiagnostic";
@@ -112,10 +112,10 @@ export function runBuild(
           buildWithNativeCompilerPlugins(options, execution, compilers),
         );
       }
-      if (checked.stdout !== "" || checked.stderr !== "") {
-        return checked;
-      }
-      return runTsgo(execution, ["--noEmit"], options);
+      return appendBuildOutput(
+        checked,
+        runTsgo(execution, ["--noEmit"], options),
+      );
     }
 
     let result: TtscBuildResult;
@@ -126,14 +126,10 @@ export function runBuild(
         buildWithNativeCompilerPlugins(options, execution, compilers),
       );
     } else {
-      if (
-        checked.stdout === "" &&
-        checked.stderr === "" &&
-        options.skipDiagnosticsCheck !== true
-      ) {
+      if (options.skipDiagnosticsCheck !== true) {
         const tsgoChecked = runTsgo(execution, ["--noEmit"], options);
         if (tsgoChecked.status !== 0) {
-          return tsgoChecked;
+          return appendBuildOutput(checked, tsgoChecked);
         }
       }
       const args = createTsgoBuildArgs(execution, options, {
@@ -201,7 +197,7 @@ function runTsgo(
         res.error.message,
     );
   }
-  return normalizeFailedDiagnostics(
+  return normalizeBuildOutput(
     {
       status: res.status ?? 1,
       stdout: outputText(res.stdout),
@@ -238,7 +234,7 @@ function runTsgoBuild(
   if (emittedFiles.length !== 0) {
     result.stdout = stripEmittedFileLines(result.stdout);
   }
-  return normalizeFailedDiagnostics(
+  return normalizeBuildOutput(
     { ...result, emittedFiles },
     execution.projectRoot,
   );
@@ -374,7 +370,7 @@ function runNativePluginCommand(
       `${label}: failed to spawn ${plugin.binary}: ${res.error.message}`,
     );
   }
-  return normalizeFailedDiagnostics(
+  return normalizeBuildOutput(
     {
       status: res.status ?? 1,
       stdout: outputText(res.stdout),
@@ -384,11 +380,11 @@ function runNativePluginCommand(
   );
 }
 
-function appendBuildOutput(
+export function appendBuildOutput(
   left: TtscBuildResult,
   right: TtscBuildResult,
 ): TtscBuildResult {
-  return normalizeFailedDiagnostics({
+  return normalizeBuildOutput({
     diagnostics: [...left.diagnostics, ...right.diagnostics],
     emittedFiles:
       right.emittedFiles !== undefined ? right.emittedFiles : left.emittedFiles,
@@ -461,7 +457,9 @@ function resolveExecutionContext(
     cwd,
     tsconfig: options.tsconfig,
   });
-  const projectRoot = path.dirname(tsconfig);
+  const projectRoot = options.projectRoot
+    ? path.resolve(cwd, options.projectRoot)
+    : path.dirname(tsconfig);
   const tsgo = resolveTsgo({ ...options, cwd: projectRoot });
   const fallbackBinary = resolveBinary(options);
   const loaded = loadProjectPlugins({
@@ -469,6 +467,7 @@ function resolveExecutionContext(
     cacheDir: options.cacheDir ?? options.env?.TTSC_CACHE_DIR,
     cwd,
     entries: options.plugins,
+    projectRoot,
     tsconfig,
   });
   return {
@@ -503,7 +502,7 @@ type PartialBuildResult = Omit<TtscBuildResult, "diagnostics"> & {
   diagnostics?: ITtscCompilerDiagnostic[];
 };
 
-function normalizeFailedDiagnostics(
+export function normalizeBuildOutput(
   result: PartialBuildResult,
   cwd?: string,
 ): TtscBuildResult {
@@ -557,6 +556,20 @@ function parseDiagnosticLine(
   line: string,
   cwd: string | undefined,
 ): ITtscCompilerDiagnostic | null {
+  const colonMatch = line.match(
+    /^(.+):(\d+):(\d+)\s+-\s+(error|warning|suggestion|message)\s+([A-Z]+)?(\d+|[A-Z][A-Z0-9_-]*):\s+(.+)$/i,
+  );
+  if (colonMatch) {
+    return {
+      category: normalizeDiagnosticCategory(colonMatch[4]!),
+      character: Number(colonMatch[3]),
+      code: normalizeDiagnosticCode(colonMatch[6]!),
+      file: normalizeDiagnosticFile(colonMatch[1]!, cwd),
+      line: Number(colonMatch[2]),
+      messageText: colonMatch[7]!,
+    };
+  }
+
   const fileMatch = line.match(
     /^(.+?)\((\d+),(\d+)\):\s+(error|warning|suggestion|message)\s+([A-Z]+)?(\d+|[A-Z][A-Z0-9_-]*):\s+(.+)$/i,
   );
@@ -611,5 +624,5 @@ function normalizeDiagnosticCode(value: string): number | string {
 }
 
 function stripAnsi(text: string): string {
-  return text.replace(/\x1b\[[0-9;]*m/g, "");
+  return text.replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "");
 }

package/src/compiler/internal/runSingleFileEmit.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 type { TtscSingleFileEmitOptions } from "../../structures/internal/TtscSingleFileEmitOptions";
 import { resolveProjectConfig } from "./project/resolveProjectConfig";