@travetto/compiler 3.4.3 → 4.0.0-rc.0

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#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, [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 supports the following operations:
    *  `start|watch` - Run the compiler in watch mode
@@ -30,7 +30,8 @@ The compiler cli supports the following operations:
    *  `build` - Ensure the project is built and upto date
    *  `clean` - Clean out the output and compiler caches
    *  `info` - Retrieve the compiler information, if running
-   *  `manifest [output] [prod]` - Generate the project manifest
+   *  `event <log|progress|state>` - Watch events in realtime as newline delimited JSON
+   *  `manifest --prod [output]` - Generate the project manifest
 In addition to the normal output, the compiler supports an environment variable `TRV_BUILD` that supports the following values: `debug`, `info`, `warn` or `none`.  This provides different level of logging during the build process which is helpful to diagnose any odd behaviors.  When invoking an unknown command (e.g. `<other>` from above), the default level is `warn`.  Otherwise the default logging level is `info`.
 
 **Terminal: Sample trv output with debug logging**
@@ -38,34 +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-client] Starting watch for events of type "log"
+2029-03-14T04:00:00.837Z debug [compiler       ] Started, streaming logs
 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: 'event', subAction: 'log' }
-2029-03-14T04:00:02.947Z debug [precompile     ] Skipped @travetto/terminal
-2029-03-14T04:00:03.093Z debug [precompile     ] Skipped @travetto/manifest
-2029-03-14T04:00:04.003Z debug [precompile     ] Skipped @travetto/transformer
-2029-03-14T04:00:04.495Z debug [precompile     ] Skipped @travetto/compiler
-2029-03-14T04:00:05.066Z debug [precompile     ] Completed
-2029-03-14T04:00:05.307Z debug [manifest       ] Started
-2029-03-14T04:00:05.952Z debug [manifest       ] Completed
-2029-03-14T04:00:06.859Z debug [transformers   ] Started
-2029-03-14T04:00:07.720Z debug [transformers   ] Skipped @travetto/base
-2029-03-14T04:00:08.179Z debug [transformers   ] Skipped @travetto/cli
-2029-03-14T04:00:08.588Z debug [transformers   ] Skipped @travetto/manifest
-2029-03-14T04:00:09.493Z debug [transformers   ] Skipped @travetto/registry
-2029-03-14T04:00:10.395Z debug [transformers   ] Skipped @travetto/schema
-2029-03-14T04:00:10.407Z debug [transformers   ] Completed
-2029-03-14T04:00:10.799Z debug [delta          ] Started
-2029-03-14T04:00:11.013Z debug [delta          ] Completed
-2029-03-14T04:00:11.827Z debug [manifest       ] Started
-2029-03-14T04:00:11.894Z debug [manifest       ] Wrote manifest @travetto-doc/compiler
-2029-03-14T04:00:12.133Z debug [manifest       ] Completed
-2029-03-14T04:00:13.123Z info  [compiler-server] State changed: compile-end
-2029-03-14T04:00:14.014Z debug [compiler-exec  ] Skipped
-2029-03-14T04:00:14.924Z debug [event-stream   ] Finished event stream
-2029-03-14T04:00:15.690Z info  [compiler-server] Closing down server
-2029-03-14T04:00:15.865Z debug [compiler-client] Stopping watch for events of type "log"
+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"
 ```
 
 **Terminal: Sample trv output with default log level**
@@ -86,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#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.
+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.

package/bin/common.js

@@ -1,55 +1,47 @@
 // @ts-check
-
-import fs from 'fs/promises';
-import path from 'path';
-import { createRequire } from 'module';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 
 import { getManifestContext } from '@travetto/manifest/bin/context.js';
 
-const COMPILER_FILES = [...['entry.trvc', 'log', 'queue', 'server/client', 'server/runner', 'server/server', 'setup', 'util'].map(x => `support/${x}.ts`), 'package.json'];
+/** @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 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 });
+};
+
+const /** @type {Transform} */ rewritePackage = (ctx, content) =>
+  JSON.stringify(Object.assign(JSON.parse(content), { type: ctx.workspace.type }), null, 2);
+
+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);
+
+  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;
+}
 
-/** @return {Promise<ReturnType<import('@travetto/compiler/support/entry.trvc').main>>} */
 export const getEntry = async () => {
   const ctx = await getManifestContext();
-  const tsconfigFile = path.resolve(ctx.workspacePath, 'tsconfig.json');
-  if (!(await fs.stat(tsconfigFile).catch(() => undefined))) {
-    await fs.writeFile(tsconfigFile, JSON.stringify({ extends: '@travetto/compiler/tsconfig.trv.json' }), 'utf8');
-  }
-  const compMod = path.dirname(createRequire(path.resolve(ctx.workspacePath, 'node_modules')).resolve('@travetto/compiler/package.json'));
-  const files = [];
-
-  for (const file of COMPILER_FILES) {
-    const target = path.resolve(ctx.workspacePath, ctx.compilerFolder, 'node_modules', '@travetto/compiler', file).replace(/[.]tsx?$/, '.js');
-    const src = path.resolve(compMod, file);
-
-    const targetTime = await fs.stat(target).then(s => Math.max(s.mtimeMs, s.ctimeMs)).catch(() => 0);
-    const srcTime = await fs.stat(src).then(s => Math.max(s.mtimeMs, s.ctimeMs));
-    // If stale
-    if (srcTime > targetTime) {
-      const ts = (await import('typescript')).default;
-      const module = ctx.moduleType === 'module' ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
-      await fs.mkdir(path.dirname(target), { recursive: true });
-      const text = await fs.readFile(src, 'utf8');
-      if (/[.]tsx?$/.test(file)) {
-        const content = ts.transpile(
-          text,
-          { target: ts.ScriptTarget.ES2022, module, esModuleInterop: true, allowSyntheticDefaultImports: true }
-        )
-          .replace(/^((?:im|ex)port .*from '[.][^']+)(')/mg, (_, a, b) => `${a}.js${b}`)
-          .replace(/^(import [^\n]*from '[^.][^\n/]+[/][^\n/]+[/][^\n']+)(')/mg, (_, a, b) => `${a}.js${b}`);
-        await fs.writeFile(target, content, 'utf8');
-      } else {
-        const pkg = JSON.parse(text);
-        pkg.type = ctx.moduleType;
-        await fs.writeFile(target, JSON.stringify(pkg, null, 2), 'utf8');
-      }
-      // Compile
-    }
-    files.push(target);
-  }
+  const entry = await outputIfChanged(ctx, 'support/entry.trvc.ts', transpile);
+  const run = (/** @type {import('@travetto/compiler/support/entry.trvc')} */ mod) => mod.main(ctx);
+
+  await outputIfChanged(ctx, 'package.json', rewritePackage);
 
-  const rootCtx = await (ctx.monoRepo ? getManifestContext(ctx.workspacePath) : ctx);
+  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))));
 
-  try { return require(files[0]).main(rootCtx, ctx); }
-  catch { return import(files[0]).then(v => v.main(rootCtx, ctx)); }
+  try { return run(require(entry)); }
+  catch { return import(entry).then(run); }
 };

package/bin/trvc.js

@@ -1,4 +1,5 @@
-#!/usr/bin/env node
+#!/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`;
 
 // @ts-check
 import { getEntry } from './common.js';
