@travetto/compiler 4.0.0-rc.0 → 4.0.0-rc.2

package/README.md

@@ -21,7 +21,7 @@ This module expands upon the [Typescript](https://typescriptlang.org) compiler,
 Beyond the [Typescript](https://typescriptlang.org) compiler functionality, the module provides the primary entry point into the development process.
 
 ## CLI
-The compiler cli, [trvc](https://github.com/travetto/travetto/tree/main/module/compiler/bin/trvc.js#L5) is the entry point for compilation-related operations. It has the ability to check for active builds, and ongoing watch operations to ensure only one process is building at a time.  Within the framework, regardless of mono-repo or not, the compilation always targets the entire project.  With the efficient caching behavior, this leads to generally a minimal overhead but allows for centralization of all operations. 
+The compiler cli, [trvc](https://github.com/travetto/travetto/tree/main/module/compiler/bin/trvc.js#L4) is the entry point for compilation-related operations. It has the ability to check for active builds, and ongoing watch operations to ensure only one process is building at a time.  Within the framework, regardless of mono-repo or not, the compilation always targets the entire project.  With the efficient caching behavior, this leads to generally a minimal overhead but allows for centralization of all operations. 
 
 The compiler cli supports the following operations:
    *  `start|watch` - Run the compiler in watch mode
@@ -39,35 +39,35 @@ In addition to the normal output, the compiler supports an environment variable
 $ TRV_BUILD=debug trvc build
 
 2029-03-14T04:00:00.618Z info  [compiler-server] Starting server http://127.0.0.1:25539
-2029-03-14T04:00:00.837Z debug [compiler       ] Started, streaming logs
+2029-03-14T04:00:00.837Z debug [client.main    ] Start Server
 2029-03-14T04:00:01.510Z debug [event-stream   ] Started event stream
 2029-03-14T04:00:02.450Z debug [precompile     ] Started
-2029-03-14T04:00:02.762Z debug [compiler-server] Receive request { action: 'info', subAction: undefined }
-2029-03-14T04:00:02.947Z debug [client.server  ] Starting watch for events of type "log"
-2029-03-14T04:00:03.093Z debug [compiler-server] Receive request { action: 'event', subAction: 'log' }
-2029-03-14T04:00:04.003Z debug [precompile     ] Skipped @travetto/manifest
-2029-03-14T04:00:04.495Z debug [precompile     ] Skipped @travetto/transformer
-2029-03-14T04:00:05.066Z debug [precompile     ] Skipped @travetto/compiler
-2029-03-14T04:00:05.307Z debug [precompile     ] Completed
-2029-03-14T04:00:05.952Z debug [manifest       ] Started
-2029-03-14T04:00:06.859Z debug [manifest       ] Completed
-2029-03-14T04:00:07.720Z debug [transformers   ] Started
-2029-03-14T04:00:08.179Z debug [transformers   ] Skipped @travetto/base
-2029-03-14T04:00:08.588Z debug [transformers   ] Skipped @travetto/cli
-2029-03-14T04:00:09.493Z debug [transformers   ] Skipped @travetto/manifest
-2029-03-14T04:00:10.395Z debug [transformers   ] Skipped @travetto/registry
-2029-03-14T04:00:10.407Z debug [transformers   ] Skipped @travetto/schema
-2029-03-14T04:00:10.799Z debug [transformers   ] Completed
-2029-03-14T04:00:11.013Z debug [delta          ] Started
-2029-03-14T04:00:11.827Z debug [delta          ] Completed
-2029-03-14T04:00:11.894Z debug [manifest       ] Started
-2029-03-14T04:00:12.133Z debug [manifest       ] Wrote manifest @travetto-doc/compiler
-2029-03-14T04:00:13.123Z debug [manifest       ] Completed
-2029-03-14T04:00:14.014Z info  [compiler-server] State changed: compile-end
-2029-03-14T04:00:14.924Z debug [compiler-exec  ] Skipped
-2029-03-14T04:00:15.690Z debug [event-stream   ] Finished event stream
-2029-03-14T04:00:15.865Z info  [compiler-server] Closing down server
-2029-03-14T04:00:16.757Z debug [client.server  ] Stopping watch for events of type "log"
+2029-03-14T04:00:02.762Z debug [precompile     ] Skipped @travetto/manifest
+2029-03-14T04:00:02.947Z debug [precompile     ] Skipped @travetto/transformer
+2029-03-14T04:00:03.093Z debug [precompile     ] Skipped @travetto/compiler
+2029-03-14T04:00:04.003Z debug [precompile     ] Completed
+2029-03-14T04:00:04.495Z debug [manifest       ] Started
+2029-03-14T04:00:05.066Z debug [manifest       ] Completed
+2029-03-14T04:00:05.307Z debug [transformers   ] Started
+2029-03-14T04:00:05.952Z debug [transformers   ] Skipped @travetto/base
+2029-03-14T04:00:06.859Z debug [transformers   ] Skipped @travetto/cli
+2029-03-14T04:00:07.720Z debug [transformers   ] Skipped @travetto/manifest
+2029-03-14T04:00:08.179Z debug [transformers   ] Skipped @travetto/registry
+2029-03-14T04:00:08.588Z debug [transformers   ] Skipped @travetto/schema
+2029-03-14T04:00:09.493Z debug [transformers   ] Completed
+2029-03-14T04:00:10.395Z debug [delta          ] Started
+2029-03-14T04:00:10.407Z debug [delta          ] Completed
+2029-03-14T04:00:10.799Z debug [manifest       ] Started
+2029-03-14T04:00:11.013Z debug [manifest       ] Wrote manifest @travetto-doc/compiler
+2029-03-14T04:00:11.827Z debug [manifest       ] Completed
+2029-03-14T04:00:11.894Z info  [compiler-server] State changed: compile-end
+2029-03-14T04:00:12.133Z debug [compiler-exec  ] Skipped
+2029-03-14T04:00:13.123Z debug [event-stream   ] Finished event stream
+2029-03-14T04:00:14.014Z info  [compiler-server] Closing down server
+2029-03-14T04:00:14.924Z debug [compiler-server] Server close event
+2029-03-14T04:00:15.690Z info  [compiler-server] Closed down server
+2029-03-14T04:00:15.865Z debug [compiler-server] Finished processing events
+2029-03-14T04:00:16.757Z debug [client.main    ] End Server
 ```
 
 **Terminal: Sample trv output with default log level**
@@ -88,4 +88,4 @@ The compiler will move through the following phases on a given compilation execu
    *  `Invoke Compiler` - Run [Typescript](https://typescriptlang.org) compiler with the aforementioned enhancements
 
 ### Bootstrapping
-Given that the framework is distributed as [Typescript](https://typescriptlang.org) only files, there is a bootstrapping problem that needs to be mitigated.  The [trvc](https://github.com/travetto/travetto/tree/main/module/compiler/bin/trvc.js#L5) entrypoint, along with a small context utility in [Manifest](https://github.com/travetto/travetto/tree/main/module/manifest#readme "Support for project indexing, manifesting, along with file watching") are the only [Javascript](https://developer.mozilla.org/en-US/docs/Web/JavaScript) files needed to run the project.  The [trvc](https://github.com/travetto/travetto/tree/main/module/compiler/bin/trvc.js#L5) entry point will compile `@travetto/compiler/support/*` files as the set that is used at startup.  These files are also accessible to the compiler as they get re-compiled after the fact.
+Given that the framework is distributed as [Typescript](https://typescriptlang.org) only files, there is a bootstrapping problem that needs to be mitigated.  The [trvc](https://github.com/travetto/travetto/tree/main/module/compiler/bin/trvc.js#L4) entrypoint, along with a small context utility in [Manifest](https://github.com/travetto/travetto/tree/main/module/manifest#readme "Support for project indexing, manifesting, along with file watching") are the only [Javascript](https://developer.mozilla.org/en-US/docs/Web/JavaScript) files needed to run the project.  The [trvc](https://github.com/travetto/travetto/tree/main/module/compiler/bin/trvc.js#L4) entry point will compile `@travetto/compiler/support/*` files as the set that is used at startup.  These files are also accessible to the compiler as they get re-compiled after the fact.

package/bin/common.js

@@ -1,47 +1,60 @@
 // @ts-check
-import fs from 'node:fs/promises';
+import { statSync, readFileSync, writeFileSync, mkdirSync, readdirSync, existsSync, rmSync } from 'node:fs';
 import path from 'node:path';
 
 import { getManifestContext } from '@travetto/manifest/bin/context.js';
 
 /** @typedef {import('@travetto/manifest').ManifestContext} Ctx */
-/** @typedef {(ctx: Ctx, content:string) => (string | Promise<string>)} Transform */
 
-const stat = (/** @type {string}*/ file) => fs.stat(file).then(s => Math.max(s.mtimeMs, s.ctimeMs)).catch(() => 0);
 const TS_EXT = /[.]tsx?$/;
 
-const /** @type {Transform} */ transpile = async (ctx, content, tsconfig = path.resolve(ctx.workspace.path, 'tsconfig.json')) => {
-  await fs.stat(tsconfig).catch(() => fs.writeFile(tsconfig, JSON.stringify({ extends: '@travetto/compiler/tsconfig.trv.json' }), 'utf8'));
+const getAge = (/** @type {{mtimeMs:number, ctimeMs:number}} */ st) => Math.max(st.mtimeMs, st.ctimeMs);
+
+const getTarget = (/** @type {Ctx} */ ctx, file = '') => ({
+  dest: path.resolve(ctx.workspace.path, ctx.build.compilerFolder, 'node_modules', '@travetto/compiler', file).replace(TS_EXT, '.js'),
+  src: path.resolve(ctx.workspace.path, ctx.build.compilerModuleFolder, file),
+  async writeIfStale(/** @type {(text:string)=>(string|Promise<string>)}*/ transform) {
+    if (!existsSync(this.dest) || getAge(statSync(this.dest)) < getAge(statSync(this.src))) {
+      const text = readFileSync(this.src, 'utf8');
+      mkdirSync(path.dirname(this.dest), { recursive: true });
+      writeFileSync(this.dest, await transform(text), 'utf8');
+    }
+  }
+});
+
+const getTranspiler = async (/** @type {Ctx} */ ctx) => {
   const ts = (await import('typescript')).default;
   const module = ctx.workspace.type === 'module' ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
-  return ts.transpile(content, { target: ts.ScriptTarget.ES2022, module, esModuleInterop: true, allowSyntheticDefaultImports: true });
+  return (content = '') => ts.transpile(content, { target: ts.ScriptTarget.ES2022, module, esModuleInterop: true, allowSyntheticDefaultImports: true });
 };
 
-const /** @type {Transform} */ rewritePackage = (ctx, content) =>
-  JSON.stringify(Object.assign(JSON.parse(content), { type: ctx.workspace.type }), null, 2);
+/** @returns {Promise<import('@travetto/compiler/support/entry.trvc')>} */
+async function imp(f = '') { try { return require(f); } catch (err) { return import(f); } }
 
-async function outputIfChanged(/** @type {Ctx} */ ctx, /** @type {string} */ file, /** @type {Transform} */ transform) {
-  const target = path.resolve(ctx.workspace.path, ctx.build.compilerFolder, 'node_modules', '@travetto/compiler', file).replace(TS_EXT, '.js');
-  const src = path.resolve(ctx.workspace.path, ctx.build.compilerModuleFolder, file);
+export async function getEntry() {
+  process.setSourceMapsEnabled(true); // Ensure source map during compilation/development
+  process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS ?? ''} --enable-source-maps`; // Ensure it passes to children
 
-  if (await stat(src) > await stat(target)) {
-    await fs.mkdir(path.dirname(target), { recursive: true });
-    const content = await fs.readFile(src, 'utf8');
-    await fs.writeFile(target, await transform(ctx, content), 'utf8');
-  }
-  return target;
-}
+  const ctx = getManifestContext();
+  const target = getTarget.bind(null, ctx);
 
-export const getEntry = async () => {
-  const ctx = await getManifestContext();
-  const entry = await outputIfChanged(ctx, 'support/entry.trvc.ts', transpile);
-  const run = (/** @type {import('@travetto/compiler/support/entry.trvc')} */ mod) => mod.main(ctx);
+  // Setup Tsconfig
+  const tsconfig = path.resolve(ctx.workspace.path, 'tsconfig.json');
+  existsSync(tsconfig) || writeFileSync(tsconfig, JSON.stringify({ extends: '@travetto/compiler/tsconfig.trv.json' }), 'utf8');
 
-  await outputIfChanged(ctx, 'package.json', rewritePackage);
+  // Compile support folder
+  await target('package.json').writeIfStale(text => JSON.stringify(Object.assign(JSON.parse(text), { type: ctx.workspace.type }), null, 2));
 
-  await fs.readdir(path.resolve(ctx.workspace.path, ctx.build.compilerModuleFolder, 'support'), { recursive: true }).then(files =>
-    Promise.all(files.filter(x => TS_EXT.test(x)).map(f => outputIfChanged(ctx, `support/${f}`, transpile))));
+  let transpile;
+  for (const file of readdirSync(target('support').src, { recursive: true, encoding: 'utf8' })) {
+    if (TS_EXT.test(file)) { await target(`support/${file}`).writeIfStale(async (text) => (transpile ??= await getTranspiler(ctx))(text)); }
+  }
 
-  try { return run(require(entry)); }
-  catch { return import(entry).then(run); }
-};
+  // Load
+  try {
+    return await imp(target('support/entry.trvc.ts').dest).then(v => v.main(ctx));
+  } catch (err) {
+    rmSync(target('.').dest, { recursive: true, force: true });
+    throw err;
+  }
+}

package/bin/trvc.js

@@ -1,5 +1,4 @@
-#!/usr/bin/env -S node --disable-proto=delete --enable-source-maps
-process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS ?? ''} --enable-source-maps --disable-proto=delete`;
+#!/usr/bin/env node
 
 // @ts-check
 import { getEntry } from './common.js';
@@ -26,7 +25,7 @@ getEntry().then(async (ops) => {
   switch (op) {
     case undefined:
     case 'help': return console.log(`\n${help()}\n`);
-    case 'restart': return ops.stop().then(() => ops.compile('watch'));
+    case 'restart': return ops.restart();
     case 'stop': return ops.stop();
     case 'info': return ops.info().then(v => console.log(JSON.stringify(v, null, 2)));
     case 'event': return ops.events(args[0], v => {
@@ -36,9 +35,9 @@ getEntry().then(async (ops) => {
     });
     case 'clean': return ops.clean();
     case 'manifest': return ops.manifest(args[0], flags.some(x => x === '--prod'));
-    case 'start': return ops.compile('watch');
-    case 'watch':
-    case 'build': return ops.compile(op);
+    case 'start':
+    case 'watch': return ops.watch();
+    case 'build': return ops.build();
     default: console.error(`Unknown trvc operation: ${op}\n`); return console.error(help());
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0-rc.2",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -30,13 +30,13 @@
     "directory": "module/compiler"
   },
   "dependencies": {
-    "@parcel/watcher": "^2.3.0",
-    "@travetto/manifest": "^4.0.0-rc.0",
-    "@travetto/transformer": "^4.0.0-rc.0",
-    "@types/node": "^20.10.3"
+    "@parcel/watcher": "^2.4.0",
+    "@travetto/manifest": "^4.0.0-rc.2",
+    "@travetto/transformer": "^4.0.0-rc.2",
+    "@types/node": "^20.11.16"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.0-rc.0"
+    "@travetto/cli": "^4.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -33,18 +33,54 @@ export class Compiler {
   #watch?: boolean;
   #ctrl: AbortController;
   #signal: AbortSignal;
+  #shuttingDown = false;
 
   constructor(state: CompilerState, dirtyFiles: string[], watch?: boolean) {
     this.#state = state;
     this.#dirtyFiles = dirtyFiles[0] === '*' ?
       this.#state.getAllFiles() :
-      dirtyFiles.map(f => this.#state.getBySource(f)!.input);
+      dirtyFiles.map(f => this.#state.getBySource(f)!.inputFile);
     this.#watch = watch;
 
     this.#ctrl = new AbortController();
     this.#signal = this.#ctrl.signal;
     setMaxListeners(1000, this.#signal);
-    process.once('disconnect', () => this.#ctrl.abort()).once('SIGINT', () => this.#ctrl.abort());
+    process
+      .once('disconnect', () => this.#shutdown('manual'))
+      .on('message', ev => (ev === 'shutdown') && this.#shutdown('manual'));
+  }
+
+  #shutdown(mode: 'error' | 'manual' | 'complete' | 'reset', err?: Error): void {
+    if (this.#shuttingDown) {
+      return;
+    }
+
+    this.#shuttingDown = true;
+    switch (mode) {
+      case 'manual': {
+        Log.error('Shutting down manually');
+        process.exitCode = 2;
+        break;
+      }
+      case 'error': {
+        process.exitCode = 1;
+        if (err) {
+          Log.error('Shutting down due to failure', err.message);
+        }
+        break;
+      }
+      case 'reset': {
+        Log.info('Triggering reset due to change in core files');
+        EventUtil.sendEvent('state', { state: 'reset' });
+        process.exitCode = 0;
+        break;
+      }
+    }
+    // No longer listen to disconnect
+    process.removeAllListeners('disconnect');
+    process.removeAllListeners('message');
+    this.#ctrl.abort();
+    setTimeout(() => process.exit(), 1000).unref(); // Allow upto 1s to shutdown gracefully
   }
 
   /**
@@ -145,48 +181,43 @@ export class Compiler {
       Log.info('Watch is ready');
 
       EventUtil.sendEvent('state', { state: 'watch-start' });
-
-      for await (const ev of new CompilerWatcher(this.#state, this.#signal).watchChanges()) {
-        if (ev.action === 'reset') {
-          Log.info(`Triggering reset due to change in ${ev.file}`);
-          EventUtil.sendEvent('state', { state: 'reset' });
-          this.#ctrl.abort();
-          return;
-        }
-        const { action, entry } = ev;
-        if (action !== 'delete') {
-          const err = await emitter(entry.input, true);
-          if (err) {
-            Log.info('Compilation Error', CompilerUtil.buildTranspileError(entry.input, err));
+      try {
+        for await (const ev of new CompilerWatcher(this.#state, this.#signal).watchChanges()) {
+          if (ev.action !== 'delete') {
+            const err = await emitter(ev.entry.inputFile, true);
+            if (err) {
+              Log.info('Compilation Error', CompilerUtil.buildTranspileError(ev.entry.inputFile, err));
+            } else {
+              Log.info(`Compiled ${ev.entry.sourceFile} on ${ev.action}`);
+            }
           } else {
-            Log.info(`Compiled ${entry.source}`);
+            if (ev.entry.outputFile) {
+              // Remove output
+              Log.info(`Removed ${ev.entry.sourceFile}, ${ev.entry.outputFile}`);
+              await fs.rm(ev.entry.outputFile, { force: true }); // Ensure output is deleted
+            }
           }
-        } else {
-          // Remove output
-          Log.info(`Removed ${entry.source}, ${entry.output}`);
-          await fs.rm(entry.output!, { force: true }); // Ensure output is deleted
+
+          // Send change events
+          EventUtil.sendEvent('change', {
+            action: ev.action,
+            time: Date.now(),
+            file: ev.file,
+            output: ev.entry.outputFile!,
+            module: ev.entry.module.name
+          });
         }
+        EventUtil.sendEvent('state', { state: 'watch-end' });
 
-        // Send change events
-        EventUtil.sendEvent('change', {
-          action: ev.action,
-          time: Date.now(),
-          file: ev.file,
-          folder: ev.folder,
-          output: ev.entry.output!,
-          module: ev.entry.module.name
-        });
+      } catch (err) {
+        if (err instanceof Error) {
+          this.#shutdown(err.message === 'RESET' ? 'reset' : 'error', err);
+        }
       }
-
-      EventUtil.sendEvent('state', { state: 'watch-end' });
     }
 
-    // No longer listen to disconnect
-    process.removeAllListeners('disconnect');
+    Log.debug('Compiler process shutdown');
 
-    if (this.#ctrl.signal.aborted) {
-      process.exitCode = 2;
-      Log.error('Shutting down manually');
-    }
+    this.#shutdown('complete');
   }
 }

package/src/event.ts

@@ -2,6 +2,6 @@ import type { CompilerEvent, CompilerEventType } from '../support/types';
 
 export class EventUtil {
   static sendEvent<K extends CompilerEventType, T extends CompilerEvent & { type: K }>(type: K, payload: T['payload']): void {
-    process.connected && process.send!({ type, payload });
+    process.connected && process.send!({ type, payload }, undefined, { swallowErrors: true });
   }
 }

package/src/state.ts

@@ -3,9 +3,10 @@ import ts from 'typescript';
 import { path, ManifestModuleUtil, ManifestModule, ManifestRoot, ManifestIndex } from '@travetto/manifest';
 import { TransformerManager } from '@travetto/transformer';
 
+import { CommonUtil } from '../support/util';
+
 import { CompilerUtil } from './util';
 import { CompileStateEntry } from './types';
-import { CommonUtil } from '../support/util';
 
 function folderMapper(root: string, prefix: string): { dir: string, translate: (val: string) => string } {
   let matched: string = '~~';
@@ -26,7 +27,7 @@ export class CompilerState implements ts.CompilerHost {
   private constructor() { }
 
   #rootDir: string;
-  #inputPathToSource: (file: string) => string;
+  #inputPathToSourcePath: (file: string) => string;
   #outputPath: string;
   #inputFiles = new Set<string>();
   #inputDirectoryToSource = new Map<string, string>();
@@ -36,6 +37,7 @@ export class CompilerState implements ts.CompilerHost {
 
   #sourceContents = new Map<string, string | undefined>();
   #sourceFileObjects = new Map<string, ts.SourceFile>();
+  #sourceHashes = new Map<string, number>();
 
   #manifestIndex: ManifestIndex;
   #manifest: ManifestRoot;
@@ -43,12 +45,16 @@ export class CompilerState implements ts.CompilerHost {
   #transformerManager: TransformerManager;
   #compilerOptions: ts.CompilerOptions;
 
+  #readFile(inputFile: string): string | undefined {
+    return ts.sys.readFile(this.#inputToEntry.get(inputFile)?.sourceFile ?? this.#inputPathToSourcePath(inputFile));
+  }
+
   async init(idx: ManifestIndex): Promise<this> {
     this.#manifestIndex = idx;
     this.#manifest = idx.manifest;
     const mapper = folderMapper(this.#manifest.workspace.path, '##');
     this.#rootDir = mapper.dir;
-    this.#inputPathToSource = mapper.translate;
+    this.#inputPathToSourcePath = mapper.translate;
 
     this.#outputPath = path.resolve(this.#manifest.workspace.path, this.#manifest.build.outputFolder);
     this.#modules = Object.values(this.#manifest.modules);
@@ -95,7 +101,7 @@ export class CompilerState implements ts.CompilerHost {
   }
 
   getArbitraryInputFile(): string {
-    return this.getBySource(this.#manifestIndex.getModule('@travetto/manifest')!.files.src[0].sourceFile)!.input;
+    return this.getBySource(this.#manifestIndex.getModule('@travetto/manifest')!.files.src[0].sourceFile)!.inputFile;
   }
 
   createProgram(oldProgram?: ts.Program): ts.Program {
@@ -107,9 +113,9 @@ export class CompilerState implements ts.CompilerHost {
   writeInputFile(program: ts.Program, inputFile: string): ts.EmitResult | undefined | void {
     switch (ManifestModuleUtil.getFileType(inputFile)) {
       case 'package-json':
-        return this.writeFile(this.#inputToEntry.get(inputFile)!.output!, this.readFile(inputFile)!, false);
+        return this.writeFile(this.#inputToEntry.get(inputFile)!.outputFile!, this.readFile(inputFile)!, false);
       case 'js':
-        return this.writeFile(this.#inputToEntry.get(inputFile)!.output!, ts.transpile(this.readFile(inputFile)!, this.#compilerOptions), false);
+        return this.writeFile(this.#inputToEntry.get(inputFile)!.outputFile!, ts.transpile(this.readFile(inputFile)!, this.#compilerOptions), false);
       case 'ts':
         return program.emit(
           program.getSourceFile(inputFile)!,
@@ -134,7 +140,7 @@ export class CompilerState implements ts.CompilerHost {
       undefined :
       path.resolve(this.#outputPath, ManifestModuleUtil.sourceToOutputExt(relativeInput));
 
-    const entry = { source: sourceFile, input: inputFile, output: outputFile, module, relativeInput };
+    const entry = { sourceFile, inputFile, outputFile, module };
 
     this.#inputToEntry.set(inputFile, entry);
     this.#sourceToEntry.set(sourceFile, entry);
@@ -145,23 +151,37 @@ export class CompilerState implements ts.CompilerHost {
     }
 
     this.#inputFiles.add(inputFile);
-
+    this.#sourceHashes.set(sourceFile, -1); // Unknown
     return entry;
   }
 
-  removeInput(inputFile: string): void {
-    const { output, source } = this.#inputToEntry.get(inputFile)!;
-    if (output) {
-      this.#outputToEntry.delete(output);
+  checkIfSourceChanged(inputFile: string): boolean {
+    const contents = this.#readFile(inputFile);
+    const prevHash = this.#sourceHashes.get(inputFile);
+    if (!contents || (contents.length === 0 && prevHash)) {
+      return false; // Ignore empty file
     }
-    this.#sourceToEntry.delete(source);
-    this.#inputToEntry.delete(inputFile);
-    this.#inputFiles.delete(inputFile);
+    const currentHash = CompilerUtil.naiveHash(contents);
+    const changed = prevHash !== currentHash;
+    if (changed) {
+      this.#sourceHashes.set(inputFile, currentHash);
+      this.#sourceContents.set(inputFile, contents);
+      this.#sourceFileObjects.delete(inputFile);
+    }
+    return changed;
   }
 
-  resetInputSource(inputFile: string): void {
+  removeInput(inputFile: string): void {
+    const { outputFile, sourceFile } = this.#inputToEntry.get(inputFile)!;
+    if (outputFile) {
+      this.#outputToEntry.delete(outputFile);
+    }
     this.#sourceFileObjects.delete(inputFile);
     this.#sourceContents.delete(inputFile);
+    this.#sourceHashes.delete(inputFile);
+    this.#sourceToEntry.delete(sourceFile);
+    this.#inputToEntry.delete(inputFile);
+    this.#inputFiles.delete(inputFile);
   }
 
   getAllFiles(): string[] {
@@ -177,11 +197,11 @@ export class CompilerState implements ts.CompilerHost {
   getDefaultLibLocation(): string { return path.dirname(ts.getDefaultLibFilePath(this.#compilerOptions)); }
 
   fileExists(inputFile: string): boolean {
-    return this.#inputToEntry.has(inputFile) || ts.sys.fileExists(this.#inputPathToSource(inputFile));
+    return this.#inputToEntry.has(inputFile) || ts.sys.fileExists(this.#inputPathToSourcePath(inputFile));
   }
 
   directoryExists(inputDir: string): boolean {
-    return this.#inputDirectoryToSource.has(inputDir) || ts.sys.directoryExists(this.#inputPathToSource(inputDir));
+    return this.#inputDirectoryToSource.has(inputDir) || ts.sys.directoryExists(this.#inputPathToSourcePath(inputDir));
   }
 
   writeFile(
@@ -203,9 +223,7 @@ export class CompilerState implements ts.CompilerHost {
   }
 
   readFile(inputFile: string): string | undefined {
-    const res = this.#sourceContents.get(inputFile) ?? ts.sys.readFile(
-      this.#inputToEntry.get(inputFile)?.source ?? this.#inputPathToSource(inputFile)
-    );
+    const res = this.#sourceContents.get(inputFile) ?? this.#readFile(inputFile);
     this.#sourceContents.set(inputFile, res);
     return res;
   }

package/src/types.ts

@@ -5,4 +5,4 @@ import type { ManifestModule } from '@travetto/manifest';
 export type CompileEmitError = Error | readonly ts.Diagnostic[];
 export type CompileEmitter = (file: string, newProgram?: boolean) => Promise<CompileEmitError | undefined>;
 export type CompileEmitEvent = { file: string, i: number, total: number, err?: CompileEmitError };
-export type CompileStateEntry = { source: string, input: string, relativeInput: string, output?: string, module: ManifestModule };
+export type CompileStateEntry = { sourceFile: string, inputFile: string, outputFile?: string, module: ManifestModule };

package/src/util.ts

@@ -2,7 +2,7 @@ import ts from 'typescript';
 
 import { ManifestContext, ManifestModuleFileType, ManifestModuleUtil, ManifestRoot, Package, path } from '@travetto/manifest';
 
-type OutputToSource = (outputFile: string) => ({ source: string } | undefined);
+type OutputToSource = (outputFile: string) => ({ sourceFile: string } | undefined);
 
 const nativeCwd = process.cwd();
 
@@ -32,11 +32,11 @@ export class CompilerUtil {
   static rewriteSourceMap(ctx: ManifestContext, text: string, outputToSource: OutputToSource): string {
     const data: { sourceRoot?: string, sources: string[] } = JSON.parse(text);
     const output = ManifestModuleUtil.sourceToOutputExt(path.resolve(ctx.workspace.path, ctx.build.outputFolder, data.sources[0]));
-    const { source: file } = outputToSource(output) ?? {};
+    const { sourceFile } = outputToSource(output) ?? {};
 
-    if (file) {
+    if (sourceFile) {
       delete data.sourceRoot;
-      data.sources = [file];
+      data.sources = [sourceFile];
       text = JSON.stringify(data);
     }
     return text;