@ng-forge/dynamic-forms 1.1.0-next.3 → 1.1.0-next.4

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

@@ -1610,14 +1610,17 @@ class FieldContextRegistryService {
             return this.buildArrayScopedContext(rootFormValue, arrayScope, fieldValue, customFunctions, false, fieldContext);
         }
                                         const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         return {
             fieldValue,
             formValue: rootFormValue,
             fieldPath: localKey,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(false),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get fieldState() {
                 return readFieldStateInfo(extractFieldState(fieldContext), false);
             },
@@ -1648,6 +1651,7 @@ class FieldContextRegistryService {
             }
         }
                                 const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         const fieldStateGetter = fieldContext ? () => readFieldStateInfo(extractFieldState(fieldContext), reactive) : () => undefined;
         const formFieldStateGetter = () => createFormFieldStateMap((reactive ? rootFormSignal() : untracked(rootFormSignal)), reactive);
                 if (!scopedFormValue) {
@@ -1656,9 +1660,11 @@ class FieldContextRegistryService {
                 formValue: rootFormValue,
                 fieldPath: localKey,
                 customFunctions: customFunctions || {},
-                externalData: this.resolveExternalData(reactive),
                 logger: this.logger,
                 deprecationTracker: this.deprecationTracker ?? undefined,
+                get externalData() {
+                    return resolveExternalData();
+                },
                 get fieldState() {
                     return fieldStateGetter();
                 },
@@ -1675,9 +1681,11 @@ class FieldContextRegistryService {
             arrayPath: arrayKey,
             fieldPath: `${arrayKey}.${index}.${localKey}`,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(reactive),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get fieldState() {
                 return fieldStateGetter();
             },
@@ -1686,11 +1694,11 @@ class FieldContextRegistryService {
             },
         };
     }
-        resolveExternalData(reactive) {
+        resolveExternalData() {
         const externalDataSignal = this.externalDataSignal;
         if (!externalDataSignal)
             return undefined;
-        const externalDataRecord = reactive ? externalDataSignal() : untracked(() => externalDataSignal());
+        const externalDataRecord = externalDataSignal();
         if (!externalDataRecord) {
             return undefined;
         }
@@ -1699,7 +1707,7 @@ class FieldContextRegistryService {
             if (!isSignal(value)) {
                 throw new DynamicFormError(`externalData["${key}"] must be a Signal. Got: ${typeof value}. Wrap it with signal(yourValue).`);
             }
-            resolved[key] = reactive ? value() : untracked(() => value());
+            resolved[key] = value();
         }
         return resolved;
     }
@@ -1713,14 +1721,17 @@ class FieldContextRegistryService {
         }
         const localKey = this.extractFieldPath(fieldContext);
         const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         return {
             fieldValue,
             formValue: rootFormValue,
             fieldPath: localKey,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(true),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get fieldState() {
                 return readFieldStateInfo(extractFieldState(fieldContext), true);
             },
@@ -1735,14 +1746,17 @@ class FieldContextRegistryService {
             return this.buildArrayScopedContext(rootFormValue, arrayScope, undefined, customFunctions, true);
         }
         const rootFormSignal = this.rootFormRegistry.rootForm;
+        const resolveExternalData = () => this.resolveExternalData();
         return {
             fieldValue: undefined,
             formValue: rootFormValue,
             fieldPath,
             customFunctions: customFunctions || {},
-            externalData: this.resolveExternalData(true),
             logger: this.logger,
             deprecationTracker: this.deprecationTracker ?? undefined,
+            get externalData() {
+                return resolveExternalData();
+            },
             get formFieldState() {
                 return createFormFieldStateMap(rootFormSignal(), true);
             },
@@ -3528,8 +3542,8 @@ function isEqualInternal(a, b, seenA, seenB) {
     }
         const recordA = a;
     const recordB = b;
-        const keysA = [...Object.keys(recordA), ...Object.getOwnPropertySymbols(recordA)];
-    const keysB = [...Object.keys(recordB), ...Object.getOwnPropertySymbols(recordB)];
+                    const keysA = Object.keys(recordA);
+    const keysB = Object.keys(recordB);
     if (keysA.length !== keysB.length)
         return false;
         const keySetB = new Set(keysB);