@travetto/compiler 6.0.0-rc.2 → 6.0.0-rc.3

package/__index__.ts

@@ -1,5 +1,5 @@
-export * from './src/compiler';
-export * from './src/state';
-export * from './src/util';
-export * from './src/watch';
-export * from './src/types';
+export * from './src/compiler.ts';
+export * from './src/state.ts';
+export * from './src/util.ts';
+export * from './src/watch.ts';
+export * from './src/types.ts';

package/bin/entry.common.js

@@ -4,6 +4,9 @@ const { stat, readFile, writeFile, mkdir, rm, readdir } = require('node:fs/promi
 const path = require('node:path');
 
 const COMP_MOD = '@travetto/compiler';
+const SOURCE_EXT_RE = /[.][cm]?[tj]sx?$/;
+const BARE_IMPORT_RE = /^(@[^/]+[/])?[^.][^@/]+$/;
+const OUTPUT_EXT = '.js';
 
 async function writeIfStale(src = '', dest = '', transform = async (x = '') => x) {
   const [srcStat, destStat] = await Promise.all([src, dest].map(x => stat(`${x}`).then(z => z.mtimeMs, () => 0)));
@@ -20,6 +23,10 @@ async function transpile(content = '', esm = true, full = true) {
   return ts.transpile(content, {
     target: ts.ScriptTarget.ES2022,
     module: esm ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS,
+    importHelpers: true,
+    sourceMap: false,
+    inlineSourceMap: true,
+    allowImportingTsExtensions: true,
     ...(full ? { esModuleInterop: true, allowSyntheticDefaultImports: true } : {})
   });
 }
@@ -28,13 +35,11 @@ async function getContext() {
   const ctxSrc = require.resolve('@travetto/manifest/src/context.ts');
   const ctxDest = path.resolve(__dirname, 'gen.context.mjs');
   await writeIfStale(ctxSrc, ctxDest, content => transpile(content, true, false));
-  const ctx = await import(ctxDest).then((/** @type {import('@travetto/manifest/src/context')} */ v) => v.getManifestContext());
+  const ctx = await import(ctxDest).then((/** @type {import('@travetto/manifest')} */ v) => v.getManifestContext());
 
   const srcPath = path.resolve.bind(path, ctx.workspace.path, ctx.build.compilerModuleFolder);
-  const destPath = (file = '', mod = COMP_MOD) => {
-    const base = path.resolve(ctx.workspace.path, ctx.build.compilerFolder, mod, file);
-    return `${base}${file.includes('.') ? '' : file.includes('/') ? '.ts' : '/__index__.ts'}`.replace('.ts', '.js');
-  };
+  const destPath = (file = '') =>
+    path.resolve(ctx.workspace.path, ctx.build.compilerFolder, 'node_modules', file).replace(SOURCE_EXT_RE, OUTPUT_EXT);
 
   return {
     packageType: ctx.workspace.type,
@@ -42,29 +47,32 @@ async function getContext() {
     destPath,
     tsconfig: path.resolve(ctx.workspace.path, 'tsconfig.json'),
     cleanImports: (t = '') => t
-      .replace(/from '([.][^']+)'/g, (_, i) => `from '${i.replace(/[.]js$/, '')}.js'`)
-      .replace(/from '(@travetto\/[^/']+)([/][^']+)?'/g, (_, mod, modFile) => `from '${destPath(modFile, mod)}'`),
-    loadMain: () => import(destPath('support/entry.main.ts'))
-      .then((/** @type {import('../support/entry.main')} */ v) => v.main(ctx)),
+      .replace(/from ['"]((@travetto|[.]+)[^'"]+)['"]/g, (_, v, m) => {
+        const s = (m === '@travetto' ? destPath(v) : v).replace(SOURCE_EXT_RE, OUTPUT_EXT);
+        const suf = s.endsWith(OUTPUT_EXT) ? '' : (BARE_IMPORT_RE.test(v) ? `/__index__${OUTPUT_EXT}` : OUTPUT_EXT);
+        return `from '${s}${suf}'`;
+      }),
+    loadMain: () => import(destPath(`${COMP_MOD}/support/entry.main.ts`))
+      .then((/** @type {import('../support/entry.main.ts')} */ v) => v.main(ctx)),
     supportFiles: () => readdir(srcPath('support'), { recursive: true, encoding: 'utf8' })
       .then(v => v.filter(f => f.endsWith('.ts')).map(j => `support/${j}`))
   };
 }
 
 /** @template T */
-async function load(/** @type {(ops: import('../support/entry.main').Operations) => T} */ cb) {
+async function load(/** @type {(ops: import('../support/entry.main.ts').Operations) => T} */ cb) {
   const ctx = await getContext();
 
   try {
     await writeIfStale('', ctx.tsconfig,
       async () => JSON.stringify({ extends: `${COMP_MOD}/tsconfig.trv.json` }, null, 2));
 
-    await writeIfStale(ctx.srcPath('package.json'), ctx.destPath('package.json'),
+    await writeIfStale(ctx.srcPath('package.json'), ctx.destPath(`${COMP_MOD}/package.json`),
       async text => JSON.stringify({ ...JSON.parse(text || '{}'), type: ctx.packageType }, null, 2));
 
     await Promise.all((await ctx.supportFiles()).map(f =>
-      writeIfStale(ctx.srcPath(f), ctx.destPath(f),
-        t => transpile(t, ctx.packageType === 'module').then(ctx.cleanImports))));
+      writeIfStale(ctx.srcPath(f), ctx.destPath(`${COMP_MOD}/${f}`),
+        t => transpile(ctx.cleanImports(t), ctx.packageType === 'module'))));
 
     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
@@ -73,7 +81,7 @@ async function load(/** @type {(ops: import('../support/entry.main').Operations)
     try { module.enableCompileCache(); } catch { }
     return cb(res);
   } catch (err) {
-    await rm(ctx.destPath('.'), { recursive: true, force: true });
+    await rm(ctx.destPath(COMP_MOD), { recursive: true, force: true });
     throw err;
   }
 }

package/bin/gen.context.mjs

@@ -66,3 +66,4 @@ export function getManifestContext(root = process.cwd()) {
         }
     };
 }
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ25ELE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBTzVDLHNDQUFzQztBQUN0QyxNQUFNLE1BQU0sR0FBRyxDQUFDLEdBQVcsRUFBVSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLEdBQUcsS0FBSyxDQUFDO0FBQ2hJLE1BQU0sT0FBTyxHQUFHLENBQUMsR0FBVyxFQUFVLEVBQUUsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztBQUNuRSxNQUFNLFdBQVcsR0FBRyxDQUFDLElBQVksRUFBTyxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBRTlILG1CQUFtQjtBQUNuQixTQUFTLFdBQVcsQ0FBQyxJQUFZLEVBQUUsSUFBMkI7SUFDNUQsSUFBSSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksQ0FBQztJQUN6QixJQUFJLElBQVksQ0FBQztJQUNqQixJQUFJLEdBQW9CLENBQUM7SUFD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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "6.0.0-rc.2",
+  "version": "6.0.0-rc.3",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -30,11 +30,11 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.5.1",
-    "@travetto/manifest": "^6.0.0-rc.1",
-    "@travetto/transformer": "^6.0.0-rc.2"
+    "@travetto/manifest": "^6.0.0-rc.2",
+    "@travetto/transformer": "^6.0.0-rc.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^6.0.0-rc.1"
+    "@travetto/cli": "^6.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -3,14 +3,14 @@ import { setMaxListeners } from 'node:events';
 
 import { ManifestIndex, ManifestModuleUtil } from '@travetto/manifest';
 
-import { CompilerUtil } from './util';
-import { CompilerState } from './state';
-import { CompilerWatcher } from './watch';
-import { CompileEmitEvent, CompileEmitter, CompilerReset } from './types';
-import { EventUtil } from './event';
-
-import { IpcLogger } from '../support/log';
-import { CommonUtil } from '../support/util';
+import { CompilerUtil } from './util.ts';
+import { CompilerState } from './state.ts';
+import { CompilerWatcher } from './watch.ts';
+import { CompileEmitEvent, CompileEmitter, CompilerReset } from './types.ts';
+import { EventUtil } from './event.ts';
+
+import { IpcLogger } from '../support/log.ts';
+import { CommonUtil } from '../support/util.ts';
 
 const log = new IpcLogger({ level: 'debug' });
 

package/src/event.ts

@@ -1,4 +1,4 @@
-import type { CompilerEvent, CompilerEventType } from '../support/types';
+import type { CompilerEvent, CompilerEventType } from '../support/types.ts';
 
 export class EventUtil {
   static sendEvent<K extends CompilerEventType, T extends CompilerEvent & { type: K }>(type: K, payload: T['payload']): void {

package/src/state.ts

@@ -3,14 +3,13 @@ import ts from 'typescript';
 import { path, ManifestModuleUtil, type ManifestModule, type ManifestRoot, ManifestIndex, ManifestModuleFolderType } from '@travetto/manifest';
 import { TransformerManager } from '@travetto/transformer';
 
-import { TypescriptUtil } from '../support/ts-util';
+import { TypescriptUtil } from '../support/ts-util.ts';
 
-import { CompilerUtil } from './util';
-import { CompileEmitError, CompileStateEntry } from './types';
-import { CommonUtil } from '../support/util';
+import { CompilerUtil } from './util.ts';
+import { CompileEmitError, CompileStateEntry } from './types.ts';
+import { CommonUtil } from '../support/util.ts';
 
 const TYPINGS_FOLDER_KEYS = new Set<ManifestModuleFolderType>(['$index', 'support', 'src', '$package']);
-const TYPINGS_EXT_RE = /[.]d[.][cm]?ts([.]map)?$/;
 
 export class CompilerState implements ts.CompilerHost {
 
@@ -47,7 +46,7 @@ export class CompilerState implements ts.CompilerHost {
   #writeExternalTypings(location: string, text: string, bom: boolean): void {
     let core = location.replace('.map', '');
     if (!this.#outputToEntry.has(core)) {
-      core = core.replace('.d.ts', '.js');
+      core = core.replace(ManifestModuleUtil.TYPINGS_EXT_RE, ManifestModuleUtil.OUTPUT_EXT);
     }
     const entry = this.#outputToEntry.get(core);
     if (entry) {
@@ -144,7 +143,7 @@ export class CompilerState implements ts.CompilerHost {
         case 'ts': {
           const result = program.emit(
             program.getSourceFile(sourceFile)!,
-            (...args) => this.writeFile(...args), undefined, false,
+            (...args) => this.writeFile(args[0], args[1], args[2]), undefined, false,
             this.#transformerManager.get()
           );
           return result?.diagnostics?.length ? result.diagnostics : undefined;
@@ -185,8 +184,8 @@ export class CompilerState implements ts.CompilerHost {
     this.#tscOutputFileToOuptut.set(`${tscOutputFile}.map`, `${outputFile}.map`);
 
     if (!isTypings) {
-      const srcBase = `${ManifestModuleUtil.withoutSourceExtension(tscOutputFile)}.d.ts`;
-      const outBase = `${ManifestModuleUtil.withoutSourceExtension(outputFile)}.d.ts`;
+      const srcBase = `${ManifestModuleUtil.withoutSourceExtension(tscOutputFile)}${ManifestModuleUtil.TYPINGS_EXT}`;
+      const outBase = `${ManifestModuleUtil.withoutSourceExtension(outputFile)}${ManifestModuleUtil.TYPINGS_EXT}`;
       this.#tscOutputFileToOuptut.set(`${srcBase}.map`, `${outBase}.map`);
       this.#tscOutputFileToOuptut.set(srcBase, outBase);
     }
@@ -222,7 +221,7 @@ export class CompilerState implements ts.CompilerHost {
     this.#sourceToEntry.delete(sourceFile);
     this.#sourceFiles.delete(sourceFile);
 
-    const tscOutputDts = `${ManifestModuleUtil.withoutSourceExtension(entry.tscOutputFile)}.d.ts`;
+    const tscOutputDts = `${ManifestModuleUtil.withoutSourceExtension(entry.tscOutputFile)}${ManifestModuleUtil.TYPINGS_EXT}`;
     this.#tscOutputFileToOuptut.delete(entry.tscOutputFile);
     this.#tscOutputFileToOuptut.delete(`${entry.tscOutputFile}.map`);
     this.#tscOutputFileToOuptut.delete(tscOutputDts);
@@ -252,17 +251,14 @@ export class CompilerState implements ts.CompilerHost {
   writeFile(
     outputFile: string,
     text: string,
-    bom: boolean,
-    onError?: (message: string) => void,
-    sourceFiles?: readonly ts.SourceFile[],
-    data?: ts.WriteFileCallbackData
+    bom: boolean
   ): void {
     if (outputFile.endsWith('package.json')) {
       text = CompilerUtil.rewritePackageJSON(this.#manifest, text);
     }
     const location = this.#tscOutputFileToOuptut.get(outputFile) ?? outputFile;
 
-    if (TYPINGS_EXT_RE.test(outputFile) || outputFile.endsWith('package.json')) {
+    if (ManifestModuleUtil.TYPINGS_WITH_MAP_EXT_RE.test(outputFile) || outputFile.endsWith('package.json')) {
       this.#writeExternalTypings(location, text, bom);
     }
 

package/src/watch.ts

@@ -1,14 +1,14 @@
 import fs from 'node:fs/promises';
 import { watch } from 'node:fs';
 
-import { ManifestFileUtil, ManifestModuleUtil, ManifestUtil, PackageUtil, path } from '@travetto/manifest';
+import { ManifestFileUtil, ManifestModuleUtil, ManifestRoot, ManifestUtil, PackageUtil, path } from '@travetto/manifest';
 
-import { CompilerReset, type CompilerWatchEvent, type CompileStateEntry } from './types';
-import { CompilerState } from './state';
-import { CompilerUtil } from './util';
+import { CompilerReset, type CompilerWatchEvent, type CompileStateEntry } from './types.ts';
+import { CompilerState } from './state.ts';
+import { CompilerUtil } from './util.ts';
 
-import { AsyncQueue } from '../support/queue';
-import { IpcLogger } from '../support/log';
+import { AsyncQueue } from '../support/queue.ts';
+import { IpcLogger } from '../support/log.ts';
 
 const log = new IpcLogger({ level: 'debug' });
 
@@ -53,7 +53,7 @@ export class CompilerWatcher {
         ignores.add(item);
       }
     }
-    return [...ignores].sort().map(x => x.endsWith('/') ? x : `${x}/`);
+    return [...ignores].toSorted().map(x => x.endsWith('/') ? x : `${x}/`);
   }
 
   #toCandidateEvent(action: CompilerWatchEvent['action'], file: string): CompilerWatchEventCandidate {
@@ -63,6 +63,8 @@ export class CompilerWatcher {
       const modRoot = mod.sourceFolder || this.#root;
       const moduleFile = file.includes(`${modRoot}/`) ? file.split(`${modRoot}/`)[1] : file;
       entry = this.#state.registerInput(mod, moduleFile);
+    } else if (action === 'delete' && entry) {
+      this.#state.removeSource(entry.sourceFile); // Ensure we remove it
     }
     return { entry, file: entry?.sourceFile ?? file, action };
   }
@@ -85,54 +87,62 @@ export class CompilerWatcher {
     return true;
   }
 
-  async #reconcileAddRemove(compilerEvents: CompilerWatchEvent[]): Promise<void> {
-    const nonUpdates = compilerEvents.filter(x => x.entry.outputFile && x.action !== 'update');
-    if (!nonUpdates.length) {
+  #getManifestUpdateEventsByParents(events: CompilerWatchEvent[]): Map<string, CompilerWatchEvent[]> {
+    const eventsByMod = new Map<string, CompilerWatchEvent[]>();
+    for (const ev of events) {
+      if (ev.action === 'update') {
+        continue;
+      }
+
+      const mod = ev.entry.module;
+      const moduleSet = new Set(this.#state.manifestIndex.getDependentModules(mod.name, 'parents').map(x => x.name));
+      moduleSet.add(this.#state.manifest.workspace.name);
+      for (const m of moduleSet) {
+        if (!eventsByMod.has(m)) {
+          eventsByMod.set(m, []);
+        }
+        eventsByMod.get(m)!.push(ev);
+      }
+    }
+    return eventsByMod;
+  }
+
+  #updateManifestForEvent({ action, file, entry }: CompilerWatchEvent, manifest: ManifestRoot): void {
+    if (action === 'update') {
       return;
     }
 
-    try {
-      const eventsByMod = new Map<string, CompilerWatchEvent[]>();
+    const moduleName = entry.module.name;
+    const moduleRoot = entry.module.sourceFolder || this.#root;
+    const relativeFile = file.includes(moduleRoot) ? file.split(`${moduleRoot}/`)[1] : file;
+    const folderKey = ManifestModuleUtil.getFolderKey(relativeFile);
+    const fileType = ManifestModuleUtil.getFileType(relativeFile);
 
-      for (const ev of nonUpdates) {
-        const mod = ev.entry.module;
-        if (ev.action === 'delete') {
-          this.#state.removeSource(ev.entry.sourceFile);
-        }
-        for (const m of [mod, ...this.#state.manifestIndex.getDependentModules(mod.name, 'parents')]) {
-          if (!eventsByMod.has(m.name)) {
-            eventsByMod.set(m.name, []);
-          }
-          eventsByMod.get(m.name)!.push(ev);
-        }
-      }
+    const manifestModuleFiles = manifest.modules[moduleName].files[folderKey] ??= [];
+    const idx = manifestModuleFiles.findIndex(x => x[0] === relativeFile);
+    const wrappedIdx = idx < 0 ? manifestModuleFiles.length : idx;
 
-      for (const [mod, events] of eventsByMod.entries()) {
-        const modRoot = this.#state.manifestIndex.getManifestModule(mod)!.sourceFolder;
-        const context = ManifestUtil.getModuleContext(this.#state.manifest, modRoot);
-        const newManifest = ManifestUtil.readManifestSync(ManifestUtil.getManifestLocation(context));
-        log.debug('Updating manifest', { module: mod });
-        for (const { action, file } of events) {
-          const resolvedRoot = modRoot || this.#root;
-          const moduleFile = file.includes(resolvedRoot) ? file.split(`${resolvedRoot}/`)[1] : file;
-          const folderKey = ManifestModuleUtil.getFolderKey(moduleFile);
-          const fileType = ManifestModuleUtil.getFileType(moduleFile);
-
-          const modFiles = newManifest.modules[mod].files[folderKey] ??= [];
-          const idx = modFiles.findIndex(x => x[0] === moduleFile);
-          switch (action) {
-            case 'create': modFiles[idx < 0 ? modFiles.length : idx] = [moduleFile, fileType, Date.now()]; break;
-            case 'delete': modFiles.splice(idx, 1); break;
-          }
-        }
-        await ManifestUtil.writeManifest(newManifest);
-      }
+    switch (action) {
+      case 'create': manifestModuleFiles[wrappedIdx] = [relativeFile, fileType, Date.now()]; break;
+      case 'delete': idx >= 0 && manifestModuleFiles.splice(idx, 1); break;
+    }
+  }
+
+  async #reconcileManifestUpdates(compilerEvents: CompilerWatchEvent[]): Promise<void> {
+    for (const [mod, events] of this.#getManifestUpdateEventsByParents(compilerEvents).entries()) {
+      const moduleRoot = this.#state.manifestIndex.getManifestModule(mod)!.sourceFolder;
+      const moduleContext = ManifestUtil.getModuleContext(this.#state.manifest, moduleRoot);
+      const manifestLocation = ManifestUtil.getManifestLocation(moduleContext, mod);
+      const moduleManifest = ManifestUtil.readManifestSync(manifestLocation);
 
-      this.#state.manifestIndex.init(ManifestUtil.getManifestLocation(this.#state.manifest));
-    } catch (mErr) {
-      log.info('Restarting due to manifest rebuild failure', mErr);
-      throw new CompilerReset(`Manifest rebuild failure: ${mErr}`);
+      log.debug('Updating manifest', { module: mod, events: events.length });
+      for (const ev of events) {
+        this.#updateManifestForEvent(ev, moduleManifest);
+      }
+      await ManifestUtil.writeManifest(moduleManifest);
     }
+
+    this.#state.manifestIndex.init(ManifestUtil.getManifestLocation(this.#state.manifest));
   }
 
   async #listenWorkspace(): Promise<void> {
@@ -161,7 +171,12 @@ export class CompilerWatcher {
           .map(x => this.#toCandidateEvent(x.type, path.toPosix(x.path)))
           .filter(x => this.#isValidEvent(x));
 
-        await this.#reconcileAddRemove(items);
+        try {
+          await this.#reconcileManifestUpdates(items);
+        } catch (mErr) {
+          log.info('Restarting due to manifest rebuild failure', mErr);
+          throw new CompilerReset(`Manifest rebuild failure: ${mErr}`);
+        }
 
         for (const item of items) {
           this.#q.add(item);

package/support/entry.compiler.ts

@@ -1,3 +1,3 @@
 // @trv-no-transform
-import { Compiler } from '../src/compiler';
+import { Compiler } from '../src/compiler.ts';
 Compiler.main();

package/support/entry.main.ts

@@ -3,13 +3,13 @@ import fs from 'node:fs/promises';
 
 import type { ManifestContext } from '@travetto/manifest';
 
-import type { CompilerMode, CompilerServerInfo } from './types';
-import { Log } from './log';
-import { CompilerSetup } from './setup';
-import { CompilerServer } from './server/server';
-import { CompilerRunner } from './server/runner';
-import { CompilerClient } from './server/client';
-import { CommonUtil } from './util';
+import type { CompilerMode, CompilerServerInfo } from './types.ts';
+import { Log } from './log.ts';
+import { CompilerSetup } from './setup.ts';
+import { CompilerServer } from './server/server.ts';
+import { CompilerRunner } from './server/runner.ts';
+import { CompilerClient } from './server/client.ts';
+import { CommonUtil } from './util.ts';
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export const main = (ctx: ManifestContext) => {

package/support/log.ts

@@ -1,4 +1,4 @@
-import { CompilerLogEvent, CompilerLogLevel, CompilerProgressEvent } from './types';
+import { CompilerLogEvent, CompilerLogLevel, CompilerProgressEvent } from './types.ts';
 
 const LEVEL_TO_PRI: Record<CompilerLogLevel | 'none', number> = { debug: 1, info: 2, warn: 3, error: 4, none: 5 };
 const SCOPE_MAX = 15;

package/support/server/client.ts

@@ -4,10 +4,10 @@ import http, { Agent } from 'node:http';
 
 import { ManifestContext } from '@travetto/manifest';
 
-import type { CompilerEvent, CompilerEventType, CompilerServerInfo, CompilerStateType } from '../types';
-import type { LogShape } from '../log';
-import { CommonUtil } from '../util';
-import { ProcessHandle } from './process-handle';
+import type { CompilerEvent, CompilerEventType, CompilerServerInfo, CompilerStateType } from '../types.ts';
+import type { LogShape } from '../log.ts';
+import { CommonUtil } from '../util.ts';
+import { ProcessHandle } from './process-handle.ts';
 
 type FetchEventsConfig<T> = {
   signal?: AbortSignal;
@@ -55,8 +55,8 @@ export class CompilerClient {
         ctrl.abort('TIMEOUT');
       })
       .catch(() => { });
-    const res = await fetch(`${this.#url}${rel}`, { ...opts, signal: ctrl.signal });
-    const out = { ok: res.ok, text: await res.text() };
+    const response = await fetch(`${this.#url}${rel}`, { ...opts, signal: ctrl.signal });
+    const out = { ok: response.ok, text: await response.text() };
     timeoutCtrl.abort();
     return out;
   }
@@ -127,7 +127,7 @@ export class CompilerClient {
 
         for await (const line of rl.createInterface(response)) {
           if (line.trim().charAt(0) === '{') {
-            const val = JSON.parse(line);
+            const val: T = JSON.parse(line);
             if (cfg.until?.(val)) {
               await CommonUtil.queueMacroTask();
               ctrl.abort();
@@ -136,7 +136,8 @@ export class CompilerClient {
           }
         }
       } catch (err) {
-        if (!ctrl.signal.aborted) { throw err; }
+        const aborted = ctrl.signal.aborted || (typeof err === 'object' && err && 'code' in err && err.code === 'ECONNRESET');
+        if (!aborted) { throw err; }
       }
       signal.removeEventListener('abort', quit);
 

package/support/server/process-handle.ts

@@ -3,8 +3,8 @@ import path from 'node:path';
 
 import type { ManifestContext } from '@travetto/manifest';
 
-import { Log, Logger } from '../log';
-import { CommonUtil } from '../util';
+import { Log, Logger } from '../log.ts';
+import { CommonUtil } from '../util.ts';
 
 export class ProcessHandle {
 

package/support/server/runner.ts

@@ -3,10 +3,10 @@ import { rmSync } from 'node:fs';
 
 import type { ManifestContext, DeltaEvent } from '@travetto/manifest';
 
-import type { CompilerEvent, CompilerMode } from '../types';
-import { AsyncQueue } from '../queue';
-import { Log } from '../log';
-import { CommonUtil } from '../util';
+import type { CompilerEvent, CompilerMode } from '../types.ts';
+import { AsyncQueue } from '../queue.ts';
+import { Log } from '../log.ts';
+import { CommonUtil } from '../util.ts';
 
 const log = Log.scoped('compiler-exec');
 const isEvent = (msg: unknown): msg is CompilerEvent => !!msg && typeof msg === 'object' && 'type' in msg;
@@ -58,7 +58,7 @@ export class CompilerRunner {
 
       const kill = (): unknown => {
         log.debug('Shutting down process');
-        return (proc.connected ? proc.send('shutdown', (err) => proc.kill()) : proc.kill());
+        return (proc.connected ? proc.send('shutdown', () => proc.kill()) : proc.kill());
       };
 
       process.once('SIGINT', kill);

package/support/server/server.ts

@@ -4,11 +4,11 @@ import { setMaxListeners } from 'node:events';
 
 import type { ManifestContext } from '@travetto/manifest';
 
-import type { CompilerMode, CompilerProgressEvent, CompilerEvent, CompilerEventType, CompilerServerInfo } from '../types';
-import { Log } from '../log';
-import { CommonUtil } from '../util';
-import { CompilerClient } from './client';
-import { ProcessHandle } from './process-handle';
+import type { CompilerMode, CompilerProgressEvent, CompilerEvent, CompilerEventType, CompilerServerInfo } from '../types.ts';
+import { Log } from '../log.ts';
+import { CommonUtil } from '../util.ts';
+import { CompilerClient } from './client.ts';
+import { ProcessHandle } from './process-handle.ts';
 
 const log = Log.scoped('server');
 

package/support/setup.ts

@@ -4,9 +4,9 @@ import path from 'node:path';
 
 import type { DeltaEvent, ManifestContext, Package } from '@travetto/manifest';
 
-import { Log } from './log';
-import { CommonUtil } from './util';
-import { TypescriptUtil } from './ts-util';
+import { Log } from './log.ts';
+import { CommonUtil } from './util.ts';
+import { TypescriptUtil } from './ts-util.ts';
 
 type ModFile = { input: string, output: string, stale: boolean };
 
@@ -15,6 +15,10 @@ const PRECOMPILE_MODS = ['@travetto/manifest', '@travetto/transformer', '@travet
 const RECENT_STAT = (stat: { ctimeMs: number, mtimeMs: number }): number => Math.max(stat.ctimeMs, stat.mtimeMs);
 const REQ = createRequire(path.resolve('node_modules')).resolve.bind(null);
 
+const SOURCE_EXT_RE = /[.][cm]?[tj]s$/;
+const BARE_IMPORT_RE = /^(@[^/]+[/])?[^.][^@/]+$/;
+const OUTPUT_EXT = '.js';
+
 /**
  * Compiler Setup Utilities
  */
@@ -27,21 +31,21 @@ export class CompilerSetup {
     Pick<typeof import('@travetto/manifest'), 'ManifestDeltaUtil' | 'ManifestUtil'>
   > => {
     const all = ['util', 'delta'].map(f =>
-      import(CommonUtil.resolveWorkspace(ctx, ctx.build.compilerFolder, 'node_modules', `@travetto/manifest/src/${f}.js`))
+      import(CommonUtil.resolveWorkspace(ctx, ctx.build.compilerFolder, 'node_modules', `@travetto/manifest/src/${f}${OUTPUT_EXT}`))
     );
     return Promise.all(all).then(props => Object.assign({}, ...props));
   };
 
   /**  Convert a file to a given ext */
   static #sourceToExtension(sourceFile: string, ext: string): string {
-    return sourceFile.replace(/[.][tj]sx?$/, ext);
+    return sourceFile.replace(SOURCE_EXT_RE, ext);
   }
 
   /**
    * Get the output file name for a given input
    */
   static #sourceToOutputExt(sourceFile: string): string {
-    return this.#sourceToExtension(sourceFile, '.js');
+    return this.#sourceToExtension(sourceFile, OUTPUT_EXT);
   }
 
   /**
@@ -53,14 +57,19 @@ export class CompilerSetup {
       const compilerOut = CommonUtil.resolveWorkspace(ctx, ctx.build.compilerFolder, 'node_modules');
 
       const text = (await fs.readFile(sourceFile, 'utf8'))
-        .replace(/from '([.][^']+)'/g, (_, i) => `from '${i.replace(/[.]js$/, '')}.js'`)
-        .replace(/from '(@travetto\/(.*?))'/g, (_, i, s) => `from '${compilerOut}/${i}${s.includes('/') ? '.js' : '/__index__.js'}'`);
+        .replace(/from ['"](([.]+|@travetto)[/][^']+)['"]/g, (_, clause, m) => {
+          const s = this.#sourceToOutputExt(clause);
+          const suf = s.endsWith(OUTPUT_EXT) ? '' : (BARE_IMPORT_RE.test(clause) ? `/__index__${OUTPUT_EXT}` : OUTPUT_EXT);
+          const pre = m === '@travetto' ? `${compilerOut}/` : '';
+          return `from '${pre}${s}${suf}'`;
+        });
 
       const ts = (await import('typescript')).default;
       const content = ts.transpile(text, {
         ...await TypescriptUtil.getCompilerOptions(ctx),
         sourceMap: false,
         inlineSourceMap: true,
+        importHelpers: true,
       }, sourceFile);
       await CommonUtil.writeTextFile(outputFile, content);
     } else if (type === 'package-json') {

package/support/ts-util.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import type { CompilerOptions } from 'typescript';
 
 import type { ManifestContext } from '@travetto/manifest';
-import { CommonUtil } from './util';
+import { CommonUtil } from './util.ts';
 
 const OPT_CACHE: Record<string, CompilerOptions> = {};
 
@@ -14,7 +14,7 @@ export class TypescriptUtil {
     if (!(ctx.workspace.path in OPT_CACHE)) {
       let tsconfig = CommonUtil.resolveWorkspace(ctx, 'tsconfig.json');
 
-      if (!await fs.stat(tsconfig).then(_ => true, _ => false)) {
+      if (!await fs.stat(tsconfig).then(() => true, () => false)) {
         tsconfig = CommonUtil.resolveWorkspace(ctx, ctx.build.compilerModuleFolder, 'tsconfig.trv.json');
       }
 
@@ -26,6 +26,8 @@ export class TypescriptUtil {
 
       OPT_CACHE[ctx.workspace.path] = {
         ...options,
+        noEmit: false,
+        emitDeclarationOnly: false,
         allowJs: true,
         resolveJsonModule: true,
         sourceRoot: ctx.workspace.path,

package/support/util.ts

@@ -6,7 +6,7 @@ import native from 'node:path';
 
 import type { ManifestContext } from '@travetto/manifest';
 
-import { Log } from './log';
+import { Log } from './log.ts';
 
 const toPosix = (file: string): string => file.replaceAll('\\', '/');
 
@@ -17,7 +17,7 @@ export class CommonUtil {
   static getFileType(file: string): 'ts' | 'js' | 'package-json' | 'typings' | undefined {
     return file.endsWith('package.json') ? 'package-json' :
       (file.endsWith('.js') ? 'js' :
-        (file.endsWith('.d.ts') ? 'typings' : (/[.]tsx?$/.test(file) ? 'ts' : undefined)));
+        (file.endsWith('.d.ts') ? 'typings' : (/[.][cm]?tsx?$/.test(file) ? 'ts' : undefined)));
   }
 
   /**

package/tsconfig.trv.json

@@ -3,8 +3,9 @@
     "module": "ES2022",
     "target": "esnext",
     "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
     "lib": [
-      "ES2023"
+      "ES2024"
     ],
     "jsx": "react-jsx",
     "strict": true,
@@ -12,6 +13,7 @@
     "declarationMap": true,
     "esModuleInterop": true,
     "strictPropertyInitialization": false,
+    "erasableSyntaxOnly": true,
     "experimentalDecorators": true,
     "noEmitOnError": false,
     "noErrorTruncation": true,
@@ -22,6 +24,7 @@
     "importHelpers": true,
     "noEmitHelpers": true,
     "outDir": "build/",
+    "noEmit": true
   },
   "watchOptions": {
     "excludeDirectories": [