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

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

@@ -1720,12 +1720,15 @@ class FieldContextRegistryService {
             },
         };
     }
-        createDisplayOnlyContext(fieldPath, customFunctions) {
-        const formValue = this.rootFormRegistry.formValue();
+        createDisplayOnlyContext(fieldPath, customFunctions, arrayScope) {
+        const rootFormValue = this.rootFormRegistry.formValue();
+        if (arrayScope) {
+            return this.buildArrayScopedContext(rootFormValue, arrayScope, undefined, customFunctions, true);
+        }
         const rootFormSignal = this.rootFormRegistry.rootForm;
         return {
             fieldValue: undefined,
-            formValue,
+            formValue: rootFormValue,
             fieldPath,
             customFunctions: customFunctions || {},
             externalData: this.resolveExternalData(true),
@@ -2182,6 +2185,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);
@@ -2195,16 +2210,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) {
@@ -2221,10 +2241,13 @@ 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('.');
@@ -2249,7 +2272,9 @@ function createDebouncedLogicFunction(expression, debounceMs) {
         });
                 return debouncedValue() ?? false;
     };
+        if (cacheable) {
         cacheService.debouncedLogicFunctionCache.set(cacheKey, fn);
+    }
     return fn;
 }
 
@@ -2328,7 +2353,10 @@ function evaluateLogicCondition(condition, ctx) {
         if (isFormStateCondition(condition)) {
         return evaluateFormStateCondition(condition, ctx);
     }
-        const formValue = (ctx.formValue ?? ctx.form().value());
+                        if (ctx.evaluationContext) {
+        return evaluateCondition(condition, ctx.evaluationContext());
+    }
+                    const formValue = (ctx.formValue ?? ctx.form().value());
     const evaluationContext = {
         fieldValue: undefined,
         formValue,
@@ -2356,6 +2384,7 @@ function evaluateLogicOfType(fieldLogic, logicType, ctx) {
     const buttonCtx = {
         form: ctx.form,
         formValue: ctx.formValue,
+        evaluationContext: ctx.evaluationContext,
         logger: ctx.logger,
     };
     return fieldLogic.filter((logic) => logic.type === logicType).some((logic) => evaluateLogicCondition(logic.condition, buttonCtx));
@@ -2412,6 +2441,7 @@ function evaluateNonFieldHidden(ctx) {
         return evaluateLogicOfType(ctx.fieldLogic, 'hidden', {
             form: ctx.form,
             formValue: ctx.formValue,
+            evaluationContext: ctx.evaluationContext,
             logger: ctx.logger,
         });
     }
@@ -2428,6 +2458,7 @@ function evaluateNonFieldDisabled(ctx) {
         return evaluateLogicOfType(ctx.fieldLogic, 'disabled', {
             form: ctx.form,
             formValue: ctx.formValue,
+            evaluationContext: ctx.evaluationContext,
             logger: ctx.logger,
         });
     }
@@ -2436,6 +2467,17 @@ function evaluateNonFieldDisabled(ctx) {
 function resolveNonFieldDisabled(ctx) {
     return computed(() => evaluateNonFieldDisabled(ctx));
 }
+function injectNonFieldEvaluationContext(fieldDef, options = {}) {
+    const fieldContextRegistry = inject(FieldContextRegistryService);
+    const functionRegistry = inject(FunctionRegistryService);
+                const arrayContext = options.scopeToArrayItem ? inject(ARRAY_CONTEXT, { optional: true }) : null;
+    return () => {
+        const arrayScope = arrayContext
+            ? { arrayKey: arrayContext.arrayKey, index: arrayContext.index(), localKey: fieldDef.key ?? '' }
+            : undefined;
+        return fieldContextRegistry.createDisplayOnlyContext(fieldDef.key ?? '', functionRegistry.getCustomFunctions(), arrayScope);
+    };
+}
 
 function isFunctionHttpValidator(config) {
     const c = config;
@@ -2989,7 +3031,7 @@ function buildClassName(fieldDef) {
     return classes.length > 0 ? classes.join(' ') : undefined;
 }
 
-function applyHiddenLogic(inputs, fieldDef, rootFormRegistry) {
+function applyHiddenLogic(inputs, fieldDef, rootFormRegistry, evaluationContext) {
     const rootForm = rootFormRegistry.rootForm();
     if (rootForm && (fieldDef.hidden === true || fieldDef.logic?.some((l) => l.type === 'hidden'))) {
                         inputs['hidden'] = evaluateNonFieldHidden({
@@ -2997,12 +3039,14 @@ function applyHiddenLogic(inputs, fieldDef, rootFormRegistry) {
             fieldLogic: fieldDef.logic,
             explicitValue: fieldDef.hidden,
             formValue: rootFormRegistry.formValue(),
+            evaluationContext,
         });
     }
 }
 
 function arrayFieldMapper(fieldDef) {
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef, { scopeToArrayItem: true });
     const className = buildClassName(fieldDef);
     return computed(() => {
         const inputs = {
@@ -3010,7 +3054,7 @@ function arrayFieldMapper(fieldDef) {
             field: fieldDef,
             ...(className !== undefined && { className }),
         };
-        applyHiddenLogic(inputs, fieldDef, rootFormRegistry);
+        applyHiddenLogic(inputs, fieldDef, rootFormRegistry, evaluationContext);
         return inputs;
     });
 }
@@ -3055,6 +3099,7 @@ function baseFieldMapper(fieldDef) {
 
 function containerFieldMapper(fieldDef) {
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef, { scopeToArrayItem: true });
     const className = buildClassName(fieldDef);
     return computed(() => {
                                                         const containerField = { ...fieldDef, wrappers: undefined, skipAutoWrappers: undefined, skipDefaultWrappers: undefined };
@@ -3063,13 +3108,14 @@ function containerFieldMapper(fieldDef) {
             field: containerField,
             ...(className !== undefined && { className }),
         };
-        applyHiddenLogic(inputs, fieldDef, rootFormRegistry);
+        applyHiddenLogic(inputs, fieldDef, rootFormRegistry, evaluationContext);
         return inputs;
     });
 }
 
 function groupFieldMapper(fieldDef) {
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef, { scopeToArrayItem: true });
     const className = buildClassName(fieldDef);
     return computed(() => {
         const inputs = {
@@ -3077,7 +3123,7 @@ function groupFieldMapper(fieldDef) {
             field: fieldDef,
             ...(className !== undefined && { className }),
         };
-        applyHiddenLogic(inputs, fieldDef, rootFormRegistry);
+        applyHiddenLogic(inputs, fieldDef, rootFormRegistry, evaluationContext);
         return inputs;
     });
 }
@@ -3085,6 +3131,7 @@ function groupFieldMapper(fieldDef) {
 const ROW_WRAPPERS = [{ type: 'row' }];
 function rowFieldMapper(fieldDef) {
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef, { scopeToArrayItem: true });
     const className = buildClassName(fieldDef);
     return computed(() => {
                                                         const containerField = { ...fieldDef, type: 'container', wrappers: ROW_WRAPPERS };
@@ -3093,7 +3140,7 @@ function rowFieldMapper(fieldDef) {
             field: containerField,
             ...(className !== undefined && { className }),
         };
-        applyHiddenLogic(inputs, fieldDef, rootFormRegistry);
+        applyHiddenLogic(inputs, fieldDef, rootFormRegistry, evaluationContext);
         return inputs;
     });
 }
@@ -3109,11 +3156,12 @@ function pageFieldMapper(fieldDef) {
 
 function textFieldMapper(fieldDef) {
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef, { scopeToArrayItem: true });
     const defaultProps = inject(DEFAULT_PROPS);
         return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps());
         const inputs = { ...baseInputs };
-        applyHiddenLogic(inputs, fieldDef, rootFormRegistry);
+        applyHiddenLogic(inputs, fieldDef, rootFormRegistry, evaluationContext);
         return inputs;
     });
 }
@@ -3261,16 +3309,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" });
@@ -3300,19 +3355,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,
@@ -3605,5 +3647,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, 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, 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 };
 //# sourceMappingURL=ng-forge-dynamic-forms-internal.mjs.map