@ng-forge/dynamic-forms 1.1.0-next.1 → 1.1.0-next.3

package/fesm2022/ng-forge-dynamic-forms-internal.mjs

@@ -392,6 +392,15 @@ function hasCrossFieldWhenCondition(config, context) {
     }
     return isCrossFieldExpression(config.when, context);
 }
+function requiresTreeValidation(config) {
+    if (isResourceBasedValidator(config)) {
+        return false;
+    }
+    if (config.type === 'custom') {
+        return isCrossFieldValidator(config);
+    }
+    return isCrossFieldBuiltInValidator(config);
+}
 function isCrossFieldStateLogic(config, context) {
     return isCrossFieldExpression(config.condition, context);
 }
@@ -2185,6 +2194,18 @@ function validateNoNestedHttpConditions(expression) {
         }
     }
 }
+function containsInlineFunction(expression) {
+    if (expression.type === 'and' || expression.type === 'or') {
+        return expression.conditions.some(containsInlineFunction);
+    }
+    if (expression.type === 'custom') {
+        return typeof expression.fn === 'function';
+    }
+    if (expression.type === 'async') {
+        return typeof expression.asyncFn === 'function';
+    }
+    return false;
+}
 function createLogicFunction(expression) {
         if (expression?.type === 'async') {
         return createAsyncConditionLogicFunction(expression);
@@ -2198,16 +2219,21 @@ function createLogicFunction(expression) {
         const functionRegistry = inject(FunctionRegistryService);
     const fieldContextRegistry = inject(FieldContextRegistryService);
     const cacheService = inject(LogicFunctionCacheService);
+        const cacheable = !expression || !containsInlineFunction(expression);
         const cacheKey = stableStringify(expression);
+        if (cacheable) {
         const cached = cacheService.logicFunctionCache.get(cacheKey);
-    if (cached) {
-        return cached;
+        if (cached) {
+            return cached;
+        }
     }
     const fn = (ctx) => {
                         const evaluationContext = fieldContextRegistry.createReactiveEvaluationContext(ctx, functionRegistry.getCustomFunctions());
         return evaluateCondition(expression, evaluationContext);
     };
+        if (cacheable) {
         cacheService.logicFunctionCache.set(cacheKey, fn);
+    }
     return fn;
 }
 function createDebouncedLogicFunction(expression, debounceMs) {
@@ -2224,13 +2250,16 @@ function createDebouncedLogicFunction(expression, debounceMs) {
     const fieldContextRegistry = inject(FieldContextRegistryService);
     const injector = inject(Injector);
     const cacheService = inject(LogicFunctionCacheService);
+        const cacheable = !expression || !containsInlineFunction(expression);
         const cacheKey = `${stableStringify(expression)}:${debounceMs}`;
+        if (cacheable) {
         const cached = cacheService.debouncedLogicFunctionCache.get(cacheKey);
-    if (cached) {
-        return cached;
+        if (cached) {
+            return cached;
+        }
     }
     const fn = (ctx) => {
-        const contextKey = safeReadPathKeys(ctx).join('.');
+                        const contextKey = safeReadPathKeys(ctx).join('.');
         let signalPair = cacheService.debouncedSignalStore.get(contextKey);
         if (!signalPair) {
                         const immediateValue = signal(false, /* @ts-ignore */
@@ -2252,7 +2281,9 @@ function createDebouncedLogicFunction(expression, debounceMs) {
         });
                 return debouncedValue() ?? false;
     };
+        if (cacheable) {
         cacheService.debouncedLogicFunctionCache.set(cacheKey, fn);
+    }
     return fn;
 }
 
@@ -2517,47 +2548,52 @@ function createDynamicValueFunction(expression) {
     return fn;
 }
 
-function applyEmailValidator(path) {
-    email(path);
+function applyEmailValidator(path, when) {
+    email(path, when ? { when: when } : undefined);
 }
-function applyMinValidator(path, value, expression) {
+function applyMinValidator(path, value, expression, when) {
+    const opts = when ? { when: when } : undefined;
     if (expression) {
-        min(path, createDynamicValueFunction(expression));
+                min(path, createDynamicValueFunction(expression), opts);
     }
     else {
-        min(path, value);
+        min(path, value, opts);
     }
 }
-function applyMaxValidator(path, value, expression) {
+function applyMaxValidator(path, value, expression, when) {
+    const opts = when ? { when: when } : undefined;
     if (expression) {
-        max(path, createDynamicValueFunction(expression));
+                max(path, createDynamicValueFunction(expression), opts);
     }
     else {
-        max(path, value);
+        max(path, value, opts);
     }
 }
-function applyMinLengthValidator(path, value, expression) {
+function applyMinLengthValidator(path, value, expression, when) {
+    const opts = when ? { when: when } : undefined;
     if (expression) {
-        minLength(path, createDynamicValueFunction(expression));
+        minLength(path, createDynamicValueFunction(expression), opts);
     }
     else {
-        minLength(path, value);
+        minLength(path, value, opts);
     }
 }
-function applyMaxLengthValidator(path, value, expression) {
+function applyMaxLengthValidator(path, value, expression, when) {
+    const opts = when ? { when: when } : undefined;
     if (expression) {
-        maxLength(path, createDynamicValueFunction(expression));
+        maxLength(path, createDynamicValueFunction(expression), opts);
     }
     else {
-        maxLength(path, value);
+        maxLength(path, value, opts);
     }
 }
-function applyPatternValidator(path, value, expression) {
+function applyPatternValidator(path, value, expression, when) {
+    const opts = when ? { when: when } : undefined;
     if (expression) {
-        pattern(path, createDynamicValueFunction(expression));
+        pattern(path, createDynamicValueFunction(expression), opts);
     }
     else {
-        pattern(path, value);
+        pattern(path, value, opts);
     }
 }
 function createConditionalLogic(when) {
@@ -2565,39 +2601,34 @@ function createConditionalLogic(when) {
 }
 function applyValidator(config, fieldPath) {
     const path = fieldPath;
-    if (!isResourceBasedValidator(config) && (isCrossFieldBuiltInValidator(config) || hasCrossFieldWhenCondition(config))) {
+    if (requiresTreeValidation(config)) {
         return;
     }
     switch (config.type) {
         case 'required':
-            if (config.when) {
-                required(path, { when: createLogicFunction(config.when) });
-            }
-            else {
-                required(path);
-            }
+            required(path, config.when ? { when: createConditionalLogic(config.when) } : undefined);
             break;
         case 'email':
-            applyEmailValidator(fieldPath);
+            applyEmailValidator(fieldPath, createConditionalLogic(config.when));
             break;
         case 'min':
             if (typeof config.value === 'number') {
-                applyMinValidator(fieldPath, config.value, config.expression);
+                applyMinValidator(fieldPath, config.value, config.expression, createConditionalLogic(config.when));
             }
             break;
         case 'max':
             if (typeof config.value === 'number') {
-                applyMaxValidator(fieldPath, config.value, config.expression);
+                applyMaxValidator(fieldPath, config.value, config.expression, createConditionalLogic(config.when));
             }
             break;
         case 'minLength':
             if (typeof config.value === 'number') {
-                applyMinLengthValidator(fieldPath, config.value, config.expression);
+                applyMinLengthValidator(fieldPath, config.value, config.expression, createConditionalLogic(config.when));
             }
             break;
         case 'maxLength':
             if (typeof config.value === 'number') {
-                applyMaxLengthValidator(fieldPath, config.value, config.expression);
+                applyMaxLengthValidator(fieldPath, config.value, config.expression, createConditionalLogic(config.when));
             }
             break;
         case 'pattern':
@@ -2614,7 +2645,7 @@ function applyValidator(config, fieldPath) {
                 else {
                     regexPattern = config.value;
                 }
-                applyPatternValidator(fieldPath, regexPattern, config.expression);
+                applyPatternValidator(fieldPath, regexPattern, config.expression, createConditionalLogic(config.when));
             }
             break;
         case 'custom':
@@ -2629,9 +2660,6 @@ function applyValidator(config, fieldPath) {
     }
 }
 function applyCustomValidator(config, fieldPath) {
-    if (isCrossFieldValidator(config)) {
-        return;
-    }
     let validatorFn;
     if (config.expression) {
         validatorFn = createExpressionValidator(config);
@@ -3287,16 +3315,23 @@ function isDisplayOnlyField(field) {
 }
 
 
+function dynamicTextToObservable(value, injector) {
+    if (value === undefined) {
+        return of('');
+    }
+    if (isObservable(value)) {
+        return value;
+    }
+    if (isSignal(value)) {
+                return untracked(() => toObservable(value, { injector }));
+    }
+    return of(String(value));
+}
+
 class DynamicTextPipe {
     injector = inject(Injector);
         transform(value) {
-        if (isObservable(value)) {
-            return value;
-        }
-        if (isSignal(value)) {
-            return toObservable(value, { injector: this.injector });
-        }
-        return of(value || '');
+                return dynamicTextToObservable(value ?? undefined, this.injector);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.1", ngImport: i0, type: DynamicTextPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
     static ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "22.0.1", ngImport: i0, type: DynamicTextPipe, isStandalone: true, name: "dynamicText" });
@@ -3326,19 +3361,6 @@ function applyMetaToElement(element, meta, previouslyApplied) {
     return newApplied;
 }
 
-function dynamicTextToObservable(value, injector) {
-    if (value === undefined) {
-        return of('');
-    }
-    if (isObservable(value)) {
-        return value;
-    }
-    if (isSignal(value)) {
-        return toObservable(value, { injector });
-    }
-    return of(String(value));
-}
-
 const INITIALIZATION_TIMEOUT_MS = new InjectionToken('INITIALIZATION_TIMEOUT_MS', {
     providedIn: 'root',
     factory: () => 10_000,
@@ -3631,5 +3653,5 @@ function createWarningTracker() {
 
 
 
-export { ADDON_ACTION_HANDLERS, ADDON_ACTION_REGISTRY, ADDON_TYPE_COMPONENT_CACHE, ADDON_TYPE_DEFINITIONS, ADDON_TYPE_REGISTRY, ARRAY_CONTEXT, AsyncConditionFunctionCacheService, ComponentInitializedEvent, DEFAULT_PROPS, DEFAULT_VALIDATION_MESSAGES, DEFAULT_WRAPPERS, DEPRECATION_WARNING_TRACKER, DF_FIELD_TEMPLATES, DfAddonSlot, DynamicFormError, DynamicFormLogger, DynamicTextPipe, DynamicValueFunctionCacheService, EMIT_FORM_VALUE_ON_EVENTS, EXTERNAL_DATA, EventBus, ExpressionParser, ExpressionParserError, FIELD_REGISTRY, FIELD_SIGNAL_CONTEXT, FORM_ID_PREFIX, FORM_OPTIONS, FieldContextRegistryService, FunctionRegistryService, GROUP_CONTEXT, HTTP_CONDITION_CACHE, HttpConditionCache, HttpConditionFunctionCacheService, INITIALIZATION_TIMEOUT_MS, LogicFunctionCacheService, NoopLogger, READONLY_FIELD_TREE_CACHE, RootFormRegistryService, TokenType, WRAPPER_AUTO_ASSOCIATIONS, WRAPPER_COMPONENT_CACHE, WRAPPER_REGISTRY, applyMetaToElement, applyValidator, applyValidators, arrayFieldMapper, assertNever, baseFieldMapper, buildBaseInputs, compareValues, containerFieldMapper, createAddonActionRegistry, createDebouncedLogicFunction, createDefaultDerivationLogConfig, createDynamicValueFunction, createFormFieldStateMap, createInitializationTracker, createLogicFunction, createWarningTracker, deepMergeDefaults, derivedFromDeferred, detectFormMode, dynamicTextToObservable, evaluateCondition, evaluateNonFieldDisabled, evaluateNonFieldHidden, extractExpressionDependencies, extractStringDependencies, getArrayLength, getChangedKeys, getFieldValueHandling, getNestedValue, groupFieldMapper, hasChildFields, hasCrossFieldWhenCondition, hasFormValue, hasNestedProperty, hasTargetProperty, injectAddonTypeRegistry, injectFieldSignalContext, injectFieldsSupportingAddons, injectNonFieldEvaluationContext, interpolateParams, isArrayField, isCheckedField, isContainerField, isCrossFieldBuiltInValidator, isCrossFieldExpression, isCrossFieldSchema, isCrossFieldStateLogic, isCrossFieldValidator, isDerivationLogicConfig, isDisplayOnlyField, isEqual, isFieldBoundContext, isFormStateCondition, isFunctionHttpValidator, isGenericContainerField, isGroupField, isHiddenField, isLeafField, isNonPagedForm, isPageField, isPagedForm, isResourceBasedValidator, isRowField, isSimplifiedArrayField, isStateLogicConfig, isValidNonPagedForm, isValidPagedForm, isValueBearingField, isValueField, isWrapperTypeDefinition, keyBy, mapValues, memoize, normalizeFieldsArray, omit, pageFieldMapper, readFieldStateInfo, resolveDynamicValue, resolveHttpRequest, resolveNextButtonDisabled, resolveNonFieldDisabled, resolveNonFieldHidden, resolveSubmitButtonDisabled, resolveTokens, rowFieldMapper, runPresetAction, setupInitializationTracking, shouldLog, textFieldMapper, toReadonlyFieldTree, toReadonlyFieldTreeCached, validatePageNesting, withPreviousValue, writeToFieldValue };
+export { ADDON_ACTION_HANDLERS, ADDON_ACTION_REGISTRY, ADDON_TYPE_COMPONENT_CACHE, ADDON_TYPE_DEFINITIONS, ADDON_TYPE_REGISTRY, ARRAY_CONTEXT, AsyncConditionFunctionCacheService, ComponentInitializedEvent, DEFAULT_PROPS, DEFAULT_VALIDATION_MESSAGES, DEFAULT_WRAPPERS, DEPRECATION_WARNING_TRACKER, DF_FIELD_TEMPLATES, DfAddonSlot, DynamicFormError, DynamicFormLogger, DynamicTextPipe, DynamicValueFunctionCacheService, EMIT_FORM_VALUE_ON_EVENTS, EXTERNAL_DATA, EventBus, ExpressionParser, ExpressionParserError, FIELD_REGISTRY, FIELD_SIGNAL_CONTEXT, FORM_ID_PREFIX, FORM_OPTIONS, FieldContextRegistryService, FunctionRegistryService, GROUP_CONTEXT, HTTP_CONDITION_CACHE, HttpConditionCache, HttpConditionFunctionCacheService, INITIALIZATION_TIMEOUT_MS, LogicFunctionCacheService, NoopLogger, READONLY_FIELD_TREE_CACHE, RootFormRegistryService, TokenType, WRAPPER_AUTO_ASSOCIATIONS, WRAPPER_COMPONENT_CACHE, WRAPPER_REGISTRY, applyMetaToElement, applyValidator, applyValidators, arrayFieldMapper, assertNever, baseFieldMapper, buildBaseInputs, buildClassName, compareValues, containerFieldMapper, createAddonActionRegistry, createDebouncedLogicFunction, createDefaultDerivationLogConfig, createDynamicValueFunction, createFormFieldStateMap, createInitializationTracker, createLogicFunction, createWarningTracker, deepMergeDefaults, derivedFromDeferred, detectFormMode, dynamicTextToObservable, evaluateCondition, evaluateNonFieldDisabled, evaluateNonFieldHidden, extractExpressionDependencies, extractStringDependencies, getArrayLength, getChangedKeys, getFieldValueHandling, getGridClassString, getNestedValue, groupFieldMapper, hasChildFields, hasCrossFieldWhenCondition, hasFormValue, hasNestedProperty, hasTargetProperty, injectAddonTypeRegistry, injectFieldSignalContext, injectFieldsSupportingAddons, injectNonFieldEvaluationContext, interpolateParams, isArrayField, isCheckedField, isContainerField, isCrossFieldBuiltInValidator, isCrossFieldExpression, isCrossFieldSchema, isCrossFieldStateLogic, isCrossFieldValidator, isDerivationLogicConfig, isDisplayOnlyField, isEqual, isFieldBoundContext, isFormStateCondition, isFunctionHttpValidator, isGenericContainerField, isGroupField, isHiddenField, isLeafField, isNonPagedForm, isPageField, isPagedForm, isResourceBasedValidator, isRowField, isSimplifiedArrayField, isStateLogicConfig, isValidNonPagedForm, isValidPagedForm, isValueBearingField, isValueField, isWrapperTypeDefinition, keyBy, mapValues, memoize, normalizeFieldsArray, omit, pageFieldMapper, readFieldStateInfo, requiresTreeValidation, resolveDynamicValue, resolveHttpRequest, resolveNextButtonDisabled, resolveNonFieldDisabled, resolveNonFieldHidden, resolveSubmitButtonDisabled, resolveTokens, rowFieldMapper, runPresetAction, setupInitializationTracking, shouldLog, textFieldMapper, toReadonlyFieldTree, toReadonlyFieldTreeCached, validatePageNesting, withPreviousValue, writeToFieldValue };
 //# sourceMappingURL=ng-forge-dynamic-forms-internal.mjs.map