@travetto/email-compiler 7.0.0-rc.5 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "7.0.0-rc.5",
+  "version": "7.0.1",
   "type": "module",
   "description": "Email compiling module",
   "keywords": [
@@ -27,12 +27,12 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/config": "^7.0.0-rc.5",
-    "@travetto/di": "^7.0.0-rc.5",
-    "@travetto/email": "^7.0.0-rc.5",
-    "@travetto/image": "^7.0.0-rc.5",
-    "@travetto/runtime": "^7.0.0-rc.5",
-    "@travetto/worker": "^7.0.0-rc.5",
+    "@travetto/config": "^7.0.1",
+    "@travetto/di": "^7.0.1",
+    "@travetto/email": "^7.0.1",
+    "@travetto/image": "^7.0.1",
+    "@travetto/runtime": "^7.0.1",
+    "@travetto/worker": "^7.0.1",
     "@types/inline-css": "^3.0.4",
     "html-entities": "^2.6.0",
     "inline-css": "^4.0.3",
@@ -40,7 +40,7 @@
     "sass": "^1.97.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.5"
+    "@travetto/cli": "^7.0.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -88,10 +88,6 @@ export class EmailCompiler {
    * Spawn the compiler for a given file
    */
   static async spawnCompile(file: string): Promise<boolean> {
-    if (!EmailCompileUtil.isTemplateFile(file)) {
-      return false;
-    }
-
     const child = spawn(process.argv0, [Runtime.trvEntryPoint, 'email:compile', file], {
       cwd: Runtime.mainSourcePath,
       env: { ...process.env },
@@ -104,7 +100,6 @@ export class EmailCompiler {
     } else {
       console.log('Successfully compiled template', { changed: [file] });
     }
-
     return result.valid;
   }
 }

package/support/bin/editor.ts

@@ -1,12 +1,13 @@
 import { Inject, Injectable } from '@travetto/di';
 import { MailUtil, EmailCompiled, MailInterpolator } from '@travetto/email';
-import { AppError, TypedObject, watchCompiler } from '@travetto/runtime';
+import { AppError, TypedObject, WatchUtil } from '@travetto/runtime';
 
 import { EditorSendService } from './send.ts';
 import { EditorConfig } from './config.ts';
 import { EditorRequest, EditorResponse } from './types.ts';
 
 import { EmailCompiler } from '../../src/compiler.ts';
+import { EmailCompileUtil } from '../../src/util.ts';
 
 /**
  * Utils for interacting with editors
@@ -87,14 +88,13 @@ export class EditorService {
 
     process.send({ type: 'init' });
 
-    // Watch template files
-    for await (const { file } of watchCompiler({ restartOnCompilerExit: true })) {
-      if (await EmailCompiler.spawnCompile(file)) {
-        await this.#response(this.#renderFile(file),
+    await WatchUtil.watchCompilerEvents('change',
+      ({ file }) => EmailCompiler.spawnCompile(file).then(success =>
+        success ? this.#response(this.#renderFile(file),
           result => ({ type: 'compiled', ...result }),
           error => ({ type: 'compiled-failed', message: error.message, stack: error.stack, file })
-        );
-      }
-    }
+        ) : undefined
+      ),
+      ({ file }) => EmailCompileUtil.isTemplateFile(file));
   }
 }

package/support/cli.email_compile.ts

@@ -1,8 +1,9 @@
 import { Registry } from '@travetto/registry';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
-import { Env, Runtime, watchCompiler } from '@travetto/runtime';
+import { Env, Runtime, WatchUtil } from '@travetto/runtime';
 
 import { EmailCompiler } from '../src/compiler.ts';
+import { EmailCompileUtil } from '../src/util.ts';
 
 /**
  * CLI Entry point for running the email server
@@ -29,9 +30,9 @@ export class EmailCompileCommand implements CliCommandShape {
     }
 
     if (this.watch) {
-      for await (const { file } of watchCompiler({ restartOnCompilerExit: true })) {
-        await EmailCompiler.spawnCompile(file);
-      }
+      await WatchUtil.watchCompilerEvents('change',
+        ({ file }) => EmailCompiler.spawnCompile(file),
+        ({ file }) => EmailCompileUtil.isTemplateFile(file));
     }
   }
 }