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

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

@@ -1,12 +1,12 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, computed, isSignal, inject, Injector, input, signal, ChangeDetectionStrategy, Component, untracked, Injectable, linkedSignal, resourceFromSnapshots, Pipe } from '@angular/core';
+import { InjectionToken, computed, isSignal, inject, Injector, input, signal, ChangeDetectionStrategy, Component, untracked, Injectable, linkedSignal, resourceFromSnapshots, Pipe, viewChild, ViewContainerRef, Directive, forwardRef } from '@angular/core';
 import { NgComponentOutlet } from '@angular/common';
 import { explicitEffect } from 'ngxtension/explicit-effect';
 import { toSignal, toObservable, rxResource } from '@angular/core/rxjs-interop';
 import { isObservable, defer, combineLatest, pipe, debounceTime, distinctUntilChanged, map, tap, catchError, of, from, startWith, Subject, filter, TimeoutError, throwError } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
-import { email, min, max, minLength, maxLength, pattern, required, validate, validateAsync, validateHttp } from '@angular/forms/signals';
-import { scan, map as map$1, filter as filter$1, take, switchMap, timeout, catchError as catchError$1, shareReplay } from 'rxjs/operators';
+import { switchMap, map as map$1, scan, filter as filter$1, take, timeout, catchError as catchError$1, shareReplay } from 'rxjs/operators';
+import { email, min, max, minLength, maxLength, pattern, required, validateTree, validate, validateAsync, validateHttp } from '@angular/forms/signals';
 
 const ADDON_TYPE_DEFINITIONS = new InjectionToken('ADDON_TYPE_DEFINITIONS');
 
@@ -2662,6 +2662,187 @@ function injectNonFieldEvaluationContext(fieldDef, options = {}) {
     };
 }
 
