@ng-forge/dynamic-forms 1.1.0-next.2 → 1.1.0-next.4

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);
 }
@@ -1601,14 +1610,17 @@ class FieldContextRegistryService {
             return this.buildArrayScopedContext(rootFormValue, arrayScope, fieldValue, customFunctions, false, fieldContext);
         }
                                         const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         return {
             fieldValue,
             formValue: rootFormValue,
             fieldPath: localKey,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(false),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get fieldState() {
                 return readFieldStateInfo(extractFieldState(fieldContext), false);
             },
@@ -1639,6 +1651,7 @@ class FieldContextRegistryService {
             }
         }
                                 const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         const fieldStateGetter = fieldContext ? () => readFieldStateInfo(extractFieldState(fieldContext), reactive) : () => undefined;
         const formFieldStateGetter = () => createFormFieldStateMap((reactive ? rootFormSignal() : untracked(rootFormSignal)), reactive);
                 if (!scopedFormValue) {
@@ -1647,9 +1660,11 @@ class FieldContextRegistryService {
                 formValue: rootFormValue,
                 fieldPath: localKey,
                 customFunctions: customFunctions || {},
-                externalData: this.resolveExternalData(reactive),
                 logger: this.logger,
                 deprecationTracker: this.deprecationTracker ?? undefined,
+                get externalData() {
+                    return resolveExternalData();
+                },
                 get fieldState() {
                     return fieldStateGetter();
                 },
@@ -1666,9 +1681,11 @@ class FieldContextRegistryService {
             arrayPath: arrayKey,
             fieldPath: `${arrayKey}.${index}.${localKey}`,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(reactive),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get fieldState() {
                 return fieldStateGetter();
             },
@@ -1677,11 +1694,11 @@ class FieldContextRegistryService {
             },
         };
     }
-        resolveExternalData(reactive) {
+        resolveExternalData() {
         const externalDataSignal = this.externalDataSignal;
         if (!externalDataSignal)
             return undefined;
-        const externalDataRecord = reactive ? externalDataSignal() : untracked(() => externalDataSignal());
+        const externalDataRecord = externalDataSignal();
         if (!externalDataRecord) {
             return undefined;
         }
@@ -1690,7 +1707,7 @@ class FieldContextRegistryService {
             if (!isSignal(value)) {
                 throw new DynamicFormError(`externalData["${key}"] must be a Signal. Got: ${typeof value}. Wrap it with signal(yourValue).`);
             }
-            resolved[key] = reactive ? value() : untracked(() => value());
+            resolved[key] = value();
         }
         return resolved;
     }
@@ -1704,14 +1721,17 @@ class FieldContextRegistryService {
         }
         const localKey = this.extractFieldPath(fieldContext);
         const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         return {
             fieldValue,
             formValue: rootFormValue,
             fieldPath: localKey,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(true),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get fieldState() {
                 return readFieldStateInfo(extractFieldState(fieldContext), true);
             },
@@ -1726,14 +1746,17 @@ class FieldContextRegistryService {
             return this.buildArrayScopedContext(rootFormValue, arrayScope, undefined, customFunctions, true);
         }
         const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         return {
             fieldValue: undefined,
             formValue: rootFormValue,
             fieldPath,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(true),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get formFieldState() {
                 return createFormFieldStateMap(rootFormSignal(), true);
             },
@@ -2250,7 +2273,7 @@ function createDebouncedLogicFunction(expression, debounceMs) {
         }
     }
     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 */
@@ -2539,47 +2562,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) {
@@ -2587,39 +2615,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':
@@ -2636,7 +2659,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':
@@ -2651,9 +2674,6 @@ function applyValidator(config, fieldPath) {
     }
 }
 function applyCustomValidator(config, fieldPath) {
-    if (isCrossFieldValidator(config)) {
-        return;
-    }
     let validatorFn;
     if (config.expression) {
         validatorFn = createExpressionValidator(config);
@@ -3522,8 +3542,8 @@ function isEqualInternal(a, b, seenA, seenB) {
     }
         const recordA = a;
     const recordB = b;
-        const keysA = [...Object.keys(recordA), ...Object.getOwnPropertySymbols(recordA)];
-    const keysB = [...Object.keys(recordB), ...Object.getOwnPropertySymbols(recordB)];
+                    const keysA = Object.keys(recordA);
+    const keysB = Object.keys(recordB);
     if (keysA.length !== keysB.length)
         return false;
         const keySetB = new Set(keysB);
@@ -3647,5 +3667,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