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

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

@@ -295,7 +295,11 @@ function hasTargetProperty(config) {
 }
 
 const FORM_VALUE_ACCESS_PATTERN = /\bformValue\s*(?:\.|\[)/;
-const FORM_VALUE_PATTERN = /\bformValue\s*(?:\.([\w.]+)|\[\s*'([\w.-]+)'\s*\]|\[\s*"([\w.-]+)"\s*\])/g;
+const ID_START = String.raw `[\p{ID_Start}$_]`;
+const ID_PART = String.raw `[\p{ID_Continue}$]`;
+const DOTTED_PATH = String.raw `${ID_START}${ID_PART}*(?:\.${ID_START}${ID_PART}*)*`;
+const BRACKET_KEY = String.raw `[\p{ID_Continue}$.\-]+`;
+const FORM_VALUE_PATTERN = new RegExp(String.raw `\bformValue\s*(?:\.(${DOTTED_PATH})|\[\s*'(${BRACKET_KEY})'\s*\]|\[\s*"(${BRACKET_KEY})"\s*\])`, 'gu');
 function isCrossFieldExpression(expr, context) {
         if (expr === undefined || typeof expr === 'boolean' || isFormStateCondition(expr)) {
         return false;
@@ -392,15 +396,6 @@ 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);
 }
@@ -585,6 +580,8 @@ class ExpressionParserError extends DynamicFormError {
     }
 }
 
