ttsc 0.6.0 → 0.7.1

package/src/{cli.ts → launcher/internal/runTtsc.ts}

@@ -2,19 +2,16 @@ import { spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-import {
-  type ITtscBuildOptions,
-  type ITtscTransformOptions,
-  build,
-  check,
-  transform,
-  version,
-} from "./api";
-import { installHint, resolveBinary } from "./platform";
-import { resolveProjectConfig, resolveProjectRoot } from "./project";
-import { pluginCacheCleanupTargets } from "./source-build";
+import { resolveBinary } from "../../compiler/internal/resolveBinary";
+import { runBuild } from "../../compiler/internal/runBuild";
+import { runSingleFileEmit } from "../../compiler/internal/runSingleFileEmit";
+import { resolveProjectConfig } from "../../compiler/internal/project/resolveProjectConfig";
+import type { TtscBuildOptions } from "../../structures/internal/TtscBuildOptions";
+import { getCompilerVersionText } from "./getCompilerVersionText";
 
-export function main(argv: readonly string[] = process.argv.slice(2)): number {
+export function runTtsc(
+  argv: readonly string[] = process.argv.slice(2),
+): number {
   try {
     if (argv.length === 0) {
       return runCompatibleBuild([], false);
@@ -30,7 +27,7 @@ export function main(argv: readonly string[] = process.argv.slice(2)): number {
       case "-v":
       case "--version":
       case "version":
-        process.stdout.write(`${version()}\n`);
+        process.stdout.write(`${getCompilerVersionText()}\n`);
         return 0;
       case "build":
         return runCompatibleBuild(rest, false);
@@ -38,8 +35,6 @@ export function main(argv: readonly string[] = process.argv.slice(2)): number {
         return runCompatibleBuild(rest, true);
       case "clean":
         return runClean(rest);
-      case "transform":
-        return runTransform(rest);
       case "demo":
         return delegateToNative(argv);
       case "-p":
@@ -70,12 +65,6 @@ function isBuildAlias(command: string): boolean {
   );
 }
 
-interface ITtscBuildInvocation extends ITtscBuildOptions {
-  files: string[];
-  preserveWatchOutput: boolean;
-  watch: boolean;
-}
-
 function runCompatibleBuild(
   argv: readonly string[],
   checkOnly: boolean,
@@ -87,31 +76,23 @@ function runCompatibleBuild(
   if (options.files.length !== 0) {
     return runSingleFile(options);
   }
-  const result = checkOnly ? check(options) : build(options);
+  const result = runBuild(checkOnly ? { ...options, emit: false } : options);
   if (result.stdout) process.stdout.write(result.stdout);
   if (result.stderr) process.stderr.write(result.stderr);
   return result.status;
 }
 
-function runTransform(argv: readonly string[]): number {
-  const options = parseTransformArgs(argv);
-  const text = transform(options);
-  if (!options.out) {
-    process.stdout.write(text);
-  }
-  return 0;
-}
-
-interface ITtscCleanInvocation {
-  cwd?: string;
-  tsconfig?: string;
-}
-
 function runClean(argv: readonly string[]): number {
   const options = parseCleanArgs(argv);
   const cwd = path.resolve(options.cwd ?? process.cwd());
   const projectRoot = resolveCleanProjectRoot(cwd, options.tsconfig);
-  const targets = pluginCacheCleanupTargets(projectRoot);
+  const targets = [
+    path.join(projectRoot, "node_modules", ".ttsc"),
+    path.join(projectRoot, ".ttsc"),
+    ...(process.env.TTSC_CACHE_DIR
+      ? [path.resolve(process.env.TTSC_CACHE_DIR, "plugins")]
+      : []),
+  ];
   const removed: string[] = [];
   for (const target of targets) {
     if (!fs.existsSync(target)) continue;
@@ -119,7 +100,9 @@ function runClean(argv: readonly string[]): number {
     removed.push(target);
   }
   if (removed.length === 0) {
-    process.stdout.write(`ttsc: no cache directories found under ${projectRoot}\n`);
+    process.stdout.write(
+      `ttsc: no cache directories found under ${projectRoot}\n`,
+    );
     return 0;
   }
   for (const target of removed) {
@@ -148,10 +131,18 @@ function formatCleanPath(cwd: string, target: string): string {
 function delegateToNative(argv: readonly string[]): number {
   const bin = resolveBinary();
   if (!bin) {
-    process.stderr.write(`${installHint()}\n`);
+    process.stderr.write(
+      [
+        `ttsc: platform-specific helper binary not found (@ttsc/${process.platform}-${process.arch}).`,
+        `Set TTSC_BINARY to an absolute helper path or reinstall with optional dependencies enabled.`,
+      ].join("\n") + "\n",
+    );
     return 1;
   }
   const viaNode = /\.(?:[cm]?js|ts)$/i.test(bin);
+  if (!viaNode) {
+    ensureExecutable(bin);
+  }
   const result = spawnSync(
     viaNode ? process.execPath : bin,
     viaNode ? [bin, ...argv] : [...argv],
@@ -168,7 +159,22 @@ function delegateToNative(argv: readonly string[]): number {
   return result.status ?? 1;
 }
 
-function parseCleanArgs(argv: readonly string[]): ITtscCleanInvocation {
+function ensureExecutable(binary: string): void {
+  if (process.platform === "win32") {
+    return;
+  }
+  try {
+    const mode = fs.statSync(binary).mode & 0o777;
+    if ((mode & 0o111) !== 0) {
+      return;
+    }
+    fs.chmodSync(binary, mode | 0o755);
+  } catch {
+    /* keep the original spawn error path */
+  }
+}
+
+function parseCleanArgs(argv: readonly string[]) {
   let cwd: string | undefined;
   let tsconfig: string | undefined;
 
@@ -200,10 +206,7 @@ function parseCleanArgs(argv: readonly string[]): ITtscCleanInvocation {
   return { cwd, tsconfig };
 }
 
-function parseBuildArgs(
-  argv: readonly string[],
-  checkOnly: boolean,
-): ITtscBuildInvocation {
+function parseBuildArgs(argv: readonly string[], checkOnly: boolean) {
   let binary: string | undefined;
   let cwd: string | undefined;
   let emit: boolean | undefined = checkOnly ? false : undefined;
@@ -211,7 +214,6 @@ function parseBuildArgs(
   let outDir: string | undefined;
   let preserveWatchOutput = false;
   let quiet = true;
-  let rewriteMode: string | undefined;
   let tsconfig: string | undefined;
   let watch = false;
 
@@ -238,9 +240,6 @@ function parseBuildArgs(
       case "--preserveWatchOutput":
         preserveWatchOutput = true;
         break;
-      case "--rewrite-mode":
-        rewriteMode = takeRewriteMode(takeValue(current, rest));
-        break;
       case "--cwd":
         cwd = takeValue(current, rest);
         break;
@@ -262,10 +261,6 @@ function parseBuildArgs(
           outDir = current.slice("--outDir=".length);
         } else if (current === "-w") {
           watch = true;
-        } else if (current.startsWith("--rewrite-mode=")) {
-          rewriteMode = takeRewriteMode(
-            current.slice("--rewrite-mode=".length),
-          );
         } else if (current.startsWith("--tsconfig=")) {
           tsconfig = current.slice("--tsconfig=".length);
         } else if (current.startsWith("--project=")) {
@@ -293,79 +288,11 @@ function parseBuildArgs(
     outDir,
     preserveWatchOutput,
     quiet,
-    rewriteMode,
     tsconfig,
     watch,
   };
 }
 
-function parseTransformArgs(argv: readonly string[]): ITtscTransformOptions {
-  let binary: string | undefined;
-  let cwd: string | undefined;
-  let file: string | undefined;
-  let out: string | undefined;
-  let rewriteMode: string | undefined;
-  let tsconfig: string | undefined;
-
-  const rest = [...argv];
-  while (rest.length !== 0) {
-    const current = rest.shift()!;
-    switch (current) {
-      case "--binary":
-        binary = takeValue(current, rest);
-        break;
-      case "--cwd":
-        cwd = takeValue(current, rest);
-        break;
-      case "--file":
-        file = takeValue(current, rest);
-        break;
-      case "--out":
-        out = takeValue(current, rest);
-        break;
-      case "--rewrite-mode":
-        rewriteMode = takeRewriteMode(takeValue(current, rest));
-        break;
-      case "--tsconfig":
-      case "--project":
-        tsconfig = takeValue(current, rest);
-        break;
-      default:
-        if (current.startsWith("--binary=")) {
-          binary = current.slice("--binary=".length);
-        } else if (current.startsWith("--cwd=")) {
-          cwd = current.slice("--cwd=".length);
-        } else if (current.startsWith("--file=")) {
-          file = current.slice("--file=".length);
-        } else if (current.startsWith("--out=")) {
-          out = current.slice("--out=".length);
-        } else if (current.startsWith("--rewrite-mode=")) {
-          rewriteMode = takeRewriteMode(
-            current.slice("--rewrite-mode=".length),
-          );
-        } else if (current.startsWith("--tsconfig=")) {
-          tsconfig = current.slice("--tsconfig=".length);
-        } else if (current.startsWith("--project=")) {
-          tsconfig = current.slice("--project=".length);
-        } else {
-          throw new Error(`ttsc: unknown option ${current}`);
-        }
-        break;
-    }
-  }
-  if (!file) {
-    throw new Error("ttsc: transform requires --file");
-  }
-  return {
-    binary,
-    cwd,
-    file,
-    out,
-    rewriteMode,
-    tsconfig,
-  };
-}
-
 function printHelp(): void {
   process.stdout.write(
     [
@@ -377,7 +304,6 @@ function printHelp(): void {
       "  ttsc --watch",
       "  ttsc --noEmit",
       "  ttsc clean [options]",
-      "  ttsc transform --file <path> [options]",
       "  ttsc version",
       "  ttsc --help",
       "",
@@ -390,10 +316,8 @@ function printHelp(): void {
       "  -w, --watch            Rebuild when project files change",
       "  --preserveWatchOutput  Do not clear the screen between watch rebuilds",
       "  --outDir <dir>         Override compilerOptions.outDir for this invocation",
-      "  --rewrite-mode <mode>  Plugin-selected native rewrite backend id",
       "  --quiet                Keep build output quiet (default)",
       "  --verbose              Print the build summary and emitted files",
-      "  --out <path>           Write transform output to a file instead of stdout",
       "  --binary <path>        Use an explicit tsgo binary",
       "",
       "Plugin contract:",
@@ -410,7 +334,7 @@ function printHelp(): void {
   process.stdout.write("\n");
 }
 
-function runSingleFile(options: ITtscBuildInvocation): number {
+function runSingleFile(options: ReturnType<typeof parseBuildArgs>): number {
   if (options.files.length !== 1) {
     throw new Error(
       "ttsc: single-file mode currently accepts exactly one input file",
@@ -419,12 +343,11 @@ function runSingleFile(options: ITtscBuildInvocation): number {
   const cwd = path.resolve(options.cwd ?? process.cwd());
   const file = path.resolve(cwd, options.files[0]!);
   const out = resolveSingleFileOut(file, cwd, options.outDir);
-  const text = transform({
+  const text = runSingleFileEmit({
     binary: options.binary,
     cwd,
     file,
     out,
-    rewriteMode: options.rewriteMode,
     tsconfig: options.tsconfig,
   });
   if (!fs.existsSync(out)) {
@@ -448,9 +371,12 @@ function resolveSingleFileOut(
   return file.replace(/\.[cm]?tsx?$/i, ".js");
 }
 
-function runWatch(options: ITtscBuildInvocation, checkOnly: boolean): number {
+function runWatch(
+  options: ReturnType<typeof parseBuildArgs>,
+  checkOnly: boolean,
+): number {
   const cwd = path.resolve(options.cwd ?? process.cwd());
-  const invocation: ITtscBuildInvocation = {
+  const invocation = {
     ...options,
     cwd,
     quiet: true,
@@ -461,10 +387,7 @@ function runWatch(options: ITtscBuildInvocation, checkOnly: boolean): number {
       tsconfig: options.tsconfig,
     }),
   );
-  const watchRoot = resolveProjectRoot({
-    cwd,
-    tsconfig: options.tsconfig,
-  });
+  const watchRoot = root;
   const directories = collectWatchDirectories(watchRoot);
   const watchers = directories.map((dir) =>
     fs.watch(dir, { persistent: true }, () => trigger()),
@@ -485,7 +408,9 @@ function runWatch(options: ITtscBuildInvocation, checkOnly: boolean): number {
       invocation.files.length !== 0
         ? runSingleFile(invocation)
         : (() => {
-            const result = checkOnly ? check(invocation) : build(invocation);
+            const result = runBuild(
+              checkOnly ? { ...invocation, emit: false } : invocation,
+            );
             if (result.stdout) process.stdout.write(result.stdout);
             if (result.stderr) process.stderr.write(result.stderr);
             return result.status;
@@ -557,13 +482,6 @@ function takeValue(flag: string, rest: string[]): string {
   return value;
 }
 
-function takeRewriteMode(value: string): string {
-  if (value.length === 0) {
-    throw new Error("ttsc: rewrite mode must not be empty");
-  }
-  return value;
-}
-
 function formatError(error: unknown): string {
   if (error instanceof Error) {
     return error.message;

package/src/{runner/cli.ts → launcher/internal/runTtsx.ts}

@@ -1,23 +1,11 @@
 import * as fs from "node:fs";
-import Module = require("node:module");
 import { spawnSync } from "node:child_process";
 import * as path from "node:path";
 
-import { version } from "../api";
-import {
-  prepareExecution,
-  register,
-  type ITtscPreparedExecution,
-  type ITtscRegisterOptions,
-} from "./register";
+import { getCompilerVersionText } from "./getCompilerVersionText";
+import { prepareExecution } from "./prepareExecution";
 
-interface ITtscParsedCLI extends ITtscRegisterOptions {
-  entry: string;
-  passthrough: string[];
-  preload: string[];
-}
-
-export function main(argv: readonly string[] = process.argv.slice(2)): number {
+export function runTtsx(argv: readonly string[] = process.argv.slice(2)): number {
   try {
     return run(argv);
   } catch (error) {
@@ -33,7 +21,9 @@ function run(argv: readonly string[]): number {
     return 0;
   }
   if (parsed === "version") {
-    process.stdout.write(`${version().replace(/^ttsc\b/, "ttsx")}\n`);
+    process.stdout.write(
+      `${getCompilerVersionText().replace(/^ttsc\b/, "ttsx")}\n`,
+    );
     return 0;
   }
 
@@ -48,29 +38,9 @@ function run(argv: readonly string[]): number {
     binary: parsed.binary,
     cacheDir: parsed.cacheDir,
     cwd,
-    env: parsed.env,
-    extensions: parsed.extensions,
     project: parsed.project,
   });
-  if (prepared.moduleKind === "esm") {
-    return runEsmEntry(parsed, prepared, cwd);
-  }
-
-  const unregister = register({
-    binary: parsed.binary,
-    cacheDir: parsed.cacheDir,
-    cwd,
-    env: parsed.env,
-    extensions: parsed.extensions,
-    project: parsed.project,
-  });
-  process.once("exit", unregister);
-  for (const preload of parsed.preload) {
-    require(resolvePreload(cwd, preload));
-  }
-  process.argv = [process.execPath, entry, ...parsed.passthrough];
-  Module.runMain();
-  return 0;
+  return runPreparedEntry(parsed, prepared, cwd);
 }
 
 function formatError(error: unknown): string {
@@ -80,7 +50,7 @@ function formatError(error: unknown): string {
   return String(error);
 }
 
-function parseCLI(argv: readonly string[]): ITtscParsedCLI | "help" | "version" {
+function parseCLI(argv: readonly string[]) {
   const preload: string[] = [];
   const passthroughIndex = argv.indexOf("--");
   const head = passthroughIndex === -1 ? [...argv] : [...argv.slice(0, passthroughIndex)];
@@ -172,10 +142,6 @@ function printHelp(): void {
       "  -h, --help             Show this help",
       "  -v, --version          Print the runner version",
       "",
-      "Runtime:",
-      "  CommonJS projects execute in-process via the require hook.",
-      "  ESM projects execute the cached emitted entry in a child Node process.",
-      "",
       "Examples:",
       "  ttsx src/index.ts",
       "  ttsx --project tsconfig.json src/index.ts -- --port 3000",
@@ -199,14 +165,20 @@ function takeValue(flag: string, rest: string[]): string {
   return value;
 }
 
-function runEsmEntry(parsed: ITtscParsedCLI, execution: ITtscPreparedExecution, cwd: string): number {
+function runPreparedEntry(
+  parsed: Exclude<ReturnType<typeof parseCLI>, "help" | "version">,
+  execution: ReturnType<typeof prepareExecution>,
+  cwd: string,
+): number {
   fs.mkdirSync(execution.emitDir, { recursive: true });
-  rewriteEsmSpecifiers(execution.emitDir);
-  fs.writeFileSync(
-    path.join(execution.emitDir, "package.json"),
-    JSON.stringify({ type: "module" }),
-    "utf8",
-  );
+  if (execution.moduleKind === "esm") {
+    rewriteEsmSpecifiers(execution.emitDir);
+    fs.writeFileSync(
+      path.join(execution.emitDir, "package.json"),
+      JSON.stringify({ type: "module" }),
+      "utf8",
+    );
+  }
   const args = [
     ...parsed.preload.flatMap((preload) => ["-r", resolvePreload(cwd, preload)]),
     execution.entryFile,

package/src/launcher/ttsc.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { main } from "../cli";
+import { runTtsc } from "./internal/runTtsc";
 
-const code = main(process.argv.slice(2));
+const code = runTtsc(process.argv.slice(2));
 if (typeof code === "number") {
   process.exitCode = code;
 }

package/src/launcher/ttsx.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { main } from "../runner/cli";
+import { runTtsx } from "./internal/runTtsx";
 
-const code = main(process.argv.slice(2));
+const code = runTtsx(process.argv.slice(2));
 if (typeof code === "number") {
   process.exitCode = code;
 }