@travetto/compiler 4.0.5 → 4.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -36,7 +36,7 @@
     "@types/node": "^20.11.16"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.4"
+    "@travetto/cli": "^4.0.5"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -10,7 +10,7 @@ import { CompileEmitEvent, CompileEmitter } from './types';
 import { EventUtil } from './event';
 
 import { IpcLogger } from '../support/log';
-import { TimerUtil } from '../support/timer';
+import { CommonUtil } from '../support/util';
 
 const log = new IpcLogger({ level: 'debug' });
 
@@ -82,7 +82,7 @@ export class Compiler {
     process.removeAllListeners('disconnect');
     process.removeAllListeners('message');
     this.#ctrl.abort();
-    TimerUtil.nonBlockingTimeout(1000).then(() => process.exit()); // Allow upto 1s to shutdown gracefully
+    CommonUtil.nonBlockingTimeout(1000).then(() => process.exit()); // Allow upto 1s to shutdown gracefully
   }
 
   /**
@@ -113,7 +113,7 @@ export class Compiler {
     }
     EventUtil.sendEvent('progress', { total: files.length, idx: files.length, message: 'Complete', operation: 'compile', complete: true });
 
-    await TimerUtil.queueMacroTask();
+    await CommonUtil.queueMacroTask();
 
     log.debug(`Compiled ${i} files`);
   }

package/src/state.ts

@@ -4,7 +4,7 @@ import timers from 'node:timers/promises';
 import { path, ManifestModuleUtil, ManifestModule, ManifestRoot, ManifestIndex } from '@travetto/manifest';
 import { TransformerManager } from '@travetto/transformer';
 
-import { CommonUtil } from '../support/util';
+import { TypescriptUtil } from '../support/ts-util';
 
 import { CompilerUtil } from './util';
 import { CompileEmitError, CompileStateEntry } from './types';
@@ -82,7 +82,7 @@ export class CompilerState implements ts.CompilerHost {
     this.#transformerManager = await TransformerManager.create(this.#manifestIndex);
 
     this.#compilerOptions = {
-      ...await CommonUtil.getCompilerOptions(this.#manifest),
+      ...await TypescriptUtil.getCompilerOptions(this.#manifest),
       rootDir: this.#rootDir,
       outDir: this.#outputPath
     };

package/support/entry.trvc.ts

@@ -6,7 +6,6 @@ import type { ManifestContext } from '@travetto/manifest';
 
 import type { CompilerMode, CompilerServerInfo } from './types';
 import { Log } from './log';
-import { CommonUtil } from './util';
 import { CompilerSetup } from './setup';
 import { CompilerServer } from './server/server';
 import { CompilerRunner } from './server/runner';
@@ -97,7 +96,15 @@ export const main = (ctx: ManifestContext) => {
         Log.initLevel('error');
         await compile('build');
       }
-      return CommonUtil.moduleLoader(ctx);
+
+      return (mod, args) => {
+        const outputRoot = path.resolve(ctx.workspace.path, ctx.build.outputFolder);
+        process.env.TRV_MANIFEST = path.resolve(outputRoot, 'node_modules', ctx.main.name); // Setup for running
+        if (args) {
+          process.argv = [process.argv0, mod, ...args];
+        }
+        return import(path.join(outputRoot, 'node_modules', mod)); // Return function to run import on a module
+      };
     },
 
     /** Manifest entry point */

package/support/server/client.ts

@@ -6,7 +6,7 @@ import { ManifestContext } from '@travetto/manifest';
 
 import type { CompilerEvent, CompilerEventType, CompilerServerInfo, CompilerStateType } from '../types';
 import type { LogShape } from '../log';
