@flusys/nestjs-form-builder 9.1.1 → 9.2.0

package/README.md

@@ -204,6 +204,27 @@ FormBuilderModule.forRoot({
 | `POST form-builder/result/submit-public` | `OptionalJwtGuard` | Now also accepts `EMAIL_VERIFIED` forms — pass `{ accessToken }` for anonymous visitors, nothing for JWT-authenticated ones |
 | `POST form-builder/result/has-submitted-email` | `OptionalJwtGuard` | Anonymous-path counterpart to `has-submitted`, resolving identity the same way |
 
+**Single-response race:** the "already submitted?" count and the insert are not atomic, so a non-draft submission to a `single` form `claim`s `form-builder:submit:[<tenant>:]<formId>:<email>` (30 s, released when done) on the shared cache. A concurrent submission for the same form + email - on any instance with `redis` / `hybrid` cache - gets 409 `form.result.already.submitted`. When the cache is unreachable the count check alone applies.
+
+### Caching
+
+`FormService` and `FormResultService` cache `get-all` / `get/:id` (ApiService version stamps, see [nestjs-shared section 7](../nestjs-shared/README.md#7-hybrid-cache)):
+
+- Submit, draft save / finalize and `update-draft` bump the `form_result` stamp after the write - also when the insert fails after an old draft was already soft-removed - and before the domain event is published.
+- With the company feature, cached result lists join `form` for the company filter, so `FormResultService` also depends on the `form` stamp.
+- Public, authenticated, email-verified and submission reads (`public/:id`, `access-info/:id`, `authenticated/:id`, `email-verified/:id`, `by-slug`, submit) always read the database, so a deactivated or re-scoped form is never served from cache. OTP and access-token state lives only in `form_email_verification`, never in the cache.
+
+---
+
+## 4. Computed Fields
+
+`schema.settings.computedFields[]` are calculated on final submission (not drafts) and stored under `data._computed[key]`. Each field has ordered `rules` - `{ condition?, value }`, first match wins, else `defaultValue` - where `value` is an [Expression](../nestjs-shared/README.md#10-expressions) and `condition` an expression condition group. Combinations (regex extract, then join with another field, then upper-case; inline if / else) are just nested expressions.
+
+- References: a field id, a field `name` (what templates use, `{{ email }}`), or `computed.<key>` for a computed field defined **earlier**.
+- `valueType` (`number` | `string` | `boolean`) casts the result; a rule that fails at run time falls back to `defaultValue` instead of failing the submission.
+- Saving a form validates its computed fields (`findComputedFieldIssue`): key format and uniqueness, shape, unknown references or functions, argument counts, literal regex patterns. A problem is a 400 with `form.invalid.computed.field` and `{ field, code, ... }`.
+- **Breaking (v9):** the old rule shape (`computation: { type: 'direct' | 'field_reference' | 'arithmetic', config }` with `{ fieldId, comparison }` conditions) is not read or converted. A form saved with it computes only `defaultValue` on submit and is refused on save until its computed fields are rebuilt in the builder.
+
 ---
 
 ## License

package/config/message-keys.d.ts

@@ -15,6 +15,7 @@ export declare const FORM_MESSAGES: {
     readonly OTP_EXPIRED: "form.email.otp.expired";
     readonly OTP_TOO_MANY_ATTEMPTS: "form.email.otp.too.many.attempts";
     readonly OTP_VERIFIED: "form.email.otp.verified";
+    readonly INVALID_COMPUTED_FIELD: "form.invalid.computed.field";
 };
 export declare const FORM_RESULT_MESSAGES: {
     readonly GET_ALL_SUCCESS: "form.result.get.all.success";

package/controllers/form-result.controller.d.ts

@@ -7,6 +7,7 @@ declare const FormResultController_base: abstract new (service: FormResultServic
     readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FormResultService;
     isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
+    assertEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): void;
     insert(addDto: CreateFormResultDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;
     insertMany(addDto: CreateFormResultDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResultResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;

package/controllers/form.controller.d.ts

@@ -7,6 +7,7 @@ declare const FormController_base: abstract new (service: FormService) => {
     readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FormService;
     isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
+    assertEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): void;
     insert(addDto: CreateFormDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;
     insertMany(addDto: CreateFormDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;

package/fesm/432.js

@@ -68,7 +68,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',
@@ -428,7 +429,7 @@ _ts_decorate([
     (0,external_typeorm_.Column)({
         type: 'varchar',
         length: 50,
-        default: 'AUTHENTICATED',
+        default: form_access_type_enum/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED,
         name: 'access_type'
     }),
     _ts_metadata("design:type", typeof form_access_type_enum/* .FormAccessType */.h === "undefined" ? Object : form_access_type_enum/* .FormAccessType */.h)
@@ -1173,16 +1174,16 @@ FormEmailAuthService = _ts_decorate([
 /* import */ var _flusys_nestjs_shared_modules__rspack_import_3 = __webpack_require__(236);
 /* import */ var _nestjs_common__rspack_import_4 = __webpack_require__(157);
 /* import */ var typeorm__rspack_import_5 = __webpack_require__(158);
-/* import */ var _config_index_js__rspack_import_12 = __webpack_require__(769);
-/* import */ var _config_index_js__rspack_import_13 = __webpack_require__(137);
+/* import */ var _config_index_js__rspack_import_13 = __webpack_require__(769);
+/* import */ var _config_index_js__rspack_import_14 = __webpack_require__(137);
 /* import */ var _dtos_form_result_dto_js__rspack_import_6 = __webpack_require__(788);
 /* import */ var _entities_index_js__rspack_import_7 = __webpack_require__(814);
-/* import */ var _enums_form_access_type_enum_js__rspack_import_14 = __webpack_require__(376);
-/* import */ var _utils_computed_field_utils_js__rspack_import_15 = __webpack_require__(801);
-/* import */ var _utils_permission_utils_js__rspack_import_8 = __webpack_require__(988);
-/* import */ var _form_builder_config_service_js__rspack_import_9 = __webpack_require__(781);
-/* import */ var _form_builder_datasource_provider_js__rspack_import_10 = __webpack_require__(593);
-/* import */ var _form_email_auth_service_js__rspack_import_11 = __webpack_require__(474);
+/* import */ var _enums_form_access_type_enum_js__rspack_import_15 = __webpack_require__(376);
+/* import */ var _utils_computed_field_utils_js__rspack_import_8 = __webpack_require__(801);
+/* import */ var _utils_permission_utils_js__rspack_import_9 = __webpack_require__(988);
+/* import */ var _form_builder_config_service_js__rspack_import_10 = __webpack_require__(781);
+/* import */ var _form_builder_datasource_provider_js__rspack_import_11 = __webpack_require__(593);
+/* import */ var _form_email_auth_service_js__rspack_import_12 = __webpack_require__(474);
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
@@ -1230,14 +1231,20 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
     permissionResolver;
     permissionCache;
     formRepository = null;
-    // Serializes the single-response check-then-insert per (formId, email) within
-    // this process, so a double-click/two-tab submission can't both pass the check
-    // before either has saved. Static because the service is REQUEST-scoped - a
-    // per-instance lock would never be shared between the two racing requests.
-    // Does not span multiple app instances; see withSubmissionLock().
-    static submissionLocks = new Map();
+    resultLogger = new _nestjs_common__rspack_import_4.Logger(FormResultService.name);
+    // Bounds how long a crashed instance can block a submitter's retry.
+    static SUBMISSION_CLAIM_TTL_MS = 30_000;
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider, formEmailAuthService, permissionResolver, permissionCache){
-        super(_config_index_js__rspack_import_12/* .FORM_BUILDER_EVENT_ENTITIES.FORM_RESULT */.eF.FORM_RESULT, cacheManager, utilsService, FormResultService.name, true, _config_index_js__rspack_import_12/* .FORM_BUILDER_EVENT_MODULE */.T$, dataSourceProvider, _entities_index_js__rspack_import_7/* .FormResult */.ez), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formEmailAuthService = formEmailAuthService, this.permissionResolver = permissionResolver, this.permissionCache = permissionCache;
+        super(_config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_ENTITIES.FORM_RESULT */.eF.FORM_RESULT, cacheManager, utilsService, FormResultService.name, true, _config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_MODULE */.T$, dataSourceProvider, _entities_index_js__rspack_import_7/* .FormResult */.ez), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formEmailAuthService = formEmailAuthService, this.permissionResolver = permissionResolver, this.permissionCache = permissionCache;
+    }
+    // With the company feature, cached lists join the form to filter by its company.
+    cacheDependencies() {
+        return this.formBuilderConfig.isCompanyFeatureEnabled() ? [
+            this.entityName,
+            _config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_ENTITIES.FORM */.eF.FORM
+        ] : [
+            this.entityName
+        ];
     }
     async ensureFormRepositoryInitialized() {
         if (!this.formRepository) {
@@ -1246,21 +1253,31 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             this.formRepository = await this.dataSourceProvider.getRepository(formEntity);
         }
     }
-    async withSubmissionLock(key, fn) {
-        const prior = FormResultService.submissionLocks.get(key) ?? Promise.resolve();
-        let release;
-        const current = new Promise((resolve)=>{
-            release = resolve;
-        });
-        FormResultService.submissionLocks.set(key, current);
-        await prior;
+    // Single-response forms: the count check and the insert are not atomic, so a
+    // double-click or two tabs (possibly on different instances) could both pass the
+    // check. The cross-instance claim lets only one submission per form + email run;
+    // a concurrent one is rejected as already submitted. Without a reachable cache the
+    // count check alone still applies.
+    async withSubmissionClaim(formId, email, fn) {
+        const tenant = this.cacheTenant();
+        const claimKey = `form-builder:submit:${tenant ? `${tenant}:` : ''}${formId}:${email}`;
+        let claimed = false;
+        try {
+            claimed = await this.cacheManager.claim(claimKey, FormResultService.SUBMISSION_CLAIM_TTL_MS);
+            if (!claimed) {
+                throw new _nestjs_common__rspack_import_4.ConflictException({
+                    message: 'You have already submitted a response to this form',
+                    messageKey: _config_index_js__rspack_import_14/* .FORM_RESULT_MESSAGES.ALREADY_SUBMITTED */.y.ALREADY_SUBMITTED
+                });
+            }
+        } catch (error) {
+            if (error instanceof _nestjs_common__rspack_import_4.ConflictException) throw error;
+            this.resultLogger.warn(`Submission claim unavailable for form '${formId}': ${error.message}`);
+        }
         try {
             return await fn();
         } finally{
-            release();
-            if (FormResultService.submissionLocks.get(key) === current) {
-                FormResultService.submissionLocks.delete(key);
-            }
+            if (claimed) await this.cacheManager.releaseClaim(claimKey).catch(()=>undefined);
         }
     }
     async getActiveForm(formId) {
@@ -1275,88 +1292,93 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         if (!form) {
             throw new _nestjs_common__rspack_import_4.NotFoundException({
                 message: 'Form not found or inactive',
-                messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.NOT_FOUND */.Q.NOT_FOUND
+                messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.NOT_FOUND */.Q.NOT_FOUND
             });
         }
         return form;
     }
     applyCompanyFilterToQuery(query, user) {
-        if (this.formBuilderConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            query.innerJoin('form', 'f', 'f.id = form_result.formId').andWhere('f.company_id = :companyId', {
-                companyId: user.companyId
-            });
+        if (!this.formBuilderConfig.isCompanyFeatureEnabled() || !user) return;
+        if (!user.companyId) {
+            query.andWhere('1 = 0');
+            return;
         }
+        query.innerJoin('form', 'f', 'f.id = form_result.formId').andWhere('f.company_id = :companyId', {
+            companyId: user.companyId
+        });
     }
     static PUBLICLY_SUBMITTABLE_ACCESS_TYPES = new Set([
-        _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.PUBLIC */.h.PUBLIC,
-        _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.EMAIL_VERIFIED */.h.EMAIL_VERIFIED
+        _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.PUBLIC */.h.PUBLIC,
+        _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.EMAIL_VERIFIED */.h.EMAIL_VERIFIED
     ]);
     async validateSubmissionAccess(form, user, isPublic) {
         if (isPublic) {
             if (!FormResultService.PUBLICLY_SUBMITTABLE_ACCESS_TYPES.has(form.accessType)) {
                 throw new _nestjs_common__rspack_import_4.UnauthorizedException({
                     message: 'This form is not available for public submission',
-                    messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.NOT_PUBLIC */.Q.NOT_PUBLIC
+                    messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.NOT_PUBLIC */.Q.NOT_PUBLIC
                 });
             }
             return;
         }
         switch(form.accessType){
-            case _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.PUBLIC */.h.PUBLIC:
+            case _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.PUBLIC */.h.PUBLIC:
                 return;
-            case _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.EMAIL_VERIFIED */.h.EMAIL_VERIFIED:
+            case _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.EMAIL_VERIFIED */.h.EMAIL_VERIFIED:
                 throw new _nestjs_common__rspack_import_4.BadRequestException({
                     message: 'Email-verified forms must be submitted through the public endpoint',
-                    messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.INVALID_ACCESS_TYPE */.Q.INVALID_ACCESS_TYPE
+                    messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.INVALID_ACCESS_TYPE */.Q.INVALID_ACCESS_TYPE
                 });
-            case _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.ACTION_GROUP */.h.ACTION_GROUP:
-            case _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED:
+            case _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.ACTION_GROUP */.h.ACTION_GROUP:
+            case _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED:
                 break;
             default:
                 throw new _nestjs_common__rspack_import_4.BadRequestException({
                     message: 'Invalid form access type',
-                    messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.INVALID_ACCESS_TYPE */.Q.INVALID_ACCESS_TYPE
+                    messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.INVALID_ACCESS_TYPE */.Q.INVALID_ACCESS_TYPE
                 });
         }
         if (!user) {
             throw new _nestjs_common__rspack_import_4.UnauthorizedException({
                 message: 'Authentication required to submit this form',
-                messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.AUTH_REQUIRED */.Q.AUTH_REQUIRED
+                messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.AUTH_REQUIRED */.Q.AUTH_REQUIRED
             });
         }
-        if (form.accessType === _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.ACTION_GROUP */.h.ACTION_GROUP && form.permissionLogic) {
-            const permitted = await (0,_utils_permission_utils_js__rspack_import_8/* .hasFormPermission */.E)(user, form.permissionLogic, {
+        if (form.accessType === _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.ACTION_GROUP */.h.ACTION_GROUP && form.permissionLogic) {
+            const permitted = await (0,_utils_permission_utils_js__rspack_import_9/* .hasFormPermission */.E)(user, form.permissionLogic, {
                 resolver: this.permissionResolver,
                 cache: this.permissionCache
             });
             if (!permitted) {
                 throw new _nestjs_common__rspack_import_4.ForbiddenException({
                     message: 'You do not have permission to submit this form',
-                    messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.ACCESS_DENIED */.Q.ACCESS_DENIED
+                    messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.ACCESS_DENIED */.Q.ACCESS_DENIED
                 });
             }
-        } else if (form.accessType !== _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED) {
+        } else if (form.accessType !== _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED) {
             throw new _nestjs_common__rspack_import_4.BadRequestException({
                 message: 'Invalid form access type',
-                messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.INVALID_ACCESS_TYPE */.Q.INVALID_ACCESS_TYPE
+                messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.INVALID_ACCESS_TYPE */.Q.INVALID_ACCESS_TYPE
             });
         }
     }
     async resolveEmailVerifiedSubmitter(form, user, accessToken) {
-        if (form.accessType !== _enums_form_access_type_enum_js__rspack_import_14/* .FormAccessType.EMAIL_VERIFIED */.h.EMAIL_VERIFIED) return null;
+        if (form.accessType !== _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.EMAIL_VERIFIED */.h.EMAIL_VERIFIED) return null;
         const email = await this.formEmailAuthService.resolveSubmitterEmail(form.id, user ?? undefined, accessToken);
         if (!email) {
             throw new _nestjs_common__rspack_import_4.UnauthorizedException({
                 message: 'Email verification required to submit this form',
-                messageKey: _config_index_js__rspack_import_13/* .FORM_MESSAGES.EMAIL_VERIFICATION_REQUIRED */.Q.EMAIL_VERIFICATION_REQUIRED
+                messageKey: _config_index_js__rspack_import_14/* .FORM_MESSAGES.EMAIL_VERIFICATION_REQUIRED */.Q.EMAIL_VERIFICATION_REQUIRED
             });
         }
         return email;
     }
-    async assertSingleResponseNotExceeded(form, submitterEmail) {
-        if (!submitterEmail) return;
+    isSingleResponse(form) {
         const settings = form.schema?.settings;
-        if (settings?.responseMode !== 'single') return;
+        return settings?.responseMode === 'single';
+    }
+    async assertSingleResponseNotExceeded(form, submitterEmail) {
+        if (!submitterEmail || !this.isSingleResponse(form)) return;
         const count = await this.repository.count({
             where: {
                 formId: form.id,
@@ -1368,7 +1390,7 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         if (count > 0) {
             throw new _nestjs_common__rspack_import_4.ConflictException({
                 message: 'You have already submitted a response to this form',
-                messageKey: _config_index_js__rspack_import_13/* .FORM_RESULT_MESSAGES.ALREADY_SUBMITTED */.y.ALREADY_SUBMITTED
+                messageKey: _config_index_js__rspack_import_14/* .FORM_RESULT_MESSAGES.ALREADY_SUBMITTED */.y.ALREADY_SUBMITTED
             });
         }
     }
@@ -1413,13 +1435,10 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         if (isDraft) {
             return data;
         }
-        const schema = form.schema;
-        const settings = schema?.settings;
-        const computedFields = settings?.computedFields;
-        if (!computedFields || computedFields.length === 0) {
+        const computedValues = (0,_utils_computed_field_utils_js__rspack_import_8/* .calculateComputedFields */.XZ)(data, form.schema);
+        if (Object.keys(computedValues).length === 0) {
             return data;
         }
-        const computedValues = (0,_utils_computed_field_utils_js__rspack_import_15/* .calculateComputedFields */.X)(data, computedFields);
         return {
             ...data,
             _computed: computedValues
@@ -1452,11 +1471,8 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         const submitterEmail = await this.resolveEmailVerifiedSubmitter(form, user, dto.accessToken);
         const isDraft = dto.isDraft ?? false;
         const persist = ()=>this.persistSubmission(form, dto, user, submitterEmail, isDraft);
-        // Only a non-draft submission is subject to the single-response check, so
-        // only that path needs serializing against a concurrent duplicate for the
-        // same form + email (see withSubmissionLock()).
-        if (!isDraft && submitterEmail) {
-            return this.withSubmissionLock(`${form.id}:${submitterEmail}`, persist);
+        if (!isDraft && submitterEmail && this.isSingleResponse(form)) {
+            return this.withSubmissionClaim(form.id, submitterEmail, persist);
         }
         return persist();
     }
@@ -1464,8 +1480,17 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         if (!isDraft) {
             await this.assertSingleResponseNotExceeded(form, submitterEmail);
         }
-        const staleResults = [];
-        // Handle existing draft for authenticated users
+        let saved;
+        try {
+            saved = await this.writeSubmission(form, dto, user, submitterEmail, isDraft);
+        } finally{
+            // Also after a failed insert: the replaced draft may already be soft-removed.
+            await this.invalidateCache();
+        }
+        await this.publishSubmissionEvent(saved, dto.formId, saved.isDraft, user);
+        return this.convertEntityToResponseDto(saved, false);
+    }
+    async writeSubmission(form, dto, user, submitterEmail, isDraft) {
         if (user?.id) {
             const existingDraft = await this.repository.findOne({
                 where: this.buildUserDraftWhere(dto.formId, user.id)
@@ -1478,18 +1503,12 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
                         schemaVersion: form.schemaVersion,
                         submittedAt: new Date()
                     });
-                    const saved = await this.repository.save(existingDraft);
-                    await this.invalidateResultCache([
-                        saved
-                    ]);
-                    await this.publishSubmissionEvent(saved, dto.formId, true, user);
-                    return this.convertEntityToResponseDto(saved, false);
+                    return await this.repository.save(existingDraft);
                 }
                 await this.repository.softRemove(existingDraft);
-                staleResults.push(existingDraft);
             }
         }
-        const saved = await this.repository.save({
+        return await this.repository.save({
             formId: dto.formId,
             schemaVersionSnapshot: form.schema,
             schemaVersion: form.schemaVersion,
@@ -1499,12 +1518,6 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             submittedAt: new Date(),
             isDraft
         });
-        await this.invalidateResultCache([
-            ...staleResults,
-            saved
-        ]);
-        await this.publishSubmissionEvent(saved, dto.formId, isDraft, user);
-        return this.convertEntityToResponseDto(saved, false);
     }
     async getMyDraft(formId, user) {
         await this.ensureDataSourceRepository();
@@ -1521,14 +1534,16 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         const draft = await this.repository.findOne({
             where: {
                 id: draftId,
+                formId: dto.formId,
                 submittedById: user.id,
+                isDraft: true,
                 deletedAt: (0,typeorm__rspack_import_5.IsNull)()
             }
         });
         if (!draft) {
             throw new _nestjs_common__rspack_import_4.NotFoundException({
                 message: 'Draft not found',
-                messageKey: _config_index_js__rspack_import_13/* .FORM_RESULT_MESSAGES.NOT_FOUND */.y.NOT_FOUND
+                messageKey: _config_index_js__rspack_import_14/* .FORM_RESULT_MESSAGES.NOT_FOUND */.y.NOT_FOUND
             });
         }
         const form = await this.getActiveForm(dto.formId);
@@ -1541,14 +1556,12 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             isDraft
         });
         const saved = await this.repository.save(draft);
-        await this.invalidateResultCache([
-            saved
-        ]);
+        await this.invalidateCache();
         await this.publishSubmissionEvent(saved, dto.formId, isDraft, user);
         return this.convertEntityToResponseDto(saved, false);
     }
     async publishSubmissionEvent(result, formId, isDraft, user) {
-        await this.publishDomainAction(isDraft ? _config_index_js__rspack_import_12/* .FORM_BUILDER_EVENT_ACTIONS.DRAFT_SAVED */.ov.DRAFT_SAVED : _config_index_js__rspack_import_12/* .FORM_BUILDER_EVENT_ACTIONS.SUBMITTED */.ov.SUBMITTED, {
+        await this.publishDomainAction(isDraft ? _config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_ACTIONS.DRAFT_SAVED */.ov.DRAFT_SAVED : _config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_ACTIONS.SUBMITTED */.ov.SUBMITTED, {
             ids: [
                 result.id
             ],
@@ -1561,12 +1574,6 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             user
         });
     }
-    async invalidateResultCache(results) {
-        await Promise.all([
-            this.clearCacheForAll(),
-            this.clearCacheForId(results)
-        ]);
-    }
     async getByFormId(formId, user, pagination) {
         await this.ensureDataSourceRepository();
         const query = this.repository.createQueryBuilder(this.entityName).where('form_result.formId = :formId', {
@@ -1641,9 +1648,9 @@ FormResultService = _ts_decorate([
     }),
     _ts_param(0, (0,_nestjs_common__rspack_import_4.Inject)('CACHE_INSTANCE')),
     _ts_param(1, (0,_nestjs_common__rspack_import_4.Inject)(_flusys_nestjs_shared_modules__rspack_import_3.UtilsService)),
-    _ts_param(2, (0,_nestjs_common__rspack_import_4.Inject)(_form_builder_config_service_js__rspack_import_9/* .FormBuilderConfigService */.j)),
-    _ts_param(3, (0,_nestjs_common__rspack_import_4.Inject)(_form_builder_datasource_provider_js__rspack_import_10/* .FormBuilderDataSourceProvider */._)),
-    _ts_param(4, (0,_nestjs_common__rspack_import_4.Inject)(_form_email_auth_service_js__rspack_import_11/* .FormEmailAuthService */.w)),
+    _ts_param(2, (0,_nestjs_common__rspack_import_4.Inject)(_form_builder_config_service_js__rspack_import_10/* .FormBuilderConfigService */.j)),
+    _ts_param(3, (0,_nestjs_common__rspack_import_4.Inject)(_form_builder_datasource_provider_js__rspack_import_11/* .FormBuilderDataSourceProvider */._)),
+    _ts_param(4, (0,_nestjs_common__rspack_import_4.Inject)(_form_email_auth_service_js__rspack_import_12/* .FormEmailAuthService */.w)),
     _ts_param(5, (0,_nestjs_common__rspack_import_4.Optional)()),
     _ts_param(5, (0,_nestjs_common__rspack_import_4.Inject)(_flusys_nestjs_shared_interfaces__rspack_import_2.PERMISSION_RESOLVER)),
     _ts_param(6, (0,_nestjs_common__rspack_import_4.Optional)()),
@@ -1652,9 +1659,9 @@ FormResultService = _ts_decorate([
     _ts_metadata("design:paramtypes", [
         typeof _flusys_nestjs_shared_classes__rspack_import_0.HybridCache === "undefined" ? Object : _flusys_nestjs_shared_classes__rspack_import_0.HybridCache,
         typeof _flusys_nestjs_shared_modules__rspack_import_3.UtilsService === "undefined" ? Object : _flusys_nestjs_shared_modules__rspack_import_3.UtilsService,
-        typeof _form_builder_config_service_js__rspack_import_9/* .FormBuilderConfigService */.j === "undefined" ? Object : _form_builder_config_service_js__rspack_import_9/* .FormBuilderConfigService */.j,
-        typeof _form_builder_datasource_provider_js__rspack_import_10/* .FormBuilderDataSourceProvider */._ === "undefined" ? Object : _form_builder_datasource_provider_js__rspack_import_10/* .FormBuilderDataSourceProvider */._,
-        typeof _form_email_auth_service_js__rspack_import_11/* .FormEmailAuthService */.w === "undefined" ? Object : _form_email_auth_service_js__rspack_import_11/* .FormEmailAuthService */.w,
+        typeof _form_builder_config_service_js__rspack_import_10/* .FormBuilderConfigService */.j === "undefined" ? Object : _form_builder_config_service_js__rspack_import_10/* .FormBuilderConfigService */.j,
+        typeof _form_builder_datasource_provider_js__rspack_import_11/* .FormBuilderDataSourceProvider */._ === "undefined" ? Object : _form_builder_datasource_provider_js__rspack_import_11/* .FormBuilderDataSourceProvider */._,
+        typeof _form_email_auth_service_js__rspack_import_12/* .FormEmailAuthService */.w === "undefined" ? Object : _form_email_auth_service_js__rspack_import_12/* .FormEmailAuthService */.w,
         typeof IPermissionResolver === "undefined" ? Object : IPermissionResolver,
         typeof _flusys_nestjs_shared_modules__rspack_import_3.SharedPermissionCacheService === "undefined" ? Object : _flusys_nestjs_shared_modules__rspack_import_3.SharedPermissionCacheService
     ])
@@ -1695,6 +1702,8 @@ var message_keys = __webpack_require__(137);
 var entities = __webpack_require__(814);
 // EXTERNAL MODULE: ./projects/nestjs-form-builder/src/enums/form-access-type.enum.ts
 var form_access_type_enum = __webpack_require__(376);
+// EXTERNAL MODULE: ./projects/nestjs-form-builder/src/utils/computed-field.utils.ts
+var computed_field_utils = __webpack_require__(801);
 // EXTERNAL MODULE: ./projects/nestjs-form-builder/src/utils/permission.utils.ts
 var permission_utils = __webpack_require__(988);
 // EXTERNAL MODULE: ./projects/nestjs-form-builder/src/services/form-builder-config.service.ts
@@ -1738,6 +1747,7 @@ function _ts_param(paramIndex, decorator) {
 
 
 
+
 class FormService extends classes_.ApiService {
     cacheManager;
     utilsService;
@@ -1751,6 +1761,9 @@ class FormService extends classes_.ApiService {
     async convertSingleDtoToEntity(dto, user) {
         let form = {};
         let isUpdate = false;
+        if (dto.schema) {
+            this.assertValidComputedFields(dto.schema);
+        }
         // NOTE: Using 'id' in dto check instead of instanceof - instanceof may not work after esbuild bundling
         if ('id' in dto && dto.id && typeof dto.id === 'string') {
             const dbData = await this.repository.findOne({
@@ -1776,6 +1789,9 @@ class FormService extends classes_.ApiService {
             ...form,
             ...dto
         };
+        if (!isUpdate) {
+            form.accessType ??= form_access_type_enum/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED;
+        }
         // Set company context if enabled
         const enableCompanyFeature = this.formBuilderConfig.isCompanyFeatureEnabled();
         if (enableCompanyFeature) {
@@ -1795,6 +1811,19 @@ class FormService extends classes_.ApiService {
         }
         return form;
     }
+    assertValidComputedFields(schema) {
+        const issue = (0,computed_field_utils/* .findComputedFieldIssue */.Qc)(schema);
+        if (!issue) return;
+        throw new common_.BadRequestException({
+            message: `Computed field "${issue.field}" is invalid (${issue.code}).`,
+            messageKey: message_keys/* .FORM_MESSAGES.INVALID_COMPUTED_FIELD */.Q.INVALID_COMPUTED_FIELD,
+            messageVariables: {
+                field: issue.field,
+                code: issue.code,
+                ...issue.variables
+            }
+        });
+    }
     async getSelectQuery(query, _user, select) {
         if (!select || !select.length) {
             select = [
@@ -2074,204 +2103,144 @@ FormService = _ts_decorate([
 
 },
 801(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
-/**
- * Computed Field Calculation Utilities
- *
- * This module provides functions to calculate computed field values
- * based on form submission data and computed field definitions.
- *
- * NOTE: Interface definitions here mirror @flusys/ng-form-builder interfaces
- * but are defined separately to avoid cross-package dependencies.
- * Both use compatible JSON structures for form schema serialization.
- *
- * @see FLUSYS_NG/projects/ng-form-builder/interfaces/computed-field.interface.ts
- */ // ============================================================================
-// Type Definitions
-// ============================================================================
-// ============================================================================
-// Type Guards & Helpers
-// ============================================================================
-function isObject(value) {
-    return typeof value === 'object' && value !== null;
-}
-function isDirectValueConfig(config) {
-    return isObject(config) && config.type === 'direct' && 'value' in config;
+/* import */ var _flusys_nestjs_shared_utils__rspack_import_0 = __webpack_require__(216);
+
+/** A field reference to an earlier computed field: `computed.<key>`. */ const COMPUTED_REF_PREFIX = 'computed.';
+const COMPUTED_KEY_PATTERN = /^[A-Za-z_]\w*$/;
+function asSchema(schema) {
+    return typeof schema === 'object' && schema !== null ? schema : {};
 }
-function isFieldReferenceConfig(config) {
-    return isObject(config) && config.type === 'field_reference' && 'fieldId' in config;
+function formFields(schema) {
+    return (schema.sections ?? []).flatMap((section)=>section.fields ?? []).filter((field)=>typeof field?.id === 'string');
 }
-function isArithmeticConfig(config) {
-    return isObject(config) && config.type === 'arithmetic' && 'operation' in config && 'operands' in config && Array.isArray(config.operands);
+/** References resolve by field id, by field name (what templates use), or `computed.<key>`. */ function createResolver(data, fields, computed) {
+    const idByName = new Map(fields.filter((f)=>f.name).map((f)=>[
+            f.name,
+            f.id
+        ]));
+    return (ref)=>{
+        if (ref.startsWith(COMPUTED_REF_PREFIX)) {
+            const key = ref.slice(COMPUTED_REF_PREFIX.length);
+            return Object.hasOwn(computed, key) ? computed[key] : undefined;
+        }
+        if (Object.hasOwn(data, ref)) return data[ref];
+        const id = idByName.get(ref);
+        return id !== undefined && Object.hasOwn(data, id) ? data[id] : undefined;
+    };
 }
-function isEmptyValue(value) {
-    return value === null || value === undefined || value === '' || Array.isArray(value) && value.length === 0;
+function castValue(value, valueType) {
+    if (value === null || value === undefined) return null;
+    switch(valueType){
+        case 'number':
+            try {
+                return (0,_flusys_nestjs_shared_utils__rspack_import_0.expressionToNumber)(value);
+            } catch  {
+                return null;
+            }
+        case 'boolean':
+            if (typeof value === 'boolean') return value;
+            return [
+                'true',
+                '1',
+                'yes'
+            ].includes(((0,_flusys_nestjs_shared_utils__rspack_import_0.expressionToText)(value) ?? '').trim().toLowerCase());
+        default:
+            return (0,_flusys_nestjs_shared_utils__rspack_import_0.expressionToText)(value);
+    }
 }
-/**
- * Normalize operator to uppercase string (handles both enum and string values)
- */ function normalizeOperator(op) {
-    const strOp = String(op).toUpperCase();
-    return strOp === 'OR' ? 'OR' : 'AND';
+function computeField(field, ctx) {
+    for (const rule of field.rules ?? []){
+        if (!rule.condition || (0,_flusys_nestjs_shared_utils__rspack_import_0.evaluateConditionGroup)(rule.condition, ctx)) return (0,_flusys_nestjs_shared_utils__rspack_import_0.evaluateExpression)(rule.value, ctx);
+    }
+    return field.defaultValue ?? null;
 }
 /**
- * Calculate all computed fields for a form submission
- *
- * @param formData - The submitted form data (field values by field ID)
- * @param computedFields - Array of computed field definitions from form settings
- * @returns Object containing computed field values keyed by their key property
- */ function calculateComputedFields(formData, computedFields) {
-    if (!computedFields || computedFields.length === 0) {
-        return {};
-    }
+ * Computed values for a submission, keyed by each computed field's `key`. Fields run in order,
+ * so a field may use earlier ones (`computed.<key>`); a field whose rules fail at run time gets
+ * its default value instead of failing the submission.
+ */ function calculateComputedFields(data, schema) {
+    const parsed = asSchema(schema);
+    const computedFields = parsed.settings?.computedFields ?? [];
     const result = {};
+    if (computedFields.length === 0) return result;
+    const ctx = {
+        resolveRef: createResolver(data, formFields(parsed), result)
+    };
     for (const field of computedFields){
+        let value;
         try {
-            const value = calculateComputedField(formData, field);
-            result[field.key] = value;
-        } catch (error) {
-            // If calculation fails, use default value or null
-            result[field.key] = field.defaultValue ?? null;
+            value = computeField(field, ctx);
+        } catch  {
+            value = field.defaultValue ?? null;
         }
+        result[field.key] = castValue(value, field.valueType);
     }
     return result;
 }
-/**
- * Calculate a single computed field value
- */ function calculateComputedField(formData, field) {
-    // Evaluate rules in order, first matching rule wins
-    for (const rule of field.rules){
-        if (evaluateCondition(formData, rule.condition)) {
-            return executeComputation(formData, rule.computation, field.valueType);
+/** First problem in the schema's computed fields, or null. Run on save so authors see it there, not at submit. */ function findComputedFieldIssue(schema) {
+    const parsed = asSchema(schema);
+    const computedFields = parsed.settings?.computedFields ?? [];
+    const fields = formFields(parsed);
+    const knownRefs = new Set(fields.flatMap((f)=>f.name ? [
+            f.id,
+            f.name
+        ] : [
+            f.id
+        ]));
+    const earlierKeys = new Set();
+    for (const field of computedFields){
+        const label = String(field?.name || field?.key || '');
+        if (typeof field?.key !== 'string' || !COMPUTED_KEY_PATTERN.test(field.key)) {
+            return {
+                field: label,
+                code: 'invalid_key',
+                variables: {
+                    key: String(field?.key ?? '')
+                }
+            };
         }
-    }
-    // No rule matched, return default
-    return field.defaultValue ?? null;
-}
-/**
- * Evaluate a condition group
- */ function evaluateCondition(formData, conditionGroup) {
-    // No condition = always true
-    if (!conditionGroup || !conditionGroup.conditions || conditionGroup.conditions.length === 0) {
-        return true;
-    }
-    const results = conditionGroup.conditions.map((condition)=>evaluateSingleCondition(formData, condition));
-    // Normalize operator to handle both string and enum values
-    const operator = normalizeOperator(conditionGroup.operator);
-    if (operator === 'AND') {
-        return results.every((r)=>r);
-    } else {
-        return results.some((r)=>r);
-    }
-}
-/**
- * Evaluate a single condition
- */ function evaluateSingleCondition(formData, condition) {
-    const fieldValue = formData[condition.fieldId];
-    const compareValue = condition.value;
-    switch(condition.comparison){
-        case 'equals':
-            return fieldValue === compareValue || String(fieldValue) === String(compareValue);
-        case 'not_equals':
-            return fieldValue !== compareValue && String(fieldValue) !== String(compareValue);
-        case 'is_empty':
-            return isEmptyValue(fieldValue);
-        case 'is_not_empty':
-            return !isEmptyValue(fieldValue);
-        case 'contains':
-            return String(fieldValue).includes(String(compareValue));
-        case 'not_contains':
-            return !String(fieldValue).includes(String(compareValue));
-        case 'starts_with':
-            return String(fieldValue).startsWith(String(compareValue));
-        case 'ends_with':
-            return String(fieldValue).endsWith(String(compareValue));
-        case 'greater_than':
-            return Number(fieldValue) > Number(compareValue);
-        case 'less_than':
-            return Number(fieldValue) < Number(compareValue);
-        case 'greater_or_equal':
-            return Number(fieldValue) >= Number(compareValue);
-        case 'less_or_equal':
-            return Number(fieldValue) <= Number(compareValue);
-        case 'is_before':
-            return new Date(String(fieldValue)) < new Date(String(compareValue));
-        case 'is_after':
-            return new Date(String(fieldValue)) > new Date(String(compareValue));
-        case 'is_checked':
-            return fieldValue === true || fieldValue === 'true' || fieldValue === 1;
-        case 'is_not_checked':
-            return fieldValue === false || fieldValue === 'false' || fieldValue === 0 || !fieldValue;
-        case 'is_any_of':
-        case 'in':
-            return Array.isArray(compareValue) && compareValue.includes(fieldValue);
-        case 'is_none_of':
-        case 'not_in':
-            return !Array.isArray(compareValue) || !compareValue.includes(fieldValue);
-        default:
-            return false;
-    }
-}
-/**
- * Execute a computation and return the result
- */ function executeComputation(formData, computation, valueType) {
-    const { config } = computation;
-    // Use type guards for safe access
-    if (computation.type === 'direct' && isDirectValueConfig(config)) {
-        return valueType === 'number' ? Number(config.value) : String(config.value);
-    }
-    if (computation.type === 'field_reference' && isFieldReferenceConfig(config)) {
-        const value = formData[config.fieldId];
-        if (value === null || value === undefined) {
-            return null;
+        if (earlierKeys.has(field.key)) return {
+            field: label,
+            code: 'duplicate_key',
+            variables: {
+                key: field.key
+            }
+        };
+        if (!Array.isArray(field.rules)) return {
+            field: label,
+            code: 'invalid_node',
+            variables: {
+                type: 'rules'
+            }
+        };
+        const isKnownRef = (ref)=>knownRefs.has(ref) || ref.startsWith(COMPUTED_REF_PREFIX) && earlierKeys.has(ref.slice(COMPUTED_REF_PREFIX.length));
+        try {
+            for (const rule of field.rules){
+                if (rule.condition) (0,_flusys_nestjs_shared_utils__rspack_import_0.assertValidConditionGroup)(rule.condition, {
+                    isKnownRef
+                });
+                (0,_flusys_nestjs_shared_utils__rspack_import_0.assertValidExpression)(rule.value, {
+                    isKnownRef
+                });
+            }
+        } catch (error) {
+            if ((0,_flusys_nestjs_shared_utils__rspack_import_0.isExpressionError)(error)) return {
+                field: label,
+                code: error.code,
+                variables: error.variables
+            };
+            throw error;
         }
-        return valueType === 'number' ? Number(value) : String(value);
+        earlierKeys.add(field.key);
     }
-    if (computation.type === 'arithmetic' && isArithmeticConfig(config)) {
-        return calculateArithmetic(formData, config);
-    }
-    // Unknown computation type
     return null;
 }
-/**
- * Perform arithmetic calculation
- */ function calculateArithmetic(formData, config) {
-    const values = config.operands.map((operand)=>{
-        if (operand.type === 'constant') {
-            return operand.value ?? 0;
-        } else {
-            const fieldValue = formData[operand.fieldId ?? ''];
-            return fieldValue !== null && fieldValue !== undefined ? Number(fieldValue) : 0;
-        }
-    });
-    if (values.length === 0) {
-        return null;
-    }
-    switch(config.operation){
-        case 'sum':
-        case 'increment':
-            return values.reduce((acc, val)=>acc + val, 0);
-        case 'subtract':
-        case 'decrement':
-            return values.reduce((acc, val, idx)=>idx === 0 ? val : acc - val, 0);
-        case 'multiply':
-            return values.reduce((acc, val)=>acc * val, 1);
-        case 'divide':
-            {
-                const [first, ...rest] = values;
-                return rest.reduce((acc, val)=>val !== 0 ? acc / val : acc, first);
-            }
-        case 'average':
-            return values.reduce((acc, val)=>acc + val, 0) / values.length;
-        case 'min':
-            return Math.min(...values);
-        case 'max':
-            return Math.max(...values);
-        default:
-            return null;
-    }
-}
 
 __webpack_require__.d(__webpack_exports__, {
-  X: () => (calculateComputedFields)
+  Qc: () => (findComputedFieldIssue),
+  XZ: () => (calculateComputedFields)
+}, {
+  xI: COMPUTED_REF_PREFIX
 });
 
 

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/entities/index.js

@@ -104,7 +104,7 @@ _ts_decorate([
     (0,external_typeorm_.Column)({
         type: 'varchar',
         length: 50,
-        default: 'AUTHENTICATED',
+        default: form_access_type_enum/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED,
         name: 'access_type'
     }),
     _ts_metadata("design:type", typeof form_access_type_enum/* .FormAccessType */.h === "undefined" ? Object : form_access_type_enum/* .FormAccessType */.h)

package/fesm/index.js

@@ -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,7 +237,8 @@ __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),
   EY: () => (/* reexport */ permission_utils/* .hasFormPermission */.E)
@@ -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__hasFormPermission = __webpack_exports__.EY;
-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__hasFormPermission as hasFormPermission };
+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/package.json

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

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

@@ -18,15 +18,18 @@ export declare class FormResultService extends ApiService<CreateFormResultDto, U
     private readonly permissionResolver?;
     private readonly permissionCache?;
     private formRepository;
-    private static readonly submissionLocks;
+    private readonly resultLogger;
+    private static readonly SUBMISSION_CLAIM_TTL_MS;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider, formEmailAuthService: FormEmailAuthService, permissionResolver?: IPermissionResolver | undefined, permissionCache?: SharedPermissionCacheService | undefined);
+    protected cacheDependencies(): string[];
     private ensureFormRepositoryInitialized;
-    private withSubmissionLock;
+    private withSubmissionClaim;
     private getActiveForm;
     private applyCompanyFilterToQuery;
     private static readonly PUBLICLY_SUBMITTABLE_ACCESS_TYPES;
     private validateSubmissionAccess;
     private resolveEmailVerifiedSubmitter;
+    private isSingleResponse;
     private assertSingleResponseNotExceeded;
     private buildUserDraftWhere;
     getSelectQuery(query: SelectQueryBuilder<FormResult>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
@@ -41,10 +44,10 @@ export declare class FormResultService extends ApiService<CreateFormResultDto, U
     protected convertEntityToResponseDto(entity: FormResult, _isRaw: boolean): IFormResult;
     submitForm(dto: SubmitFormDto, user: ILoggedUserInfo | null, isPublic?: boolean): Promise<IFormResult>;
     private persistSubmission;
+    private writeSubmission;
     getMyDraft(formId: string, user: ILoggedUserInfo): Promise<IFormResult | null>;
     updateDraft(draftId: string, dto: SubmitFormDto, user: ILoggedUserInfo): Promise<IFormResult>;
     private publishSubmissionEvent;
-    private invalidateResultCache;
     getByFormId(formId: string, user: ILoggedUserInfo | null, pagination?: {
         page?: number;
         pageSize?: number;

package/services/form.service.d.ts

@@ -17,6 +17,7 @@ export declare class FormService extends ApiService<CreateFormDto, UpdateFormDto
     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;

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;