+const IDENTIFIER_START = /[\p{ID_Start}$_]/u;
+const IDENTIFIER_PART = /[\p{ID_Continue}$]/u;
 class Tokenizer {
     position = 0;
     expression;
@@ -617,7 +614,7 @@ class Tokenizer {
                 if (/[0-9]/.test(char)) {
             return this.readNumber();
         }
-                if (/[a-zA-Z_$]/.test(char)) {
+                if (IDENTIFIER_START.test(this.codePointAt(this.position))) {
             return this.readIdentifierOrKeyword();
         }
                 return this.readOperatorOrPunctuation();
@@ -676,12 +673,20 @@ class Tokenizer {
     readIdentifierOrKeyword() {
         const start = this.position;
         let value = '';
-        while (this.position < this.expression.length && /[a-zA-Z0-9_$]/.test(this.expression[this.position])) {
-            value += this.expression[this.position];
-            this.position++;
+        while (this.position < this.expression.length) {
+            const char = this.codePointAt(this.position);
+            if (!IDENTIFIER_PART.test(char)) {
+                break;
+            }
+            value += char;
+            this.position += char.length;
         }
                 const type = this.getKeywordType(value);
         return { type, value, position: start };
+    }
+        codePointAt(position) {
+        const codePoint = this.expression.codePointAt(position);
+        return codePoint === undefined ? '' : String.fromCodePoint(codePoint);
     }
     getKeywordType(value) {
         switch (value) {
@@ -1570,6 +1575,51 @@ function safeReadPathKeys(fieldContext) {
     return untracked(() => fieldContext.pathKeys());
 }
 
+function createFieldValueProxy(getRootForm, getRootFormValue) {
+        const readField = (key) => {
+        const root = getRootForm();
+        const accessor = root?.[key];
+        if (typeof accessor === 'function') {
+                        const state = untracked(() => accessor());
+            const valueSig = state && state.value;
+            if (typeof valueSig === 'function') {
+                return { hit: true, value: valueSig() };
+            }
+        }
+        return { hit: false, value: undefined };
+    };
+    return new Proxy({}, {
+        get(_target, prop) {
+            if (typeof prop === 'symbol')
+                return undefined;
+            const { hit, value } = readField(prop);
+            return hit ? value : getRootFormValue()[prop];
+        },
+        has(_target, prop) {
+            if (typeof prop === 'symbol')
+                return false;
+            const root = getRootForm();
+            if (root && prop in root)
+                return true;
+            return prop in getRootFormValue();
+        },
+                ownKeys() {
+            return Reflect.ownKeys(getRootFormValue());
+        },
+        getOwnPropertyDescriptor(_target, prop) {
+            if (typeof prop === 'symbol')
+                return undefined;
+            const whole = getRootFormValue();
+            if (!(prop in whole))
+                return undefined;
+            const { hit, value } = readField(prop);
+            return { value: hit ? value : whole[prop], enumerable: true, configurable: true, writable: false };
+        },
+        set() {
+            return false;         },
+    });
+}
+
 function isChildFieldContext(context) {
     return 'key' in context && isSignal(context.key);
 }
@@ -1580,6 +1630,17 @@ function extractFieldState(fieldContext) {
         return fieldContext.state;
     });
 }
+function navigateArrayItemTree(root, arrayKey, index) {
+    let node = root;
+    for (const segment of arrayKey.split('.')) {
+        if (node == null)
+            return undefined;
+        node = node[segment];
+    }
+    if (node == null)
+        return undefined;
+        return node[index];
+}
 function detectArrayScope(pathKeys) {
         if (pathKeys.length < 3)
         return undefined;
@@ -1693,6 +1754,65 @@ class FieldContextRegistryService {
                 return formFieldStateGetter();
             },
         };
+    }
+        buildReactiveArrayScopedContext(arrayScope, fieldValue, customFunctions, fieldContext) {
+        const { arrayKey, index, localKey } = arrayScope;
+        const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
+        const fieldStateGetter = fieldContext ? () => readFieldStateInfo(extractFieldState(fieldContext), true) : () => undefined;
+        const formFieldStateGetter = () => createFormFieldStateMap(rootFormSignal(), true);
+                const hasValidItem = untracked(() => {
+            const arrayData = getNestedValue(this.rootFormRegistry.formValue(), arrayKey);
+            if (!Array.isArray(arrayData) || index < 0 || index >= arrayData.length)
+                return false;
+            const item = arrayData[index];
+            return item != null && typeof item === 'object';
+        });
+        const rootFormValueProxy = createFieldValueProxy(() => rootFormSignal(), () => this.rootFormRegistry.formValue());
+        if (!hasValidItem) {
+            return {
+                fieldValue,
+                formValue: rootFormValueProxy,
+                fieldPath: localKey,
+                customFunctions: customFunctions || {},
+                logger: this.logger,
+                deprecationTracker: this.deprecationTracker ?? undefined,
+                get externalData() {
+                    return resolveExternalData();
+                },
+                get fieldState() {
+                    return fieldStateGetter();
+                },
+                get formFieldState() {
+                    return formFieldStateGetter();
+                },
+            };
+        }
+        const itemFormValueProxy = createFieldValueProxy(() => navigateArrayItemTree(rootFormSignal(), arrayKey, index), () => {
+            const arrayData = getNestedValue(this.rootFormRegistry.formValue(), arrayKey);
+            const item = Array.isArray(arrayData) ? arrayData[index] : undefined;
+            return item != null && typeof item === 'object' ? item : {};
+        });
+        return {
+            fieldValue,
+            formValue: itemFormValueProxy,
+            rootFormValue: rootFormValueProxy,
+            arrayIndex: index,
+            arrayPath: arrayKey,
+            fieldPath: `${arrayKey}.${index}.${localKey}`,
+            customFunctions: customFunctions || {},
+            logger: this.logger,
+            deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
+            get fieldState() {
+                return fieldStateGetter();
+            },
+            get formFieldState() {
+                return formFieldStateGetter();
+            },
+        };
     }
         resolveExternalData() {
         const externalDataSignal = this.externalDataSignal;
@@ -1702,29 +1822,48 @@ class FieldContextRegistryService {
         if (!externalDataRecord) {
             return undefined;
         }
-        const resolved = {};
-        for (const [key, value] of Object.entries(externalDataRecord)) {
+        const readKey = (key) => {
+            const value = externalDataRecord[key];
             if (!isSignal(value)) {
                 throw new DynamicFormError(`externalData["${key}"] must be a Signal. Got: ${typeof value}. Wrap it with signal(yourValue).`);
             }
-            resolved[key] = value();
-        }
-        return resolved;
+            return value();
+        };
+        return new Proxy({}, {
+            get(_target, prop) {
+                if (typeof prop === 'symbol' || !(prop in externalDataRecord))
+                    return undefined;
+                return readKey(prop);
+            },
+            has(_target, prop) {
+                return typeof prop === 'string' && prop in externalDataRecord;
+            },
+            ownKeys() {
+                return Reflect.ownKeys(externalDataRecord);
+            },
+            getOwnPropertyDescriptor(_target, prop) {
+                if (typeof prop !== 'string' || !(prop in externalDataRecord))
+                    return undefined;
+                return { value: readKey(prop), enumerable: true, configurable: true, writable: false };
+            },
+            set() {
+                return false;             },
+        });
     }
         createReactiveEvaluationContext(fieldContext, customFunctions) {
         const fieldValue = fieldContext.value();
-        const rootFormValue = this.rootFormRegistry.formValue();
         const pathKeys = safeReadPathKeys(fieldContext);
         const arrayScope = detectArrayScope(pathKeys);
         if (arrayScope) {
-            return this.buildArrayScopedContext(rootFormValue, arrayScope, fieldValue, customFunctions, true, fieldContext);
+            return this.buildReactiveArrayScopedContext(arrayScope, fieldValue, customFunctions, fieldContext);
         }
         const localKey = this.extractFieldPath(fieldContext);
         const rootFormSignal = this.rootFormRegistry.rootForm;
         const resolveExternalData = () => this.resolveExternalData();
+                        const formValueProxy = createFieldValueProxy(() => rootFormSignal(), () => this.rootFormRegistry.formValue());
         return {
             fieldValue,
-            formValue: rootFormValue,
+            formValue: formValueProxy,
             fieldPath: localKey,
             customFunctions: customFunctions || {},
             logger: this.logger,
@@ -1741,15 +1880,15 @@ class FieldContextRegistryService {
         };
     }
         createDisplayOnlyContext(fieldPath, customFunctions, arrayScope) {
-        const rootFormValue = this.rootFormRegistry.formValue();
         if (arrayScope) {
-            return this.buildArrayScopedContext(rootFormValue, arrayScope, undefined, customFunctions, true);
+            return this.buildReactiveArrayScopedContext(arrayScope, undefined, customFunctions);
         }
         const rootFormSignal = this.rootFormRegistry.rootForm;
         const resolveExternalData = () => this.resolveExternalData();
+                        const formValueProxy = createFieldValueProxy(() => rootFormSignal(), () => this.rootFormRegistry.formValue());
         return {
             fieldValue: undefined,
-            formValue: rootFormValue,
+            formValue: formValueProxy,
             fieldPath,
             customFunctions: customFunctions || {},
             logger: this.logger,
@@ -2570,9 +2709,9 @@ function createDynamicValueFunction(expression) {
         return cached;
     }
     const fn = (ctx) => {
-                const evaluationContext = fieldContextRegistry.createEvaluationContext(ctx);
+                        const evaluationContext = fieldContextRegistry.createReactiveEvaluationContext(ctx);
         try {
-                        return ExpressionParser.evaluate(expression, evaluationContext);
+                                    return (ExpressionParser.evaluate(expression, evaluationContext) ?? undefined);
         }
         catch (error) {
             logger.error('Error evaluating dynamic expression:', expression, error);
@@ -2636,9 +2775,6 @@ function createConditionalLogic(when) {
 }
 function applyValidator(config, fieldPath) {
     const path = fieldPath;
-    if (requiresTreeValidation(config)) {
-        return;
-    }
     switch (config.type) {
         case 'required':
             required(path, config.when ? { when: createConditionalLogic(config.when) } : undefined);
@@ -2742,7 +2878,7 @@ function createExpressionValidator(config) {
     const functionRegistry = inject(FunctionRegistryService);
     return (ctx) => {
         try {
-            const evaluationContext = fieldContextRegistry.createEvaluationContext(ctx, functionRegistry.getCustomFunctions());
+                                    const evaluationContext = fieldContextRegistry.createReactiveEvaluationContext(ctx, functionRegistry.getCustomFunctions());
             const result = ExpressionParser.evaluate(expression, evaluationContext);
             if (result) {
                 return null;
@@ -3079,7 +3215,6 @@ function applyHiddenLogic(inputs, fieldDef, rootFormRegistry, evaluationContext)
             form: rootForm,
             fieldLogic: fieldDef.logic,
             explicitValue: fieldDef.hidden,
-            formValue: rootFormRegistry.formValue(),
             evaluationContext,
         });
     }
@@ -3688,5 +3823,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, buildClassName, compareValues, containerFieldMapper, createAddonActionRegistry, createDebouncedLogicFunction, createDefaultDerivationLogConfig, createDynamicValueFunction, 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, requiresTreeValidation, 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, 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 };
 //# sourceMappingURL=ng-forge-dynamic-forms-internal.mjs.map