@nestjs-modules/mailer 1.7.1 → 1.9.1

package/.nvmrc

@@ -0,0 +1 @@
+18.17.0

package/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.9.1](https://github.com/nest-modules/mailer/compare/v1.9.0...v1.9.1) (2023-07-20)
+
+
+### Bug Fixes
+
+* patch vm2 Sandbox Escape vulnerability ([0f89a36](https://github.com/nest-modules/mailer/commit/0f89a36bd8c18cb349cb826ac840fdf3d6aad252))
+
+## [1.9.0](https://github.com/nest-modules/mailer/compare/v1.8.1...v1.9.0) (2023-07-20)
+
+
+### Bug Fixes
+
+* fix partial not found error on Windows ([fb1fcda](https://github.com/nest-modules/mailer/commit/fb1fcdaba04c4b4f6ccbf2492dc0f34565b198e1))
+* mjml import statement ([00abe2b](https://github.com/nest-modules/mailer/commit/00abe2b3215a41407fafbc134a56d97cb0b2ded8))
+* update dependencies by newer version ([f1d4fba](https://github.com/nest-modules/mailer/commit/f1d4fba6b9d8a0cc50ffe2ae1e3439552e327d0b))
+
+### [1.8.2](https://github.com/nest-modules/mailer/compare/v1.8.1...v1.8.2) (2022-12-22)
+
+
+### Bug Fixes
+
+* update dependencies by newer version ([f1d4fba](https://github.com/nest-modules/mailer/commit/f1d4fba6b9d8a0cc50ffe2ae1e3439552e327d0b))
+
+### [1.8.1](https://github.com/nest-modules/mailer/compare/v1.8.0...v1.8.1) (2022-07-21)
+
+
+### Bug Fixes
+
+* fixes a bad call to smtp options and broken unit tests ([1ef2d80](https://github.com/nest-modules/mailer/commit/1ef2d8090480b7500baf704c127723e796a34697))
+
+## [1.8.0](https://github.com/nest-modules/mailer/compare/v1.7.1...v1.8.0) (2022-07-19)
+
 ### [1.7.1](https://github.com/nest-modules/mailer/compare/v1.7.0...v1.7.1) (2022-06-20)
 
 

package/dist/adapters/ejs.adapter.js

@@ -17,12 +17,14 @@ class EjsAdapter {
     }
     compile(mail, callback, mailerOptions) {
         const { context, template } = mail.data;
+        const templateBaseDir = (0, lodash_1.get)(mailerOptions, 'template.dir', '');
         const templateExt = path.extname(template) || '.ejs';
-        const templateName = path.basename(template, path.extname(template));
+        let templateName = path.basename(template, path.extname(template));
         const templateDir = path.isAbsolute(template)
             ? path.dirname(template)
-            : path.join((0, lodash_1.get)(mailerOptions, 'template.dir', ''), path.dirname(template));
+            : path.join(templateBaseDir, path.dirname(template));
         const templatePath = path.join(templateDir, templateName + templateExt);
+        templateName = path.relative(templateBaseDir, templatePath).replace(templateExt, '');
         if (!this.precompiledTemplates[templateName]) {
             try {
                 const template = fs.readFileSync(templatePath, 'utf-8');

package/dist/adapters/handlebars.adapter.js

@@ -23,12 +23,14 @@ class HandlebarsAdapter {
     }
     compile(mail, callback, mailerOptions) {
         const precompile = (template, callback, options) => {
+            const templateBaseDir = (0, lodash_1.get)(options, 'dir', '');
             const templateExt = path.extname(template) || '.hbs';
-            const templateName = path.basename(template, path.extname(template));
+            let templateName = path.basename(template, path.extname(template));
             const templateDir = path.isAbsolute(template)
                 ? path.dirname(template)
-                : path.join((0, lodash_1.get)(options, 'dir', ''), path.dirname(template));
+                : path.join(templateBaseDir, path.dirname(template));
             const templatePath = path.join(templateDir, templateName + templateExt);
+            templateName = path.relative(templateBaseDir, templatePath).replace(templateExt, '');
             if (!this.precompiledTemplates[templateName]) {
                 try {
                     const template = fs.readFileSync(templatePath, 'utf-8');
@@ -51,7 +53,8 @@ class HandlebarsAdapter {
             data: {},
         });
         if (runtimeOptions.partials) {
-            const files = glob.sync(path.join(runtimeOptions.partials.dir, '**', '*.hbs'));
+            const partialPath = path.join(runtimeOptions.partials.dir, '**', '*.hbs').replace(/\\/g, '/');
+            const files = glob.sync(partialPath);
             files.forEach((file) => {
                 const { templateName, templatePath } = precompile(file, () => { }, runtimeOptions.partials);
                 const templateDir = path.relative(runtimeOptions.partials.dir, path.dirname(templatePath));

package/dist/adapters/mjml.adapter.js

@@ -4,7 +4,7 @@ exports.MjmlAdapter = void 0;
 const handlebars_adapter_1 = require("./handlebars.adapter");
 const ejs_adapter_1 = require("./ejs.adapter");
 const pug_adapter_1 = require("./pug.adapter");
-const mjml_1 = require("mjml");
+const mjml2html = require("mjml");
 class MjmlAdapter {
     constructor(engine, config, others) {
         this.engine = engine;
@@ -26,7 +26,7 @@ class MjmlAdapter {
     compile(mail, callback, mailerOptions) {
         var _a;
         (_a = this === null || this === void 0 ? void 0 : this.engine) === null || _a === void 0 ? void 0 : _a.compile(mail, () => {
-            mail.data.html = (0, mjml_1.default)(mail.data.html).html;
+            mail.data.html = mjml2html(mail.data.html).html;
             callback();
         }, mailerOptions);
     }

package/dist/interfaces/mailer-options.interface.d.ts

@@ -6,8 +6,8 @@ import * as StreamTransport from 'nodemailer/lib/stream-transport';
 import * as JSONTransport from 'nodemailer/lib/json-transport';
 import * as SESTransport from 'nodemailer/lib/ses-transport';
 import { TemplateAdapter } from './template-adapter.interface';
-declare type Options = SMTPTransport.Options | SMTPPool.Options | SendmailTransport.Options | StreamTransport.Options | JSONTransport.Options | SESTransport.Options | TransportOptions;
-export declare type TransportType = Options | SMTPTransport | SMTPPool | SendmailTransport | StreamTransport | JSONTransport | SESTransport | Transport | string;
+type Options = SMTPTransport.Options | SMTPPool.Options | SendmailTransport.Options | StreamTransport.Options | JSONTransport.Options | SESTransport.Options | TransportOptions;
+export type TransportType = Options | SMTPTransport | SMTPPool | SendmailTransport | StreamTransport | JSONTransport | SESTransport | Transport | string;
 export interface MailerOptions {
     defaults?: Options;
     transport?: TransportType;

package/dist/interfaces/send-mail-options.interface.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
 import { SendMailOptions } from 'nodemailer';
 import * as DKIM from 'nodemailer/lib/dkim';
-export declare type TextEncoding = 'quoted-printable' | 'base64';
-export declare type Headers = {
+import { Attachment } from 'nodemailer/lib/mailer';
+export type TextEncoding = 'quoted-printable' | 'base64';
+export type Headers = {
     [key: string]: string | string[] | {
         prepared: boolean;
         value: string;
@@ -22,7 +23,7 @@ export interface ISendMailOptions extends SendMailOptions {
     to?: string | Address | Array<string | Address>;
     cc?: string | Address | Array<string | Address>;
     bcc?: string | Address | Array<string | Address>;
-    replyTo?: string | Address;
+    replyTo?: string | Address | Array<string | Address>;
     inReplyTo?: string | Address;
     from?: string | Address;
     subject?: string;
@@ -40,15 +41,6 @@ export interface ISendMailOptions extends SendMailOptions {
     };
     transporterName?: string;
     template?: string;
-    attachments?: {
-        filename: string;
-        content?: any;
-        path?: string;
-        contentType?: string;
-        cid?: string;
-        encoding?: string;
-        contentDisposition?: 'attachment' | 'inline' | undefined;
-        href?: string;
-    }[];
+    attachments?: Attachment[];
     dkim?: DKIM.Options;
 }

package/dist/mailer-core.module.js

@@ -6,7 +6,7 @@ const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const mailer_constant_1 = require("./constants/mailer.constant");
 const mailer_service_1 = require("./mailer.service");
-let MailerCoreModule = MailerCoreModule_1 = class MailerCoreModule {
+let MailerCoreModule = exports.MailerCoreModule = MailerCoreModule_1 = class MailerCoreModule {
     static forRoot(options) {
         const MailerOptionsProvider = {
             provide: mailer_constant_1.MAILER_OPTIONS,
@@ -67,8 +67,7 @@ let MailerCoreModule = MailerCoreModule_1 = class MailerCoreModule {
         };
     }
 };
-MailerCoreModule = MailerCoreModule_1 = tslib_1.__decorate([
+exports.MailerCoreModule = MailerCoreModule = MailerCoreModule_1 = tslib_1.__decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({})
 ], MailerCoreModule);
-exports.MailerCoreModule = MailerCoreModule;

package/dist/mailer-transport.factory.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const nodemailer_1 = require("nodemailer");
 const common_1 = require("@nestjs/common");
 const mailer_constant_1 = require("./constants/mailer.constant");
-let MailerTransportFactory = class MailerTransportFactory {
+let MailerTransportFactory = exports.MailerTransportFactory = class MailerTransportFactory {
     constructor(options) {
         this.options = options;
     }
@@ -13,8 +13,7 @@ let MailerTransportFactory = class MailerTransportFactory {
         return (0, nodemailer_1.createTransport)(opts || this.options.transport, this.options.defaults);
     }
 };
-MailerTransportFactory = tslib_1.__decorate([
+exports.MailerTransportFactory = MailerTransportFactory = tslib_1.__decorate([
     tslib_1.__param(0, (0, common_1.Inject)(mailer_constant_1.MAILER_OPTIONS)),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], MailerTransportFactory);
-exports.MailerTransportFactory = MailerTransportFactory;

package/dist/mailer.module.js

@@ -5,7 +5,7 @@ exports.MailerModule = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const mailer_core_module_1 = require("./mailer-core.module");
-let MailerModule = MailerModule_1 = class MailerModule {
+let MailerModule = exports.MailerModule = MailerModule_1 = class MailerModule {
     static forRoot(options) {
         return {
             module: MailerModule_1,
@@ -23,7 +23,6 @@ let MailerModule = MailerModule_1 = class MailerModule {
         };
     }
 };
-MailerModule = MailerModule_1 = tslib_1.__decorate([
+exports.MailerModule = MailerModule = MailerModule_1 = tslib_1.__decorate([
     (0, common_1.Module)({})
 ], MailerModule);
-exports.MailerModule = MailerModule;

package/dist/mailer.service.d.ts

@@ -1,4 +1,5 @@
 import { SentMessageInfo } from 'nodemailer';
+import * as smtpTransport from 'nodemailer/lib/smtp-transport';
 import { MailerOptions } from './interfaces/mailer-options.interface';
 import { ISendMailOptions } from './interfaces/send-mail-options.interface';
 import { MailerTransportFactory as IMailerTransportFactory } from './interfaces/mailer-transport-factory.interface';
@@ -7,7 +8,9 @@ export declare class MailerService {
     private readonly transportFactory;
     private transporter;
     private transporters;
+    private templateAdapter;
     private initTemplateAdapter;
     constructor(mailerOptions: MailerOptions, transportFactory: IMailerTransportFactory);
     sendMail(sendMailOptions: ISendMailOptions): Promise<SentMessageInfo>;
+    addTransporter(transporterName: string, config: string | smtpTransport | smtpTransport.Options): string;
 }

package/dist/mailer.service.js

@@ -7,7 +7,24 @@ const common_1 = require("@nestjs/common");
 const previewEmail = require("preview-email");
 const mailer_constant_1 = require("./constants/mailer.constant");
 const mailer_transport_factory_1 = require("./mailer-transport.factory");
-let MailerService = class MailerService {
+let MailerService = exports.MailerService = class MailerService {
+    initTemplateAdapter(templateAdapter, transporter) {
+        if (templateAdapter) {
+            transporter.use('compile', (mail, callback) => {
+                if (mail.data.html) {
+                    return callback();
+                }
+                return templateAdapter.compile(mail, callback, this.mailerOptions);
+            });
+            if (this.mailerOptions.preview) {
+                transporter.use('stream', (mail, callback) => {
+                    return previewEmail(mail.data, this.mailerOptions.preview)
+                        .then(() => callback())
+                        .catch(callback);
+                });
+            }
+        }
+    }
     constructor(mailerOptions, transportFactory) {
         this.mailerOptions = mailerOptions;
         this.transportFactory = transportFactory;
@@ -20,7 +37,7 @@ let MailerService = class MailerService {
             !mailerOptions.transports) {
             throw new Error('Make sure to provide a nodemailer transport configuration object, connection url or a transport plugin instance.');
         }
-        const templateAdapter = (0, lodash_1.get)(this.mailerOptions, 'template.adapter');
+        this.templateAdapter = (0, lodash_1.get)(this.mailerOptions, 'template.adapter');
         if (this.mailerOptions.preview) {
             const defaults = { open: { wait: false } };
             this.mailerOptions.preview =
@@ -31,29 +48,12 @@ let MailerService = class MailerService {
         if (mailerOptions.transports) {
             Object.keys(mailerOptions.transports).forEach((name) => {
                 this.transporters.set(name, this.transportFactory.createTransport(this.mailerOptions.transports[name]));
-                this.initTemplateAdapter(templateAdapter, this.transporters.get(name));
+                this.initTemplateAdapter(this.templateAdapter, this.transporters.get(name));
             });
         }
         if (mailerOptions.transport) {
             this.transporter = this.transportFactory.createTransport();
-            this.initTemplateAdapter(templateAdapter, this.transporter);
-        }
-    }
-    initTemplateAdapter(templateAdapter, transporter) {
-        if (templateAdapter) {
-            transporter.use('compile', (mail, callback) => {
-                if (mail.data.html) {
-                    return callback();
-                }
-                return templateAdapter.compile(mail, callback, this.mailerOptions);
-            });
-            if (this.mailerOptions.preview) {
-                transporter.use('stream', (mail, callback) => {
-                    return previewEmail(mail.data, this.mailerOptions.preview)
-                        .then(() => callback())
-                        .catch(callback);
-                });
-            }
+            this.initTemplateAdapter(this.templateAdapter, this.transporter);
         }
     }
     sendMail(sendMailOptions) {
@@ -79,12 +79,16 @@ let MailerService = class MailerService {
             }
         });
     }
+    addTransporter(transporterName, config) {
+        this.transporters.set(transporterName, this.transportFactory.createTransport(config));
+        this.initTemplateAdapter(this.templateAdapter, this.transporters.get(transporterName));
+        return transporterName;
+    }
 };
-MailerService = tslib_1.__decorate([
+exports.MailerService = MailerService = tslib_1.__decorate([
     (0, common_1.Injectable)(),
     tslib_1.__param(0, (0, common_1.Inject)(mailer_constant_1.MAILER_OPTIONS)),
     tslib_1.__param(1, (0, common_1.Optional)()),
     tslib_1.__param(1, (0, common_1.Inject)(mailer_constant_1.MAILER_TRANSPORT_FACTORY)),
     tslib_1.__metadata("design:paramtypes", [Object, Object])
 ], MailerService);
-exports.MailerService = MailerService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs-modules/mailer",
-  "version": "1.7.1",
+  "version": "1.9.1",
   "private": false,
   "description": "NestJS - a mailer module (@mailer)",
   "keywords": [
@@ -52,55 +52,58 @@
     ]
   },
   "dependencies": {
-    "glob": "8.0.3",
-    "inline-css": "3.0.0",
-    "mjml": "^4.12.0",
-    "preview-email": "3.0.5"
+    "glob": "10.3.3",
+    "inline-css": "4.0.2",
+    "mjml": "^4.14.1",
+    "preview-email": "3.0.19"
   },
   "optionalDependencies": {
-    "@types/ejs": "^3.0.3",
-    "@types/pug": "2.0.5",
-    "ejs": "^3.1.2",
-    "handlebars": "^4.7.6",
-    "pug": "^3.0.1"
+    "@types/ejs": "^3.1.2",
+    "@types/pug": "2.0.6",
+    "ejs": "^3.1.9",
+    "handlebars": "^4.7.7",
+    "pug": "^3.0.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "13.2.1",
-    "@commitlint/config-angular": "13.2.0",
-    "@nestjs/common": "8.2.4",
-    "@nestjs/core": "8.4.7",
-    "@nestjs/testing": "8.4.7",
-    "@types/glob": "7.2.0",
+    "@commitlint/cli": "^17.6.7",
+    "@commitlint/config-angular": "^17.6.7",
+    "@nestjs/common": "^10.1.0",
+    "@nestjs/core": "^10.1.0",
+    "@nestjs/testing": "^10.1.0",
+    "@types/glob": "^8.1.0",
     "@types/inline-css": "3.0.1",
-    "@types/jest": "26.0.24",
-    "@types/lodash": "4.14.182",
-    "@types/nodemailer": "6.4.4",
-    "@types/pug": "2.0.5",
-    "@typescript-eslint/eslint-plugin": "5.28.0",
-    "@typescript-eslint/parser": "5.8.0",
-    "husky": "7.0.4",
-    "jest": "27.0.6",
-    "lint-staged": "13.0.2",
-    "nodemailer": "6.7.5",
-    "nodemailer-mock": "1.5.12",
-    "prettier": "2.7.1",
+    "@types/jest": "^29.5.3",
+    "@types/lodash": "^4.14.195",
+    "@types/nodemailer": "^6.4.8",
+    "@types/pug": "2.0.6",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
+    "husky": "^8.0.3",
+    "jest": "^29.6.1",
+    "lint-staged": "^13.2.3",
+    "nodemailer": "^6.9.4",
+    "nodemailer-mock": "2.0.1",
+    "prettier": "^3.0.0",
     "reflect-metadata": "0.1.13",
-    "rimraf": "3.0.2",
-    "rxjs": "7.4.0",
-    "standard-version": "9.3.2",
-    "ts-jest": "27.1.2",
-    "ts-node": "10.8.1",
-    "typescript": "4.7.4",
-    "yarn-audit-fix": "^9.3.2"
+    "rimraf": "5.0.1",
+    "rxjs": "^7.8.1",
+    "standard-version": "9.5.0",
+    "ts-jest": "^29.1.1",
+    "ts-node": "10.9.1",
+    "typescript": "^5.1.6",
+    "yarn-audit-fix": "^9.3.12"
   },
   "peerDependencies": {
-    "@nestjs/common": "^7.0.9 || ^8.0.0",
-    "@nestjs/core": "^7.0.9 || ^8.0.0",
+    "@nestjs/common": "^7.0.9 || ^8.0.0 || ^9.0.0 || ^10.0.0",
+    "@nestjs/core": "^7.0.9 || ^8.0.0 || ^9.0.0 || ^10.0.0",
     "@types/ejs": "^3.0.3",
-    "@types/pug": "2.0.5",
+    "@types/pug": "2.0.6",
     "ejs": "^3.1.2",
     "handlebars": "^4.7.6",
     "nodemailer": "^6.4.6",
     "pug": "^3.0.1"
+  },
+  "resolutions": {
+    "vm2": "isolated-vm"
   }
 }