@flusys/nestjs-form-builder 9.1.0 → 9.1.2

package/fesm/720.js

@@ -733,6 +733,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: external "@flusys/nestjs-shared/dtos"
 var dtos_ = __webpack_require__(873);
+// EXTERNAL MODULE: external "@flusys/nestjs-shared/utils"
+var utils_ = __webpack_require__(216);
 // EXTERNAL MODULE: external "@nestjs/swagger"
 var swagger_ = __webpack_require__(176);
 // EXTERNAL MODULE: external "class-transformer"
@@ -765,13 +767,23 @@ function _ts_metadata(metadataKey, metadataValue) {
 
 
 
+
+function IsPermissionLogic() {
+    return (0,external_class_validator_.ValidateBy)({
+        name: 'isPermissionLogic',
+        validator: {
+            validate: (value)=>(0,utils_.permissionLogicProblem)(value) === null,
+            defaultMessage: ()=>`$property must be a non-empty AND / OR permission rule with at most ${utils_.MAX_PERMISSION_LOGIC_CODES} permissions`
+        }
+    });
+}
 class CreateFormDto {
     name;
     description;
     slug;
     schema;
     accessType;
-    actionGroups;
+    permissionLogic;
     tags;
     companyId;
     isActive;
@@ -833,20 +845,28 @@ _ts_decorate([
 ], CreateFormDto.prototype, "accessType", void 0);
 _ts_decorate([
     (0,swagger_.ApiProperty)({
-        description: 'Action groups for permission-based access (only used when accessType is action_group)',
-        example: [
-            'hr.survey.submit',
-            'employee.feedback.submit'
-        ],
-        required: false
-    }),
-    (0,external_class_validator_.IsArray)(),
-    (0,external_class_validator_.IsString)({
-        each: true
+        description: 'AND / OR permission rule a user must pass (only used when accessType is action_group)',
+        example: {
+            type: 'group',
+            operator: 'OR',
+            children: [
+                {
+                    type: 'action',
+                    actionId: 'hr.survey.submit'
+                },
+                {
+                    type: 'action',
+                    actionId: 'employee.feedback.submit'
+                }
+            ]
+        },
+        required: false,
+        nullable: true
     }),
+    IsPermissionLogic(),
     (0,external_class_validator_.IsOptional)(),
-    _ts_metadata("design:type", Array)
-], CreateFormDto.prototype, "actionGroups", void 0);
+    _ts_metadata("design:type", Object)
+], CreateFormDto.prototype, "permissionLogic", void 0);
 _ts_decorate([
     (0,swagger_.ApiProperty)({
         description: 'Tags used by consuming modules to fetch this form (e.g. survey, review)',
@@ -911,7 +931,7 @@ class FormResponseDto extends dtos_.IdentityResponseDto {
     schema;
     schemaVersion;
     accessType;
-    actionGroups;
+    permissionLogic;
     tags;
     companyId;
     isActive;
@@ -950,9 +970,11 @@ _ts_decorate([
 ], FormResponseDto.prototype, "accessType", void 0);
 _ts_decorate([
     (0,external_class_transformer_.Expose)(),
-    (0,swagger_.ApiProperty)(),
+    (0,swagger_.ApiProperty)({
+        nullable: true
+    }),
     _ts_metadata("design:type", Object)
-], FormResponseDto.prototype, "actionGroups", void 0);
+], FormResponseDto.prototype, "permissionLogic", void 0);
 _ts_decorate([
     (0,external_class_transformer_.Expose)(),
     (0,swagger_.ApiProperty)(),
@@ -981,7 +1003,7 @@ class FormAccessInfoResponseDto extends (0,swagger_.PickType)(FormResponseDto, [
     'name',
     'description',
     'accessType',
-    'actionGroups',
+    'permissionLogic',
     'isActive'
 ]) {
 }

package/fesm/config/index.js

@@ -71,7 +71,8 @@ const FORM_MESSAGES = {
     OTP_INVALID: 'form.email.otp.invalid',
     OTP_EXPIRED: 'form.email.otp.expired',
     OTP_TOO_MANY_ATTEMPTS: 'form.email.otp.too.many.attempts',
-    OTP_VERIFIED: 'form.email.otp.verified'
+    OTP_VERIFIED: 'form.email.otp.verified',
+    INVALID_COMPUTED_FIELD: 'form.invalid.computed.field'
 };
 const FORM_RESULT_MESSAGES = {
     GET_ALL_SUCCESS: 'form.result.get.all.success',

package/fesm/docs/index.js

@@ -99,7 +99,7 @@ All queries automatically filter by current user's company context.
 
 ### Action Group Forms
 - Permission-based access via IAM
-- User must have specific permissions
+- User must pass the form's \`permissionLogic\` AND / OR rule (an \`ILogicNode\` tree)
 - Use \`/form-builder/form/authenticated/:id\` to get form
 - Use \`/form-builder/result/submit\` to submit
 

package/fesm/dtos/index.js

@@ -1,4 +1,5 @@
 import * as __rspack_external__flusys_nestjs_shared_dtos_c4585026 from "@flusys/nestjs-shared/dtos";
+import * as __rspack_external__flusys_nestjs_shared_utils_9125c1f1 from "@flusys/nestjs-shared/utils";
 import * as __rspack_external__nestjs_swagger_7cd450b5 from "@nestjs/swagger";
 import * as __rspack_external_class_transformer_c5a479fb from "class-transformer";
 import * as __rspack_external_class_validator_7b99ef4d from "class-validator";
@@ -270,6 +271,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: external "@flusys/nestjs-shared/dtos"
 var dtos_ = __webpack_require__(873);
+// EXTERNAL MODULE: external "@flusys/nestjs-shared/utils"
+var utils_ = __webpack_require__(216);
 // EXTERNAL MODULE: external "@nestjs/swagger"
 var swagger_ = __webpack_require__(176);
 // EXTERNAL MODULE: external "class-transformer"
@@ -302,13 +305,23 @@ function _ts_metadata(metadataKey, metadataValue) {
 
 
 
+
+function IsPermissionLogic() {
+    return (0,external_class_validator_.ValidateBy)({
+        name: 'isPermissionLogic',
+        validator: {
+            validate: (value)=>(0,utils_.permissionLogicProblem)(value) === null,
+            defaultMessage: ()=>`$property must be a non-empty AND / OR permission rule with at most ${utils_.MAX_PERMISSION_LOGIC_CODES} permissions`
+        }
+    });
+}
 class CreateFormDto {
     name;
     description;
     slug;
     schema;
     accessType;
-    actionGroups;
+    permissionLogic;
     tags;
     companyId;
     isActive;
@@ -370,20 +383,28 @@ _ts_decorate([
 ], CreateFormDto.prototype, "accessType", void 0);
 _ts_decorate([
     (0,swagger_.ApiProperty)({
-        description: 'Action groups for permission-based access (only used when accessType is action_group)',
-        example: [
-            'hr.survey.submit',
-            'employee.feedback.submit'
-        ],
-        required: false
-    }),
-    (0,external_class_validator_.IsArray)(),
-    (0,external_class_validator_.IsString)({
-        each: true
-    }),
+        description: 'AND / OR permission rule a user must pass (only used when accessType is action_group)',
+        example: {
+            type: 'group',
+            operator: 'OR',
+            children: [
+                {
+                    type: 'action',
+                    actionId: 'hr.survey.submit'
+                },
+                {
+                    type: 'action',
+                    actionId: 'employee.feedback.submit'
+                }
+            ]
+        },
+        required: false,
+        nullable: true
+    }),
+    IsPermissionLogic(),
     (0,external_class_validator_.IsOptional)(),
-    _ts_metadata("design:type", Array)
-], CreateFormDto.prototype, "actionGroups", void 0);
+    _ts_metadata("design:type", Object)
+], CreateFormDto.prototype, "permissionLogic", void 0);
 _ts_decorate([
     (0,swagger_.ApiProperty)({
         description: 'Tags used by consuming modules to fetch this form (e.g. survey, review)',
@@ -448,7 +469,7 @@ class FormResponseDto extends dtos_.IdentityResponseDto {
     schema;
     schemaVersion;
     accessType;
-    actionGroups;
+    permissionLogic;
     tags;
     companyId;
     isActive;
@@ -487,9 +508,11 @@ _ts_decorate([
 ], FormResponseDto.prototype, "accessType", void 0);
 _ts_decorate([
     (0,external_class_transformer_.Expose)(),
-    (0,swagger_.ApiProperty)(),
+    (0,swagger_.ApiProperty)({
+        nullable: true
+    }),
     _ts_metadata("design:type", Object)
-], FormResponseDto.prototype, "actionGroups", void 0);
+], FormResponseDto.prototype, "permissionLogic", void 0);
 _ts_decorate([
     (0,external_class_transformer_.Expose)(),
     (0,swagger_.ApiProperty)(),
@@ -518,7 +541,7 @@ class FormAccessInfoResponseDto extends (0,swagger_.PickType)(FormResponseDto, [
     'name',
     'description',
     'accessType',
-    'actionGroups',
+    'permissionLogic',
     'isActive'
 ]) {
 }
@@ -691,6 +714,12 @@ __webpack_require__.d(__webpack_exports__, {
 module.exports = __rspack_external__flusys_nestjs_shared_dtos_c4585026;
 
 
+},
+216(module) {
+
+module.exports = __rspack_external__flusys_nestjs_shared_utils_9125c1f1;
+
+
 },
 176(module) {
 

package/fesm/entities/index.js

@@ -56,7 +56,7 @@ class Form extends entities_Identity {
     schema;
     schemaVersion;
     accessType;
-    actionGroups;
+    permissionLogic;
     tags;
     isActive;
 }
@@ -113,10 +113,10 @@ _ts_decorate([
     (0,external_typeorm_.Column)({
         type: getJsonColumnType(),
         nullable: true,
-        name: 'action_groups'
+        name: 'permission_logic'
     }),
     _ts_metadata("design:type", Object)
-], Form.prototype, "actionGroups", void 0);
+], Form.prototype, "permissionLogic", void 0);
 _ts_decorate([
     (0,external_typeorm_.Column)({
         type: getJsonColumnType(),

package/fesm/index.js

@@ -118,7 +118,7 @@ All queries automatically filter by current user's company context.
 
 ### Action Group Forms
 - Permission-based access via IAM
-- User must have specific permissions
+- User must pass the form's \`permissionLogic\` AND / OR rule (an \`ILogicNode\` tree)
 - Use \`/form-builder/form/authenticated/:id\` to get form
 - Use \`/form-builder/result/submit\` to submit
 
@@ -194,6 +194,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
+  xI: () => (/* reexport */ computed_field_utils/* .COMPUTED_REF_PREFIX */.xI),
   YD: () => (/* reexport */ dtos/* .CreateFormDto */.YD),
   pZ: () => (/* reexport */ dtos/* .CreateFormResultDto */.pZ),
   d7: () => (/* reexport */ dtos/* .EmailVerifiedFormResponseDto */.d7),
@@ -236,10 +237,11 @@ __webpack_require__.d(__webpack_exports__, {
   Uj: () => (/* reexport */ dtos/* .UpdateFormResultDto */.Uj),
   uY: () => (/* reexport */ dtos/* .VerifyFormEmailOtpDto */.uY),
   TU: () => (/* reexport */ dtos/* .VerifyOtpResponseDto */.TU),
-  XZ: () => (/* reexport */ computed_field_utils/* .calculateComputedFields */.X),
+  XZ: () => (/* reexport */ computed_field_utils/* .calculateComputedFields */.XZ),
+  Qc: () => (/* reexport */ computed_field_utils/* .findComputedFieldIssue */.Qc),
   aY: () => (/* reexport */ docs/* .formBuilderSwaggerConfig */.a),
   iO: () => (/* reexport */ entities.getFormBuilderEntitiesByConfig),
-  io: () => (/* reexport */ permission_utils/* .validateUserPermissions */.i)
+  EY: () => (/* reexport */ permission_utils/* .hasFormPermission */.E)
 });
 
 // EXTERNAL MODULE: ./projects/nestjs-form-builder/src/config/index.ts
@@ -488,7 +490,8 @@ import * as __rspack_chunk_2 from './720.js';
 __webpack_require__.C(__rspack_chunk_2);
 import * as __rspack_chunk_3 from './index.js';
 __webpack_require__.C(__rspack_chunk_3);
-var __webpack_exports__ = __webpack_exec__(851);var __webpack_exports__CreateFormDto = __webpack_exports__.YD;
+var __webpack_exports__ = __webpack_exec__(851);var __webpack_exports__COMPUTED_REF_PREFIX = __webpack_exports__.xI;
+var __webpack_exports__CreateFormDto = __webpack_exports__.YD;
 var __webpack_exports__CreateFormResultDto = __webpack_exports__.pZ;
 var __webpack_exports__EmailVerifiedFormResponseDto = __webpack_exports__.d7;
 var __webpack_exports__FORM_BUILDER_EMAIL_PROVIDER = __webpack_exports__.Q3;
@@ -531,7 +534,8 @@ var __webpack_exports__UpdateFormResultDto = __webpack_exports__.Uj;
 var __webpack_exports__VerifyFormEmailOtpDto = __webpack_exports__.uY;
 var __webpack_exports__VerifyOtpResponseDto = __webpack_exports__.TU;
 var __webpack_exports__calculateComputedFields = __webpack_exports__.XZ;
+var __webpack_exports__findComputedFieldIssue = __webpack_exports__.Qc;
 var __webpack_exports__formBuilderSwaggerConfig = __webpack_exports__.aY;
 var __webpack_exports__getFormBuilderEntitiesByConfig = __webpack_exports__.iO;
-var __webpack_exports__validateUserPermissions = __webpack_exports__.io;
-export { __webpack_exports__CreateFormDto as CreateFormDto, __webpack_exports__CreateFormResultDto as CreateFormResultDto, __webpack_exports__EmailVerifiedFormResponseDto as EmailVerifiedFormResponseDto, __webpack_exports__FORM_BUILDER_EMAIL_PROVIDER as FORM_BUILDER_EMAIL_PROVIDER, __webpack_exports__FORM_BUILDER_EVENT_ACTIONS as FORM_BUILDER_EVENT_ACTIONS, __webpack_exports__FORM_BUILDER_EVENT_ENTITIES as FORM_BUILDER_EVENT_ENTITIES, __webpack_exports__FORM_BUILDER_EVENT_MODULE as FORM_BUILDER_EVENT_MODULE, __webpack_exports__FORM_BUILDER_MODULE_OPTIONS as FORM_BUILDER_MODULE_OPTIONS, __webpack_exports__FORM_MESSAGES as FORM_MESSAGES, __webpack_exports__FORM_RESULT_MESSAGES as FORM_RESULT_MESSAGES, __webpack_exports__Form as Form, __webpack_exports__FormAccessInfoResponseDto as FormAccessInfoResponseDto, __webpack_exports__FormAccessType as FormAccessType, __webpack_exports__FormBase as FormBase, __webpack_exports__FormBuilderConfigService as FormBuilderConfigService, __webpack_exports__FormBuilderDataSourceProvider as FormBuilderDataSourceProvider, __webpack_exports__FormBuilderModule as FormBuilderModule, __webpack_exports__FormCompanyEntities as FormCompanyEntities, __webpack_exports__FormController as FormController, __webpack_exports__FormCoreEntities as FormCoreEntities, __webpack_exports__FormEmailAuthController as FormEmailAuthController, __webpack_exports__FormEmailAuthService as FormEmailAuthService, __webpack_exports__FormEmailVerification as FormEmailVerification, __webpack_exports__FormResponseDto as FormResponseDto, __webpack_exports__FormResult as FormResult, __webpack_exports__FormResultController as FormResultController, __webpack_exports__FormResultResponseDto as FormResultResponseDto, __webpack_exports__FormResultService as FormResultService, __webpack_exports__FormService as FormService, __webpack_exports__FormWithCompany as FormWithCompany, __webpack_exports__GetMyDraftDto as GetMyDraftDto, __webpack_exports__GetResultsByFormDto as GetResultsByFormDto, __webpack_exports__HasSubmittedEmailDto as HasSubmittedEmailDto, __webpack_exports__LoadEmailVerifiedFormDto as LoadEmailVerifiedFormDto, __webpack_exports__PublicFormResponseDto as PublicFormResponseDto, __webpack_exports__RequestFormEmailOtpDto as RequestFormEmailOtpDto, __webpack_exports__SubmitFormDto as SubmitFormDto, __webpack_exports__UpdateDraftDto as UpdateDraftDto, __webpack_exports__UpdateFormDto as UpdateFormDto, __webpack_exports__UpdateFormResultDto as UpdateFormResultDto, __webpack_exports__VerifyFormEmailOtpDto as VerifyFormEmailOtpDto, __webpack_exports__VerifyOtpResponseDto as VerifyOtpResponseDto, __webpack_exports__calculateComputedFields as calculateComputedFields, __webpack_exports__formBuilderSwaggerConfig as formBuilderSwaggerConfig, __webpack_exports__getFormBuilderEntitiesByConfig as getFormBuilderEntitiesByConfig, __webpack_exports__validateUserPermissions as validateUserPermissions };
+var __webpack_exports__hasFormPermission = __webpack_exports__.EY;
+export { __webpack_exports__COMPUTED_REF_PREFIX as COMPUTED_REF_PREFIX, __webpack_exports__CreateFormDto as CreateFormDto, __webpack_exports__CreateFormResultDto as CreateFormResultDto, __webpack_exports__EmailVerifiedFormResponseDto as EmailVerifiedFormResponseDto, __webpack_exports__FORM_BUILDER_EMAIL_PROVIDER as FORM_BUILDER_EMAIL_PROVIDER, __webpack_exports__FORM_BUILDER_EVENT_ACTIONS as FORM_BUILDER_EVENT_ACTIONS, __webpack_exports__FORM_BUILDER_EVENT_ENTITIES as FORM_BUILDER_EVENT_ENTITIES, __webpack_exports__FORM_BUILDER_EVENT_MODULE as FORM_BUILDER_EVENT_MODULE, __webpack_exports__FORM_BUILDER_MODULE_OPTIONS as FORM_BUILDER_MODULE_OPTIONS, __webpack_exports__FORM_MESSAGES as FORM_MESSAGES, __webpack_exports__FORM_RESULT_MESSAGES as FORM_RESULT_MESSAGES, __webpack_exports__Form as Form, __webpack_exports__FormAccessInfoResponseDto as FormAccessInfoResponseDto, __webpack_exports__FormAccessType as FormAccessType, __webpack_exports__FormBase as FormBase, __webpack_exports__FormBuilderConfigService as FormBuilderConfigService, __webpack_exports__FormBuilderDataSourceProvider as FormBuilderDataSourceProvider, __webpack_exports__FormBuilderModule as FormBuilderModule, __webpack_exports__FormCompanyEntities as FormCompanyEntities, __webpack_exports__FormController as FormController, __webpack_exports__FormCoreEntities as FormCoreEntities, __webpack_exports__FormEmailAuthController as FormEmailAuthController, __webpack_exports__FormEmailAuthService as FormEmailAuthService, __webpack_exports__FormEmailVerification as FormEmailVerification, __webpack_exports__FormResponseDto as FormResponseDto, __webpack_exports__FormResult as FormResult, __webpack_exports__FormResultController as FormResultController, __webpack_exports__FormResultResponseDto as FormResultResponseDto, __webpack_exports__FormResultService as FormResultService, __webpack_exports__FormService as FormService, __webpack_exports__FormWithCompany as FormWithCompany, __webpack_exports__GetMyDraftDto as GetMyDraftDto, __webpack_exports__GetResultsByFormDto as GetResultsByFormDto, __webpack_exports__HasSubmittedEmailDto as HasSubmittedEmailDto, __webpack_exports__LoadEmailVerifiedFormDto as LoadEmailVerifiedFormDto, __webpack_exports__PublicFormResponseDto as PublicFormResponseDto, __webpack_exports__RequestFormEmailOtpDto as RequestFormEmailOtpDto, __webpack_exports__SubmitFormDto as SubmitFormDto, __webpack_exports__UpdateDraftDto as UpdateDraftDto, __webpack_exports__UpdateFormDto as UpdateFormDto, __webpack_exports__UpdateFormResultDto as UpdateFormResultDto, __webpack_exports__VerifyFormEmailOtpDto as VerifyFormEmailOtpDto, __webpack_exports__VerifyOtpResponseDto as VerifyOtpResponseDto, __webpack_exports__calculateComputedFields as calculateComputedFields, __webpack_exports__findComputedFieldIssue as findComputedFieldIssue, __webpack_exports__formBuilderSwaggerConfig as formBuilderSwaggerConfig, __webpack_exports__getFormBuilderEntitiesByConfig as getFormBuilderEntitiesByConfig, __webpack_exports__hasFormPermission as hasFormPermission };

package/interfaces/form.interface.d.ts

@@ -1,4 +1,4 @@
-import { type IIdentity } from '@flusys/nestjs-shared/interfaces';
+import { type IIdentity, type ILogicNode } from '@flusys/nestjs-shared/interfaces';
 import { FormAccessType } from '../enums/form-access-type.enum.js';
 export interface IForm extends IIdentity {
     name: string;
@@ -7,7 +7,7 @@ export interface IForm extends IIdentity {
     schema: Record<string, unknown>;
     schemaVersion: number;
     accessType: FormAccessType;
-    actionGroups: string[] | null;
+    permissionLogic: ILogicNode | null;
     tags: string[] | null;
     isActive: boolean;
     companyId: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-form-builder",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "description": "Dynamic form builder module with schema versioning and access control",
   "type": "module",
   "main": "./fesm/index.js",
@@ -65,17 +65,17 @@
     "@nestjs/common": "^12.0.0",
     "@nestjs/config": "^12.0.0",
     "@nestjs/core": "^12.0.0",
-    "@nestjs/platform-express": "^12.0.0",
+    "@nestjs/platform-express": "^12.1.2",
     "@nestjs/swagger": "^12.0.0",
     "@nestjs/throttler": "^6.5.0",
     "@nestjs/typeorm": "^12.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.15.0",
-    "typeorm": "^0.3.0",
+    "typeorm": "^0.3.31",
     "express": "^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "9.1.0",
-    "@flusys/nestjs-shared": "9.1.0"
+    "@flusys/nestjs-core": "9.1.2",
+    "@flusys/nestjs-shared": "9.1.2"
   }
 }

package/services/form-result.service.d.ts

@@ -1,7 +1,7 @@
 import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
-import { type ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
-import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { type ILoggedUserInfo, type IPermissionResolver } from '@flusys/nestjs-shared/interfaces';
+import { SharedPermissionCacheService, UtilsService } from '@flusys/nestjs-shared/modules';
 import { SelectQueryBuilder } from 'typeorm';
 import { CreateFormResultDto, SubmitFormDto, UpdateFormResultDto } from '../dtos/form-result.dto.js';
 import { FormResult } from '../entities/index.js';
@@ -15,9 +15,11 @@ export declare class FormResultService extends ApiService<CreateFormResultDto, U
     private readonly formBuilderConfig;
     private readonly dataSourceProvider;
     private readonly formEmailAuthService;
+    private readonly permissionResolver?;
+    private readonly permissionCache?;
     private formRepository;
     private static readonly submissionLocks;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider, formEmailAuthService: FormEmailAuthService);
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider, formEmailAuthService: FormEmailAuthService, permissionResolver?: IPermissionResolver | undefined, permissionCache?: SharedPermissionCacheService | undefined);
     private ensureFormRepositoryInitialized;
     private withSubmissionLock;
     private getActiveForm;

package/services/form.service.d.ts

@@ -1,7 +1,7 @@
 import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
-import { type ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
-import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { type ILoggedUserInfo, type ILogicNode, type IPermissionResolver } from '@flusys/nestjs-shared/interfaces';
+import { SharedPermissionCacheService, UtilsService } from '@flusys/nestjs-shared/modules';
 import { SelectQueryBuilder } from 'typeorm';
 import { CreateFormDto, UpdateFormDto } from '../dtos/form.dto.js';
 import { Form } from '../entities/index.js';
@@ -13,8 +13,11 @@ export declare class FormService extends ApiService<CreateFormDto, UpdateFormDto
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly formBuilderConfig;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider);
+    private readonly permissionResolver?;
+    private readonly permissionCache?;
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider, permissionResolver?: IPermissionResolver | undefined, permissionCache?: SharedPermissionCacheService | undefined);
     convertSingleDtoToEntity(dto: CreateFormDto | UpdateFormDto, user: ILoggedUserInfo | null): Promise<Form>;
+    private assertValidComputedFields;
     getSelectQuery(query: SelectQueryBuilder<Form>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<Form>;
         isRaw: boolean;
@@ -40,7 +43,7 @@ export declare class FormService extends ApiService<CreateFormDto, UpdateFormDto
         name: string;
         description: string | null;
         accessType: FormAccessType;
-        actionGroups: string[] | null;
+        permissionLogic: ILogicNode | null;
         isActive: boolean;
     }>;
     getEmailVerifiedFormEntity(formId: string): Promise<Form>;

package/utils/computed-field.utils.d.ts

@@ -1,48 +1,24 @@
+import type { Expression, IExpressionConditionGroup } from '@flusys/nestjs-shared/interfaces';
+export type ComputedValueType = 'string' | 'number' | 'boolean';
 export interface IComputedField {
     id: string;
     name: string;
     key: string;
-    valueType: 'string' | 'number';
+    valueType: ComputedValueType;
     rules: IComputedRule[];
-    defaultValue?: string | number | null;
+    defaultValue?: string | number | boolean | null;
     description?: string;
 }
 export interface IComputedRule {
     id: string;
-    condition?: IComputedConditionGroup;
-    computation: IComputation;
+    condition?: IExpressionConditionGroup;
+    value: Expression;
 }
-export interface IComputedConditionGroup {
-    operator: 'AND' | 'OR' | string;
-    conditions: IComputedCondition[];
+export declare const COMPUTED_REF_PREFIX = "computed.";
+export interface IComputedFieldIssue {
+    field: string;
+    code: string;
+    variables: Record<string, string | number>;
 }
-export interface IComputedCondition {
-    fieldId: string;
-    comparison: string;
-    value: unknown;
-}
-export interface IComputation {
-    type: ComputationType;
-    config: IDirectValueConfig | IFieldReferenceConfig | IArithmeticConfig;
-}
-export type ComputationType = 'direct' | 'field_reference' | 'arithmetic';
-export interface IDirectValueConfig {
-    type: 'direct';
-    value: string | number;
-}
-export interface IFieldReferenceConfig {
-    type: 'field_reference';
-    fieldId: string;
-}
-export interface IArithmeticConfig {
-    type: 'arithmetic';
-    operation: ArithmeticOperation;
-    operands: IArithmeticOperand[];
-}
-export type ArithmeticOperation = 'sum' | 'subtract' | 'multiply' | 'divide' | 'average' | 'min' | 'max' | 'increment' | 'decrement';
-export interface IArithmeticOperand {
-    type: 'field' | 'constant';
-    fieldId?: string;
-    value?: number;
-}
-export declare function calculateComputedFields(formData: Record<string, unknown>, computedFields: IComputedField[] | undefined): Record<string, unknown>;
+export declare function calculateComputedFields(data: Record<string, unknown>, schema: unknown): Record<string, unknown>;
+export declare function findComputedFieldIssue(schema: unknown): IComputedFieldIssue | null;

package/utils/permission.utils.d.ts

@@ -1,3 +1,3 @@
-import { HybridCache } from '@flusys/nestjs-shared/classes';
-import { type ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
-export declare function validateUserPermissions(user: ILoggedUserInfo, requiredPermissions: string[], cacheManager: HybridCache, enableCompanyFeature: boolean): Promise<boolean>;
+import { type ILoggedUserInfo, type ILogicNode } from '@flusys/nestjs-shared/interfaces';
+import { type IPermissionSources } from '@flusys/nestjs-shared/utils';
+export declare function hasFormPermission(user: ILoggedUserInfo, logic: ILogicNode, sources: IPermissionSources): Promise<boolean>;