@aemforms/af-core 0.22.166 → 0.22.169

package/esm/afb-runtime.js

@@ -1840,6 +1840,12 @@ class BaseNode {
         }
         if (_data) {
             if (!this.isContainer && _parent !== NullDataValue && _data !== NullDataValue) {
+                if (_data.$isDataGroup && _data.$_fields.length > 0) {
+                    console.error(`Data binding conflict: non-container field "${this._jsonModel.name || this.id}" ` +
+                        `with dataRef "${dataRef}" points to a DataGroup already bound by a container. ` +
+                        'This would destroy existing child data. The data of this field will not be exported.');
+                    return this._data;
+                }
                 _data = _data?.$convertToDataValue();
                 _parent.$addDataNode(_key, _data, true);
             }
@@ -2039,6 +2045,11 @@ class Scriptable extends BaseNode {
         }
         return this._events[eName] || [];
     }
+    getState(forRestore = false) {
+        const state = super.getState(forRestore);
+        state.events = state.events || {};
+        return state;
+    }
     applyUpdates(updates) {
         if (typeof updates === 'object') {
             if (updates !== null) {
@@ -2781,7 +2792,15 @@ class EventNode {
         return that !== null && that !== undefined && this._node == that._node && this._event.type == that._event.type;
     }
     toString() {
-        return this._node.id + '__' + this.event.type;
+        const base = this._node.id + '__' + this._event.type;
+        if (this._event.type === 'change' && this._event.payload?.changes) {
+            const sig = this._event.payload.changes
+                .map((c) => c.propertyName)
+                .sort()
+                .join(',');
+            return base + '__' + sig;
+        }
+        return base;
     }
     valueOf() {
         return this.toString();

package/esm/types/src/Scriptable.d.ts

@@ -8,6 +8,27 @@ declare abstract class Scriptable<T extends RulesJson> extends BaseNode<T> imple
     getRules(): import("./types/Json").Items<string>;
     private getCompiledRule;
     private getCompiledEvent;
+    getState(forRestore?: boolean): T & {
+        _dependents?: {
+            id: string;
+            propertyName: string | undefined;
+        }[] | undefined;
+        allowedComponents?: undefined;
+        columnClassNames?: undefined;
+        columnCount?: undefined;
+        gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
+        properties: {
+            [key: string]: any;
+        };
+        index: number;
+        parent: undefined;
+        qualifiedName: any;
+        id: string;
+    };
     protected applyUpdates(updates: any): void;
     protected executeAllRules(context: any): void;
     private getExpressionScope;

package/lib/BaseNode.js

@@ -491,6 +491,12 @@ class BaseNode {
         }
         if (_data) {
             if (!this.isContainer && _parent !== EmptyDataValue_1.default && _data !== EmptyDataValue_1.default) {
+                if (_data.$isDataGroup && _data.$_fields.length > 0) {
+                    console.error(`Data binding conflict: non-container field "${this._jsonModel.name || this.id}" ` +
+                        `with dataRef "${dataRef}" points to a DataGroup already bound by a container. ` +
+                        'This would destroy existing child data. The data of this field will not be exported.');
+                    return this._data;
+                }
                 _data = _data === null || _data === void 0 ? void 0 : _data.$convertToDataValue();
                 _parent.$addDataNode(_key, _data, true);
             }

package/lib/Scriptable.d.ts

@@ -8,6 +8,27 @@ declare abstract class Scriptable<T extends RulesJson> extends BaseNode<T> imple
     getRules(): import("./types/Json").Items<string>;
     private getCompiledRule;
     private getCompiledEvent;
+    getState(forRestore?: boolean): T & {
+        _dependents?: {
+            id: string;
+            propertyName: string | undefined;
+        }[] | undefined;
+        allowedComponents?: undefined;
+        columnClassNames?: undefined;
+        columnCount?: undefined;
+        gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
+        properties: {
+            [key: string]: any;
+        };
+        index: number;
+        parent: undefined;
+        qualifiedName: any;
+        id: string;
+    };
     protected applyUpdates(updates: any): void;
     protected executeAllRules(context: any): void;
     private getExpressionScope;

package/lib/Scriptable.js

@@ -81,6 +81,11 @@ class Scriptable extends BaseNode_1.BaseNode {
         }
         return this._events[eName] || [];
     }
+    getState(forRestore = false) {
+        const state = super.getState(forRestore);
+        state.events = state.events || {};
+        return state;
+    }
     applyUpdates(updates) {
         if (typeof updates === 'object') {
             if (updates !== null) {

package/lib/controller/EventQueue.js

@@ -16,7 +16,16 @@ class EventNode {
         return that !== null && that !== undefined && this._node == that._node && this._event.type == that._event.type;
     }
     toString() {
-        return this._node.id + '__' + this.event.type;
+        var _a;
+        const base = this._node.id + '__' + this._event.type;
+        if (this._event.type === 'change' && ((_a = this._event.payload) === null || _a === void 0 ? void 0 : _a.changes)) {
+            const sig = this._event.payload.changes
+                .map((c) => c.propertyName)
+                .sort()
+                .join(',');
+            return base + '__' + sig;
+        }
+        return base;
     }
     valueOf() {
         return this.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.166",
+  "version": "0.22.169",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.166"
+    "@aemforms/af-formatters": "^0.22.169"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",