@flusys/nestjs-form-builder 5.4.1 → 6.0.0-beta.1

package/cjs/dtos/form.dto.js

@@ -60,6 +60,7 @@ let CreateFormDto = class CreateFormDto {
         _define_property(this, "schema", void 0);
         _define_property(this, "accessType", void 0);
         _define_property(this, "actionGroups", void 0);
+        _define_property(this, "tags", void 0);
         _define_property(this, "companyId", void 0);
         _define_property(this, "isActive", void 0);
     }
@@ -135,6 +136,22 @@ _ts_decorate([
     (0, _classvalidator.IsOptional)(),
     _ts_metadata("design:type", Array)
 ], CreateFormDto.prototype, "actionGroups", void 0);
+_ts_decorate([
+    (0, _swagger.ApiProperty)({
+        description: 'Tags used by consuming modules to fetch this form (e.g. survey, review)',
+        example: [
+            'survey',
+            'review'
+        ],
+        required: false
+    }),
+    (0, _classvalidator.IsArray)(),
+    (0, _classvalidator.IsString)({
+        each: true
+    }),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Array)
+], CreateFormDto.prototype, "tags", void 0);
 _ts_decorate([
     (0, _swagger.ApiProperty)({
         description: 'Company ID - Only available when company feature is enabled',
@@ -179,7 +196,7 @@ _ts_decorate([
 ], UpdateFormDto.prototype, "schemaVersion", void 0);
 let FormResponseDto = class FormResponseDto extends _dtos.IdentityResponseDto {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "companyId", void 0), _define_property(this, "isActive", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "tags", void 0), _define_property(this, "companyId", void 0), _define_property(this, "isActive", void 0);
     }
 };
 _ts_decorate([
@@ -219,6 +236,11 @@ _ts_decorate([
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], FormResponseDto.prototype, "actionGroups", void 0);
+_ts_decorate([
+    (0, _classtransformer.Expose)(),
+    (0, _swagger.ApiProperty)(),
+    _ts_metadata("design:type", Object)
+], FormResponseDto.prototype, "tags", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),

package/cjs/entities/form.entity.js

@@ -36,7 +36,7 @@ function _ts_metadata(k, v) {
 }
 let Form = class Form extends _entities.Identity {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "isActive", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "tags", void 0), _define_property(this, "isActive", void 0);
     }
 };
 _ts_decorate([
@@ -96,6 +96,13 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Object)
 ], Form.prototype, "actionGroups", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: (0, _nestjsshared.getJsonColumnType)(),
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Form.prototype, "tags", void 0);
 _ts_decorate([
     (0, _typeorm.Column)({
         type: 'boolean',

package/cjs/services/form.service.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "FormService", {
         return FormService;
     }
 });
+const _nestjscore = require("@flusys/nestjs-core");
 const _classes = require("@flusys/nestjs-shared/classes");
 const _modules = require("@flusys/nestjs-shared/modules");
 const _utils = require("@flusys/nestjs-shared/utils");
@@ -109,6 +110,7 @@ let FormService = class FormService extends _classes.ApiService {
                 'schemaVersion',
                 'accessType',
                 'actionGroups',
+                'tags',
                 'isActive',
                 'createdAt',
                 'updatedAt'
@@ -125,6 +127,38 @@ let FormService = class FormService extends _classes.ApiService {
             isRaw: false
         };
     }
+    // Supports filtering by one or more tags (array-contains-all) via the generic get-all filter,
+    // e.g. { filter: { tags: ['survey', 'review'] } }, since tags is a JSON array column.
+    async getFilterQuery(query, filter, user) {
+        const { tags, ...rest } = filter;
+        if (tags !== undefined && tags !== null) {
+            const tagList = (Array.isArray(tags) ? tags : [
+                tags
+            ]).map(String);
+            if (tagList.length > 0) {
+                this.applyTagFilter(query, tagList);
+            }
+        }
+        return super.getFilterQuery(query, rest, user);
+    }
+    applyTagFilter(query, tags) {
+        const driver = _nestjscore.envConfig.getTypeOrmConfig().type;
+        if (driver === 'postgres') {
+            query.andWhere(`${this.entityName}.tags @> :tagValues::jsonb`, {
+                tagValues: JSON.stringify(tags)
+            });
+        } else if (driver === 'mysql') {
+            query.andWhere(`JSON_CONTAINS(${this.entityName}.tags, :tagValues)`, {
+                tagValues: JSON.stringify(tags)
+            });
+        } else {
+            tags.forEach((tag, index)=>{
+                query.andWhere(`${this.entityName}.tags LIKE :tagValue${index}`, {
+                    [`tagValue${index}`]: `%"${tag}"%`
+                });
+            });
+        }
+    }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
         // Apply company filter using shared utility
@@ -146,6 +180,7 @@ let FormService = class FormService extends _classes.ApiService {
             schemaVersion: entity.schemaVersion,
             accessType: entity.accessType,
             actionGroups: entity.actionGroups,
+            tags: entity.tags,
             isActive: entity.isActive,
             companyId: entityWithCompany.companyId ?? null,
             createdAt: entity.createdAt,

package/dtos/form.dto.d.ts

@@ -7,6 +7,7 @@ export declare class CreateFormDto {
     schema: Record<string, unknown>;
     accessType?: FormAccessType;
     actionGroups?: string[];
+    tags?: string[];
     companyId?: string;
     isActive?: boolean;
 }
@@ -23,6 +24,7 @@ export declare class FormResponseDto extends IdentityResponseDto {
     schemaVersion: number;
     accessType: FormAccessType;
     actionGroups: string[] | null;
+    tags: string[] | null;
     companyId: string | null;
     isActive: boolean;
 }

package/entities/form.entity.d.ts

@@ -8,5 +8,6 @@ export declare class Form extends Identity {
     schemaVersion: number;
     accessType: FormAccessType;
     actionGroups: string[] | null;
+    tags: string[] | null;
     isActive: boolean;
 }

package/fesm/dtos/form.dto.js

@@ -33,6 +33,7 @@ export class CreateFormDto {
         _define_property(this, "schema", void 0);
         _define_property(this, "accessType", void 0);
         _define_property(this, "actionGroups", void 0);
+        _define_property(this, "tags", void 0);
         _define_property(this, "companyId", void 0);
         _define_property(this, "isActive", void 0);
     }
@@ -108,6 +109,22 @@ _ts_decorate([
     IsOptional(),
     _ts_metadata("design:type", Array)
 ], CreateFormDto.prototype, "actionGroups", void 0);
+_ts_decorate([
+    ApiProperty({
+        description: 'Tags used by consuming modules to fetch this form (e.g. survey, review)',
+        example: [
+            'survey',
+            'review'
+        ],
+        required: false
+    }),
+    IsArray(),
+    IsString({
+        each: true
+    }),
+    IsOptional(),
+    _ts_metadata("design:type", Array)
+], CreateFormDto.prototype, "tags", void 0);
 _ts_decorate([
     ApiProperty({
         description: 'Company ID - Only available when company feature is enabled',
@@ -152,7 +169,7 @@ _ts_decorate([
 ], UpdateFormDto.prototype, "schemaVersion", void 0);
 export class FormResponseDto extends IdentityResponseDto {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "companyId", void 0), _define_property(this, "isActive", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "tags", void 0), _define_property(this, "companyId", void 0), _define_property(this, "isActive", void 0);
     }
 }
 _ts_decorate([
@@ -192,6 +209,11 @@ _ts_decorate([
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], FormResponseDto.prototype, "actionGroups", void 0);
+_ts_decorate([
+    Expose(),
+    ApiProperty(),
+    _ts_metadata("design:type", Object)
+], FormResponseDto.prototype, "tags", void 0);
 _ts_decorate([
     Expose(),
     ApiProperty(),

package/fesm/entities/form.entity.js

@@ -26,7 +26,7 @@ import { Column, Entity, Index } from 'typeorm';
 import { FormAccessType } from '../enums/form-access-type.enum';
 export class Form extends Identity {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "isActive", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "slug", void 0), _define_property(this, "schema", void 0), _define_property(this, "schemaVersion", void 0), _define_property(this, "accessType", void 0), _define_property(this, "actionGroups", void 0), _define_property(this, "tags", void 0), _define_property(this, "isActive", void 0);
     }
 }
 _ts_decorate([
@@ -86,6 +86,13 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Object)
 ], Form.prototype, "actionGroups", void 0);
+_ts_decorate([
+    Column({
+        type: getJsonColumnType(),
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Form.prototype, "tags", void 0);
 _ts_decorate([
     Column({
         type: 'boolean',

package/fesm/services/form.service.js

@@ -25,6 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
+import { envConfig } from '@flusys/nestjs-core';
 import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
@@ -99,6 +100,7 @@ export class FormService extends ApiService {
                 'schemaVersion',
                 'accessType',
                 'actionGroups',
+                'tags',
                 'isActive',
                 'createdAt',
                 'updatedAt'
@@ -115,6 +117,38 @@ export class FormService extends ApiService {
             isRaw: false
         };
     }
+    // Supports filtering by one or more tags (array-contains-all) via the generic get-all filter,
+    // e.g. { filter: { tags: ['survey', 'review'] } }, since tags is a JSON array column.
+    async getFilterQuery(query, filter, user) {
+        const { tags, ...rest } = filter;
+        if (tags !== undefined && tags !== null) {
+            const tagList = (Array.isArray(tags) ? tags : [
+                tags
+            ]).map(String);
+            if (tagList.length > 0) {
+                this.applyTagFilter(query, tagList);
+            }
+        }
+        return super.getFilterQuery(query, rest, user);
+    }
+    applyTagFilter(query, tags) {
+        const driver = envConfig.getTypeOrmConfig().type;
+        if (driver === 'postgres') {
+            query.andWhere(`${this.entityName}.tags @> :tagValues::jsonb`, {
+                tagValues: JSON.stringify(tags)
+            });
+        } else if (driver === 'mysql') {
+            query.andWhere(`JSON_CONTAINS(${this.entityName}.tags, :tagValues)`, {
+                tagValues: JSON.stringify(tags)
+            });
+        } else {
+            tags.forEach((tag, index)=>{
+                query.andWhere(`${this.entityName}.tags LIKE :tagValue${index}`, {
+                    [`tagValue${index}`]: `%"${tag}"%`
+                });
+            });
+        }
+    }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
         // Apply company filter using shared utility
@@ -136,6 +170,7 @@ export class FormService extends ApiService {
             schemaVersion: entity.schemaVersion,
             accessType: entity.accessType,
             actionGroups: entity.actionGroups,
+            tags: entity.tags,
             isActive: entity.isActive,
             companyId: entityWithCompany.companyId ?? null,
             createdAt: entity.createdAt,

package/interfaces/form.interface.d.ts

@@ -8,6 +8,7 @@ export interface IForm extends IIdentity {
     schemaVersion: number;
     accessType: FormAccessType;
     actionGroups: string[] | null;
+    tags: string[] | null;
     isActive: boolean;
     companyId: string | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-form-builder",
-  "version": "5.4.1",
+  "version": "6.0.0-beta.1",
   "description": "Dynamic form builder module with schema versioning and access control",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -79,12 +79,12 @@
     "@nestjs/swagger": "^11.0.0",
     "@nestjs/typeorm": "^11.0.0",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.0 || ^0.15.0",
+    "class-validator": "^0.15.0",
     "typeorm": "^0.3.0",
-    "express": "^4.18.0 || ^5.0.0"
+    "express": "^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.4.1",
-    "@flusys/nestjs-shared": "5.4.1"
+    "@flusys/nestjs-core": "6.0.0-beta.1",
+    "@flusys/nestjs-shared": "6.0.0-beta.1"
   }
 }

package/services/form.service.d.ts

@@ -20,6 +20,11 @@ export declare class FormService extends ApiService<CreateFormDto, UpdateFormDto
         query: SelectQueryBuilder<Form>;
         isRaw: boolean;
     }>;
+    protected getFilterQuery(query: SelectQueryBuilder<Form>, filter: Record<string, unknown>, user: ILoggedUserInfo | null): Promise<{
+        query: SelectQueryBuilder<Form>;
+        isRaw: boolean;
+    }>;
+    private applyTagFilter;
     protected getExtraManipulateQuery(query: SelectQueryBuilder<Form>, filterDto: FilterAndPaginationDto, user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<Form>;
         isRaw: boolean;