@ng-forge/dynamic-forms 1.2.0-next.5 → 1.2.0-next.6

package/fesm2022/{ng-forge-dynamic-forms-ng-forge-dynamic-forms-DSXZJHcu.mjs → ng-forge-dynamic-forms-ng-forge-dynamic-forms-B2C_WAMP.mjs}

@@ -10,6 +10,8 @@ import { isPlatformBrowser, AsyncPipe, NgTemplateOutlet, NgComponentOutlet } fro
 import { NG_STATUS_CLASSES } from '@angular/forms/signals/compat';
 
 const EMPTY_WRAPPERS = Object.freeze([]);
+const FIELD_ERRORS_WRAPPER = 'field-errors';
+const FIELD_ERRORS_CONFIG = Object.freeze({ type: FIELD_ERRORS_WRAPPER });
 function isSameWrapperChain(a, b) {
     if (a === b)
         return true;
@@ -21,17 +23,26 @@ function isSameWrapperChain(a, b) {
     }
     return true;
 }
-function resolveWrappers(field, defaultWrappers, autoAssociations) {
-    if (field.wrappers === null) {
+function resolveWrappers(field, defaultWrappers, autoAssociations, wrapperRegistry) {
+        if (field.wrappers === null) {
         return EMPTY_WRAPPERS;
     }
     const autoWrappers = field.skipAutoWrappers ? EMPTY_WRAPPERS : (autoAssociations.get(field.type) ?? EMPTY_WRAPPERS);
     const defaults = field.skipDefaultWrappers ? EMPTY_WRAPPERS : (defaultWrappers ?? EMPTY_WRAPPERS);
     const fieldLevel = field.wrappers ?? EMPTY_WRAPPERS;
-    if (autoWrappers.length === 0 && defaults.length === 0 && fieldLevel.length === 0) {
-        return EMPTY_WRAPPERS;
+    const composed = [...autoWrappers, ...defaults, ...fieldLevel];
+            if (needsErrorWrapper(field, composed, wrapperRegistry)) {
+        composed.push(FIELD_ERRORS_CONFIG);
     }
-    return [...autoWrappers, ...defaults, ...fieldLevel];
+    return composed.length === 0 ? EMPTY_WRAPPERS : composed;
+}
+const VALIDATABLE_CONTAINERS = new Set(['group', 'array']);
+function needsErrorWrapper(field, composed, wrapperRegistry) {
+        if (!VALIDATABLE_CONTAINERS.has(field.type))
+        return false;
+    if (!field.validators || field.validators.length === 0)
+        return false;
+    return !composed.some((w) => w.type === FIELD_ERRORS_WRAPPER || wrapperRegistry.get(w.type)?.rendersFieldErrors);
 }
 
 const inputNamesCache = new WeakMap();
@@ -246,7 +257,7 @@ function pushFieldInputsOnChange(opts, getRefs) {
     });
 }
 
-function buildFieldInputs(rawInputs, cache, fieldType) {
+function buildFieldInputs(rawInputs, cache, fieldType, validationMessages) {
     const fieldTreeCandidate = rawInputs['field'];
             const hasFieldTree = fieldTreeCandidate !== undefined && typeof fieldTreeCandidate === 'function';
     const readonlyField = hasFieldTree ? toReadonlyFieldTreeCached(cache, fieldTreeCandidate) : undefined;
@@ -258,6 +269,7 @@ function buildFieldInputs(rawInputs, cache, fieldType) {
         type: fieldType,
         field: readonlyField,
         setValue,
+                        ...(validationMessages !== undefined && { validationMessages }),
     };
 }
 
@@ -356,6 +368,7 @@ class DfFieldOutlet {
     vcr = signal(this.vcrRef).asReadonly();
     destroyRef = inject(DestroyRef);
     wrapperAutoAssociations = inject(WRAPPER_AUTO_ASSOCIATIONS);
+    wrapperRegistry = inject(WRAPPER_REGISTRY);
     defaultWrappersSignal = inject(DEFAULT_WRAPPERS, { optional: true });
     readonlyFieldCache = inject(READONLY_FIELD_TREE_CACHE);
         fieldComponent = new FieldComponentSlot();
@@ -365,8 +378,8 @@ class DfFieldOutlet {
     ...(ngDevMode ? [{ debugName: "renderReady" }] : /* istanbul ignore next */ []));
     rawInputs = computed(() => this.dfFieldOutlet().inputs(), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "rawInputs" }] : /* istanbul ignore next */ []));