-import { TimerUtil } from '../timer';
+import { CommonUtil } from '../util';
 import { ProcessHandle } from './process-handle';
 
 type FetchEventsConfig<T> = {
@@ -129,7 +129,7 @@ export class CompilerClient {
           if (line.trim().charAt(0) === '{') {
             const val = JSON.parse(line);
             if (cfg.until?.(val)) {
-              await TimerUtil.queueMacroTask();
+              await CommonUtil.queueMacroTask();
               ctrl.abort();
             }
             yield val;
@@ -140,7 +140,7 @@ export class CompilerClient {
       }
       signal.removeEventListener('abort', quit);
 
-      await TimerUtil.queueMacroTask();
+      await CommonUtil.queueMacroTask();
 
       info = await this.info();
 

package/support/server/process-handle.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 
 import type { ManifestContext } from '@travetto/manifest';
 import { Log, Logger } from '../log';
-import { TimerUtil } from '../timer';
+import { CommonUtil } from '../util';
 
 export class ProcessHandle {
 
@@ -56,7 +56,7 @@ export class ProcessHandle {
       if (!await this.isRunning()) {
         return true;
       }
-      await TimerUtil.nonBlockingTimeout(100);
+      await CommonUtil.blockingTimeout(100);
     }
     try {
       this.#log.debug('Force Killing', pid);

package/support/server/server.ts

@@ -8,7 +8,6 @@ import type { ManifestContext } from '@travetto/manifest';
 import type { CompilerMode, CompilerProgressEvent, CompilerEvent, CompilerEventType, CompilerServerInfo } from '../types';
 import { Log } from '../log';
 import { CommonUtil } from '../util';
-import { TimerUtil } from '../timer';
 import { CompilerClient } from './client';
 import { ProcessHandle } from './process-handle';
 
@@ -78,7 +77,7 @@ export class CompilerServer {
         .on('close', () => log.debug('Server close event'));
 
       const url = new URL(this.#url);
-      TimerUtil.queueMacroTask().then(() => this.#server.listen(+url.port, url.hostname)); // Run async
+      CommonUtil.queueMacroTask().then(() => this.#server.listen(+url.port, url.hostname)); // Run async
     });
 
     if (output === 'retry') {
@@ -122,7 +121,7 @@ export class CompilerServer {
   async #disconnectActive(): Promise<void> {
     log.info('Server disconnect requested');
     this.info.iteration = Date.now();
-    await TimerUtil.nonBlockingTimeout(20);
+    await CommonUtil.blockingTimeout(20);
     for (const el of Object.values(this.#listeners)) {
       try { el.res.end(); } catch { }
     }
@@ -205,7 +204,7 @@ export class CompilerServer {
 
     try {
       await new Promise((resolve, reject) => {
-        TimerUtil.nonBlockingTimeout(2000).then(reject); // Wait 2s max
+        CommonUtil.nonBlockingTimeout(2000).then(reject); // Wait 2s max
         this.#server.close(resolve);
         this.#emitEvent({ type: 'state', payload: { state: 'closed' } });
         setImmediate(() => {

package/support/setup.ts

@@ -6,6 +6,7 @@ import { type DeltaEvent, type ManifestContext, type Package } from '@travetto/m
 
 import { Log } from './log';
 import { CommonUtil } from './util';
+import { TypescriptUtil } from './ts-util';
 
 type ModFile = { input: string, output: string, stale: boolean };
 
@@ -57,7 +58,7 @@ export class CompilerSetup {
 
       const ts = (await import('typescript')).default;
       const content = ts.transpile(text, {
-        ...await CommonUtil.getCompilerOptions(ctx),
+        ...await TypescriptUtil.getCompilerOptions(ctx),
         sourceMap: false,
         inlineSourceMap: true,
       }, inputFile);

package/support/ts-util.ts

@@ -0,0 +1,38 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+import { ManifestContext } from '@travetto/manifest';
+
+const OPT_CACHE: Record<string, import('typescript').CompilerOptions> = {};
+
+export class TypescriptUtil {
+  /**
+     * Returns the compiler options
+     */
+  static async getCompilerOptions(ctx: ManifestContext): Promise<{}> {
+    if (!(ctx.workspace.path in OPT_CACHE)) {
+      let tsconfig = path.resolve(ctx.workspace.path, 'tsconfig.json');
+
+      if (!await fs.stat(tsconfig).then(_ => true, _ => false)) {
+        tsconfig = path.resolve(ctx.workspace.path, ctx.build.compilerModuleFolder, 'tsconfig.trv.json');
+      }
+
+      const ts = (await import('typescript')).default;
+
+      const { options } = ts.parseJsonSourceFileConfigFileContent(
+        ts.readJsonConfigFile(tsconfig, ts.sys.readFile), ts.sys, ctx.workspace.path
+      );
+
+      OPT_CACHE[ctx.workspace.path] = {
+        ...options,
+        allowJs: true,
+        resolveJsonModule: true,
+        sourceRoot: ctx.workspace.path,
+        rootDir: ctx.workspace.path,
+        outDir: path.resolve(ctx.workspace.path),
+        module: ctx.workspace.type === 'commonjs' ? ts.ModuleKind.CommonJS : ts.ModuleKind.ESNext,
+      };
+    }
+    return OPT_CACHE[ctx.workspace.path];
+  }
+}

package/support/util.ts

@@ -1,44 +1,11 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { setMaxListeners } from 'node:events';
-
-import type { ManifestContext } from '@travetto/manifest';
+import timers from 'node:timers/promises';
 
 import { Log } from './log';
 
-const OPT_CACHE: Record<string, import('typescript').CompilerOptions> = {};
-
 export class CommonUtil {
-  /**
-   * Returns the compiler options
-   */
-  static async getCompilerOptions(ctx: ManifestContext): Promise<{}> {
-    if (!(ctx.workspace.path in OPT_CACHE)) {
-      let tsconfig = path.resolve(ctx.workspace.path, 'tsconfig.json');
-
-      if (!await fs.stat(tsconfig).then(_ => true, _ => false)) {
-        tsconfig = path.resolve(ctx.workspace.path, ctx.build.compilerModuleFolder, 'tsconfig.trv.json');
-      }
-
-      const ts = (await import('typescript')).default;
-
-      const { options } = ts.parseJsonSourceFileConfigFileContent(
-        ts.readJsonConfigFile(tsconfig, ts.sys.readFile), ts.sys, ctx.workspace.path
-      );
-
-      OPT_CACHE[ctx.workspace.path] = {
-        ...options,
-        allowJs: true,
-        resolveJsonModule: true,
-        sourceRoot: ctx.workspace.path,
-        rootDir: ctx.workspace.path,
-        outDir: path.resolve(ctx.workspace.path),
-        module: ctx.workspace.type === 'commonjs' ? ts.ModuleKind.CommonJS : ts.ModuleKind.ESNext,
-      };
-    }
-    return OPT_CACHE[ctx.workspace.path];
-  }
-
   /**
    * Determine file type
    */
@@ -92,17 +59,23 @@ export class CommonUtil {
   }
 
   /**
-   * Create a module loader given a context, and assuming build is complete
-   * @param ctx
+   * Non-blocking timeout
    */
-  static moduleLoader(ctx: ManifestContext): (mod: string, args?: string[]) => Promise<unknown> {
-    return (mod, args) => {
-      const outputRoot = path.resolve(ctx.workspace.path, ctx.build.outputFolder);
-      process.env.TRV_MANIFEST = path.resolve(outputRoot, 'node_modules', ctx.main.name); // Setup for running
-      if (args) {
-        process.argv = [process.argv0, mod, ...args];
-      }
-      return import(path.join(outputRoot, 'node_modules', mod)); // Return function to run import on a module
-    };
+  static nonBlockingTimeout(time: number): Promise<void> {
+    return timers.setTimeout(time, undefined, { ref: false }).catch(() => { });
+  }
+
+  /**
+   * Blocking timeout
+   */
+  static blockingTimeout(time: number): Promise<void> {
+    return timers.setTimeout(time, undefined, { ref: true }).catch(() => { });
+  }
+
+  /**
+   * Queue new macrotask
+   */
+  static queueMacroTask(): Promise<void> {
+    return timers.setImmediate(undefined);
   }
 }

package/support/timer.ts

@@ -1,17 +0,0 @@
-import timers from 'node:timers/promises';
-
-export class TimerUtil {
-  /**
-   * Non-blocking timeout, that is cancellable
-   */
-  static nonBlockingTimeout(time: number): Promise<void> {
-    return timers.setTimeout(time, undefined, { ref: false }).catch(() => { });
-  }
-
-  /**
-   * Queue new macrotask
-   */
-  static queueMacroTask(): Promise<void> {
-    return timers.setImmediate(undefined);
-  }
-}