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

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

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { inject, computed, signal, Injector, isDevMode, afterRenderEffect, input, Directive, untracked, InjectionToken, ElementRef, EnvironmentInjector, runInInjectionContext } from '@angular/core';
-import { injectFieldSignalContext, omit, buildBaseInputs, DEFAULT_PROPS, resolveNonFieldHidden, resolveNonFieldDisabled, RootFormRegistryService, ARRAY_CONTEXT, FORM_OPTIONS, resolveSubmitButtonDisabled, resolveNextButtonDisabled, dynamicTextToObservable, interpolateParams, isEqual, applyMetaToElement, DEFAULT_VALIDATION_MESSAGES, EventBus, resolveTokens, resolveDynamicValue, ADDON_ACTION_REGISTRY, writeToFieldValue } from '@ng-forge/dynamic-forms/internal';
+import { injectFieldSignalContext, omit, buildBaseInputs, DEFAULT_PROPS, resolveNonFieldHidden, resolveNonFieldDisabled, RootFormRegistryService, injectNonFieldEvaluationContext, ARRAY_CONTEXT, FORM_OPTIONS, resolveSubmitButtonDisabled, resolveNextButtonDisabled, dynamicTextToObservable, interpolateParams, isEqual, applyMetaToElement, DEFAULT_VALIDATION_MESSAGES, EventBus, resolveTokens, resolveDynamicValue, ADDON_ACTION_REGISTRY, writeToFieldValue } from '@ng-forge/dynamic-forms/internal';
 export { ADDON_ACTION_REGISTRY, ADDON_TYPE_COMPONENT_CACHE, ADDON_TYPE_DEFINITIONS, ADDON_TYPE_REGISTRY, ARRAY_CONTEXT, DEFAULT_PROPS, DEFAULT_VALIDATION_MESSAGES, DEFAULT_WRAPPERS, DfAddonSlot, DynamicTextPipe, EventBus, FIELD_REGISTRY, FIELD_SIGNAL_CONTEXT, FORM_OPTIONS, GROUP_CONTEXT, INITIALIZATION_TIMEOUT_MS, RootFormRegistryService, applyMetaToElement, applyValidator, applyValidators, arrayFieldMapper, baseFieldMapper, buildBaseInputs, containerFieldMapper, dynamicTextToObservable, getArrayLength, groupFieldMapper, injectAddonTypeRegistry, injectFieldSignalContext, injectFieldsSupportingAddons, interpolateParams, isCheckedField, isEqual, isValueField, pageFieldMapper, resolveDynamicValue, resolveNonFieldDisabled, resolveNonFieldHidden, resolveTokens, rowFieldMapper, runPresetAction, textFieldMapper, toReadonlyFieldTree, withPreviousValue, writeToFieldValue } from '@ng-forge/dynamic-forms/internal';
 import { DynamicFormLogger, AppendArrayItemEvent, PrependArrayItemEvent, InsertArrayItemEvent, RemoveAtIndexEvent, PopArrayItemEvent, ShiftArrayItemEvent, NextPageEvent, PreviousPageEvent } from '@ng-forge/dynamic-forms';
 export { BUILT_IN_FIELDS, createWrappers, isWrappersBundle, wrapperProps } from '@ng-forge/dynamic-forms';
@@ -125,7 +125,7 @@ function sliderFieldMapper(fieldDef) {
     });
 }
 
-function applyNonFieldLogic(rootFormRegistry, fieldDef) {
+function applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext) {
     const result = {};
     const rootForm = rootFormRegistry.rootForm();
     if (rootForm) {
@@ -134,6 +134,7 @@ function applyNonFieldLogic(rootFormRegistry, fieldDef) {
                 form: rootForm,
                 fieldLogic: fieldDef.logic,
                 explicitValue: fieldDef.hidden,
+                evaluationContext,
             });
             result.hidden = hiddenSignal();
         }
@@ -142,6 +143,7 @@ function applyNonFieldLogic(rootFormRegistry, fieldDef) {
                 form: rootForm,
                 fieldLogic: fieldDef.logic,
                 explicitValue: fieldDef.disabled,
+                evaluationContext,
             });
             result.disabled = disabledSignal();
         }
