@flusys/nestjs-email 7.0.0 → 7.0.2

package/cjs/providers/smtp-provider.js

@@ -80,7 +80,7 @@ let SmtpProvider = class SmtpProvider {
                 minVersion: config.tls?.minVersion ?? 'TLSv1.2'
             }
         });
-        await this.verifyConnection();
+        await this.withTimeout(this.transporter.verify(), VERIFY_TIMEOUT_MS, 'SMTP verification timeout');
     }
     async sendEmail(options) {
         if (!this.transporter) return {
@@ -135,9 +135,6 @@ let SmtpProvider = class SmtpProvider {
         }
     }
     // ─── Private Helpers ────────────────────────────────────────────────────────
-    async verifyConnection() {
-        await this.withTimeout(this.transporter.verify(), VERIFY_TIMEOUT_MS, 'SMTP verification timeout');
-    }
     formatFrom(from, fromName) {
         return fromName ? `"${fromName}" <${from}>` : from;
     }

package/cjs/services/email-provider-config.service.js

@@ -45,9 +45,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let EmailProviderConfigService = class EmailProviderConfigService extends _classes.ApiService {
-    resolveEntity() {
-        return this.emailConfig.isCompanyFeatureEnabled() ? _entities.EmailConfigWithCompany : _entities.EmailConfig;
-    }
     async beforeDeleteOperation(dto, _user, _queryRunner) {
         const ids = Array.isArray(dto.id) ? dto.id : [
             dto.id
@@ -141,7 +138,7 @@ let EmailProviderConfigService = class EmailProviderConfigService extends _class
         });
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailConfig', cacheManager, utilsService, EmailProviderConfigService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+        super(_config.EMAIL_EVENT_ENTITIES.CONFIG, cacheManager, utilsService, EmailProviderConfigService.name, true, _config.EMAIL_EVENT_MODULE, dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? _entities.EmailConfigWithCompany : _entities.EmailConfig), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 };
 EmailProviderConfigService = _ts_decorate([

package/cjs/services/email-provider-config.service.spec.js

@@ -40,6 +40,7 @@ function buildQuery() {
 }
 describe('EmailProviderConfigService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockEmailConfig;
     beforeEach(async ()=>{
@@ -48,7 +49,7 @@ describe('EmailProviderConfigService', ()=>{
         mockEmailConfig = {
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
         };
-        const module = await _testing.Test.createTestingModule({
+        module = await _testing.Test.createTestingModule({
             providers: [
                 _emailproviderconfigservice.EmailProviderConfigService,
                 {
@@ -71,13 +72,16 @@ describe('EmailProviderConfigService', ()=>{
         }).compile();
         service = await module.resolve(_emailproviderconfigservice.EmailProviderConfigService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves the plain EmailConfig entity when the company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(_entities.EmailConfig);
+    describe('entity selection', ()=>{
+        it('uses EmailConfig when the company feature is disabled', async ()=>{
+            mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(_emailproviderconfigservice.EmailProviderConfigService);
+            expect(built['_entity']).toBe(_entities.EmailConfig);
         });
-        it('resolves EmailConfigWithCompany when the company feature is enabled', ()=>{
+        it('uses EmailConfigWithCompany when the company feature is enabled', async ()=>{
             mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_entities.EmailConfigWithCompany);
+            const built = await module.resolve(_emailproviderconfigservice.EmailProviderConfigService);
+            expect(built['_entity']).toBe(_entities.EmailConfigWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/cjs/services/email-template.service.js

@@ -12,6 +12,7 @@ const _classes = require("@flusys/nestjs-shared/classes");
 const _modules = require("@flusys/nestjs-shared/modules");
 const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
+const _config = require("../config");
 const _entities = require("../entities");
 const _emailconfigservice = require("./email-config.service");
 const _emaildatasourceprovider = require("./email-datasource.provider");
@@ -58,9 +59,6 @@ const DEFAULT_SELECT_FIELDS = [
     'updatedAt'
 ];
 let EmailTemplateService = class EmailTemplateService extends _classes.ApiService {
-    resolveEntity() {
-        return this.emailConfig.isCompanyFeatureEnabled() ? _entities.EmailTemplateWithCompany : _entities.EmailTemplate;
-    }
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
         await this.incrementSchemaVersionIfChanged(dto, entity);
@@ -125,7 +123,7 @@ let EmailTemplateService = class EmailTemplateService extends _classes.ApiServic
         }
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailTemplate', cacheManager, utilsService, EmailTemplateService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+        super(_config.EMAIL_EVENT_ENTITIES.TEMPLATE, cacheManager, utilsService, EmailTemplateService.name, true, _config.EMAIL_EVENT_MODULE, dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? _entities.EmailTemplateWithCompany : _entities.EmailTemplate), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 };
 EmailTemplateService = _ts_decorate([

package/cjs/services/email-template.service.spec.js

@@ -43,6 +43,7 @@ function buildQuery() {
 }
 describe('EmailTemplateService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockEmailConfig;
     beforeEach(async ()=>{
@@ -51,7 +52,7 @@ describe('EmailTemplateService', ()=>{
         mockEmailConfig = {
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
         };
-        const module = await _testing.Test.createTestingModule({
+        module = await _testing.Test.createTestingModule({
             providers: [
                 _emailtemplateservice.EmailTemplateService,
                 {
@@ -77,13 +78,16 @@ describe('EmailTemplateService', ()=>{
         // lazily initialized by insert()/update() via ensureDataSourceRepository() first.
         await service.ensureDataSourceRepository();
     });
-    describe('resolveEntity', ()=>{
-        it('resolves the plain EmailTemplate entity when the company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(_entities.EmailTemplate);
+    describe('entity selection', ()=>{
+        it('uses EmailTemplate when the company feature is disabled', async ()=>{
+            mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(_emailtemplateservice.EmailTemplateService);
+            expect(built['_entity']).toBe(_entities.EmailTemplate);
         });
-        it('resolves EmailTemplateWithCompany when the company feature is enabled', ()=>{
+        it('uses EmailTemplateWithCompany when the company feature is enabled', async ()=>{
             mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_entities.EmailTemplateWithCompany);
+            const built = await module.resolve(_emailtemplateservice.EmailTemplateService);
+            expect(built['_entity']).toBe(_entities.EmailTemplateWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/fesm/providers/smtp-provider.js

@@ -29,7 +29,7 @@ export class SmtpProvider {
                 minVersion: config.tls?.minVersion ?? 'TLSv1.2'
             }
         });
-        await this.verifyConnection();
+        await this.withTimeout(this.transporter.verify(), VERIFY_TIMEOUT_MS, 'SMTP verification timeout');
     }
     async sendEmail(options) {
         if (!this.transporter) return {
@@ -84,9 +84,6 @@ export class SmtpProvider {
         }
     }
     // ─── Private Helpers ────────────────────────────────────────────────────────
-    async verifyConnection() {
-        await this.withTimeout(this.transporter.verify(), VERIFY_TIMEOUT_MS, 'SMTP verification timeout');
-    }
     formatFrom(from, fromName) {
         return fromName ? `"${fromName}" <${from}>` : from;
     }

package/fesm/services/email-provider-config.service.js

@@ -30,14 +30,11 @@ import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter, buildCompanyWhereCondition } from '@flusys/nestjs-shared/utils';
 import { ForbiddenException, Inject, Injectable, Scope } from '@nestjs/common';
 import { In, IsNull } from 'typeorm';
-import { EMAIL_CONFIG_MESSAGES } from '../config';
+import { EMAIL_CONFIG_MESSAGES, EMAIL_EVENT_ENTITIES, EMAIL_EVENT_MODULE } from '../config';
 import { EmailConfig, EmailConfigWithCompany } from '../entities';
 import { EmailConfigService } from './email-config.service';
 import { EmailDataSourceProvider } from './email-datasource.provider';
 export class EmailProviderConfigService extends ApiService {
-    resolveEntity() {
-        return this.emailConfig.isCompanyFeatureEnabled() ? EmailConfigWithCompany : EmailConfig;
-    }
     async beforeDeleteOperation(dto, _user, _queryRunner) {
         const ids = Array.isArray(dto.id) ? dto.id : [
             dto.id
@@ -131,7 +128,7 @@ export class EmailProviderConfigService extends ApiService {
         });
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailConfig', cacheManager, utilsService, EmailProviderConfigService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+        super(EMAIL_EVENT_ENTITIES.CONFIG, cacheManager, utilsService, EmailProviderConfigService.name, true, EMAIL_EVENT_MODULE, dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? EmailConfigWithCompany : EmailConfig), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 }
 EmailProviderConfigService = _ts_decorate([

package/fesm/services/email-provider-config.service.spec.js

@@ -36,6 +36,7 @@ function buildQuery() {
 }
 describe('EmailProviderConfigService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockEmailConfig;
     beforeEach(async ()=>{
@@ -44,7 +45,7 @@ describe('EmailProviderConfigService', ()=>{
         mockEmailConfig = {
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
         };
-        const module = await Test.createTestingModule({
+        module = await Test.createTestingModule({
             providers: [
                 EmailProviderConfigService,
                 {
@@ -67,13 +68,16 @@ describe('EmailProviderConfigService', ()=>{
         }).compile();
         service = await module.resolve(EmailProviderConfigService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves the plain EmailConfig entity when the company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(EmailConfig);
+    describe('entity selection', ()=>{
+        it('uses EmailConfig when the company feature is disabled', async ()=>{
+            mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(EmailProviderConfigService);
+            expect(built['_entity']).toBe(EmailConfig);
         });
-        it('resolves EmailConfigWithCompany when the company feature is enabled', ()=>{
+        it('uses EmailConfigWithCompany when the company feature is enabled', async ()=>{
             mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(EmailConfigWithCompany);
+            const built = await module.resolve(EmailProviderConfigService);
+            expect(built['_entity']).toBe(EmailConfigWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/fesm/services/email-template.service.js

@@ -29,6 +29,7 @@ import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter, buildCompanyWhereCondition } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';
+import { EMAIL_EVENT_ENTITIES, EMAIL_EVENT_MODULE } from '../config';
 import { EmailTemplate, EmailTemplateWithCompany } from '../entities';
 import { EmailConfigService } from './email-config.service';
 import { EmailDataSourceProvider } from './email-datasource.provider';
@@ -48,9 +49,6 @@ const DEFAULT_SELECT_FIELDS = [
     'updatedAt'
 ];
 export class EmailTemplateService extends ApiService {
-    resolveEntity() {
-        return this.emailConfig.isCompanyFeatureEnabled() ? EmailTemplateWithCompany : EmailTemplate;
-    }
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
         await this.incrementSchemaVersionIfChanged(dto, entity);
@@ -115,7 +113,7 @@ export class EmailTemplateService extends ApiService {
         }
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailTemplate', cacheManager, utilsService, EmailTemplateService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+        super(EMAIL_EVENT_ENTITIES.TEMPLATE, cacheManager, utilsService, EmailTemplateService.name, true, EMAIL_EVENT_MODULE, dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? EmailTemplateWithCompany : EmailTemplate), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 }
 EmailTemplateService = _ts_decorate([

package/fesm/services/email-template.service.spec.js

@@ -39,6 +39,7 @@ function buildQuery() {
 }
 describe('EmailTemplateService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockEmailConfig;
     beforeEach(async ()=>{
@@ -47,7 +48,7 @@ describe('EmailTemplateService', ()=>{
         mockEmailConfig = {
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
         };
-        const module = await Test.createTestingModule({
+        module = await Test.createTestingModule({
             providers: [
                 EmailTemplateService,
                 {
@@ -73,13 +74,16 @@ describe('EmailTemplateService', ()=>{
         // lazily initialized by insert()/update() via ensureDataSourceRepository() first.
         await service.ensureDataSourceRepository();
     });
-    describe('resolveEntity', ()=>{
-        it('resolves the plain EmailTemplate entity when the company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(EmailTemplate);
+    describe('entity selection', ()=>{
+        it('uses EmailTemplate when the company feature is disabled', async ()=>{
+            mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(EmailTemplateService);
+            expect(built['_entity']).toBe(EmailTemplate);
         });
-        it('resolves EmailTemplateWithCompany when the company feature is enabled', ()=>{
+        it('uses EmailTemplateWithCompany when the company feature is enabled', async ()=>{
             mockEmailConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(EmailTemplateWithCompany);
+            const built = await module.resolve(EmailTemplateService);
+            expect(built['_entity']).toBe(EmailTemplateWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/interfaces/email-module-options.interface.d.ts

@@ -1,4 +1,4 @@
-import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
+import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig } from '@flusys/nestjs-core';
 import { IModuleEventsConfig } from '@flusys/nestjs-shared/interfaces';
 import { ModuleMetadata, Type } from '@nestjs/common';
 export interface IEmailModuleConfig extends IDataSourceServiceOptions {
@@ -11,7 +11,7 @@ export interface EmailModuleOptions extends IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;
     config?: IEmailModuleConfig;
 }
-export interface EmailOptionsFactory extends IModuleOptionsFactory<IEmailModuleConfig> {
+export interface EmailOptionsFactory {
     createEmailOptions(): Promise<IEmailModuleConfig> | IEmailModuleConfig;
 }
 export interface EmailModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>, IDynamicModuleConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-email",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Modular email package with SMTP, SendGrid, and Mailgun providers",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -105,7 +105,7 @@
     }
   },
   "dependencies": {
-    "@flusys/nestjs-core": "7.0.0",
-    "@flusys/nestjs-shared": "7.0.0"
+    "@flusys/nestjs-core": "7.0.2",
+    "@flusys/nestjs-shared": "7.0.2"
   }
 }

package/providers/smtp-provider.d.ts

@@ -6,7 +6,6 @@ export declare class SmtpProvider implements IEmailProvider {
     sendBulkEmails(options: IEmailSendOptions[]): Promise<IEmailSendResult[]>;
     healthCheck(): Promise<boolean>;
     close(): Promise<void>;
-    private verifyConnection;
     private formatFrom;
     private joinAddresses;
     private withTimeout;

package/services/email-provider-config.service.d.ts

@@ -2,7 +2,7 @@ import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { DeleteDto, FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, QueryRunner, SelectQueryBuilder } from 'typeorm';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { CreateEmailConfigDto, UpdateEmailConfigDto } from '../dtos';
 import { EmailConfig, EmailConfigBase } from '../entities';
 import { IEmailConfig } from '../interfaces';
@@ -13,7 +13,6 @@ export declare class EmailProviderConfigService extends ApiService<CreateEmailCo
     protected utilsService: UtilsService;
     private readonly emailConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, emailConfig: EmailConfigService, dataSourceProvider: EmailDataSourceProvider);
-    protected resolveEntity(): EntityTarget<EmailConfigBase>;
     protected beforeDeleteOperation(dto: DeleteDto, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     convertSingleDtoToEntity(dto: CreateEmailConfigDto | UpdateEmailConfigDto, user: ILoggedUserInfo | null): Promise<EmailConfigBase>;
     getSelectQuery(query: SelectQueryBuilder<EmailConfigBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{

package/services/email-template.service.d.ts

@@ -2,7 +2,7 @@ import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, SelectQueryBuilder } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm';
 import { CreateEmailTemplateDto, UpdateEmailTemplateDto } from '../dtos';
 import { EmailTemplate, EmailTemplateBase } from '../entities';
 import { IEmailTemplate } from '../interfaces';
@@ -13,7 +13,6 @@ export declare class EmailTemplateService extends ApiService<CreateEmailTemplate
     protected utilsService: UtilsService;
     private readonly emailConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, emailConfig: EmailConfigService, dataSourceProvider: EmailDataSourceProvider);
-    protected resolveEntity(): EntityTarget<EmailTemplateBase>;
     convertSingleDtoToEntity(dto: CreateEmailTemplateDto | UpdateEmailTemplateDto, user: ILoggedUserInfo | null): Promise<EmailTemplateBase>;
     getSelectQuery(query: SelectQueryBuilder<EmailTemplateBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<EmailTemplate>;