@@ -7,18 +8,20 @@ const help = () => [
   'npx trvc [command]',
   '',
   'Available Commands:',
-  ' * start|watch               - Run the compiler in watch mode',
-  ' * stop                      - Stop the compiler if running',
-  ' * restart                   - Restart the compiler in watch mode',
-  ' * build                     - Ensure the project is built and upto date',
-  ' * clean                     - Clean out the output and compiler caches',
-  ' * info                      - Retrieve the compiler information, if running',
-  ' * manifest [output] [prod]  - Generate the project manifest',
+  ' * start|watch                - Run the compiler in watch mode',
+  ' * stop                       - Stop the compiler if running',
+  ' * restart                    - Restart the compiler in watch mode',
+  ' * build                      - Ensure the project is built and upto date',
+  ' * clean                      - Clean out the output and compiler caches',
+  ' * info                       - Retrieve the compiler information, if running',
+  ' * event <log|progress|state> - Watch events in realtime as newline delimited JSON',
+  ' * manifest --prod [output]   - Generate the project manifest',
 ].join('\n');
 
 getEntry().then(async (ops) => {
-  const [op, ...args] = process.argv.slice(2);
-  const baseArgs = args.filter(x => !x.startsWith('-'));
+  const [op, ...all] = process.argv.slice(2);
+  const args = all.filter(x => !x.startsWith('-'));
+  const flags = all.filter(x => x.startsWith('-'));
 
   switch (op) {
     case undefined:
@@ -26,8 +29,13 @@ getEntry().then(async (ops) => {
     case 'restart': return ops.stop().then(() => ops.compile('watch'));
     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 => {
+      if (!process.stdout.write(`${JSON.stringify(v)}\n`)) {
+        return new Promise(r => process.stdout.once('drain', r));
+      }
+    });
     case 'clean': return ops.clean();
-    case 'manifest': return ops.manifest(baseArgs[0], /prod/i.test(baseArgs[1] ?? ''));
+    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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "3.4.3",
+  "version": "4.0.0-rc.0",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -31,13 +31,12 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.3.0",
-    "@travetto/manifest": "^3.4.0",
-    "@travetto/terminal": "^3.4.0",
-    "@travetto/transformer": "^3.4.2",
-    "@types/node": "^20.9.2"
+    "@travetto/manifest": "^4.0.0-rc.0",
+    "@travetto/transformer": "^4.0.0-rc.0",
+    "@types/node": "^20.10.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.6"
+    "@travetto/cli": "^4.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -1,8 +1,9 @@
-import { install } from 'source-map-support';
 import ts from 'typescript';
-import fs from 'fs/promises';
+import timers from 'node:timers/promises';
+import fs from 'node:fs/promises';
+import { setMaxListeners } from 'node:events';
 
-import { ManifestModuleUtil, RootIndex } from '@travetto/manifest';
+import { ManifestModuleUtil, RuntimeIndex } from '@travetto/manifest';
 
 import { CompilerUtil } from './util';
 import { CompilerState } from './state';
@@ -21,15 +22,17 @@ export class Compiler {
    */
   static async main(): Promise<void> {
     const [dirty, watch] = process.argv.slice(2);
-    const state = await CompilerState.get(RootIndex);
+    const state = await CompilerState.get(RuntimeIndex);
+    Log.debug('Running compiler with dirty file', dirty);
     const dirtyFiles = ManifestModuleUtil.getFileType(dirty) === 'ts' ? [dirty] : (await fs.readFile(dirty, 'utf8')).split(/\n/).filter(x => !!x);
     await new Compiler(state, dirtyFiles, watch === 'true').run();
-    process.exit();
   }
 
   #state: CompilerState;
   #dirtyFiles: string[];
   #watch?: boolean;
+  #ctrl: AbortController;
+  #signal: AbortSignal;
 
   constructor(state: CompilerState, dirtyFiles: string[], watch?: boolean) {
     this.#state = state;
@@ -37,6 +40,11 @@ export class Compiler {
       this.#state.getAllFiles() :
       dirtyFiles.map(f => this.#state.getBySource(f)!.input);
     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());
   }
 
   /**
@@ -50,6 +58,7 @@ export class Compiler {
         if (needsNewProgram) {
           program = this.#state.createProgram(program);
         }
+        await timers.setImmediate();
         const result = this.#state.writeInputFile(program, inputFile);
         if (result?.diagnostics?.length) {
           return result.diagnostics;
@@ -72,6 +81,7 @@ export class Compiler {
   async * emit(files: string[], emitter: CompileEmitter): AsyncIterable<CompileEmitEvent> {
     let i = 0;
     let lastSent = Date.now();
+
     for (const file of files) {
       const err = await emitter(file);
       const imp = file.replace(/.*node_modules\//, '');
@@ -80,8 +90,14 @@ export class Compiler {
         lastSent = Date.now();
         EventUtil.sendEvent('progress', { total: files.length, idx: i, message: imp, operation: 'compile' });
       }
+      if (this.#signal.aborted) {
+        break;
+      }
     }
     EventUtil.sendEvent('progress', { total: files.length, idx: files.length, message: 'Complete', operation: 'compile', complete: true });
+
+    await timers.setTimeout(1);
+
     Log.debug(`Compiled ${i} files`);
   }
 
@@ -89,16 +105,10 @@ export class Compiler {
    * Run the compiler
    */
   async run(): Promise<void> {
-    install();
-
     Log.debug('Compilation started');
 
     EventUtil.sendEvent('state', { state: 'init', extra: { pid: process.pid } });
 
-    if (process.send) {
-      process.on('disconnect', () => process.exit(0));
-    }
-
     const emitter = await this.getCompiler();
     let failed = false;
 
@@ -114,9 +124,12 @@ export class Compiler {
           EventUtil.sendEvent('log', { level: 'error', message: compileError.toString(), time: Date.now() });
         }
       }
-      if (failed) {
+      if (this.#signal.aborted) {
+        Log.debug('Compilation aborted');
+      } else if (failed) {
         Log.debug('Compilation failed');
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       } else {
         Log.debug('Compilation succeeded');
       }
@@ -128,15 +141,16 @@ export class Compiler {
 
     EventUtil.sendEvent('state', { state: 'compile-end' });
 
-    if (this.#watch) {
+    if (this.#watch && !this.#signal.aborted) {
       Log.info('Watch is ready');
 
       EventUtil.sendEvent('state', { state: 'watch-start' });
 
-      for await (const ev of CompilerWatcher.watch(this.#state)) {
+      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;
@@ -166,5 +180,13 @@ export class Compiler {
 
       EventUtil.sendEvent('state', { state: 'watch-end' });
     }
+
+    // No longer listen to disconnect
+    process.removeAllListeners('disconnect');
+
+    if (this.#ctrl.signal.aborted) {
+      process.exitCode = 2;
+      Log.error('Shutting down manually');
+    }
   }
 }

package/src/event.ts

@@ -1,7 +1,7 @@
-import type { CompilerServerEvent, CompilerServerEventType } from '../support/types';
+import type { CompilerEvent, CompilerEventType } from '../support/types';
 
 export class EventUtil {
-  static sendEvent<K extends CompilerServerEventType, T extends CompilerServerEvent & { type: K }>(type: K, payload: T['payload']): void {
-    process.send?.({ type, payload });
+  static sendEvent<K extends CompilerEventType, T extends CompilerEvent & { type: K }>(type: K, payload: T['payload']): void {
+    process.connected && process.send!({ type, payload });
   }
 }

package/src/internal/watch-core.ts

@@ -1,6 +1,6 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 
-import { IndexedModule, ManifestContext, ManifestModuleUtil, RootIndex, path } from '@travetto/manifest';
+import { IndexedModule, ManifestContext, ManifestModuleUtil, path } from '@travetto/manifest';
 
 import { AsyncQueue } from '../../support/queue';
 
@@ -13,7 +13,7 @@ const VALID_TYPES = new Set(['ts', 'typings', 'js', 'package-json']);
 type ToWatch = { file: string, actions: string[] };
 
 /** Watch file for reset */
-async function watchForReset(q: AsyncQueue<WatchEvent>, root: string, files: ToWatch[], signal: AbortSignal): Promise<void> {
+function watchForReset(q: AsyncQueue<WatchEvent>, root: string, files: ToWatch[], signal: AbortSignal): void {
   const watchers: Record<string, { folder: string, files: Map<string, (ToWatch & { name: string, actionSet: Set<string> })> }> = {};
   // Group by base path
   for (const el of files) {
@@ -26,15 +26,19 @@ async function watchForReset(q: AsyncQueue<WatchEvent>, root: string, files: ToW
 
   // Fire them all off
   Object.values(watchers).map(async (watcher) => {
-    for await (const ev of fs.watch(watcher.folder, { persistent: true, encoding: 'utf8', signal })) {
-      const toWatch = watcher.files.get(ev.filename!);
-      if (toWatch) {
-        const stat = await fs.stat(path.resolve(root, ev.filename!)).catch(() => undefined);
-        const action = !stat ? 'delete' : ((Date.now() - stat.ctimeMs) < CREATE_THRESHOLD) ? 'create' : 'update';
-        if (toWatch.actionSet.has(action)) {
-          q.add({ action: 'reset', file: ev.filename! });
+    try {
+      for await (const ev of fs.watch(watcher.folder, { persistent: true, encoding: 'utf8', signal })) {
+        const toWatch = watcher.files.get(ev.filename!);
+        if (toWatch) {
+          const stat = await fs.stat(path.resolve(root, ev.filename!)).catch(() => undefined);
+          const action = !stat ? 'delete' : ((Date.now() - stat.ctimeMs) < CREATE_THRESHOLD) ? 'create' : 'update';
+          if (toWatch.actionSet.has(action)) {
+            q.add({ action: 'reset', file: ev.filename! });
+          }
         }
       }
+    } catch (err) {
+      // Ignore
     }
   });
 }
@@ -44,7 +48,7 @@ async function watchFolder(ctx: ManifestContext, q: AsyncQueue<WatchEvent>, src:
   const lib = await import('@parcel/watcher');
   const ignore = [
     'node_modules', '**/.trv',
-    ...((!ctx.monoRepo || src === ctx.workspacePath) ? [ctx.compilerFolder, ctx.outputFolder, ctx.toolFolder] : []),
+    ...((!ctx.workspace.mono || src === ctx.workspace.path) ? [ctx.build.compilerFolder, ctx.build.outputFolder] : []),
     ...(await fs.readdir(src)).filter(x => x.startsWith('.'))
   ];
 
@@ -78,24 +82,23 @@ async function watchFolder(ctx: ManifestContext, q: AsyncQueue<WatchEvent>, src:
 export async function* fileWatchEvents(manifest: ManifestContext, modules: IndexedModule[], signal: AbortSignal): AsyncIterable<WatchEvent> {
   const q = new AsyncQueue<WatchEvent>(signal);
 
-  for (const m of modules.filter(x => !manifest.monoRepo || x.sourcePath !== manifest.workspacePath)) {
-    watchFolder(manifest, q, m.sourcePath, m.sourcePath, signal);
+  for (const m of modules.filter(x => !manifest.workspace.mono || x.sourcePath !== manifest.workspace.path)) {
+    await watchFolder(manifest, q, m.sourcePath, m.sourcePath, signal);
   }
 
   // Add monorepo folders
-  if (manifest.monoRepo) {
-    const mono = modules.find(x => x.sourcePath === manifest.workspacePath)!;
+  if (manifest.workspace.mono) {
+    const mono = modules.find(x => x.sourcePath === manifest.workspace.path)!;
     for (const folder of Object.keys(mono.files)) {
       if (!folder.startsWith('$')) {
-        watchFolder(manifest, q, path.resolve(mono.sourcePath, folder), mono.sourcePath, signal);
+        await watchFolder(manifest, q, path.resolve(mono.sourcePath, folder), mono.sourcePath, signal);
       }
     }
   }
 
-  watchForReset(q, RootIndex.manifest.workspacePath, [
-    { file: RootIndex.manifest.outputFolder, actions: ['delete'] },
-    { file: RootIndex.manifest.compilerFolder, actions: ['delete'] },
-    { file: RootIndex.manifest.toolFolder, actions: ['delete'] },
+  watchForReset(q, manifest.workspace.path, [
+    { file: manifest.build.outputFolder, actions: ['delete'] },
+    { file: manifest.build.compilerFolder, actions: ['delete'] },
     { file: 'package-lock.json', actions: ['delete', 'update', 'create'] },
     { file: 'package.json', actions: ['delete', 'update', 'create'] }
   ], signal);

package/src/log.ts

@@ -3,7 +3,7 @@ import { EventUtil } from './event';
 
 function log(level: CompilerLogLevel, message: string, ...args: unknown[]): void {
   EventUtil.sendEvent('log', { level, message, args, time: Date.now(), scope: 'compiler-exec' });
-  if (!process.send) {
+  if (!process.connected) {
     // eslint-disable-next-line no-console
     console[level](message, ...args);
   }

package/src/state.ts

@@ -46,11 +46,11 @@ export class CompilerState implements ts.CompilerHost {
   async init(idx: ManifestIndex): Promise<this> {
     this.#manifestIndex = idx;
     this.#manifest = idx.manifest;
-    const mapper = folderMapper(this.#manifest.workspacePath, '##');
+    const mapper = folderMapper(this.#manifest.workspace.path, '##');
     this.#rootDir = mapper.dir;
     this.#inputPathToSource = mapper.translate;
 
-    this.#outputPath = path.resolve(this.#manifest.workspacePath, this.#manifest.outputFolder);
+    this.#outputPath = path.resolve(this.#manifest.workspace.path, this.#manifest.build.outputFolder);
     this.#modules = Object.values(this.#manifest.modules);
 
     // Register all inputs
@@ -91,7 +91,7 @@ export class CompilerState implements ts.CompilerHost {
   }
 
   resolveOutputFile(file: string): string {
-    return path.resolve(this.#manifest.workspacePath, this.#manifest.outputFolder, file);
+    return path.resolve(this.#manifest.workspace.path, this.#manifest.build.outputFolder, file);
   }
 
   getArbitraryInputFile(): string {
@@ -125,7 +125,7 @@ export class CompilerState implements ts.CompilerHost {
 
   registerInput(module: ManifestModule, moduleFile: string): CompileStateEntry {
     const relativeInput = `${module.outputFolder}/${moduleFile}`;
-    const sourceFile = path.resolve(this.#manifest.workspacePath, module.sourceFolder, moduleFile);
+    const sourceFile = path.resolve(this.#manifest.workspace.path, module.sourceFolder, moduleFile);
     const sourceFolder = path.dirname(sourceFile);
     const inputFile = path.resolve(this.#rootDir, relativeInput); // Ensure input is isolated
     const inputFolder = path.dirname(inputFile);

package/src/util.ts

@@ -31,7 +31,7 @@ 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.workspacePath, ctx.outputFolder, data.sources[0]));
+    const output = ManifestModuleUtil.sourceToOutputExt(path.resolve(ctx.workspace.path, ctx.build.outputFolder, data.sources[0]));
     const { source: file } = outputToSource(output) ?? {};
 
     if (file) {
@@ -81,7 +81,7 @@ export class CompilerUtil {
     if (pkg.main) {
       pkg.main = ManifestModuleUtil.sourceToOutputExt(pkg.main);
     }
-    pkg.type = manifest.moduleType;
+    pkg.type = manifest.workspace.type;
     for (const key of ['devDependencies', 'dependencies', 'peerDependencies'] as const) {
       if (key in pkg) {
         for (const dep of Object.keys(pkg[key] ?? {})) {