@@ -156,7 +158,7 @@ function applyNonFieldLogic(rootFormRegistry, fieldDef) {
     }
     return result;
 }
-function resolveHiddenValue(rootForm, fieldDef) {
+function resolveHiddenValue(rootForm, fieldDef, evaluationContext) {
     if (!rootForm) {
         return fieldDef.hidden;
     }
@@ -165,23 +167,29 @@ function resolveHiddenValue(rootForm, fieldDef) {
             form: rootForm,
             fieldLogic: fieldDef.logic,
             explicitValue: fieldDef.hidden,
+            evaluationContext,
                     })();
     }
     return undefined;
 }
+function injectNonFieldLogicResolver(fieldDef) {
+    const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
+    return () => applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext);
+}
 
 function buttonFieldMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
-    const rootFormRegistry = inject(RootFormRegistryService);
+    const resolveLogic = injectNonFieldLogicResolver(fieldDef);
     return computed(() => {
         const inputs = buildBaseInputs(fieldDef, defaultProps());
-                inputs['event'] = fieldDef.event;
+        inputs['event'] = fieldDef.event;
         if (fieldDef.eventArgs !== undefined) {
             inputs['eventArgs'] = fieldDef.eventArgs;
         }
-                return {
+        return {
             ...inputs,
-            ...applyNonFieldLogic(rootFormRegistry, fieldDef),
+            ...resolveLogic(),
         };
     });
 }
@@ -225,6 +233,7 @@ function resolveArrayButtonEventArgs(fieldEventArgs, defaultEventArgs = ['$array
 function addArrayItemButtonMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const ctx = resolveArrayButtonContext(fieldDef.key, 'addArrayItem', fieldDef.arrayKey);
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps?.());
@@ -233,13 +242,14 @@ function addArrayItemButtonMapper(fieldDef) {
             event: AppendArrayItemEvent,
             eventArgs: resolveArrayButtonEventArgs(fieldDef.eventArgs, ['$arrayKey', '$template']),
             eventContext: buildArrayButtonEventContext(fieldDef.key, ctx, fieldDef.template),
-            ...applyNonFieldLogic(rootFormRegistry, fieldDef),
+            ...applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext),
         };
     });
 }
 function prependArrayItemButtonMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const ctx = resolveArrayButtonContext(fieldDef.key, 'prependArrayItem', fieldDef.arrayKey);
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps?.());
@@ -248,13 +258,14 @@ function prependArrayItemButtonMapper(fieldDef) {
             event: PrependArrayItemEvent,
             eventArgs: resolveArrayButtonEventArgs(fieldDef.eventArgs, ['$arrayKey', '$template']),
             eventContext: buildArrayButtonEventContext(fieldDef.key, ctx, fieldDef.template),
-            ...applyNonFieldLogic(rootFormRegistry, fieldDef),
+            ...applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext),
         };
     });
 }
 function insertArrayItemButtonMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const ctx = resolveArrayButtonContext(fieldDef.key, 'insertArrayItem', fieldDef.arrayKey);
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps?.());
@@ -263,13 +274,14 @@ function insertArrayItemButtonMapper(fieldDef) {
             event: InsertArrayItemEvent,
             eventArgs: resolveArrayButtonEventArgs(fieldDef.eventArgs, ['$arrayKey', fieldDef.index, '$template']),
             eventContext: buildArrayButtonEventContext(fieldDef.key, ctx, fieldDef.template),
-            ...applyNonFieldLogic(rootFormRegistry, fieldDef),
+            ...applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext),
         };
     });
 }
 function removeArrayItemButtonMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const ctx = resolveArrayButtonContext(fieldDef.key, 'removeArrayItem', fieldDef.arrayKey);
                 const eventType = ctx.isInsideArray ? RemoveAtIndexEvent : PopArrayItemEvent;
     const defaultEventArgs = ctx.isInsideArray ? ['$arrayKey', '$index'] : ['$arrayKey'];