-        wrappers = computed(() => resolveWrappers(this.dfFieldOutlet().fieldDef, this.defaultWrappersSignal?.(), this.wrapperAutoAssociations), { ...(ngDevMode ? { debugName: "wrappers" } : /* istanbul ignore next */ {}), equal: isSameWrapperChain });
-        fieldInputs = computed(() => buildFieldInputs(this.rawInputs(), this.readonlyFieldCache, this.dfFieldOutlet().fieldDef.type), /* @ts-ignore */
+        wrappers = computed(() => resolveWrappers(this.dfFieldOutlet().fieldDef, this.defaultWrappersSignal?.(), this.wrapperAutoAssociations, this.wrapperRegistry), { ...(ngDevMode ? { debugName: "wrappers" } : /* istanbul ignore next */ {}), equal: isSameWrapperChain });
+        fieldInputs = computed(() => buildFieldInputs(this.rawInputs(), this.readonlyFieldCache, this.dfFieldOutlet().fieldDef.type, this.dfFieldOutlet().fieldDef.validationMessages), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "fieldInputs" }] : /* istanbul ignore next */ []));
     defaultEnvInjector = inject(EnvironmentInjector);
         fieldEnvInjector = computed(() => this.dfFieldOutletEnvironmentInjector() ?? this.defaultEnvInjector, /* @ts-ignore */
@@ -801,10 +814,10 @@ class PageOrchestratorComponent {
       }
     }
   `, isInline: true, styles: [":host{display:block;position:relative;width:100%}\n"], changeDetection: i0.ChangeDetectionStrategy.OnPush, deferBlockDependencies: [() => [/* @ts-ignore */
-                import('./ng-forge-dynamic-forms-page-field.component-B92kLZkH.mjs').then(m => m.default)]] });
+                import('./ng-forge-dynamic-forms-page-field.component-CwH22lRl.mjs').then(m => m.default)]] });
 }
 i0.ɵɵngDeclareClassMetadataAsync({ minVersion: "18.0.0", version: "22.0.1", ngImport: i0, type: PageOrchestratorComponent, resolveDeferredDeps: () => [/* @ts-ignore */
-        import('./ng-forge-dynamic-forms-page-field.component-B92kLZkH.mjs').then(m => m.default)], resolveMetadata: PageFieldComponent => ({ decorators: [{
+        import('./ng-forge-dynamic-forms-page-field.component-CwH22lRl.mjs').then(m => m.default)], resolveMetadata: PageFieldComponent => ({ decorators: [{
                 type: Component,
                 args: [{ selector: 'div[page-orchestrator]', imports: [PageFieldComponent], template: `
     @for (pageField of pageFields(); track pageField.key; let i = $index) {
@@ -920,7 +933,7 @@ function validateSimplifiedTemplate(field) {
     }
 }
 function expandSimplifiedArray(field) {
-    const { template, value = [], addButton, removeButton, key, logic, minLength, maxLength, wrappers, skipAutoWrappers, skipDefaultWrappers, } = field;
+    const { template, value = [], addButton, removeButton, key, logic, minLength, maxLength, wrappers, skipAutoWrappers, skipDefaultWrappers, validators, validationMessages, required, validateWhenHidden, } = field;
     const isObjectTemplate = Array.isArray(template);
     const values = value;
         validateSimplifiedTemplate(field);
@@ -956,6 +969,18 @@ function expandSimplifiedArray(field) {
     }
     if (skipDefaultWrappers !== undefined) {
         arrayFieldObj['skipDefaultWrappers'] = skipDefaultWrappers;
+    }
+            if (validators !== undefined) {
+        arrayFieldObj['validators'] = validators;
+    }
+    if (validationMessages !== undefined) {
+        arrayFieldObj['validationMessages'] = validationMessages;
+    }
+    if (required !== undefined) {
+        arrayFieldObj['required'] = required;
+    }
+    if (validateWhenHidden !== undefined) {
+        arrayFieldObj['validateWhenHidden'] = validateWhenHidden;
     }
         const arrayField = arrayFieldObj;
                                                 const primitiveFieldKey = !isObjectTemplate ? template.key : undefined;
@@ -1272,6 +1297,11 @@ function resolveDescendantContext(fieldDef, ownContext) {
     let ancestorAlwaysHidden = ownContext.ancestorAlwaysHidden;
     let ancestorHiddenLogics = ownContext.ancestorHiddenLogics;
     let mutated = false;
+                let ancestorRequired = ownContext.ancestorRequired;
+    if (fieldDef.required !== undefined && fieldDef.required !== ancestorRequired) {
+        ancestorRequired = fieldDef.required;
+        mutated = true;
+    }
     if (fieldDef.hidden === true && !ancestorAlwaysHidden) {
         ancestorAlwaysHidden = true;
         mutated = true;
@@ -1303,6 +1333,7 @@ function resolveDescendantContext(fieldDef, ownContext) {
         validateWhenHidden: ownContext.validateWhenHidden,
         ancestorAlwaysHidden,
         ancestorHiddenLogics,
+        ancestorRequired,
     };
 }
 
@@ -1373,6 +1404,7 @@ function mapFieldToForm(fieldDef, fieldPath, inheritedContext = DEFAULT_FIELD_TR
     }
                     if (isGroupField(fieldDef)) {
         const descendantContext = resolveDescendantContext(fieldDef, ownContext);
+        applyContainerValidators(fieldDef, fieldPath, descendantContext);
         mapContainerChildren(fieldDef.fields, fieldPath, descendantContext);
         return;
     }
@@ -1422,7 +1454,7 @@ function mapLeafField(fieldDef, fieldPath, context) {
         }
     }
         const applyValidation = (validationPath) => {
-        applySimpleValidationRules(validationField, validationPath);
+        applySimpleValidationRules(validationField, validationPath, context);
         if (validationField.validators) {
             for (const config of validationField.validators) {
                 applyValidator(config, validationPath);
@@ -1436,8 +1468,11 @@ function mapLeafField(fieldDef, fieldPath, context) {
             }
         }
     };
+    applyHiddenGatedValidation(path, context, applyValidation);
+}
+function applyHiddenGatedValidation(path, context, apply) {
     if (context.validateWhenHidden) {
-        applyValidation(path);
+        apply(path);
         return;
     }
             if (context.ancestorAlwaysHidden) {
@@ -1450,10 +1485,21 @@ function mapLeafField(fieldDef, fieldPath, context) {
         if (ancestorHiddenLogic && ancestorHiddenLogic(ctx))
             return false;
         return true;
-    }, schema((subPath) => applyValidation(subPath)));
+    }, schema((subPath) => apply(subPath)));
+}
+function applyContainerValidators(fieldDef, fieldPath, context) {
+    const validators = fieldDef.validators;
+    if (!validators || validators.length === 0)
+        return;
+    applyHiddenGatedValidation(fieldPath, context, (validationPath) => {
+        for (const config of validators) {
+            applyValidator(config, validationPath, 'tree');
+        }
+    });
 }
