@travetto/compiler 7.0.0-rc.1 → 7.0.0-rc.2

package/bin/entry.common.js

@@ -4,17 +4,17 @@ 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 SOURCE_EXT_REGEX = /[.][cm]?[tj]sx?$/;
+const BARE_IMPORT_REGEX = /^(@[^/]+[/])?[^.][^@/]+$/;
 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)));
+async function writeIfStale(sourceFile = '', destinationFile = '', transform = async (text = '') => text) {
+  const [srcStat, destStat] = await Promise.all([sourceFile, destinationFile].map(file => stat(`${file}`).then(stats => stats.mtimeMs, () => 0)));
 
   if (!destStat || destStat < srcStat) {
-    const text = src ? await readFile(src, 'utf8') : '';
-    await mkdir(path.dirname(dest), { recursive: true });
-    await writeFile(dest, await transform(text), 'utf8');
+    const text = sourceFile ? await readFile(sourceFile, 'utf8') : '';
+    await mkdir(path.dirname(destinationFile), { recursive: true });
+    await writeFile(destinationFile, await transform(text), 'utf8');
   }
 }
 
@@ -32,35 +32,35 @@ async function transpile(content = '', esm = true, full = true) {
 }
 
 async function getContext() {
-  const ctxSrc = require.resolve('@travetto/manifest/src/context.ts');
+  const ctxFile = 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')} */ v) => v.getManifestContext());
+  await writeIfStale(ctxFile, ctxDest, content => transpile(content, true, false));
+  const ctx = await import(ctxDest).then((/** @type {import('@travetto/manifest')} */ value) => value.getManifestContext());
 
   const srcPath = path.resolve.bind(path, ctx.workspace.path, ctx.build.compilerModuleFolder);
   const destPath = (file = '') =>
-    path.resolve(ctx.workspace.path, ctx.build.compilerFolder, 'node_modules', file).replace(SOURCE_EXT_RE, OUTPUT_EXT);
+    path.resolve(ctx.workspace.path, ctx.build.compilerFolder, 'node_modules', file).replace(SOURCE_EXT_REGEX, OUTPUT_EXT);
 
   return {
     packageType: ctx.workspace.type,
     srcPath,
     destPath,
     tsconfig: path.resolve(ctx.workspace.path, 'tsconfig.json'),
-    cleanImports: (t = '') => t
-      .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}'`;
+    cleanImports: (text = '') => text
+      .replace(/from ['"]((@travetto|[.]+)[^'"]+)['"]/g, (_, location, module) => {
+        const root = (module === '@travetto' ? destPath(location) : location).replace(SOURCE_EXT_REGEX, OUTPUT_EXT);
+        const suffix = root.endsWith(OUTPUT_EXT) ? '' : (BARE_IMPORT_REGEX.test(location) ? `/__index__${OUTPUT_EXT}` : OUTPUT_EXT);
+        return `from '${root}${suffix}'`;
       }),
     loadMain: () => import(destPath(`${COMP_MOD}/support/entry.main.ts`))
-      .then((/** @type {import('../support/entry.main.ts')} */ v) => v.main(ctx)),
+      .then((/** @type {import('../support/entry.main.ts')} */  value) => value.main(ctx)),
     supportFiles: () => readdir(srcPath('support'), { recursive: true, encoding: 'utf8' })
-      .then(v => v.filter(f => f.endsWith('.ts')).map(j => `support/${j}`))
+      .then(files => files.filter(file => file.endsWith('.ts')).map(file => `support/${file}`))
   };
 }
 
 /** @template T */
