@travetto/email-compiler 5.0.0-rc.1 → 5.0.0-rc.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.10",
   "description": "Email compiling module",
   "keywords": [
     "email",
@@ -26,12 +26,12 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/base": "^5.0.0-rc.1",
-    "@travetto/config": "^5.0.0-rc.1",
-    "@travetto/di": "^5.0.0-rc.0",
-    "@travetto/email": "^5.0.0-rc.1",
-    "@travetto/image": "^5.0.0-rc.1",
-    "@travetto/worker": "^5.0.0-rc.0",
+    "@travetto/runtime": "^5.0.0-rc.9",
+    "@travetto/config": "^5.0.0-rc.10",
+    "@travetto/di": "^5.0.0-rc.9",
+    "@travetto/email": "^5.0.0-rc.10",
+    "@travetto/image": "^5.0.0-rc.9",
+    "@travetto/worker": "^5.0.0-rc.9",
     "@types/inline-css": "^3.0.3",
     "html-entities": "^2.5.2",
     "inline-css": "^4.0.2",
@@ -39,7 +39,7 @@
     "sass": "^1.77.6"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.1"
+    "@travetto/cli": "^5.0.0-rc.10"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -1,9 +1,8 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { TypedObject, Util, watchCompiler } from '@travetto/base';
+import { TypedObject, Util, RuntimeIndex, watchCompiler, Runtime } from '@travetto/runtime';
 import { EmailCompiled, MailUtil, EmailTemplateImport, EmailTemplateModule } from '@travetto/email';
-import { RuntimeIndex } from '@travetto/manifest';
 
 import { EmailCompileUtil } from './util';
 
@@ -16,13 +15,9 @@ export class EmailCompiler {
    * Load Template
    */
   static async loadTemplate(file: string): Promise<EmailTemplateModule> {
-    const entry = RuntimeIndex.getEntry(file);
-    const mod = entry ? RuntimeIndex.getModule(entry.module) : undefined;
-    if (!entry || !mod) {
-      throw new Error(`Unable to find template for ${file}`);
-    }
-    const root: EmailTemplateImport = (await import(entry.outputFile)).default;
-    return await root.prepare({ file, module: mod.name });
+    const root = (await Runtime.importFrom<{ default: EmailTemplateImport }>(file)).default;
+    const entry = RuntimeIndex.getEntry(file)!;
+    return await root.prepare({ file, module: entry.module });
   }
 
   /**

package/src/util.ts

@@ -140,7 +140,7 @@ export class EmailCompileUtil {
         const output = await ImageConverter.optimize(
           ext === '.png' ? 'png' : 'jpeg', await opts.loader.readStream(src)
         );
-        const buffer = toBuffer(output);
+        const buffer = await toBuffer(output);
         pendingImages.push([token, ext, buffer]);
       } else {
         pendingImages.push([token, ext, opts.loader.read(src, true)]);

package/support/bin/config.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 
-import { Util, RuntimeContext } from '@travetto/base';
+import { Util, Runtime } from '@travetto/runtime';
 import { parse, stringify } from 'yaml';
 
 import { EditorConfigType } from './types';
@@ -35,13 +35,12 @@ export class EditorConfig {
   static async get(): Promise<EditorConfigType>;
   static async get<K extends keyof EditorConfigType>(key?: K): Promise<EditorConfigType | EditorConfigType[K]> {
     try {
-      const resolved = RuntimeContext.workspaceRelative(CONFIG_FILE);
+      const resolved = Runtime.workspaceRelative(CONFIG_FILE);
       const content = await fs.readFile(resolved, 'utf8');
       const data: EditorConfigType = parse(content) ?? {};
       return key ? data[key] : data;
     } catch {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      return {} as EditorConfigType;
+      return { to: undefined!, from: undefined! };
     }
   }
 
@@ -50,7 +49,7 @@ export class EditorConfig {
   }
 
   static async ensureConfig(): Promise<string> {
-    const resolved = RuntimeContext.workspaceRelative(CONFIG_FILE);
+    const resolved = Runtime.workspaceRelative(CONFIG_FILE);
     if (!(await fs.stat(resolved).catch(() => { }))) {
       await Util.bufferedFileWrite(resolved, this.getDefaultConfig());
     }

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/base';
+import { AppError, TypedObject } from '@travetto/runtime';
 
 import { EditorSendService } from './send';
 import { EditorConfig } from './config';

package/support/bin/send.ts

@@ -1,4 +1,4 @@
-import { MailService, EmailOptions, SentEmail } from '@travetto/email';
+import { MailService, EmailOptions } from '@travetto/email';
 import { MailTransportTarget } from '@travetto/email/src/internal/types';
 import { DependencyRegistry, Injectable } from '@travetto/di';
 
@@ -29,7 +29,7 @@ export class EditorSendService {
         DependencyRegistry.install(cls, { curr: cls, type: 'added' });
 
         this.ethereal = !!senderConfig.host?.includes('ethereal.email');
-      } catch (err) {
+      } catch {
         console.error('A mail transport is currently needed to support sending emails.  Please install @travetto/email-nodemailer or any other compatible transport');
         throw new Error('A mail transport is currently needed to support sending emails.  Please install @travetto/email-nodemailer or any other compatible transport');
       }
@@ -45,13 +45,19 @@ export class EditorSendService {
     try {
       console.log('Sending email', { to });
       const svc = await this.service();
-      const info = await svc.send<{ host?: string } & SentEmail>(message);
-      console.log('Sent email', { to });
-
-      return this.ethereal ? {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-        url: (await import('nodemailer')).getTestMessageUrl(info as any)
-      } : {};
+      if (this.ethereal) {
+        const { getTestMessageUrl } = await import('nodemailer');
+        const { default: _smtp } = await import('nodemailer/lib/smtp-transport/index');
+        type SendMessage = Parameters<Parameters<(typeof _smtp)['prototype']['send']>[1]>[1];
+        const info = await svc.send<SendMessage>(message);
+        const url = getTestMessageUrl(info);
+        console.log('Sent email', { to, url });
+        return { url };
+      } else {
+        await svc.send(message);
+        console.log('Sent email', { to });
+        return {};
+      }
     } catch (err) {
       console.warn('Failed to send email', { to, error: err });
       throw err;

package/support/cli.email_compile.ts

@@ -1,6 +1,6 @@
 import { RootRegistry } from '@travetto/registry';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
-import { Env, RuntimeContext } from '@travetto/base';
+import { Env, Runtime } from '@travetto/runtime';
 
 import { EmailCompiler } from '../src/compiler';
 
@@ -26,7 +26,7 @@ export class EmailCompileCommand implements CliCommandShape {
     const all = await EmailCompiler.compileAll();
     console!.log(cliTpl`Successfully compiled ${{ param: `${all.length}` }} templates`);
     for (const el of all) {
-      console!.log(cliTpl`  * ${{ param: RuntimeContext.stripWorkspacePath(el) }}`);
+      console!.log(cliTpl`  * ${{ param: Runtime.stripWorkspacePath(el) }}`);
     }
 
     if (this.watch) {

package/support/cli.email_editor.ts

@@ -1,4 +1,4 @@
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { CliCommand, CliUtil } from '@travetto/cli';
 import { RootRegistry } from '@travetto/registry';
 import { DependencyRegistry } from '@travetto/di';
@@ -6,7 +6,7 @@ import { DependencyRegistry } from '@travetto/di';
 import { EditorService } from './bin/editor';
 
 /** The email editor compilation service and output serving */
-@CliCommand({ addEnv: true })
+@CliCommand({ with: { env: true } })
 export class EmailEditorCommand {
 
   preMain(): void {

package/support/cli.email_test.ts

@@ -3,14 +3,14 @@ import path from 'node:path';
 import { RootRegistry } from '@travetto/registry';
 import { CliCommandShape, CliCommand } from '@travetto/cli';
 import { DependencyRegistry } from '@travetto/di';
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 
 import { EditorService } from './bin/editor';
 
 /**
  * CLI Entry point for running the email server
  */
-@CliCommand({ addEnv: true })
+@CliCommand({ with: { env: true } })
 export class EmailTestCommand implements CliCommandShape {
 
   preMain(): void {