@travetto/compiler 3.0.0-rc.28 → 3.0.0-rc.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "3.0.0-rc.28",
+  "version": "3.0.0-rc.29",
   "description": "Compiler",
   "keywords": [
     "compiler",
@@ -32,11 +32,11 @@
   "dependencies": {
     "@parcel/watcher": "^2.1.0",
     "@travetto/manifest": "^3.0.0-rc.15",
-    "@travetto/terminal": "^3.0.0-rc.9",
+    "@travetto/terminal": "^3.0.0-rc.10",
     "@travetto/transformer": "^3.0.0-rc.19"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.0.0-rc.19"
+    "@travetto/cli": "^3.0.0-rc.20"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -21,21 +21,22 @@ export class Compiler {
    */
   static async main(): Promise<void> {
     const [dirty, watch] = process.argv.slice(2);
-    install();
+    const state = await CompilerState.get(RootIndex);
     const dirtyFiles = (await fs.readFile(dirty, 'utf8')).split(/\n/).filter(x => !!x);
-    return new Compiler().init(dirtyFiles).then(c => c.run(watch === 'true'));
+    await new Compiler(state, dirtyFiles, watch === 'true').run();
+    process.exit(0);
   }
 
   #state: CompilerState;
   #dirtyFiles: string[];
+  #watch?: boolean;
 
-  async init(dirtyFiles: string[]): Promise<this> {
-    this.#state = await CompilerState.get(RootIndex);
+  constructor(state: CompilerState, dirtyFiles: string[], watch?: boolean) {
+    this.#state = state;
     this.#dirtyFiles = dirtyFiles[0] === '*' ?
       this.#state.getAllFiles() :
       dirtyFiles.map(f => this.#state.getBySource(f)!.input);
-
-    return this;
+    this.#watch = watch;
   }
 
   /**
@@ -96,9 +97,14 @@ export class Compiler {
   /**
    * Run the compiler
    */
-  async run(watch?: boolean): Promise<void> {
+  async run(): Promise<void> {
+    await GlobalTerminal.init();
+    install();
+
     Log.debug('Compilation started');
 
+    process.on('disconnect', () => process.exit(0));
+
     const emitter = await this.getCompiler();
     let failed = false;
 
@@ -120,7 +126,7 @@ export class Compiler {
       } else {
         Log.debug('Compilation succeeded');
       }
-    } else if (watch) {
+    } else if (this.#watch) {
       // Prime compiler before complete
       const resolved = this.#state.getArbitraryInputFile();
       await emitter(resolved, true);
@@ -128,7 +134,7 @@ export class Compiler {
 
     process.send?.('build-complete');
 
-    if (watch) {
+    if (this.#watch) {
       Log.info('Watch is ready');
       await this.#watchLocalModules(emitter);
       const output = this.#state.resolveOutputFile('.');
@@ -139,4 +145,4 @@ export class Compiler {
       }
     }
   }
-}
+}

package/support/launcher.ts

@@ -21,7 +21,10 @@ async function compile(ctx: ManifestContext, op: 'watch' | 'build' | undefined,
 
   await LogUtil.withLogger('precompile', async () => {
     for (const mod of PRECOMPILE_MODS) {
-      changes += (await TranspileUtil.compileIfStale(ctx, 'precompile', mod, SOURCE_SEED)).length;
+      const count = (await TranspileUtil.compileIfStale(ctx, 'precompile', mod, SOURCE_SEED)).length;
+      if (mod !== '@travetto/terminal') {
+        changes += count;
+      }
     }
   });
 

package/support/lock.ts

@@ -28,7 +28,7 @@ export class LockManager {
    * Get the lock file name
    */
   static #getFileName(ctx: ManifestContext, type: LockType): string {
-    return path.resolve(ctx.workspacePath, ctx.toolFolder, `${type}.pid`);
+    return path.resolve(ctx.workspacePath, ctx.toolFolder, `${type}.lock`);
   }
 
   /**
@@ -47,8 +47,7 @@ export class LockManager {
     const stale = this.#isStale(stat);
     let pid: number | undefined;
     if (stat) {
-      const content = await fs.readFile(file, 'utf8');
-      const filePid = parseInt(content, 10);
+      const { pid: filePid } = JSON.parse(await fs.readFile(file, 'utf8'));
       if (stale) {
         LogUtil.log('lock', [], 'debug', `${type} file is stale: ${stat.mtimeMs} vs ${Date.now()}`);
       } else {
@@ -65,7 +64,7 @@ export class LockManager {
     const file = this.#getFileName(ctx, type);
     mkdirSync(path.dirname(file), { recursive: true });
     LogUtil.log('lock', [], 'debug', `Acquiring ${type}`);
-    writeFileSync(file, `${process.pid}`, 'utf8');
+    writeFileSync(file, JSON.stringify({ pid: process.pid }), 'utf8');
   }
 
   /**

package/support/transpile.ts

@@ -131,8 +131,8 @@ export class TranspileUtil {
   }
 
   /**
- * Recompile folder if stale
- */
+   * Recompile folder if stale
+   */
   static async compileIfStale(ctx: ManifestContext, scope: string, mod: string, seed: string[]): Promise<string[]> {
     const files = await this.getModuleSources(ctx, mod, seed);
     const changes = files.filter(x => x.stale).map(x => x.input);