@travetto/email 3.0.0-rc.2 → 3.0.0-rc.21

package/README.md

@@ -1,5 +1,5 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
-<!-- Please modify https://github.com/travetto/travetto/tree/main/module/email/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/email/DOC.ts and execute "npx trv doc" to rebuild -->
 # Email
 ## Email transmission module.
 

package/{index.ts → __index__.ts}

@@ -2,5 +2,6 @@ export * from './src/service';
 export * from './src/types';
 export * from './src/config';
 export * from './src/transport';
+export * from './src/resource';
 export * from './src/util';
 export * from './src/template';

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@travetto/email",
-  "displayName": "Email",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.21",
   "description": "Email transmission module.",
   "keywords": [
     "email",
@@ -15,20 +14,24 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
+    "__index__.ts",
     "src"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/email"
   },
   "dependencies": {
-    "@travetto/config": "^3.0.0-rc.2",
-    "@travetto/di": "^3.0.0-rc.2",
-    "@types/mustache": "^4.2.1",
+    "@travetto/base": "^3.0.0-rc.17",
+    "@travetto/config": "^3.0.0-rc.21",
+    "@travetto/di": "^3.0.0-rc.20",
+    "@types/mustache": "^4.2.2",
     "mustache": "^4.2.0"
   },
+  "travetto": {
+    "displayName": "Email"
+  },
   "publishConfig": {
     "access": "public"
   }

package/src/resource.ts

@@ -0,0 +1,14 @@
+import { FileResourceProvider } from '@travetto/base';
+import { InjectableFactory } from '@travetto/di';
+
+export class EmailResource extends FileResourceProvider {
+
+  @InjectableFactory()
+  static getResources(): EmailResource {
+    return new EmailResource();
+  }
+
+  constructor(paths?: string[]) {
+    super({ paths, includeCommon: true });
+  }
+}

package/src/service.ts

@@ -1,11 +1,11 @@
-import { ResourceManager } from '@travetto/base';
+import { GlobalEnv } from '@travetto/base';
 import { Injectable } from '@travetto/di';
-import { EnvUtil } from '@travetto/boot';
 
 import { MessageOptions, SentMessage } from './types';
 import { MailTransport } from './transport';
 import { MailTemplateEngine } from './template';
 import { MailUtil } from './util';
+import { EmailResource } from './resource';
 
 /**
  * Email service for sending and templating emails
@@ -16,13 +16,16 @@ export class MailService {
   #compiled = new Map<string, MessageOptions>();
   #transport: MailTransport;
   #tplEngine: MailTemplateEngine;
+  #resources: EmailResource;
 
   constructor(
     transport: MailTransport,
-    tplEngine: MailTemplateEngine
+    tplEngine: MailTemplateEngine,
+    resources: EmailResource
   ) {
     this.#tplEngine = tplEngine;
     this.#transport = transport;
+    this.#resources = resources;
   }
 
   /**
@@ -46,11 +49,11 @@ export class MailService {
    */
   async sendCompiled<S extends SentMessage = SentMessage>(key: string, msg: Omit<MessageOptions, 'html' | 'text' | 'subject'>): Promise<S> {
     // Bypass cache if in dynamic mode
-    if (EnvUtil.isDynamic() || !this.#compiled.has(key)) {
+    if (GlobalEnv.dynamic || !this.#compiled.has(key)) {
       const [html, text, subject] = await Promise.all([
-        ResourceManager.read(`${key}.compiled.html`, 'utf8'),
-        ResourceManager.read(`${key}.compiled.text`, 'utf8').catch(() => ''),
-        ResourceManager.read(`${key}.compiled.subject`, 'utf8')
+        this.#resources.read(`${key}.compiled.html`),
+        this.#resources.read(`${key}.compiled.text`).catch(() => ''),
+        this.#resources.read(`${key}.compiled.subject`)
       ]);
 
       this.#compiled.set(key, { html, text, subject });

package/src/template.ts

@@ -1,7 +1,8 @@
-import * as Mustache from 'mustache';
+import mustache from 'mustache';
 
 import { Injectable } from '@travetto/di';
-import { ResourceManager } from '@travetto/base';
+
+import { EmailResource } from './resource';
 
 /**
  * Mail templating engine
@@ -23,14 +24,16 @@ export interface MailTemplateEngine {
 @Injectable()
 export class MustacheTemplateEngine implements MailTemplateEngine {
 
+  resources = new EmailResource();
+
   /**
    * Resolved nested templates
    */
   async resolveNested(template: string): Promise<string> {
     const promises: Promise<string>[] = [];
-    template = template.replace(/[{]{2}>\s+(\S+)([.]html)?\s*[}]{2}/g, (all: string, name: string) => {
+    template = template.replace(/[{]{2,3}>\s+(\S+)([.]html)?\s*[}]{2,3}/g, (all: string, name: string) => {
       promises.push(
-        ResourceManager.read(`${name}.html`, 'utf8') // Ensure html file
+        this.resources.read(`${name}.html`) // Ensure html file
           .then(contents => this.resolveNested(contents))
       );
       return `$%${promises.length - 1}%$`;
@@ -43,6 +46,6 @@ export class MustacheTemplateEngine implements MailTemplateEngine {
    * Interpolate text with data
    */
   template(text: string, data: Record<string, unknown>): string {
-    return Mustache.render(text, data);
+    return mustache.render(text, data);
   }
 }

package/src/extension/nodemailer.ts

@@ -1,48 +0,0 @@
-import type * as nodemailer from 'nodemailer';
-import type * as json from 'nodemailer/lib/json-transport';
-import type * as smtp from 'nodemailer/lib/smtp-transport';
-import type * as ses from 'nodemailer/lib/ses-transport';
-import type * as sendmail from 'nodemailer/lib/sendmail-transport';
-
-import { MessageOptions, SentMessage } from '../types';
-import { MailTransport } from '../transport';
-
-type Transport = nodemailer.Transport | json.Options | smtp.Options | ses.Options | sendmail.Options;
-
-/**
- * Nodemailer transport, takes in a transport factory as the input
- */
-export class NodemailerTransport implements MailTransport {
-  #transport: nodemailer.Transporter;
-
-  constructor(transportFactory: Transport) {
-    try {
-      const nm = require('nodemailer');
-      this.#transport = nm.createTransport(transportFactory);
-    } catch (err) {
-      if (err instanceof Error) {
-        console.error('Please install nodemailer before use: "npm install nodemailer"');
-      }
-      throw err;
-    }
-  }
-
-  async send<S extends SentMessage = SentMessage>(mail: MessageOptions): Promise<S> {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const res = await this.#transport.sendMail(mail) as {
-      messageId?: string;
-      envelope?: Record<string, string>;
-      accepted?: string[];
-      rejected?: string[];
-      pending?: string[];
-      response?: string;
-    };
-
-    if (res.rejected?.length) {
-      console.error('Unable to send emails', { recipientCount: res.rejected?.length });
-    }
-
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return res as S;
-  }
-}