@flusys/nestjs-form-builder 7.0.0 → 7.0.1

package/cjs/config/event-actions.js

@@ -17,6 +17,9 @@ _export(exports, {
     },
     get FORM_BUILDER_EVENT_ENTITIES () {
         return FORM_BUILDER_EVENT_ENTITIES;
+    },
+    get FORM_BUILDER_EVENT_MODULE () {
+        return FORM_BUILDER_EVENT_MODULE;
     }
 });
 const FORM_BUILDER_EVENT_ACTIONS = {
@@ -27,3 +30,4 @@ const FORM_BUILDER_EVENT_ENTITIES = {
     FORM: 'form',
     FORM_RESULT: 'form_result'
 };
+const FORM_BUILDER_EVENT_MODULE = 'form-builder';

package/cjs/services/form-result.service.js

@@ -319,7 +319,7 @@ let FormResultService = class FormResultService extends _classes.ApiService {
         return count > 0;
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form_result', cacheManager, utilsService, FormResultService.name, true, 'form-builder', _entities.FormResult, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
+        super(_config.FORM_BUILDER_EVENT_ENTITIES.FORM_RESULT, cacheManager, utilsService, FormResultService.name, true, _config.FORM_BUILDER_EVENT_MODULE, dataSourceProvider, _entities.FormResult), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
     }
 };
 _ts_decorate([

package/cjs/services/form.service.js

@@ -48,9 +48,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let FormService = class FormService extends _classes.ApiService {
-    resolveEntity() {
-        return this.formBuilderConfig.isCompanyFeatureEnabled() ? _entities.FormWithCompany : _entities.Form;
-    }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         let form = {};
@@ -323,7 +320,7 @@ let FormService = class FormService extends _classes.ApiService {
         return this.toPublicForm(form);
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form', cacheManager, utilsService, FormService.name, true, 'form-builder', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig;
+        super(_config.FORM_BUILDER_EVENT_ENTITIES.FORM, cacheManager, utilsService, FormService.name, true, _config.FORM_BUILDER_EVENT_MODULE, dataSourceProvider, formBuilderConfig.isCompanyFeatureEnabled() ? _entities.FormWithCompany : _entities.Form), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig;
     }
 };
 FormService = _ts_decorate([

package/cjs/services/form.service.spec.js

@@ -120,14 +120,14 @@ describe('FormService', ()=>{
     afterEach(()=>{
         jest.clearAllMocks();
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to Form when company feature disabled', async ()=>{
+    describe('entity selection', ()=>{
+        it('uses Form when company feature disabled', async ()=>{
             await buildService(false);
-            expect(service.resolveEntity()).toBe(_entities.Form);
+            expect(service['_entity']).toBe(_entities.Form);
         });
-        it('resolves to FormWithCompany when company feature enabled', async ()=>{
+        it('uses FormWithCompany when company feature enabled', async ()=>{
             await buildService(true);
-            expect(service.resolveEntity()).toBe(_entities.FormWithCompany);
+            expect(service['_entity']).toBe(_entities.FormWithCompany);
         });
     });
     // ==========================================================================

package/config/event-actions.d.ts

@@ -6,3 +6,4 @@ export declare const FORM_BUILDER_EVENT_ENTITIES: {
     readonly FORM: "form";
     readonly FORM_RESULT: "form_result";
 };
+export declare const FORM_BUILDER_EVENT_MODULE = "form-builder";

package/fesm/config/event-actions.js

@@ -9,3 +9,4 @@
     FORM: 'form',
     FORM_RESULT: 'form_result'
 };
+export const FORM_BUILDER_EVENT_MODULE = 'form-builder';

package/fesm/services/form-result.service.js

@@ -31,7 +31,7 @@ import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { BadRequestException, ForbiddenException, Inject, Injectable, NotFoundException, Scope, UnauthorizedException } from '@nestjs/common';
 import { IsNull } from 'typeorm';
-import { FORM_BUILDER_EVENT_ACTIONS, FORM_MESSAGES, FORM_RESULT_MESSAGES } from '../config';
+import { FORM_BUILDER_EVENT_ACTIONS, FORM_BUILDER_EVENT_ENTITIES, FORM_BUILDER_EVENT_MODULE, FORM_MESSAGES, FORM_RESULT_MESSAGES } from '../config';
 import { SubmitFormDto } from '../dtos/form-result.dto';
 import { Form, FormResult, FormWithCompany } from '../entities';
 import { FormAccessType } from '../enums/form-access-type.enum';
@@ -309,7 +309,7 @@ export class FormResultService extends ApiService {
         return count > 0;
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form_result', cacheManager, utilsService, FormResultService.name, true, 'form-builder', FormResult, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
+        super(FORM_BUILDER_EVENT_ENTITIES.FORM_RESULT, cacheManager, utilsService, FormResultService.name, true, FORM_BUILDER_EVENT_MODULE, dataSourceProvider, FormResult), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
     }
 }
 _ts_decorate([

package/fesm/services/form.service.js

@@ -31,16 +31,13 @@ import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { BadRequestException, ForbiddenException, Inject, Injectable, NotFoundException, Scope, UnauthorizedException } from '@nestjs/common';
 import { IsNull } from 'typeorm';
-import { FORM_MESSAGES } from '../config';
+import { FORM_BUILDER_EVENT_ENTITIES, FORM_BUILDER_EVENT_MODULE, FORM_MESSAGES } from '../config';
 import { Form, FormWithCompany } from '../entities';
 import { FormAccessType } from '../enums/form-access-type.enum';
 import { validateUserPermissions } from '../utils/permission.utils';
 import { FormBuilderConfigService } from './form-builder-config.service';
 import { FormBuilderDataSourceProvider } from './form-builder-datasource.provider';
 export class FormService extends ApiService {
-    resolveEntity() {
-        return this.formBuilderConfig.isCompanyFeatureEnabled() ? FormWithCompany : Form;
-    }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         let form = {};
@@ -313,7 +310,7 @@ export class FormService extends ApiService {
         return this.toPublicForm(form);
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form', cacheManager, utilsService, FormService.name, true, 'form-builder', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig;
+        super(FORM_BUILDER_EVENT_ENTITIES.FORM, cacheManager, utilsService, FormService.name, true, FORM_BUILDER_EVENT_MODULE, dataSourceProvider, formBuilderConfig.isCompanyFeatureEnabled() ? FormWithCompany : Form), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig;
     }
 }
 FormService = _ts_decorate([

package/fesm/services/form.service.spec.js

@@ -75,14 +75,14 @@ describe('FormService', ()=>{
     afterEach(()=>{
         jest.clearAllMocks();
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to Form when company feature disabled', async ()=>{
+    describe('entity selection', ()=>{
+        it('uses Form when company feature disabled', async ()=>{
             await buildService(false);
-            expect(service.resolveEntity()).toBe(Form);
+            expect(service['_entity']).toBe(Form);
         });
-        it('resolves to FormWithCompany when company feature enabled', async ()=>{
+        it('uses FormWithCompany when company feature enabled', async ()=>{
             await buildService(true);
-            expect(service.resolveEntity()).toBe(FormWithCompany);
+            expect(service['_entity']).toBe(FormWithCompany);
         });
     });
     // ==========================================================================

package/interfaces/form-builder-module.interface.d.ts

@@ -1,5 +1,5 @@
 import { ModuleMetadata, Type } from '@nestjs/common';
-import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
+import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig } from '@flusys/nestjs-core';
 import { IModuleEventsConfig } from '@flusys/nestjs-shared/interfaces';
 export interface IFormBuilderConfig extends IDataSourceServiceOptions {
     events?: IModuleEventsConfig;
@@ -8,7 +8,7 @@ export interface FormBuilderModuleOptions extends IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;
     config?: IFormBuilderConfig;
 }
-export interface FormBuilderOptionsFactory extends IModuleOptionsFactory<IFormBuilderConfig> {
+export interface FormBuilderOptionsFactory {
     createFormBuilderOptions(): Promise<IFormBuilderConfig> | IFormBuilderConfig;
 }
 export interface FormBuilderModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-form-builder",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Dynamic form builder module with schema versioning and access control",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -84,7 +84,7 @@
     "express": "^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "7.0.0",
-    "@flusys/nestjs-shared": "7.0.0"
+    "@flusys/nestjs-core": "7.0.1",
+    "@flusys/nestjs-shared": "7.0.1"
   }
 }

package/services/form.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 { CreateFormDto, UpdateFormDto } from '../dtos/form.dto';
 import { Form } from '../entities';
 import { FormAccessType } from '../enums/form-access-type.enum';
@@ -14,7 +14,6 @@ export declare class FormService extends ApiService<CreateFormDto, UpdateFormDto
     protected utilsService: UtilsService;
     private readonly formBuilderConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider);
-    protected resolveEntity(): EntityTarget<Form>;
     convertSingleDtoToEntity(dto: CreateFormDto | UpdateFormDto, user: ILoggedUserInfo | null): Promise<Form>;
     getSelectQuery(query: SelectQueryBuilder<Form>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<Form>;