@@ -280,13 +292,14 @@ function removeArrayItemButtonMapper(fieldDef) {
             event: eventType,
             eventArgs: resolveArrayButtonEventArgs(fieldDef.eventArgs, defaultEventArgs),
             eventContext: buildArrayButtonEventContext(fieldDef.key, ctx),
-            ...applyNonFieldLogic(rootFormRegistry, fieldDef),
+            ...applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext),
         };
     });
 }
 function popArrayItemButtonMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const ctx = resolveArrayButtonContext(fieldDef.key, 'popArrayItem', fieldDef.arrayKey);
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps?.());
@@ -295,13 +308,14 @@ function popArrayItemButtonMapper(fieldDef) {
             event: PopArrayItemEvent,
             eventArgs: resolveArrayButtonEventArgs(fieldDef.eventArgs, ['$arrayKey']),
             eventContext: buildArrayButtonEventContext(fieldDef.key, ctx),
-            ...applyNonFieldLogic(rootFormRegistry, fieldDef),
+            ...applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext),
         };
     });
 }
 function shiftArrayItemButtonMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const ctx = resolveArrayButtonContext(fieldDef.key, 'shiftArrayItem', fieldDef.arrayKey);
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps?.());
@@ -310,7 +324,7 @@ function shiftArrayItemButtonMapper(fieldDef) {
             event: ShiftArrayItemEvent,
             eventArgs: resolveArrayButtonEventArgs(fieldDef.eventArgs, ['$arrayKey']),
             eventContext: buildArrayButtonEventContext(fieldDef.key, ctx),
-            ...applyNonFieldLogic(rootFormRegistry, fieldDef),
+            ...applyNonFieldLogic(rootFormRegistry, fieldDef, evaluationContext),
         };
     });
 }
@@ -319,6 +333,7 @@ function submitButtonFieldMapper(fieldDef) {
     const rootFormRegistry = inject(RootFormRegistryService);
     const defaultProps = inject(DEFAULT_PROPS);
     const formOptions = inject(FORM_OPTIONS);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const fieldWithLogic = fieldDef;
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps());
@@ -329,6 +344,7 @@ function submitButtonFieldMapper(fieldDef) {
                 formOptions: formOptions(),
                 fieldLogic: fieldWithLogic.logic,
                 explicitlyDisabled: fieldDef.disabled,
+                evaluationContext,
             })()
             : (fieldDef.disabled ?? false);
         const inputs = {
@@ -336,7 +352,7 @@ function submitButtonFieldMapper(fieldDef) {
                         props: { ...fieldDef.props, type: 'submit' },
             disabled,
         };
-        const hidden = resolveHiddenValue(rootForm, fieldWithLogic);
+        const hidden = resolveHiddenValue(rootForm, fieldWithLogic, evaluationContext);
         if (hidden !== undefined) {
             inputs['hidden'] = hidden;
         }
@@ -348,6 +364,7 @@ function nextButtonFieldMapper(fieldDef) {
     const rootFormRegistry = inject(RootFormRegistryService);
     const defaultProps = inject(DEFAULT_PROPS);
     const formOptions = inject(FORM_OPTIONS);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const fieldWithLogic = fieldDef;
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps());
@@ -357,13 +374,14 @@ function nextButtonFieldMapper(fieldDef) {
             formOptions: formOptions(),
             fieldLogic: fieldWithLogic.logic,
             currentPageValid: fieldSignalContext.currentPageValid,
+            evaluationContext,
         })();
         const inputs = {
             ...baseInputs,
             event: NextPageEvent,
             disabled,
         };
-        const hidden = resolveHiddenValue(rootForm, fieldWithLogic);
+        const hidden = resolveHiddenValue(rootForm, fieldWithLogic, evaluationContext);
         if (hidden !== undefined) {
             inputs['hidden'] = hidden;
         }
