@brilab-mailer/core 0.0.2-8 → 0.0.3

package/lib/mailer-sender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mailer-sender.d.ts","sourceRoot":"","sources":["../../src/lib/mailer-sender.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,EACd,qBAAqB,EACrB,KAAK,0BAA0B,EAC/B,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,KAAK,kBAAkB,CAAC,cAAc,IAAI,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,CAAA;AAElF,qBAAa,YAAY,CACxB,cAAc,GAAG,MAAM,EACvB,QAAQ,SAAS,kBAAkB,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC,cAAc,CAAC,CACvF,SAAQ,qBAAqB;IAI7B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAJ1B,OAAO,CAAC,eAAe,CAAwD;gBAG7D,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EACtC,OAAO,CAAC,EAAE,0BAA0B,YAAA;IAK/C,WAAW,CAAC,GAAG,MAAM,EAAE,UAAU,CAAC,0BAA0B,CAAC,GAAG,YAAY;IAQtE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAQlC"}
+{"version":3,"file":"mailer-sender.d.ts","sourceRoot":"","sources":["../../src/lib/mailer-sender.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,EACd,qBAAqB,EACrB,KAAK,0BAA0B,EAC/B,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,KAAK,kBAAkB,CAAC,cAAc,IAAI,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,CAAA;AAElF,qBAAa,YAAY,CACxB,cAAc,GAAG,MAAM,EACvB,QAAQ,SAAS,kBAAkB,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC,cAAc,CAAC,CACvF,SAAQ,qBAAqB;IAI7B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAJ1B,OAAO,CAAC,eAAe,CAAwD;gBAG7D,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EACtC,OAAO,CAAC,EAAE,0BAA0B,YAAA;IAK/C,WAAW,CAAC,GAAG,MAAM,EAAE,UAAU,CAAC,0BAA0B,CAAC,GAAG,YAAY;IAQtE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAclC"}

package/lib/mailer-sender.js

@@ -17,6 +17,12 @@ export class MailerSender extends MailerMessagesBuilder {
     }
     async send() {
         if (this._templateParams && this._render) {
+            const draft = this.generateDraft() || {};
+            const ctx = this._templateParams[1] || {};
+            this._templateParams[1] = {
+                subject: draft.subject,
+                ...ctx,
+            };
             const html = await this._render(...this._templateParams);
             this.setHtml(html);
         }

package/lib/mailer.module.d.ts

@@ -1,6 +1,7 @@
 import { DynamicModule } from '@nestjs/common';
-import type { MailerModuleParams } from './types.js';
+import type { MailerModuleRegisterAsyncParams, MailerModuleRegisterParams } from './types.js';
 export declare class MailerModule {
-    static register(params: MailerModuleParams): DynamicModule;
+    static register(params: MailerModuleRegisterParams): DynamicModule;
+    static registerAsync(params: MailerModuleRegisterAsyncParams): DynamicModule;
 }
 //# sourceMappingURL=mailer.module.d.ts.map

package/lib/mailer.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mailer.module.d.ts","sourceRoot":"","sources":["../../src/lib/mailer.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkB,MAAM,gBAAgB,CAAC;AAc/D,OAAO,KAAK,EAAuB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEzE,qBAEa,YAAY;IACxB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,GAAG,aAAa;CAkE1D"}
+{"version":3,"file":"mailer.module.d.ts","sourceRoot":"","sources":["../../src/lib/mailer.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkB,MAAM,gBAAgB,CAAC;AAmB/D,OAAO,KAAK,EAGX,+BAA+B,EAC/B,0BAA0B,EAC1B,MAAM,YAAY,CAAA;AAEnB,qBAEa,YAAY;IACxB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,0BAA0B,GAAG,aAAa;IAmElE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,+BAA+B,GAAG,aAAa;CA6E5E"}

package/lib/mailer.module.js

@@ -2,7 +2,7 @@ var MailerModule_1;
 import { __decorate } from "tslib";
 import { Global, Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import { MAILER_OPTIONS, MAILER_PROVIDER, MAILER_PROVIDER_NATIVE_CLIENT, MAILER_PROVIDER_OPTIONS, MAILER_RETRY_ATTEMPTS, MAILER_RETRY_BACKOFF_MS, MAILER_TEMPLATE_ENGINE, MAILER_TEMPLATE_ENGINE_OPTIONS, } from '@brilab-mailer/contracts';
+import { MAILER_ASYNC, MAILER_OPTIONS, MAILER_PROVIDER, MAILER_PROVIDER_OPTIONS, MAILER_PROVIDER_NATIVE_CLIENT, MAILER_TEMPLATE_ENGINE, MAILER_TEMPLATE_ENGINE_OPTIONS, MAILER_RETRY_ATTEMPTS, MAILER_RETRY_BACKOFF_MS, } from '@brilab-mailer/contracts';
 import { MailerService } from './mailer.service.js';
 import { MAILER_RETRY_ATTEMPTS_DEFAULT, MAILER_RETRY_BACKOFF_MS_DEFAULT } from "./mailer.constants.js";
 let MailerModule = MailerModule_1 = class MailerModule {
@@ -66,6 +66,77 @@ let MailerModule = MailerModule_1 = class MailerModule {
             ]
         };
     }
+    static registerAsync(params) {
+        if (!params?.providerClass) {
+            throw new Error('[MailerModule.registerAsync] providerClass is required.');
+        }
+        if (!params?.useFactory) {
+            throw new Error('[MailerModule.registerAsync] useFactory is required.');
+        }
+        return {
+            module: MailerModule_1,
+            imports: [ConfigModule, ...(params.imports || [])],
+            providers: [
+                {
+                    provide: MAILER_ASYNC,
+                    useFactory: params.useFactory,
+                    inject: params.inject || [],
+                },
+                {
+                    provide: MAILER_OPTIONS,
+                    useFactory: async (config, asyncCfg) => {
+                        const maxAttemptsFromConfig = config.get(MAILER_RETRY_ATTEMPTS) ?? MAILER_RETRY_ATTEMPTS_DEFAULT;
+                        const backoffConfig = config.get(MAILER_RETRY_BACKOFF_MS);
+                        const backoffMsFromConfig = backoffConfig
+                            ? backoffConfig.split(',').map((v) => Number(v.trim()) || 0)
+                            : MAILER_RETRY_BACKOFF_MS_DEFAULT;
+                        const overrides = asyncCfg?.options || {};
+                        return {
+                            maxAttempts: overrides.maxAttempts ?? maxAttemptsFromConfig,
+                            backoffMs: (overrides.backoffMs ?? backoffMsFromConfig),
+                        };
+                    },
+                    inject: [ConfigService, MAILER_ASYNC],
+                },
+                {
+                    provide: MAILER_PROVIDER,
+                    useClass: params.providerClass,
+                },
+                {
+                    provide: MAILER_PROVIDER_OPTIONS,
+                    useFactory: (asyncCfg) => asyncCfg?.providerOptions || {},
+                    inject: [MAILER_ASYNC],
+                },
+                {
+                    provide: MAILER_PROVIDER_NATIVE_CLIENT,
+                    useFactory: (provider) => provider?.getClient?.(),
+                    inject: [MAILER_PROVIDER],
+                },
+                ...(params.templateEngineClass
+                    ? [
+                        {
+                            provide: MAILER_TEMPLATE_ENGINE,
+                            useClass: params.templateEngineClass,
+                        },
+                        {
+                            provide: MAILER_TEMPLATE_ENGINE_OPTIONS,
+                            useFactory: (asyncCfg) => asyncCfg?.templateEngineOptions || {},
+                            inject: [MAILER_ASYNC],
+                        },
+                    ]
+                    : []),
+                MailerService,
+            ],
+            exports: [
+                MailerService,
+                MAILER_ASYNC,
+                MAILER_OPTIONS,
+                MAILER_PROVIDER_OPTIONS,
+                MAILER_PROVIDER,
+                MAILER_PROVIDER_NATIVE_CLIENT,
+            ]
+        };
+    }
 };
 MailerModule = MailerModule_1 = __decorate([
     Global(),

package/lib/mailer.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mailer.service.d.ts","sourceRoot":"","sources":["../../src/lib/mailer.service.ts"],"names":[],"mappings":"AACA,OAAO,EAKN,sBAAsB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACX,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,qBACa,aAAa,CAAC,QAAQ,SAAS,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,cAAc;IAGxF,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAGzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAG/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBARX,OAAO,EAAE,mBAAmB,EAE5B,QAAQ,EAAE,QAAQ,EAGlB,aAAa,CAAC,EAAE,sBAAsB,CAAC,QAAQ,CAAC,YAAA,EAGhD,UAAU,CAAC,EAAE,oBAAoB,YAAA;IAGnD,IAAW,YAAY,IAAI,sBAAsB,CAAC,QAAQ,CAAC,CAQ1D;IAED,IAAW,SAAS,IAAI,oBAAoB,CAI3C;IAEY,IAAI,CAAC,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3D,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC;YAOjC,SAAS;CAsBvB"}
+{"version":3,"file":"mailer.service.d.ts","sourceRoot":"","sources":["../../src/lib/mailer.service.ts"],"names":[],"mappings":"AACA,OAAO,EAKN,sBAAsB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACX,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,qBACa,aAAa,CAAC,QAAQ,SAAS,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,cAAc;IAGxF,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAGzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAG/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBARX,OAAO,EAAE,mBAAmB,EAE5B,QAAQ,EAAE,QAAQ,EAGlB,aAAa,CAAC,EAAE,sBAAsB,CAAC,QAAQ,CAAC,YAAA,EAGhD,UAAU,CAAC,EAAE,oBAAoB,YAAA;IAInD,IAAW,YAAY,IAAI,sBAAsB,CAAC,QAAQ,CAAC,CAQ1D;IAED,IAAW,SAAS,IAAI,oBAAoB,CAI3C;IAEY,IAAI,CAAC,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3D,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC;YAQjC,SAAS;CAsBvB"}

package/lib/mailer.service.js

@@ -39,7 +39,9 @@ let MailerService = class MailerService {
         return this.withRetry(run);
     }
     sender() {
-        return new MailerSender((...rest) => this.send.call(this, ...rest), this._templater?.render?.bind(this._templater));
+        return new MailerSender(this.send.bind(this), this._templater?.render?.bind(this._templater)
+        // (...rest) => this.send.call(this, ...rest),
+        );
     }
     async withRetry(fn) {
         let attempt = 0;

package/lib/types.d.ts

@@ -1,14 +1,25 @@
-import { Type } from "@nestjs/common";
+import { ModuleMetadata, Type } from "@nestjs/common";
 import { MailerProvider, type MailerProviderOptionsType, MailerTemplateEngine, MailerTemplateEngineOptionsType } from "@brilab-mailer/contracts";
 export interface MailerModuleOptions {
     maxAttempts: number;
     backoffMs: [number, number, number];
 }
-export interface MailerModuleParams {
+export interface MailerModuleRegisterParams {
     providerClass: Type<MailerProvider<any, any>>;
     providerOptions?: MailerProviderOptionsType;
     options?: Partial<MailerModuleOptions>;
     templateEngineClass?: Type<MailerTemplateEngine>;
     templateEngineOptions?: MailerTemplateEngineOptionsType;
 }
+export interface MailerModuleAsyncFactoryResult {
+    options?: Partial<MailerModuleOptions>;
+    providerOptions?: MailerProviderOptionsType;
+    templateEngineOptions?: MailerTemplateEngineOptionsType;
+}
+export interface MailerModuleRegisterAsyncParams extends Pick<ModuleMetadata, 'imports'> {
+    providerClass: Type<MailerProvider<any, any>>;
+    templateEngineClass?: Type<MailerTemplateEngine>;
+    inject?: any[];
+    useFactory: (...args: any[]) => Promise<MailerModuleAsyncFactoryResult> | MailerModuleAsyncFactoryResult;
+}
 //# sourceMappingURL=types.d.ts.map

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EACN,cAAc,EACd,KAAK,yBAAyB,EAAE,oBAAoB,EAAE,+BAA+B,EACrF,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,mBAAmB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,kBAAkB;IAClC,aAAa,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvC,mBAAmB,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACjD,qBAAqB,CAAC,EAAE,+BAA+B,CAAC;CAExD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EACN,cAAc,EACd,KAAK,yBAAyB,EAAE,oBAAoB,EAAE,+BAA+B,EACrF,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,mBAAmB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,0BAA0B;IAC1C,aAAa,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvC,mBAAmB,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACjD,qBAAqB,CAAC,EAAE,+BAA+B,CAAC;CACxD;AAGD,MAAM,WAAW,8BAA8B;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvC,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,qBAAqB,CAAC,EAAE,+BAA+B,CAAC;CACxD;AAED,MAAM,WAAW,+BAAgC,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IACvF,aAAa,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,mBAAmB,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAEjD,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,UAAU,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAC1B,OAAO,CAAC,8BAA8B,CAAC,GAAG,8BAA8B,CAAC;CAC1E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brilab-mailer/core",
-  "version": "0.0.2-8",
+  "version": "0.0.3",
   "author": "Bohdan Radchenko <radchenkobs@gmail.com>",
   "type": "module",
   "main": "./index.js",
@@ -28,6 +28,6 @@
     "@nestjs/config": "^3.0.0"
   },
   "dependencies": {
-    "@brilab-mailer/contracts": "^0.0.1"
+    "@brilab-mailer/contracts": "^0.0.3"
   }
 }