@travetto/email-compiler 7.0.0-rc.2 → 7.0.0-rc.3

package/package.json

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

package/src/compiler.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { TypedObject, RuntimeIndex, watchCompiler, Runtime, BinaryUtil } from '@travetto/runtime';
+import { TypedObject, RuntimeIndex, Runtime, BinaryUtil, ExecUtil } from '@travetto/runtime';
 import { EmailCompiled, MailUtil, EmailTemplateImport, EmailTemplateModule } from '@travetto/email';
 
 import { EmailCompileUtil } from './util.ts';
@@ -84,22 +84,26 @@ export class EmailCompiler {
   }
 
   /**
-   * Watch compilation
+   * Spawn the compiler for a given file
    */
-  static async * watchCompile(signal?: AbortSignal): AsyncIterable<string> {
-    // Watch template files
-    for await (const { file, action } of watchCompiler({ signal })) {
-      const entry = RuntimeIndex.getEntry(file);
-      if (!entry || !EmailCompileUtil.isTemplateFile(entry.sourceFile) || action === 'delete') {
-        continue;
-      }
-      try {
-        await this.compile(file);
-        console.log('Successfully compiled template', { changed: [file] });
-        yield file;
-      } catch (error) {
-        console.error(`Error in compiling ${file}`, error && error instanceof Error ? error.message : `${error}`);
-      }
+  static async spawnCompile(file: string): Promise<boolean> {
+    if (!EmailCompileUtil.isTemplateFile(file)) {
+      return false;
     }
+
+    const child = ExecUtil.spawnTrv('email:compile', [file], {
+      cwd: Runtime.mainSourcePath,
+      env: { ...process.env },
+    });
+
+    const result = await ExecUtil.getResult(child, { catch: true });
+
+    if (!result.valid) {
+      console.error('Error compiling template', { file, stderr: result.stderr });
+    } else {
+      console.log('Successfully compiled template', { changed: [file] });
+    }
+
+    return result.valid;
   }
 }

package/src/util.ts

@@ -1,9 +1,10 @@
-import util from 'node:util';
 import { buffer as toBuffer } from 'node:stream/consumers';
 import path from 'node:path';
+import type { CompileResult, Options } from 'sass';
 
 import { EmailCompiled, EmailTemplateModule, EmailTemplateResource } from '@travetto/email';
 import { ImageUtil } from '@travetto/image';
+import { RuntimeIndex } from '@travetto/runtime';
 
 type Tokenized = {
   text: string;
@@ -29,7 +30,7 @@ export class EmailCompileUtil {
    * Is file a template?
    */
   static isTemplateFile(file: string): boolean {
-    return EXT.test(file);
+    return EXT.test(file) && RuntimeIndex.findModuleForArbitraryFile(file) !== undefined;
   }
 
   /**
@@ -80,12 +81,20 @@ export class EmailCompileUtil {
    * Compile SCSS content with roots as search paths for additional assets
    */
   static async compileSass(input: { data: string } | { file: string }, options: EmailTemplateResource): Promise<string> {
-    const sass = await import('sass');
-    const result = await util.promisify(sass.render)({
-      ...input,
+    const { initAsyncCompiler } = await import('sass');
+    const compiler = await initAsyncCompiler();
+    const compilerOptions: Options<'async'> = {
       sourceMap: false,
-      includePaths: options.loader.searchPaths.slice(0)
-    });
+      quietDeps: true,
+      loadPaths: options.loader.searchPaths.slice(0),
+    };
+
+    let result: CompileResult;
+    if ('data' in input) {
+      result = await compiler.compileStringAsync(input.data, compilerOptions);
+    } else {
+      result = await compiler.compileAsync(input.file, compilerOptions);
+    }
     return result!.css.toString();
   }
 

package/support/bin/editor.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@travetto/di';
 import { MailUtil, EmailCompiled, MailInterpolator } from '@travetto/email';
-import { AppError, TypedObject } from '@travetto/runtime';
+import { AppError, TypedObject, watchCompiler } from '@travetto/runtime';
 
 import { EditorSendService } from './send.ts';
 import { EditorConfig } from './config.ts';
@@ -87,11 +87,14 @@ export class EditorService {
 
     process.send({ type: 'init' });
 
-    for await (const file of EmailCompiler.watchCompile()) {
-      await this.#response(this.#renderFile(file),
-        result => ({ type: 'compiled', ...result }),
-        error => ({ type: 'compiled-failed', message: error.message, stack: error.stack, file })
-      );
+    // Watch template files
+    for await (const { file } of watchCompiler({ restartOnCompilerExit: true })) {
+      if (await EmailCompiler.spawnCompile(file)) {
+        await this.#response(this.#renderFile(file),
+          result => ({ type: 'compiled', ...result }),
+          error => ({ type: 'compiled-failed', message: error.message, stack: error.stack, file })
+        );
+      }
     }
   }
 }

package/support/bin/send.ts

@@ -33,7 +33,7 @@ export class EditorSendService {
             }
           }
         });
-        Registry.process([{ type: 'added', current: cls }]);
+        Registry.process([cls]);
 
         this.ethereal = !!senderConfig.host?.includes('ethereal.email');
       } catch {
@@ -41,7 +41,9 @@ export class EditorSendService {
         throw new Error('A mail transport is currently needed to support sending emails.  Please install @travetto/email-nodemailer or any other compatible transport');
       }
     }
-    return await DependencyRegistryIndex.getInstance(MailService);
+    const service = await DependencyRegistryIndex.getInstance(MailService);
+    service.setCacheState(false); // Ensure we don't cache locally
+    return service;
   }
 
   /**

package/support/cli.email_compile.ts

@@ -1,6 +1,6 @@
 import { Registry } from '@travetto/registry';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
-import { Env, Runtime } from '@travetto/runtime';
+import { Env, Runtime, watchCompiler } from '@travetto/runtime';
 
 import { EmailCompiler } from '../src/compiler.ts';
 
@@ -16,7 +16,6 @@ export class EmailCompileCommand implements CliCommandShape {
   preMain(): void {
     Env.DEBUG.set(false);
     Env.TRV_ROLE.set('build');
-    Env.TRV_DYNAMIC.set(this.watch);
   }
 
   async main(): Promise<void> {
@@ -30,8 +29,8 @@ export class EmailCompileCommand implements CliCommandShape {
     }
 
     if (this.watch) {
-      for await (const _ of EmailCompiler.watchCompile()) {
-        // Iterate until done
+      for await (const { file } of watchCompiler({ restartOnCompilerExit: true })) {
+        await EmailCompiler.spawnCompile(file);
       }
     }
   }

package/support/cli.email_editor.ts

@@ -1,5 +1,5 @@
 import { Env } from '@travetto/runtime';
-import { CliCommand, CliUtil } from '@travetto/cli';
+import { CliCommand } from '@travetto/cli';
 import { Registry } from '@travetto/registry';
 import { DependencyRegistryIndex } from '@travetto/di';
 
@@ -10,15 +10,10 @@ import { EditorService } from './bin/editor.ts';
 export class EmailEditorCommand {
 
   preMain(): void {
-    Env.TRV_DYNAMIC.set(true);
     Env.TRV_ROLE.set('build');
   }
 
   async main(): Promise<void> {
-    if (await CliUtil.runWithRestart(this, true)) {
-      return;
-    }
-
     await Registry.init();
     const service = await DependencyRegistryIndex.getInstance(EditorService);
     await service.listen();