@@ -373,6 +391,7 @@ function nextButtonFieldMapper(fieldDef) {
 function previousButtonFieldMapper(fieldDef) {
     const defaultProps = inject(DEFAULT_PROPS);
     const rootFormRegistry = inject(RootFormRegistryService);
+    const evaluationContext = injectNonFieldEvaluationContext(fieldDef);
     const fieldWithLogic = fieldDef;
     return computed(() => {
         const baseInputs = buildBaseInputs(fieldDef, defaultProps());
@@ -384,7 +403,7 @@ function previousButtonFieldMapper(fieldDef) {
                 if (fieldDef.disabled !== undefined) {
             inputs['disabled'] = fieldDef.disabled;
         }
-        const hidden = resolveHiddenValue(rootForm, fieldWithLogic);
+        const hidden = resolveHiddenValue(rootForm, fieldWithLogic, evaluationContext);
         if (hidden !== undefined) {
             inputs['hidden'] = hidden;
         }
@@ -979,5 +998,5 @@ function provideTestValidationMessages(messages) {
 
 
 
-export { ADDON_PRESET_HANDLER, NG_FORGE_ACTION_INPUTS, NG_FORGE_ADDONS_INPUTS, NG_FORGE_ADDON_ACTION_INPUTS, NG_FORGE_FIELD_SHELL_INPUTS, NG_FORGE_VALUE_FIELD_INPUTS, NgForgeAction, NgForgeActionHost, NgForgeAddonAction, NgForgeAddonActionBase, NgForgeAddons, NgForgeAddonsBase, NgForgeControl, NgForgeField, NgForgeFieldHost, NgForgeFieldShell, NgForgeHostControl, addArrayItemButtonMapper, buildArrayButtonEventContext, buildValueFieldInputs, buttonFieldMapper, checkboxFieldMapper, createAriaDescribedBySignal, createNgForgeActionFixture, createNgForgeFieldFixture, createResolvedErrorsSignal, datepickerFieldMapper, injectNgForgeAction, injectNgForgeAddonAction, injectNgForgeAddons, injectNgForgeField, insertArrayItemButtonMapper, nextButtonFieldMapper, optionsFieldMapper, popArrayItemButtonMapper, prependArrayItemButtonMapper, previousButtonFieldMapper, provideTestValidationMessages, removeArrayItemButtonMapper, resolveArrayButtonContext, resolveArrayButtonEventArgs, resolveValueFieldContext, setupMetaTracking, shiftArrayItemButtonMapper, shouldShowErrors, submitButtonFieldMapper, valueFieldMapper };
+export { ADDON_PRESET_HANDLER, NG_FORGE_ACTION_INPUTS, NG_FORGE_ADDONS_INPUTS, NG_FORGE_ADDON_ACTION_INPUTS, NG_FORGE_FIELD_SHELL_INPUTS, NG_FORGE_VALUE_FIELD_INPUTS, NgForgeAction, NgForgeActionHost, NgForgeAddonAction, NgForgeAddonActionBase, NgForgeAddons, NgForgeAddonsBase, NgForgeControl, NgForgeField, NgForgeFieldHost, NgForgeFieldShell, NgForgeHostControl, addArrayItemButtonMapper, buildArrayButtonEventContext, buildValueFieldInputs, buttonFieldMapper, checkboxFieldMapper, createAriaDescribedBySignal, createNgForgeActionFixture, createNgForgeFieldFixture, createResolvedErrorsSignal, datepickerFieldMapper, injectNgForgeAction, injectNgForgeAddonAction, injectNgForgeAddons, injectNgForgeField, injectNonFieldLogicResolver, insertArrayItemButtonMapper, nextButtonFieldMapper, optionsFieldMapper, popArrayItemButtonMapper, prependArrayItemButtonMapper, previousButtonFieldMapper, provideTestValidationMessages, removeArrayItemButtonMapper, resolveArrayButtonContext, resolveArrayButtonEventArgs, resolveValueFieldContext, setupMetaTracking, shiftArrayItemButtonMapper, shouldShowErrors, submitButtonFieldMapper, valueFieldMapper };
 //# sourceMappingURL=ng-forge-dynamic-forms-integration.mjs.map