-function applySimpleValidationRules(fieldDef, path) {
-    if (fieldDef.required) {
+function applySimpleValidationRules(fieldDef, path, context) {
+                const declaresRequiredLogic = fieldDef.logic?.some(isValidationStateLogic) ?? false;
+    if (fieldDef.required ?? (declaresRequiredLogic ? false : context.ancestorRequired)) {
         required(path);
     }
         const stringConfig = getStringValidationConfig(fieldDef);
@@ -1486,6 +1532,7 @@ function mapArrayFieldToForm(arrayField, fieldPath, context) {
     if (arrayField.maxLength !== undefined) {
         maxLength(fieldPath, arrayField.maxLength);
     }
+    applyContainerValidators(arrayField, fieldPath, context);
         let itemDefinitions = arrayField.fields;
                     if (!itemDefinitions || itemDefinitions.length === 0) {
         const metadataTemplate = getNormalizedArrayMetadata(arrayField)?.template;
@@ -1531,17 +1578,16 @@ function mapArrayFieldToForm(arrayField, fieldPath, context) {
                 mapContainerChildren(templateField.fields, itemPath, layoutDescendant);
             }
             else if (isGroupField(templateField)) {
-                                const groupKey = templateField.key;
-                const groupOwn = resolveFieldOwnContext(templateField, context);
-                const groupDescendant = resolveDescendantContext(templateField, groupOwn);
+                const groupKey = templateField.key;
                 if (groupKey) {
-                    const groupPath = pathRecord[groupKey];
+                                        const groupPath = pathRecord[groupKey];
                     if (groupPath) {
-                        mapContainerChildren(templateField.fields, groupPath, groupDescendant);
+                        mapFieldToForm(templateField, groupPath, context);
                     }
                 }
                 else {
-                                        mapContainerChildren(templateField.fields, itemPath, groupDescendant);
+                                        const groupOwn = resolveFieldOwnContext(templateField, context);
+                    mapContainerChildren(templateField.fields, itemPath, resolveDescendantContext(templateField, groupOwn));
                 }
             }
             else {
@@ -3818,7 +3864,7 @@ function createDerivationRenderGate() {
         if (!has || engine() !== 'idle')
             return;
         engine.set('loading');
-                pendingTasks.run(() => import('./ng-forge-dynamic-forms-bootstrap-derivation-orchestrator-OBDy6qd9.mjs')
+                pendingTasks.run(() => import('./ng-forge-dynamic-forms-bootstrap-derivation-orchestrator-CNCeWAeJ.mjs')
             .then(({ bootstrapDerivationOrchestrator }) => {
             runInInjectionContext(injector, () => bootstrapDerivationOrchestrator());
             engine.set('wired');
@@ -4373,28 +4419,28 @@ const DISPLAY_FIELD_TYPES_BASE = {
 const BUILT_IN_FIELDS = [
     {
         name: 'row',
-                                loadComponent: () => import('./ng-forge-dynamic-forms-container-field.component-BpeFyhAt.mjs'),
+                                loadComponent: () => import('./ng-forge-dynamic-forms-container-field.component-ByGdzAsk.mjs'),
         mapper: rowFieldMapper,
         valueHandling: 'flatten',
         ...CONTAINER_FIELD_TYPES_BASE,
     },
     {
         name: 'group',
-        loadComponent: () => import('./ng-forge-dynamic-forms-group-field.component-BNjYMTqT.mjs'),
+        loadComponent: () => import('./ng-forge-dynamic-forms-group-field.component-DnLZdj8v.mjs'),
         mapper: groupFieldMapper,
         valueHandling: 'include',
         ...CONTAINER_FIELD_TYPES_BASE,
     },
     {
         name: 'array',
-        loadComponent: () => import('./ng-forge-dynamic-forms-array-field.component-D-VWBM-t.mjs'),
+        loadComponent: () => import('./ng-forge-dynamic-forms-array-field.component-NTHLPjau.mjs'),
         mapper: arrayFieldMapper,
         valueHandling: 'include',
         ...CONTAINER_FIELD_TYPES_BASE,
     },
     {
         name: 'page',
-        loadComponent: () => import('./ng-forge-dynamic-forms-page-field.component-B92kLZkH.mjs'),
+        loadComponent: () => import('./ng-forge-dynamic-forms-page-field.component-CwH22lRl.mjs'),
         mapper: pageFieldMapper,
         valueHandling: 'flatten',
         ...CONTAINER_FIELD_TYPES_BASE,
@@ -4412,7 +4458,7 @@ const BUILT_IN_FIELDS = [
     },
     {
         name: 'container',
-        loadComponent: () => import('./ng-forge-dynamic-forms-container-field.component-BpeFyhAt.mjs'),
+        loadComponent: () => import('./ng-forge-dynamic-forms-container-field.component-ByGdzAsk.mjs'),
         mapper: containerFieldMapper,
         valueHandling: 'flatten',
         ...CONTAINER_FIELD_TYPES_BASE,
@@ -4427,6 +4473,11 @@ const BUILT_IN_WRAPPERS = [
         wrapperName: 'row',
         loadComponent: () => import('./ng-forge-dynamic-forms-row-wrapper.component-BBWmqQA_.mjs'),
     },
+    {
+        wrapperName: 'field-errors',
+        loadComponent: () => import('./ng-forge-dynamic-forms-field-errors-wrapper.component-ZdaC4Bit.mjs'),
+        rendersFieldErrors: true,
+    },
 ];
 
 function isDynamicFormFeature(value) {
@@ -4486,7 +4537,8 @@ function provideDynamicForm(...items) {
     const wrapperBundles = items.filter(isWrappersBundle);
     const features = items.filter(isDynamicFormFeature);
     const fields = [...BUILT_IN_FIELDS, ...fieldTypes];
-    const wrappers = [...BUILT_IN_WRAPPERS, ...wrapperTypes, ...wrapperBundles.flatMap((bundle) => bundle.ɵdefinitions)];
+    const customWrappers = [...wrapperTypes, ...wrapperBundles.flatMap((bundle) => bundle.ɵdefinitions)];
+    const wrappers = [...BUILT_IN_WRAPPERS, ...customWrappers];
         const featureProviders = [];
     const hasLoggerFeature = features.some((feature) => feature.ɵkind === 'logger');
     features.forEach((feature) => {
@@ -4527,11 +4579,16 @@ function provideDynamicForm(...items) {
             useFactory: () => {
                 const logger = inject(DynamicFormLogger);
                 const registry = new Map();
-                                wrappers.forEach((wrapperType) => {
-                    if (registry.has(wrapperType.wrapperName)) {
-                        logger.warn(`Wrapper type "${wrapperType.wrapperName}" is already registered. Overwriting.`);
+                                                                                const builtInNames = new Set(BUILT_IN_WRAPPERS.map((w) => w.wrapperName));
+                BUILT_IN_WRAPPERS.forEach((wrapperType) => registry.set(wrapperType.wrapperName, wrapperType));
+                const seenCustom = new Set();
+                customWrappers.forEach((wrapperType) => {
+                    const name = wrapperType.wrapperName;
+                    if (seenCustom.has(name) && !builtInNames.has(name)) {
+                        logger.warn(`Wrapper type "${name}" is already registered. Overwriting.`);
                     }
-                    registry.set(wrapperType.wrapperName, wrapperType);
+                    seenCustom.add(name);
+                    registry.set(name, wrapperType);
                 });
                 return registry;
             },
@@ -4942,4 +4999,4 @@ function arrayEvent(arrayKey) {
 
 
 export { withEventFormValue as $, ArrayItemRegistryService as A, BUILT_IN_FIELDS as B, CONTAINER_FIELD_PROCESSORS as C, DfFieldOutlet as D, EventDispatcher as E, FIELD_WINDOWING as F, GoToPageEvent as G, PageChangeEvent as H, InsertArrayItemEvent as I, PagerStateEvent as J, PopArrayItemEvent as K, PrependArrayItemEvent as L, MoveArrayItemEvent as M, NextPageEvent as N, PreviousPageEvent as O, PROPERTY_OVERRIDE_STORE as P, TextAddonComponent as Q, RemoveAtIndexEvent as R, ShiftArrayItemEvent as S, TemplateAddonComponent as T, arrayEvent as U, createWrappers as V, isWrappersBundle as W, provideDynamicForm as X, sanitizeFormConfig as Y, withAddonActions as Z, withCustomAddon as _, isSameWrapperChain as a, withFieldWindowing as a0, withLegacyStatusClasses as a1, withLoggerConfig as a2, withPagePreload as a3, withValidationExecutionDefaults as a4, withValueExclusionDefaults as a5, wrapperProps as a6, createWrapperChainController as b, createFieldResolutionPipe as c, createSchemaFromFields as d, createHiddenSignal as e, createRenderReadySignal as f, getNormalizedArrayMetadata as g, getFieldDefaultValue as h, injectFieldRegistry as i, resolveFieldWindowing as j, DEV_MODE as k, DEFAULT_DEBOUNCE_MS as l, mapFieldToInputs as m, DERIVATION_WARNING_TRACKER as n, FormStateManager as o, DERIVATION_LOG_CONFIG as p, AppendArrayItemEvent as q, resolveWrappers as r, ComponentAddonComponent as s, traverseFieldsWithContext as t, ConsoleLogger as u, DfTemplate as v, DynamicForm as w, FormClearEvent as x, FormResetEvent as y, FormSubmitEvent as z };
-//# sourceMappingURL=ng-forge-dynamic-forms-ng-forge-dynamic-forms-DSXZJHcu.mjs.map
+//# sourceMappingURL=ng-forge-dynamic-forms-ng-forge-dynamic-forms-B2C_WAMP.mjs.map