+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));
+}
+
+const PLACEHOLDER_PATTERN = /\{\{([^{}]*)\}\}/g;
+function interpolateParams(message, error) {
+    const params = extractErrorParams(error);
+                return message.replace(PLACEHOLDER_PATTERN, (placeholder, rawKey) => {
+        const key = rawKey.trim();
+        return Object.hasOwn(params, key) ? safeToString(params[key]) : placeholder;
+    });
+}
+function safeToString(value) {
+    if (value === null || value === undefined) {
+        return '';
+    }
+        if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+        return String(value);
+    }
+        if (value instanceof RegExp) {
+        return value.toString();
+    }
+        if (value instanceof Date) {
+        return value.toISOString();
+    }
+        if (Array.isArray(value)) {
+        return value.join(', ');
+    }
+        try {
+                if (typeof value === 'object' && value.toString !== Object.prototype.toString) {
+            return value.toString();
+        }
+                return JSON.stringify(value);
+    }
+    catch {
+                return '[object]';
+    }
+}
+function extractErrorParams(error) {
+    const params = {};
+        if ('min' in error)
+        params.min = error.min;
+    if ('max' in error)
+        params.max = error.max;
+    if ('pattern' in error)
+        params.pattern = error.pattern;
+    if ('actual' in error)
+        params.actual = error.actual;
+    if ('expected' in error)
+        params.expected = error.expected;
+                    if ('requiredLength' in error) {
+        params.requiredLength = error.requiredLength;
+    }
+    else if ('minLength' in error) {
+                params.requiredLength = error.minLength;
+        params.minLength = error.minLength;
+    }
+    else if ('maxLength' in error) {
+                params.requiredLength = error.maxLength;
+        params.maxLength = error.maxLength;
+    }
+    if ('actualLength' in error)
+        params.actualLength = error.actualLength;
+            Object.keys(error).forEach((key) => {
+        if (key !== 'kind' && !(key in params)) {
+            params[key] = error[key];
+        }
+    });
+    return params;
+}
+
+function createResolvedErrorsSignal(field, validationMessages, defaultValidationMessages = signal(undefined), injector = inject(Injector)) {
+        const logger = injector.get(DynamicFormLogger);
+        const messages = computed(() => validationMessages() ?? {}, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "messages" }] : /* istanbul ignore next */ []));
+    const defaultMessages = computed(() => defaultValidationMessages() ?? {}, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "defaultMessages" }] : /* istanbul ignore next */ []));
+            const errors = computed(() => field()?.().errors() ?? [], /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "errors" }] : /* istanbul ignore next */ []));
+        const errors$ = toObservable(errors, { injector });
+    const messages$ = toObservable(messages, { injector });
+    const defaultMessages$ = toObservable(defaultMessages, { injector });
+        const resolvedErrors$ = combineLatest([errors$, messages$, defaultMessages$]).pipe(switchMap(([currentErrors, msgs, defaultMsgs]) => {
+                if (!currentErrors || currentErrors.length === 0) {
+            return of([]);
+        }
+                const errorResolvers = currentErrors.map((error) => resolveErrorMessage(error, msgs, defaultMsgs, injector, logger));
+                return errorResolvers.length > 0
+            ? combineLatest(errorResolvers).pipe(map$1((errors) => errors.filter((e) => e !== null)))
+            : of([]);
+    }));
+            return toSignal(resolvedErrors$, { initialValue: [], injector });
+}
+function isMessageResolver(message) {
+    return typeof message === 'function' && !isSignal(message);
+}
+function resolveMessageFunction(resolver, error, logger) {
+    try {
+        return resolver(error) ?? error.message ?? '';
+    }
+    catch (err) {
+        logger.error(`Validation message resolver for error kind "${error.kind}" threw; falling back to error.message.`, err);
+        return error.message ?? '';
+    }
+}
+function resolveErrorMessage(error, fieldMessages, defaultMessages, injector, logger) {
+        const fieldMessage = fieldMessages[error.kind];
+        const defaultMessage = defaultMessages[error.kind];
+        const messageToUse = fieldMessage ?? defaultMessage ?? error.message;
+        if (!messageToUse) {
+        logger.warn(`No validation message found for error kind "${error.kind}". ` +
+            `Please provide a message via field-level validationMessages or form-level defaultValidationMessages.`);
+        return of(null);
+    }
+            const isSchemaMessage = fieldMessage === undefined && defaultMessage === undefined;
+        const messageText = isMessageResolver(messageToUse) ? resolveMessageFunction(messageToUse, error, logger) : messageToUse;
+    const messageObservable = isSchemaMessage
+        ? of(messageToUse)         : dynamicTextToObservable(messageText, injector);
+        return messageObservable.pipe(map$1((msg) => ({
+        kind: error.kind,
+        message: interpolateParams(msg, error),
+    })));
+}
+
+function shouldShowErrors(field) {
+    return computed(() => {
+        const control = field()?.();
+        if (!control)
+            return false;
+        return control.invalid() && control.touched() && control.errors().length > 0;
+    });
+}
+
+const FIELD_ERROR_DISPLAY = new InjectionToken('FIELD_ERROR_DISPLAY');
+function injectFieldErrors(options) {
+    const injector = options.injector ?? inject(Injector);
+    const defaultValidationMessages = inject(DEFAULT_VALIDATION_MESSAGES, { optional: true });
+    const fieldSignalContext = inject(FIELD_SIGNAL_CONTEXT, { optional: true });
+                const fieldState = computed(() => {
+        const inputs = options.fieldInputs();
+        if (!inputs)
+            return undefined;
+        if (inputs.field)
+            return inputs.field;
+        const parentTree = fieldSignalContext?.form;
+        const node = inputs.key ? parentTree?.[inputs.key] : undefined;
+        return node ? node() : undefined;
+    }, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "fieldState" }] : /* istanbul ignore next */ []));
+            const fieldTree = computed(() => {
+        const state = fieldState();
+        return state ? (() => state) : undefined;
+    }, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "fieldTree" }] : /* istanbul ignore next */ []));
+    const messages = computed(() => options.validationMessages?.() ?? options.fieldInputs()?.validationMessages, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "messages" }] : /* istanbul ignore next */ []));
+    const errors = createResolvedErrorsSignal(fieldTree, messages, computed(() => defaultValidationMessages?.()), injector);
+    const showErrors = shouldShowErrors(fieldTree);
+    return {
+        errors,
+        showErrors,
+        errorsToDisplay: computed(() => (showErrors() ? errors() : [])),
+        errorId: computed(() => `${options.fieldInputs()?.key ?? ''}-error`),
+    };
+}
+
+function rowError(ctx, index, key, error) {
+                const rows = ctx.fieldTree;
+    const fieldTree = rows?.[index]?.[key];
+    return fieldTree ? { ...error, fieldTree } : error;
+}
+
 function isFunctionHttpValidator(config) {
     const c = config;
     return typeof c.functionName === 'string' || (c.fn !== null && typeof c.fn === 'object');
@@ -2773,7 +2954,8 @@ function applyPatternValidator(path, value, expression, when) {
 function createConditionalLogic(when) {
     return when ? createLogicFunction(when) : undefined;
 }
-function applyValidator(config, fieldPath) {
+function applyValidator(config, 
+fieldPath, attachment = 'field') {
     const path = fieldPath;
     switch (config.type) {
         case 'required':
@@ -2820,7 +3002,7 @@ function applyValidator(config, fieldPath) {
             }
             break;
         case 'custom':
-            applyCustomValidator(config, path);
+            applyCustomValidator(config, path, attachment);
             break;
         case 'async':
             applyAsyncValidator(config, path);
@@ -2830,7 +3012,7 @@ function applyValidator(config, fieldPath) {
             break;
     }
 }
-function applyCustomValidator(config, fieldPath) {
+function applyCustomValidator(config, fieldPath, attachment = 'field') {
     let validatorFn;
     if (config.expression) {
         validatorFn = createExpressionValidator(config);
@@ -2842,11 +3024,16 @@ function applyCustomValidator(config, fieldPath) {
         throw new DynamicFormError('Custom validator requires one of "expression", "functionName", or "fn".');
     }
     const whenLogic = createConditionalLogic(config.when);
-    validate(fieldPath, (ctx) => {
+    const run = (ctx) => {
         if (whenLogic && !whenLogic(ctx))
             return null;
         return validatorFn(ctx);
-    });
+    };
+    if (attachment === 'tree') {
+        validateTree(fieldPath, run);
+        return;
+    }
+    validate(fieldPath, run);
 }
 function createFunctionValidator(config) {
     const logger = inject(DynamicFormLogger);
@@ -2998,8 +3185,9 @@ function applyDeclarativeHttpValidator(config, fieldPath) {
         },
     });
 }
-function applyValidators(configs, fieldPath) {
-    configs.forEach((config) => applyValidator(config, fieldPath));
+function applyValidators(configs, 
+fieldPath, attachment = 'field') {
+    configs.forEach((config) => applyValidator(config, fieldPath, attachment));
 }
 
 function isCheckedField(field) {
@@ -3485,19 +3673,6 @@ 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) {
@@ -3559,73 +3734,6 @@ function setupInitializationTracking(options) {
     }), shareReplay({ bufferSize: 1, refCount: false }));
 }
 
-const PLACEHOLDER_PATTERN = /\{\{([^{}]*)\}\}/g;
-function interpolateParams(message, error) {
-    const params = extractErrorParams(error);
-                return message.replace(PLACEHOLDER_PATTERN, (placeholder, rawKey) => {
-        const key = rawKey.trim();
-        return Object.hasOwn(params, key) ? safeToString(params[key]) : placeholder;
-    });
-}
-function safeToString(value) {
-    if (value === null || value === undefined) {
-        return '';
-    }
-        if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
-        return String(value);
-    }
-        if (value instanceof RegExp) {
-        return value.toString();
-    }
-        if (value instanceof Date) {
-        return value.toISOString();
-    }
-        if (Array.isArray(value)) {
-        return value.join(', ');
-    }
-        try {
-                if (typeof value === 'object' && value.toString !== Object.prototype.toString) {
-            return value.toString();
-        }
-                return JSON.stringify(value);
-    }
-    catch {
-                return '[object]';
-    }
-}
-function extractErrorParams(error) {
-    const params = {};
-        if ('min' in error)
-        params.min = error.min;
-    if ('max' in error)
-        params.max = error.max;
-    if ('pattern' in error)
-        params.pattern = error.pattern;
-    if ('actual' in error)
-        params.actual = error.actual;
-    if ('expected' in error)
-        params.expected = error.expected;
-                    if ('requiredLength' in error) {
-        params.requiredLength = error.requiredLength;
-    }
-    else if ('minLength' in error) {
-                params.requiredLength = error.minLength;
-        params.minLength = error.minLength;
-    }
-    else if ('maxLength' in error) {
-                params.requiredLength = error.maxLength;
-        params.maxLength = error.maxLength;
-    }
-    if ('actualLength' in error)
-        params.actualLength = error.actualLength;
-            Object.keys(error).forEach((key) => {
-        if (key !== 'kind' && !(key in params)) {
-            params[key] = error[key];
-        }
-    });
-    return params;
-}
-
 function isEqual(a, b) {
     return isEqualInternal(a, b, new WeakMap(), new WeakMap());
 }
@@ -3820,7 +3928,29 @@ function createWarningTracker() {
     return { warnedKeys: new Set() };
 }
 
+class FieldErrorsWrapperBase {
+    fieldComponent = viewChild.required('fieldComponent', { read: ViewContainerRef });
+        validationMessages = input(/* @ts-ignore */
+    ...(ngDevMode ? [undefined, { debugName: "validationMessages" }] : /* istanbul ignore next */ []));
+    fieldInputs = input(/* @ts-ignore */
+    ...(ngDevMode ? [undefined, { debugName: "fieldInputs" }] : /* istanbul ignore next */ []));
+        claimedKey = computed(() => this.fieldInputs()?.key, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "claimedKey" }] : /* istanbul ignore next */ []));
+        ngf = injectFieldErrors({
+        fieldInputs: this.fieldInputs,
+        validationMessages: this.validationMessages,
+    });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.1", ngImport: i0, type: FieldErrorsWrapperBase, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.2.0", version: "22.0.1", type: FieldErrorsWrapperBase, isStandalone: true, inputs: { validationMessages: { classPropertyName: "validationMessages", publicName: "validationMessages", isSignal: true, isRequired: false, transformFunction: null }, fieldInputs: { classPropertyName: "fieldInputs", publicName: "fieldInputs", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "fieldComponent", first: true, predicate: ["fieldComponent"], descendants: true, read: ViewContainerRef, isSignal: true }], ngImport: i0 });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.1", ngImport: i0, type: FieldErrorsWrapperBase, decorators: [{
+            type: Directive
+        }], propDecorators: { fieldComponent: [{ type: i0.ViewChild, args: ['fieldComponent', { ...{ read: ViewContainerRef }, isSignal: true }] }], validationMessages: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationMessages", required: false }] }], fieldInputs: [{ type: i0.Input, args: [{ isSignal: true, alias: "fieldInputs", required: false }] }] } });
+function provideFieldErrorDisplay(wrapper) {
+    return { provide: FIELD_ERROR_DISPLAY, useExisting: forwardRef(wrapper) };
+}
+
 
 
-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, createFieldValueProxy, createFormFieldStateMap, createFormStateLogicFunction, 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, 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_ERROR_DISPLAY, FIELD_REGISTRY, FIELD_SIGNAL_CONTEXT, FORM_ID_PREFIX, FORM_OPTIONS, FieldContextRegistryService, FieldErrorsWrapperBase, 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, createFieldValueProxy, createFormFieldStateMap, createFormStateLogicFunction, createInitializationTracker, createLogicFunction, createResolvedErrorsSignal, createWarningTracker, deepMergeDefaults, derivedFromDeferred, detectFormMode, dynamicTextToObservable, evaluateCondition, evaluateNonFieldDisabled, evaluateNonFieldHidden, extractExpressionDependencies, extractStringDependencies, getArrayLength, getChangedKeys, getFieldValueHandling, getGridClassString, getNestedValue, groupFieldMapper, hasChildFields, hasCrossFieldWhenCondition, hasFormValue, hasNestedProperty, hasTargetProperty, injectAddonTypeRegistry, injectFieldErrors, 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, provideFieldErrorDisplay, readFieldStateInfo, resolveDynamicValue, resolveHttpRequest, resolveNextButtonDisabled, resolveNonFieldDisabled, resolveNonFieldHidden, resolveSubmitButtonDisabled, resolveTokens, rowError, rowFieldMapper, runPresetAction, setupInitializationTracking, shouldLog, shouldShowErrors, textFieldMapper, toReadonlyFieldTree, toReadonlyFieldTreeCached, validatePageNesting, withPreviousValue, writeToFieldValue };
 //# sourceMappingURL=ng-forge-dynamic-forms-internal.mjs.map