@travetto/email 5.0.0-rc.1 → 5.0.0-rc.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.11",
   "description": "Email transmission module.",
   "keywords": [
     "email",
@@ -23,9 +23,9 @@
     "directory": "module/email"
   },
   "dependencies": {
-    "@travetto/base": "^5.0.0-rc.1",
-    "@travetto/config": "^5.0.0-rc.1",
-    "@travetto/di": "^5.0.0-rc.0",
+    "@travetto/config": "^5.0.0-rc.11",
+    "@travetto/di": "^5.0.0-rc.10",
+    "@travetto/runtime": "^5.0.0-rc.10",
     "@types/mustache": "^4.2.5",
     "mustache": "^4.2.0"
   },

package/src/resource.ts

@@ -1,5 +1,4 @@
-import { AppError, Env, FileLoader } from '@travetto/base';
-import { RuntimeIndex } from '@travetto/manifest';
+import { AppError, Env, FileLoader, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 /** Build a resource loader that looks into a module and it's dependencies */
 export class EmailResourceLoader extends FileLoader {
@@ -14,6 +13,6 @@ export class EmailResourceLoader extends FileLoader {
       ...RuntimeIndex.getDependentModules(mod, 'children').map(x => `${x.name}#resources`),
       '@@#resources',
       ...globalResources ?? []
-    ]);
+    ].map(v => Runtime.modulePath(v)));
   }
 }

package/src/service.ts

@@ -1,4 +1,4 @@
-import { Env, RuntimeResources } from '@travetto/base';
+import { Runtime, RuntimeResources } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 
 import { EmailCompiled, EmailOptions, SentEmail } from './types';
@@ -30,7 +30,7 @@ export class MailService {
    * Get compiled content by key
    */
   async getCompiled(key: string): Promise<EmailCompiled> {
-    if (Env.dynamic || !this.#compiled.has(key)) {
+    if (Runtime.dynamic || !this.#compiled.has(key)) {
       const [html, text, subject] = await Promise.all([
         RuntimeResources.read(`${key}.compiled.html`),
         RuntimeResources.read(`${key}.compiled.text`),
@@ -48,7 +48,7 @@ export class MailService {
    * @param ctx
    * @returns
    */
-  async renderMessage(keyOrMessage: string | EmailCompiled, ctx: Record<string, unknown>): Promise<EmailCompiled> {
+  async renderMessage(keyOrMessage: string | EmailCompiled | EmailOptions, ctx: Record<string, unknown>): Promise<EmailCompiled> {
     const tpl = (typeof keyOrMessage === 'string' ? await this.getCompiled(keyOrMessage) : keyOrMessage);
 
     const [html, text, subject] = await Promise.all([
@@ -78,8 +78,7 @@ export class MailService {
   ): Promise<S> {
     const keyOrMessage = key ?? ('html' in message ? message : '') ?? '';
     const context = ctx ?? (('context' in message) ? message.context : {}) ?? {};
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const compiled = await this.renderMessage(keyOrMessage as EmailCompiled, context);
+    const compiled = await this.renderMessage(keyOrMessage, context);
 
     const final = { ...base, ...message, ...compiled, context };
 

package/src/template.ts

@@ -1,7 +1,7 @@
 import mustache from 'mustache';
 
 import { Injectable } from '@travetto/di';
-import { RuntimeResources } from '@travetto/base';
+import { RuntimeResources } from '@travetto/runtime';
 
 /**
  * Mail interpolation engine

package/src/transport.ts

@@ -14,7 +14,6 @@ export interface MailTransport {
  */
 export class NullTransport implements MailTransport {
   async send<S extends SentEmail = SentEmail>(mail: EmailOptions): Promise<S> {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return {} as S;
+    return undefined! ?? {};
   }
 }

package/src/types.ts

@@ -1,4 +1,4 @@
-import { FileLoader } from '@travetto/base';
+import { FileLoader } from '@travetto/runtime';
 import { Readable } from 'node:stream';
 import { Url } from 'node:url';
 

package/src/util.ts

@@ -1,4 +1,4 @@
-import { Util, RuntimeContext } from '@travetto/base';
+import { Runtime, BinaryUtil } from '@travetto/runtime';
 
 import { EmailAttachment, EmailIdentity, EmailIdentityList, EmailOptions } from './types';
 
@@ -15,7 +15,7 @@ export class MailUtil {
   static buildBrand(file: string, content: string, compile?: string): string {
     const out = [
       'WARNING: Do not modify.',
-      `File is generated from "${file.replace(RuntimeContext.workspace.path, '.')}"`,
+      `File is generated from "${file.replace(Runtime.workspace.path, '.')}"`,
       compile ? `Run \`${compile.replaceAll('\n', ' ')}\` to regenerate` : ''
     ];
     return `<!-- ${out.join(' ').trim()}   -->\n${content}`;
@@ -77,7 +77,7 @@ export class MailUtil {
   static buildUniqueMessageId(message: EmailOptions): string {
     const from = this.getPrimaryEmail(message.from)!;
     const to = this.getPrimaryEmail(message.to)!;
-    const uid = Util.hash(`${to}${from}${message.subject}${Date.now()}`, 12);
+    const uid = BinaryUtil.hash(`${to}${from}${message.subject}${Date.now()}`, 12);
     return `<${uid}@${from.split('@')[1]}>`;
   }
 }