@travetto/email-compiler 3.1.21 → 3.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "3.1.21",
+  "version": "3.1.22",
   "description": "Email compiling module",
   "keywords": [
     "email",

package/src/compiler.ts

@@ -128,6 +128,7 @@ export class EmailCompiler {
       try {
         if (EmailCompileUtil.isTemplateFile(file)) {
           await this.compile(file, true);
+          console.log(`Successfully compiled ${1} templates`, { changed: [file] });
           yield file;
         } else if (VALID_FILE(file)) {
           const rootFile = file.replace(/\/resources.*/, '/package.json');

package/support/bin/config.ts

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 
-import { path } from '@travetto/manifest';
+import { RootIndex, path } from '@travetto/manifest';
 import { YamlUtil } from '@travetto/yaml';
 
 interface ConfigType {
@@ -22,7 +22,7 @@ interface ConfigType {
  */
 export class $EditorConfig {
 
-  #configFile = path.resolve('resources/email/dev.yml');
+  #configFile: Record<string, string> = {};
   #defaultConfig = {
     to: 'my-email@gmail.com',
     from: 'from-email@gmail.com',
@@ -42,9 +42,10 @@ export class $EditorConfig {
   /**
    *
    */
-  async get(): Promise<ConfigType> {
+  async get(file: string): Promise<ConfigType> {
     try {
-      const content = await fs.readFile(this.#configFile, 'utf8');
+      const mod = RootIndex.getModuleFromSource(file)!.name;
+      const content = await fs.readFile(this.#configFile[mod], 'utf8');
       return YamlUtil.parse<ConfigType>(content);
     } catch {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -52,13 +53,13 @@ export class $EditorConfig {
     }
   }
 
-  async getContext(): Promise<Exclude<ConfigType['context'], undefined>> {
-    const conf = await this.get();
+  async getContext(file: string): Promise<Exclude<ConfigType['context'], undefined>> {
+    const conf = await this.get(file);
     return conf.context ?? {};
   }
 
-  async getSenderConfig(): Promise<Exclude<ConfigType['sender'], undefined>> {
-    const conf = await this.get();
+  async getSenderConfig(file: string): Promise<Exclude<ConfigType['sender'], undefined>> {
+    const conf = await this.get(file);
     return conf.sender ?? {};
   }
 
@@ -66,13 +67,15 @@ export class $EditorConfig {
     return YamlUtil.serialize(this.#defaultConfig);
   }
 
-  async ensureConfig(): Promise<string> {
-    const file = this.#configFile;
-    if (!(await fs.stat(file).catch(() => { }))) {
-      await fs.mkdir(path.dirname(file), { recursive: true });
-      await fs.writeFile(file, this.getDefaultConfig(), { encoding: 'utf8' });
+  async ensureConfig(file: string): Promise<string> {
+    console.log('Ensuring config', file);
+    const mod = RootIndex.getModuleFromSource(file)!;
+    const resolved = this.#configFile[mod.name] ??= path.resolve(mod.sourcePath, 'resources/email/dev.yml');
+    if (!(await fs.stat(resolved).catch(() => { }))) {
+      await fs.mkdir(path.dirname(resolved), { recursive: true });
+      await fs.writeFile(resolved, this.getDefaultConfig(), { encoding: 'utf8' });
     }
-    return file;
+    return resolved;
   }
 }
 

package/support/bin/editor.ts

@@ -1,3 +1,5 @@
+import { ShutdownManager } from '@travetto/base';
+
 import { EmailCompilationManager } from './manager';
 import { EditorSendService } from './send';
 import { EditorConfig } from './config';
@@ -6,7 +8,7 @@ import { EmailCompiler } from '../../src/compiler';
 import { EmailCompileUtil } from '../../src/util';
 
 type InboundMessage =
-  { type: 'configure' } |
+  { type: 'configure', file: string } |
   { type: 'redraw', file: string } |
   { type: 'send', file: string, from?: string, to?: string };
 
@@ -23,12 +25,10 @@ type OutboundMessage =
 export class EditorState {
 
   #lastFile = '';
-  #sender: EditorSendService;
   #template: EmailCompilationManager;
 
   constructor(template: EmailCompilationManager) {
     this.#template = template;
-    this.#sender = new EditorSendService();
   }
 
   async renderFile(file: string): Promise<void> {
@@ -36,7 +36,7 @@ export class EditorState {
     if (file) {
       try {
         const content = await this.#template.resolveCompiledTemplate(
-          file, await EditorConfig.getContext()
+          file, await EditorConfig.getContext(file)
         );
         this.response({
           type: 'changed',
@@ -60,7 +60,7 @@ export class EditorState {
   }
 
   async onConfigure(msg: InboundMessage & { type: 'configure' }): Promise<void> {
-    this.response({ type: 'configured', file: await EditorConfig.ensureConfig() });
+    this.response({ type: 'configured', file: await EditorConfig.ensureConfig(msg.file) });
   }
 
   async #onRedraw(msg: InboundMessage & { type: 'redraw' }): Promise<void> {
@@ -77,15 +77,15 @@ export class EditorState {
   }
 
   async onSend(msg: InboundMessage & { type: 'send' }): Promise<void> {
-    const cfg = await EditorConfig.get();
+    const cfg = await EditorConfig.get(msg.file);
     const to = msg.to || cfg.to;
     const from = msg.from || cfg.from;
     const content = await this.#template.resolveCompiledTemplate(
-      msg.file!, await EditorConfig.getContext()
+      msg.file, await EditorConfig.getContext(msg.file)
     );
 
     try {
-      const url = await this.#sender.sendEmail({ from, to, ...content, });
+      const url = await EditorSendService.sendEmail(msg.file, { from, to, ...content, });
       this.response({ type: 'sent', to, file: msg.file, ...url });
     } catch (err) {
       if (err && err instanceof Error) {
@@ -107,6 +107,10 @@ export class EditorState {
         case 'send': this.onSend(msg); break;
       }
     });
+
+    process.on('disconnect', () => ShutdownManager.execute());
+    process.send?.('ready');
+
     for await (const f of EmailCompiler.watchCompile()) {
       await this.renderFile(f);
     }

package/support/bin/send.ts

@@ -3,20 +3,23 @@ import { MailTransportTarget } from '@travetto/email/src/internal/types';
 import { DependencyRegistry } from '@travetto/di';
 
 import { EditorConfig } from './config';
+import { RootIndex } from '@travetto/manifest';
 
 /**
  * Util for sending emails
  */
 export class EditorSendService {
 
-  #svc: MailService;
+  static #svc: Record<string, MailService> = {};
 
   /**
    * Get mail service
    */
-  async getMailService(): Promise<MailService> {
-    if (!this.#svc) {
-      const senderConfig = await EditorConfig.getSenderConfig();
+  static async getMailService(file: string): Promise<MailService> {
+    const mod = RootIndex.getModuleFromSource(file)!.name;
+
+    if (!this.#svc[mod]) {
+      const senderConfig = await EditorConfig.getSenderConfig(file);
 
       if (senderConfig?.host?.includes('ethereal.email')) {
         const cls = class { };
@@ -39,22 +42,22 @@ ${EditorConfig.getDefaultConfig()}`.trim();
         throw new Error(errorMessage);
       }
 
-      this.#svc = await DependencyRegistry.getInstance(MailService);
+      this.#svc[mod] = await DependencyRegistry.getInstance(MailService);
     }
-    return this.#svc;
+    return this.#svc[mod];
   }
 
   /**
    * Resolve template
    */
-  async sendEmail(message: MessageOptions): Promise<{
+  static async sendEmail(file: string, message: MessageOptions): Promise<{
     url?: string | false;
   }> {
     const to = message.to!;
     try {
       console.log('Sending email', { to });
       // Let the engine template
-      const svc = await this.getMailService();
+      const svc = await this.getMailService(file);
       if (!svc) {
         throw new Error('Node mailer support is missing');
       }
@@ -62,7 +65,7 @@ ${EditorConfig.getDefaultConfig()}`.trim();
       const info = await svc.send<{ host?: string } & SentMessage>(message);
       console.log('Sent email', { to });
 
-      const senderConfig = await EditorConfig.getSenderConfig();
+      const senderConfig = await EditorConfig.getSenderConfig(file);
       return senderConfig.host?.includes('ethereal.email') ? {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
         url: (await import('nodemailer')).getTestMessageUrl(info as any)

package/support/cli.email_editor.ts

@@ -1,6 +1,5 @@
-import { GlobalEnvConfig, ShutdownManager } from '@travetto/base';
+import { GlobalEnvConfig } from '@travetto/base';
 import { CliCommand } from '@travetto/cli';
-import { RootIndex } from '@travetto/manifest';
 import { RootRegistry } from '@travetto/registry';
 
 import { EditorState } from './bin/editor';
@@ -11,19 +10,11 @@ import { EmailCompilationManager } from './bin/manager';
 export class EmailEditorCommand {
 
   envInit(): GlobalEnvConfig {
-    return {
-      envName: 'dev',
-      resourcePaths: [`${RootIndex.getModule('@travetto/email-compiler')!.sourcePath}/resources`]
-    };
+    return { envName: 'dev', dynamic: true };
   }
 
   async main(): Promise<void> {
     await RootRegistry.init();
-    const editor = new EditorState(await EmailCompilationManager.createInstance());
-    await editor.init();
-    if (process.send) {
-      process.on('disconnect', () => ShutdownManager.execute());
-      process.send('ready');
-    }
+    await new EditorState(await EmailCompilationManager.createInstance()).init();
   }
 }

package/support/cli.email_test.ts

@@ -25,10 +25,9 @@ export class EmailTestCommand implements CliCommandShape {
     await EmailCompiler.compile(file, true);
 
     const mgr = await EmailCompilationManager.createInstance();
-    const send = new EditorSendService();
-    const cfg = await EditorConfig.get();
+    const cfg = await EditorConfig.get(file);
+    const content = await mgr.resolveCompiledTemplate(file, await EditorConfig.getContext(file));
 
-    const content = await mgr.resolveCompiledTemplate(file!, await EditorConfig.getContext());
-    await send.sendEmail({ from: cfg.from, to, ...content, });
+    await EditorSendService.sendEmail(file, { from: cfg.from, to, ...content, });
   }
 }