@travetto/compiler 3.0.0 → 3.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -31,12 +31,12 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.1.0",
-    "@travetto/manifest": "^3.0.0",
-    "@travetto/terminal": "^3.0.0",
-    "@travetto/transformer": "^3.0.0"
+    "@travetto/manifest": "^3.0.1",
+    "@travetto/terminal": "^3.0.1",
+    "@travetto/transformer": "^3.0.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.0.0"
+    "@travetto/cli": "^3.0.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/state.ts

@@ -110,10 +110,11 @@ export class CompilerState implements ts.CompilerHost {
     } else if (inputFile.endsWith('.js')) {
       this.writeFile(this.#inputToEntry.get(inputFile)!.output!, ts.transpile(this.readFile(inputFile)!, this.#compilerOptions), false);
     } else if (inputFile.endsWith('.ts')) {
+      const source = this.readFile(inputFile);
       return program.emit(
         program.getSourceFile(inputFile)!,
         (...args) => this.writeFile(...args), undefined, false,
-        this.#transformerManager.get()
+        /^[/][/]\s*@skip-transformers/.test(source!) ? undefined : this.#transformerManager.get()
       );
     }
   }

package/src/watch.ts

@@ -3,7 +3,7 @@ import fs from 'fs/promises';
 
 import {
   ManifestContext, ManifestModuleUtil, ManifestUtil, WatchEvent, ManifestModuleFolderType,
-  ManifestModuleFileType, path, ManifestModule, watchFolders, WatchEventListener
+  ManifestModuleFileType, path, ManifestModule, watchFolders, WatchEventListener, watchFolderImmediate, WatchConfig
 } from '@travetto/manifest';
 import { getManifestContext } from '@travetto/manifest/bin/context';
 
@@ -125,18 +125,35 @@ export class CompilerWatcher {
   /**
    * Watch files based on root index
    */
-  watchFiles(emit: CompileEmitter): Promise<() => Promise<void>> {
-    return watchFolders(
-      this.#state.manifestIndex.getLocalInputFolderMapping(),
-      this.#getWatcher({
-        create: emit,
-        update: emit,
-        delete: (outputFile) => fs.rm(outputFile, { force: true })
-      }),
-      {
-        filter: ev => ev.file.endsWith('.ts') || ev.file.endsWith('.js') || ev.file.endsWith('package.json'),
-        ignore: ['node_modules']
+  async watchFiles(emit: CompileEmitter): Promise<() => Promise<void>> {
+    let watchRoot: (() => Promise<void>) | undefined = undefined;
+
+    const idx = this.#state.manifestIndex;
+    const modules = [...idx.getModuleList('all')].map(x => idx.getModule(x)!);
+    const remove = (outputFile: string): Promise<void> => fs.rm(outputFile, { force: true });
+    const handler = this.#getWatcher({ create: emit, update: emit, delete: remove });
+    const options: WatchConfig = {
+      filter: ev => ev.file.endsWith('.ts') || ev.file.endsWith('.js') || ev.file.endsWith('package.json'),
+      ignore: ['node_modules']
+    };
+
+    const moduleFolders = modules
+      .filter(x => !idx.manifest.monoRepo || x.sourcePath !== idx.manifest.workspacePath)
+      .map(x => [x.sourcePath, x.sourcePath] as const);
+
+    // Add monorepo folders
+    if (idx.manifest.monoRepo) {
+      const mono = modules.find(x => x.sourcePath === idx.manifest.workspacePath)!;
+      for (const folder of Object.keys(mono.files)) {
+        if (!folder.startsWith('$')) {
+          moduleFolders.push([path.resolve(mono.sourcePath, folder), mono.sourcePath]);
+        }
       }
-    );
+      watchRoot = await watchFolderImmediate(mono.sourcePath, handler, options);
+    }
+
+    const watchAll = await watchFolders(moduleFolders, handler, options);
+
+    return () => Promise.all([watchRoot?.(), watchAll()]).then(() => { });
   }
 }

package/support/launcher.ts

@@ -145,7 +145,7 @@ export async function launch(ctx: ManifestContext, root: ManifestContext, op?: '
       // TODO: Externalize somehow?
       const outputPath = path.resolve(ctx.workspacePath, ctx.outputFolder);
       process.env.TRV_MANIFEST = path.resolve(outputPath, 'node_modules', ctx.mainModule);
-      const cliMain = path.join(outputPath, 'node_modules', '@travetto/cli/support/cli.js');
+      const cliMain = path.join(outputPath, 'node_modules', '@travetto/cli/support/entry.cli.js');
       return import(cliMain);
     }
   }