@travetto/compiler 3.3.0 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -30,13 +30,13 @@
     "directory": "module/compiler"
   },
   "dependencies": {
-    "@parcel/watcher": "^2.2.0",
-    "@travetto/manifest": "^3.3.0",
-    "@travetto/terminal": "^3.3.0",
-    "@travetto/transformer": "^3.3.0"
+    "@parcel/watcher": "^2.3.0",
+    "@travetto/manifest": "^3.3.1",
+    "@travetto/terminal": "^3.3.1",
+    "@travetto/transformer": "^3.3.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.3.0"
+    "@travetto/cli": "^3.3.3"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -24,7 +24,7 @@ export class Compiler {
     const state = await CompilerState.get(RootIndex);
     const dirtyFiles = ManifestModuleUtil.getFileType(dirty) === 'ts' ? [dirty] : (await fs.readFile(dirty, 'utf8')).split(/\n/).filter(x => !!x);
     await new Compiler(state, dirtyFiles, watch === 'true').run();
-    process.exit(0);
+    process.exit();
   }
 
   #state: CompilerState;
@@ -132,20 +132,23 @@ export class Compiler {
     if (this.#watch) {
       Log.info('Watch is ready');
       for await (const { file, action } of CompilerWatcher.watch(this.#state)) {
+        if (action === 'restart') {
+          Log.info(`Triggering restart due to change in ${file}`);
+          process.send?.({ type: 'restart' });
+          return;
+        }
+        const module = file.split('node_modules/')[1];
         if (action !== 'delete') {
           const err = await emitter(file, true);
           if (err) {
             Log.info('Compilation Error', CompilerUtil.buildTranspileError(file, err));
           } else {
-            Log.info(`Compiled ${file.split('node_modules/')[1]}`);
+            Log.info(`Compiled ${module}`);
           }
         } else {
-          Log.info(`Removed ${file.split('node_modules/')[1]}`);
+          Log.info(`Removed ${module}`);
         }
       }
-      if (!process.exitCode) {
-        process.send?.({ type: 'restart' });
-      }
     }
   }
 }

package/src/watch.ts

@@ -9,6 +9,9 @@ import { getManifestContext } from '@travetto/manifest/bin/context';
 import { CompilerState } from './state';
 import { CompilerUtil } from './util';
 
+type CompileWatchEvent = WatchEvent | { action: 'restart', file: string };
+const RESTART_SIGNAL = 'RESTART_SIGNAL';
+
 /**
  * Utils for watching
  */
@@ -19,7 +22,7 @@ export class CompilerWatcher {
    * @param state
    * @returns
    */
-  static watch(state: CompilerState): AsyncIterable<WatchEvent> {
+  static watch(state: CompilerState): AsyncIterable<CompileWatchEvent> {
     return new CompilerWatcher(state).watchChanges();
   }
 
@@ -74,14 +77,15 @@ export class CompilerWatcher {
  * @param handler
  * @returns
  */
-  async * watchChanges(): AsyncIterable<WatchEvent> {
+  async * watchChanges(): AsyncIterable<CompileWatchEvent> {
     const stream = this.#watchFiles();
 
     const mods = this.#getModuleMap();
     for await (const { file: sourceFile, action, folder } of stream) {
 
-      if (folder === '.trv_internal') {
-        break;
+      if (folder === RESTART_SIGNAL) {
+        yield { action: 'restart', file: sourceFile };
+        return;
       }
 
       const mod = mods[folder];
@@ -168,14 +172,27 @@ export class CompilerWatcher {
     const outputWatch = (root: string, sources: string[]): WatchFolder => {
       const valid = new Set(sources.map(src => path.resolve(root, src)));
       return {
-        src: root, target: '.trv_internal', immediate: true, includeHidden: true,
+        src: root, target: RESTART_SIGNAL, immediate: true, includeHidden: true,
         filter: ev => ev.action === 'delete' && valid.has(path.resolve(root, ev.file))
       };
     };
+
+    const topLevelFiles = (root: string, files: string[]): WatchFolder => {
+      const valid = new Set(files.map(src => path.resolve(root, src)));
+      return {
+        src: root, target: RESTART_SIGNAL, immediate: true,
+        filter: ev => valid.has(path.resolve(root, ev.file))
+      };
+    };
+
     moduleFolders.push(
       outputWatch(RootIndex.manifest.workspacePath, [
         RootIndex.manifest.outputFolder,
         RootIndex.manifest.compilerFolder
+      ]),
+      topLevelFiles(RootIndex.manifest.workspacePath, [
+        'package.json',
+        'package-lock.json'
       ])
     );