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

package/bin/common.js

@@ -25,7 +25,11 @@ const getTarget = (/** @type {Ctx} */ ctx, file = '') => ({
 const getTranspiler = async (/** @type {Ctx} */ ctx) => {
   const ts = (await import('typescript')).default;
   const module = ctx.workspace.type === 'module' ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
-  return (content = '') => ts.transpile(content, { target: ts.ScriptTarget.ES2022, module, esModuleInterop: true, allowSyntheticDefaultImports: true });
+  return (content = '') =>
+    ts.transpile(content, { target: ts.ScriptTarget.ES2022, module, esModuleInterop: true, allowSyntheticDefaultImports: true })
+      .replace(/from '([.][^']+)'/g, (_, i) => `from '${i.replace(/[.]js$/, '')}.js'`)
+      .replace(/from '(@travetto\/(.*?))'/g, (_, i, s) =>
+        `from '${path.resolve(ctx.workspace.path, ctx.build.compilerFolder, `${i}${s.includes('/') ? '.js' : '/__index__.js'}`)}'`);
 };
 
 /** @returns {Promise<import('@travetto/compiler/support/entry.trvc')>} */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.4",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -31,12 +31,12 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.4.0",
-    "@travetto/manifest": "^4.0.0-rc.2",
-    "@travetto/transformer": "^4.0.0-rc.2",
+    "@travetto/manifest": "^4.0.0-rc.4",
+    "@travetto/transformer": "^4.0.0-rc.4",
     "@types/node": "^20.11.16"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.0-rc.2"
+    "@travetto/cli": "^4.0.0-rc.5"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/watch.ts

@@ -1,4 +1,4 @@
-import { ManifestContext, ManifestModuleUtil, ManifestUtil, RuntimeIndex, path } from '@travetto/manifest';
+import { ManifestContext, ManifestModuleUtil, ManifestUtil, PackageUtil, RuntimeIndex, path } from '@travetto/manifest';
 
 import type { CompileStateEntry } from './types';
 import { CompilerState } from './state';
@@ -22,10 +22,28 @@ export class CompilerWatcher {
     this.#signal = signal;
   }
 
+  #getIgnores(): string[] {
+    // TODO: Read .gitignore?
+    let ignores = PackageUtil.readPackage(this.#state.manifest.workspace.path)?.travetto?.build?.watchIgnores;
+
+    if (!ignores) {
+      ignores = ['node_modules/**'];
+    }
+
+    return [
+      ...ignores,
+      '.git', '**/.git',
+      `${this.#state.manifest.build.outputFolder}/node_modules/**`,
+      `${this.#state.manifest.build.compilerFolder}/node_modules/**`,
+      `${this.#state.manifest.build.toolFolder}/**`
+    ];
+  }
+
   /** Watch files */
   async * #watchFolder(rootPath: string): AsyncIterable<WatchEvent> {
     const q = new AsyncQueue<WatchEvent>(this.#signal);
     const lib = await import('@parcel/watcher');
+    const ignore = this.#getIgnores();
 
     const cleanup = await lib.subscribe(rootPath, (err, events) => {
       if (err) {
@@ -36,15 +54,7 @@ export class CompilerWatcher {
       for (const ev of events) {
         q.add({ action: ev.type, file: path.toPosix(ev.path) });
       }
-    }, {
-      // TODO: Read .gitignore?
-      ignore: [
-        'node_modules', '**/node_modules', '.git', '**/.git',
-        `${this.#state.manifest.build.outputFolder}/node_modules/**`,
-        `${this.#state.manifest.build.compilerFolder}/node_modules/**`,
-        `${this.#state.manifest.build.toolFolder}/**`
-      ]
-    });
+    }, { ignore });
 
     if (this.#signal.aborted) { // If already aborted, can happen async
       cleanup.unsubscribe();

package/support/entry.compiler.ts

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

package/support/entry.trvc.ts

@@ -1,3 +1,4 @@
+// @trv-no-transform
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
@@ -40,6 +41,7 @@ export const main = (ctx: ManifestContext) => {
       await client.waitForState(['compile-end', 'watch-start'], 'Successfully built');
       ctrl.abort();
     }
+    LogUtil.cleanup();
   };
 
   const ops = {

package/support/log.ts

@@ -10,6 +10,8 @@ const LEVEL_TO_PRI: Record<CompilerLogLevel, number> = { debug: 1, info: 2, warn
 
 const SCOPE_MAX = 15;
 
+const ESC = '\x1b[';
+
 export class LogUtil {
 
   static root = process.cwd();
@@ -22,14 +24,13 @@ export class LogUtil {
 
   static #rewriteLine(text: string): Promise<void> | void {
     // Move to 1st position, and clear after text
-    const done = process.stdout.write(`\x1b[1G${text}\x1b[0K`);
+    const done = process.stdout.write(`${ESC}1G${text}${ESC}0K`);
     this.linePartial = !!text;
     if (!done) {
       return new Promise<void>(r => process.stdout.once('drain', r));
     }
   }
 
-
   /**
    * Set level for operation
    */
@@ -40,7 +41,18 @@ export class LogUtil {
       this.logLevel = build || defaultLevel;
     }
     this.root = ctx.workspace.path;
-    this.logProgress = (this.isLevelActive('info') && process.stdout.isTTY) ? this.#logProgressEvent : undefined;
+    // If we are in info or a terminal and also in a tty
+    this.logProgress = ((this.isLevelActive('info') || process.env.PS1) && process.stdout.isTTY) ? this.#logProgressEvent : undefined;
+    if (this.logProgress) {
+      process.stdout.write(`${ESC}?25l`); // Hide cursor
+    }
+    process.on('exit', () => this.cleanup());
+  }
+
+  static cleanup(): void {
+    if (this.logProgress) {
+      process.stdout.write(`${ESC}!p`); // Reset
+    }
   }
 
   static #logProgressEvent(ev: CompilerProgressEvent): Promise<void> | void {

package/support/server/client.ts

@@ -37,11 +37,11 @@ export class CompilerClient {
     return this.#url;
   }
 
-  async #fetch(rel: string, opts?: RequestInit & { timeout?: number }): Promise<Response> {
+  async #fetch(rel: string, opts?: RequestInit & { timeout?: number }, logTimeout = true): Promise<Response> {
     const ctrl = new AbortController();
     opts?.signal?.addEventListener('abort', () => ctrl.abort());
     const timeoutId = setTimeout(() => {
-      this.#log('error', `Timeout on request to ${this.#url}${rel}`);
+      logTimeout && this.#log('error', `Timeout on request to ${this.#url}${rel}`);
       ctrl.abort('TIMEOUT');
     }, 100).unref();
     try {
@@ -53,7 +53,7 @@ export class CompilerClient {
 
   /** Get server information, if server is running */
   info(): Promise<CompilerServerInfo | undefined> {
-    return this.#fetch('/info').then(v => v.json(), () => undefined)
+    return this.#fetch('/info', {}, false).then(v => v.json(), () => undefined)
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       .then(v => v as CompilerServerInfo);
   }

package/support/server/process-handle.ts

@@ -12,7 +12,8 @@ export class ProcessHandle {
     this.#file = path.resolve(ctx.workspace.path, ctx.build.toolFolder, `${name}.pid`);
   }
 
-  writePid(pid: number): Promise<void> {
+  async writePid(pid: number): Promise<void> {
+    await fs.mkdir(path.dirname(this.#file), { recursive: true });
     return fs.writeFile(this.#file, JSON.stringify(pid), 'utf8');
   }
 

package/support/server/server.ts

@@ -20,7 +20,7 @@ export class CompilerServer {
 
   #ctx: ManifestContext;
   #server: http.Server;
-  #listeners: { res: http.ServerResponse, type: CompilerEventType }[] = [];
+  #listeners: Record<string, { res: http.ServerResponse, type: CompilerEventType }> = {};
   #shutdown = new AbortController();
   signal = this.#shutdown.signal;
   info: CompilerServerInfo;
@@ -97,20 +97,21 @@ export class CompilerServer {
 
   async #addListener(type: string, res: http.ServerResponse): Promise<void> {
     res.writeHead(200);
+    const id = `id_${Date.now()}_${Math.random()}`.replace('.', '1');
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    this.#listeners.push({ res, type: type as 'change' });
+    this.#listeners[id] = { res, type: type as 'change' };
     if (type === 'state') { // Send on initial connect
       res.write(JSON.stringify({ state: this.info.state }));
     }
     res.write('\n'); // Send at least one byte on listen
-    await new Promise(resolve => res.on('close', resolve));
-    this.#listeners.splice(this.#listeners.findIndex(x => x.res === res), 1);
-    res.end();
+
+    // Do not wait on it
+    res.on('close', () => { delete this.#listeners[id]; });
   }
 
   #emitEvent(ev: CompilerEvent): void {
     const msg = `${JSON.stringify(ev.payload)}\n`;
-    for (const el of this.#listeners) {
+    for (const el of Object.values(this.#listeners)) {
       if (!el.res.closed && el.type === ev.type) {
         el.res.write(msg);
       }
@@ -121,8 +122,8 @@ export class CompilerServer {
     log('info', 'Server disconnect requested');
     this.info.iteration = Date.now();
     await new Promise(r => setTimeout(r, 20));
-    for (const el of this.#listeners) {
-      el.res.destroy();
+    for (const el of Object.values(this.#listeners)) {
+      el.res.end();
     }
   }