-async function load(/** @type {(ops: import('../support/entry.main.ts').Operations) => T} */ cb) {
+async function load(/** @type {(operations: import('../support/entry.main.ts').Operations) => T} */ callback) {
   const ctx = await getContext();
 
   try {
@@ -70,19 +70,19 @@ async function load(/** @type {(ops: import('../support/entry.main.ts').Operatio
     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(`${COMP_MOD}/${f}`),
-        t => transpile(ctx.cleanImports(t), ctx.packageType === 'module'))));
+    await Promise.all((await ctx.supportFiles()).map(file =>
+      writeIfStale(ctx.srcPath(file), ctx.destPath(`${COMP_MOD}/${file}`),
+        text => transpile(ctx.cleanImports(text), 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
-    const res = await ctx.loadMain();
+    const result = await ctx.loadMain();
     // @ts-ignore
     try { module.enableCompileCache(); } catch { }
-    return cb(res);
-  } catch (err) {
+    return callback(result);
+  } catch (error) {
     await rm(ctx.destPath(COMP_MOD), { recursive: true, force: true });
-    throw err;
+    throw error;
   }
 }
 

package/bin/gen.context.mjs

@@ -2,22 +2,22 @@ import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { createRequire } from 'node:module';
 // eslint-disable-next-line no-bitwise
-const toPort = (pth) => (Math.abs([...pth].reduce((a, b) => (a * 33) ^ b.charCodeAt(0), 5381)) % 29000) + 20000;
-const toPosix = (pth) => pth.replaceAll('\\', '/');
+const toPort = (location) => (Math.abs([...location].reduce((a, b) => (a * 33) ^ b.charCodeAt(0), 5381)) % 29000) + 20000;
+const toPosix = (location) => location.replaceAll('\\', '/');
 const readPackage = (file) => ({ ...JSON.parse(readFileSync(file, 'utf8')), path: toPosix(path.dirname(file)) });
 /** Find package */
 function findPackage(base, pred) {
     let folder = `${base}/.`;
-    let prev;
+    let previous;
     let pkg;
     const packages = [];
     do {
         pkg && packages.push(pkg);
-        prev = folder;
+        previous = folder;
         folder = path.dirname(folder);
         const folderPkg = path.resolve(folder, 'package.json');
         pkg = existsSync(folderPkg) ? readPackage(folderPkg) : pkg;
-    } while (prev !== folder && // Not at root
+    } while (previous !== folder && // Not at root
         !pred(pkg) && // Matches criteria
         !existsSync(path.resolve(folder, '.git')) // Not at source root
     );
@@ -66,4 +66,4 @@ export function getManifestContext(root = process.cwd()) {
         }
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ25ELE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBTzVDLHNDQUFzQztBQUN0QyxNQUFNLE1BQU0sR0FBRyxDQUFDLEdBQVcsRUFBVSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLEdBQUcsS0FBSyxDQUFDO0FBQ2hJLE1BQU0sT0FBTyxHQUFHLENBQUMsR0FBVyxFQUFVLEVBQUUsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztBQUNuRSxNQUFNLFdBQVcsR0FBRyxDQUFDLElBQVksRUFBTyxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBRTlILG1CQUFtQjtBQUNuQixTQUFTLFdBQVcsQ0FBQyxJQUFZLEVBQUUsSUFBMkI7SUFDNUQsSUFBSSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksQ0FBQztJQUN6QixJQUFJLElBQVksQ0FBQztJQUNqQixJQUFJLEdBQW9CLENBQUM7SUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ25ELE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBTzVDLHNDQUFzQztBQUN0QyxNQUFNLE1BQU0sR0FBRyxDQUFDLFFBQWdCLEVBQVUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxHQUFHLEtBQUssQ0FBQztBQUMxSSxNQUFNLE9BQU8sR0FBRyxDQUFDLFFBQWdCLEVBQVUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQzdFLE1BQU0sV0FBVyxHQUFHLENBQUMsSUFBWSxFQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7QUFFOUgsbUJBQW1CO0FBQ25CLFNBQVMsV0FBVyxDQUFDLElBQVksRUFBRSxJQUEyQjtJQUM1RCxJQUFJLE1BQU0sR0FBRyxHQUFHLElBQUksSUFBSSxDQUFDO0lBQ3pCLElBQUksUUFBZ0IsQ0FBQztJQUNyQixJQUFJLEdBQW9CLENBQUM7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

package/bin/trvc.js

@@ -14,26 +14,26 @@ Available Commands:
  * manifest --prod [output]   - Generate the project manifest
 `;
 
-const toJson = (/** @type {number} */ depth) => v => process.stdout.write(`${JSON.stringify(v, undefined, depth)}\n`) ||
-  new Promise(r => process.stdout.once('drain', r));
+const toJson = (/** @type {number} */ depth) => value => process.stdout.write(`${JSON.stringify(value, undefined, depth)}\n`) ||
+  new Promise(resolve => process.stdout.once('drain', resolve));
 
-require('./entry.common.js').load(ops => {
-  const [op, ...all] = process.argv.slice(2);
-  const args = all.filter(x => !x.startsWith('-'));
+require('./entry.common.js').load(operations => {
+  const [operation, ...all] = process.argv.slice(2);
+  const args = all.filter(arg => !arg.startsWith('-'));
 
-  switch (op) {
+  switch (operation) {
     case undefined:
     case 'help': return console.log(help);
-    case 'info': return ops.info().then(toJson(2));
-    case 'event': return ops.events(args[0], toJson(0));
-    case 'manifest': return ops.manifest(args[0], all.some(x => x === '--prod'));
-    case 'exec': return ops.exec(args[0], all.slice(1));
-    case 'build': return ops.build();
-    case 'clean': return ops.clean();
+    case 'info': return operations.info().then(toJson(2));
+    case 'event': return operations.events(args[0], toJson(0));
+    case 'manifest': return operations.manifest(args[0], all.some(arg => arg === '--prod'));
+    case 'exec': return operations.exec(args[0], all.slice(1));
+    case 'build': return operations.build();
+    case 'clean': return operations.clean();
     case 'start':
-    case 'watch': return ops.watch();
-    case 'stop': return ops.stop();
-    case 'restart': return ops.restart();
-    default: console.error(`\nUnknown trvc operation: ${op}\n${help}`);
+    case 'watch': return operations.watch();
+    case 'stop': return operations.stop();
+    case 'restart': return operations.restart();
+    default: console.error(`\nUnknown trvc operation: ${operation}\n${help}`);
   }
 });

package/package.json

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

package/src/compiler.ts

@@ -26,7 +26,8 @@ export class Compiler {
     const [dirty, watch] = process.argv.slice(2);
     const state = await CompilerState.get(new ManifestIndex());
     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);
+    const dirtyFiles = ManifestModuleUtil.getFileType(dirty) === 'ts' ? [dirty] :
+      (await fs.readFile(dirty, 'utf8')).split(/\n/).filter(line => !!line);
     log.debug('Running compiler with dirty file', dirtyFiles);
     await new Compiler(state, dirtyFiles, watch === 'true').run();
   }
@@ -34,7 +35,7 @@ export class Compiler {
   #state: CompilerState;
   #dirtyFiles: string[];
   #watch?: boolean;
-  #ctrl: AbortController;
+  #controller: AbortController;
   #signal: AbortSignal;
   #shuttingDown = false;
 
@@ -42,18 +43,18 @@ export class Compiler {
     this.#state = state;
     this.#dirtyFiles = dirtyFiles[0] === '*' ?
       this.#state.getAllFiles() :
-      dirtyFiles.map(f => this.#state.getBySource(f)!.sourceFile);
+      dirtyFiles.map(file => this.#state.getBySource(file)!.sourceFile);
     this.#watch = watch;
 
-    this.#ctrl = new AbortController();
-    this.#signal = this.#ctrl.signal;
+    this.#controller = new AbortController();
+    this.#signal = this.#controller.signal;
     setMaxListeners(1000, this.#signal);
     process
       .once('disconnect', () => this.#shutdown('manual'))
-      .on('message', ev => (ev === 'shutdown') && this.#shutdown('manual'));
+      .on('message', event => (event === 'shutdown') && this.#shutdown('manual'));
   }
 
-  #shutdown(mode: 'error' | 'manual' | 'complete' | 'reset', err?: Error): void {
+  #shutdown(mode: 'error' | 'manual' | 'complete' | 'reset', error?: Error): void {
     if (this.#shuttingDown) {
       return;
     }
@@ -67,14 +68,14 @@ export class Compiler {
       }
       case 'error': {
         process.exitCode = 1;
-        if (err) {
-          EventUtil.sendEvent('log', { level: 'error', message: err.toString(), time: Date.now() });
-          log.error('Shutting down due to failure', err.stack);
+        if (error) {
+          EventUtil.sendEvent('log', { level: 'error', message: error.toString(), time: Date.now() });
+          log.error('Shutting down due to failure', error.stack);
         }
         break;
       }
       case 'reset': {
-        log.info('Reset due to', err?.message);
+        log.info('Reset due to', error?.message);
         EventUtil.sendEvent('state', { state: 'reset' });
         process.exitCode = 0;
         break;
@@ -83,7 +84,7 @@ export class Compiler {
     // No longer listen to disconnect
     process.removeAllListeners('disconnect');
     process.removeAllListeners('message');
-    this.#ctrl.abort();
+    this.#controller.abort();
     CommonUtil.nonBlockingTimeout(1000).then(() => process.exit()); // Allow upto 1s to shutdown gracefully
   }
 
@@ -92,7 +93,7 @@ export class Compiler {
    */
   logStatistics(metrics: CompileEmitEvent[]): void {
     // Simple metrics
-    const durations = metrics.map(x => x.duration);
+    const durations = metrics.map(event => event.duration);
     const total = durations.reduce((a, b) => a + b, 0);
     const avg = total / durations.length;
     const sorted = [...durations].sort((a, b) => a - b);
@@ -102,7 +103,7 @@ export class Compiler {
     const slowest = [...metrics]
       .sort((a, b) => b.duration - a.duration)
       .slice(0, 5)
-      .map(x => ({ file: x.file, duration: x.duration }));
+      .map(event => ({ file: event.file, duration: event.duration }));
 
     log.debug('Compilation Statistics', {
       files: metrics.length,
@@ -131,12 +132,12 @@ export class Compiler {
 
     for (const file of files) {
       const start = Date.now();
-      const err = await emitter(file);
+      const error = await emitter(file);
       const duration = Date.now() - start;
-      const nodeModSep = 'node_modules/';
-      const nodeModIdx = file.lastIndexOf(nodeModSep);
-      const imp = nodeModIdx >= 0 ? file.substring(nodeModIdx + nodeModSep.length) : file;
-      yield { file: imp, i: i += 1, err, total: files.length, duration };
+      const nodeModSeparator = 'node_modules/';
+      const nodeModIdx = file.lastIndexOf(nodeModSeparator);
+      const imp = nodeModIdx >= 0 ? file.substring(nodeModIdx + nodeModSeparator.length) : file;
+      yield { file: imp, i: i += 1, error, total: files.length, duration };
       if ((Date.now() - lastSent) > 50) { // Limit to 1 every 50ms
         lastSent = Date.now();
         EventUtil.sendEvent('progress', { total: files.length, idx: i, message: imp, operation: 'compile' });
@@ -158,7 +159,7 @@ export class Compiler {
   async run(): Promise<void> {
     log.debug('Compilation started');
 
-    EventUtil.sendEvent('state', { state: 'init', extra: { pid: process.pid } });
+    EventUtil.sendEvent('state', { state: 'init', extra: { processId: process.pid } });
 
     const emitter = await this.getCompiler();
     let failure: Error | undefined;
@@ -170,13 +171,13 @@ export class Compiler {
     const metrics: CompileEmitEvent[] = [];
 
     if (this.#dirtyFiles.length) {
-      for await (const ev of this.emit(this.#dirtyFiles, emitter)) {
-        if (ev.err) {
-          const compileError = CompilerUtil.buildTranspileError(ev.file, ev.err);
+      for await (const event of this.emit(this.#dirtyFiles, emitter)) {
+        if (event.error) {
+          const compileError = CompilerUtil.buildTranspileError(event.file, event.error);
           failure ??= compileError;
           EventUtil.sendEvent('log', { level: 'error', message: compileError.toString(), time: Date.now() });
         }
-        metrics.push(ev);
+        metrics.push(event);
       }
       if (this.#signal.aborted) {
         log.debug('Compilation aborted');
@@ -203,35 +204,35 @@ export class Compiler {
 
       EventUtil.sendEvent('state', { state: 'watch-start' });
       try {
-        for await (const ev of new CompilerWatcher(this.#state, this.#signal)) {
-          if (ev.action !== 'delete') {
-            const err = await emitter(ev.entry.sourceFile, true);
-            if (err) {
-              log.info('Compilation Error', CompilerUtil.buildTranspileError(ev.entry.sourceFile, err));
+        for await (const event of new CompilerWatcher(this.#state, this.#signal)) {
+          if (event.action !== 'delete') {
+            const error = await emitter(event.entry.sourceFile, true);
+            if (error) {
+              log.info('Compilation Error', CompilerUtil.buildTranspileError(event.entry.sourceFile, error));
             } else {
-              log.info(`Compiled ${ev.entry.sourceFile} on ${ev.action}`);
+              log.info(`Compiled ${event.entry.sourceFile} on ${event.action}`);
             }
           } else {
-            if (ev.entry.outputFile) {
+            if (event.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
+              log.info(`Removed ${event.entry.sourceFile}, ${event.entry.outputFile}`);
+              await fs.rm(event.entry.outputFile, { force: true }); // Ensure output is deleted
             }
           }
 
           // Send change events
           EventUtil.sendEvent('change', {
-            action: ev.action,
+            action: event.action,
             time: Date.now(),
-            file: ev.file,
-            output: ev.entry.outputFile!,
-            module: ev.entry.module.name
+            file: event.file,
+            output: event.entry.outputFile!,
+            module: event.entry.module.name
           });
         }
         EventUtil.sendEvent('state', { state: 'watch-end' });
-      } catch (err) {
-        if (err instanceof Error) {
-          this.#shutdown(err instanceof CompilerReset ? 'reset' : 'error', err);
+      } catch (error) {
+        if (error instanceof Error) {
+          this.#shutdown(error instanceof CompilerReset ? 'reset' : 'error', error);
         }
       }
     }

package/src/state.ts

@@ -46,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(ManifestModuleUtil.TYPINGS_EXT_RE, ManifestModuleUtil.OUTPUT_EXT);
+      core = core.replace(ManifestModuleUtil.TYPINGS_EXT_REGEX, ManifestModuleUtil.OUTPUT_EXT);
     }
     const entry = this.#outputToEntry.get(core);
     if (entry) {
@@ -72,8 +72,8 @@ export class CompilerState implements ts.CompilerHost {
     this.#modules = Object.values(this.#manifest.modules);
 
     // Register all inputs
-    for (const x of this.#modules) {
-      const base = x?.files ?? {};
+    for (const mod of this.#modules) {
+      const base = mod?.files ?? {};
       const files = [
         ...base.bin ?? [],
         ...base.src ?? [],
@@ -85,7 +85,7 @@ export class CompilerState implements ts.CompilerHost {
       ];
       for (const [file, type] of files) {
         if (CompilerUtil.validFile(type)) {
-          this.registerInput(x, file);
+          this.registerInput(mod, file);
         }
       }
     }
@@ -109,7 +109,7 @@ export class CompilerState implements ts.CompilerHost {
 
   getArbitraryInputFile(): string {
     const randomSource = this.#manifestIndex.getWorkspaceModules()
-      .filter(x => x.files.src?.length)[0]
+      .filter(mod => mod.files.src?.length)[0]
       .files.src[0].sourceFile;
 
     return this.getBySource(randomSource)!.sourceFile;
@@ -149,11 +149,11 @@ export class CompilerState implements ts.CompilerHost {
           return result?.diagnostics?.length ? result.diagnostics : undefined;
         }
       }
-    } catch (err) {
-      if (err instanceof Error) {
-        return err;
+    } catch (error) {
+      if (error instanceof Error) {
+        return error;
       } else {
-        throw err;
+        throw error;
       }
     }
   }
@@ -235,7 +235,7 @@ export class CompilerState implements ts.CompilerHost {
   /* Start Compiler Host */
   getCanonicalFileName(file: string): string { return file; }
   getCurrentDirectory(): string { return this.#manifest.workspace.path; }
-  getDefaultLibFileName(opts: ts.CompilerOptions): string { return ts.getDefaultLibFileName(opts); }
+  getDefaultLibFileName(options: ts.CompilerOptions): string { return ts.getDefaultLibFileName(options); }
   getNewLine(): string { return ts.sys.newLine; }
   useCaseSensitiveFileNames(): boolean { return ts.sys.useCaseSensitiveFileNames; }
   getDefaultLibLocation(): string { return path.dirname(ts.getDefaultLibFilePath(this.#compilerOptions)); }
@@ -244,8 +244,8 @@ export class CompilerState implements ts.CompilerHost {
     return this.#sourceToEntry.has(sourceFile) || ts.sys.fileExists(sourceFile);
   }
 
-  directoryExists(sourceDir: string): boolean {
-    return this.#sourceDirectory.has(sourceDir) || ts.sys.directoryExists(sourceDir);
+  directoryExists(sourceDirectory: string): boolean {
+    return this.#sourceDirectory.has(sourceDirectory) || ts.sys.directoryExists(sourceDirectory);
   }
 
   writeFile(
@@ -258,7 +258,7 @@ export class CompilerState implements ts.CompilerHost {
     }
     const location = this.#tscOutputFileToOuptut.get(outputFile) ?? outputFile;
 
-    if (ManifestModuleUtil.TYPINGS_WITH_MAP_EXT_RE.test(outputFile) || outputFile.endsWith('package.json')) {
+    if (ManifestModuleUtil.TYPINGS_WITH_MAP_EXT_REGEX.test(outputFile) || outputFile.endsWith('package.json')) {
       this.#writeExternalTypings(location, text, bom);
     }
 
@@ -266,9 +266,9 @@ export class CompilerState implements ts.CompilerHost {
   }
 
   readFile(sourceFile: string): string | undefined {
-    const res = this.#sourceContents.get(sourceFile) ?? this.#readFile(sourceFile);
-    this.#sourceContents.set(sourceFile, res);
-    return res;
+    const contents = this.#sourceContents.get(sourceFile) ?? this.#readFile(sourceFile);
+    this.#sourceContents.set(sourceFile, contents);
+    return contents;
   }
 
   getSourceFile(sourceFile: string, language: ts.ScriptTarget): ts.SourceFile {

package/src/types.ts

@@ -4,7 +4,7 @@ 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, duration: number };
+export type CompileEmitEvent = { file: string, i: number, total: number, error?: CompileEmitError, duration: number };
 export type CompileStateEntry = { sourceFile: string, tscOutputFile: string, outputFile?: string, module: ManifestModule };
 export type CompilerWatchEvent = { action: 'create' | 'update' | 'delete', file: string, entry: CompileStateEntry };
 export class CompilerReset extends Error { }

package/src/util.ts

@@ -24,7 +24,7 @@ export class CompilerUtil {
   static rewritePackageJSON(manifest: ManifestRoot, text: string): string {
     const pkg: Package = JSON.parse(text);
     if (pkg.files) {
-      pkg.files = pkg.files.map(x => ManifestModuleUtil.withOutputExtension(x));
+      pkg.files = pkg.files.map(file => ManifestModuleUtil.withOutputExtension(file));
     }
     if (pkg.main) {
       pkg.main = ManifestModuleUtil.withOutputExtension(pkg.main);
@@ -32,9 +32,9 @@ export class CompilerUtil {
     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] ?? {})) {
-          if (dep in manifest.modules) {
-            pkg[key]![dep] = manifest.modules[dep].version;
+        for (const dependency of Object.keys(pkg[key] ?? {})) {
+          if (dependency in manifest.modules) {
+            pkg[key]![dependency] = manifest.modules[dependency].version;
           }
         }
       }