@aemforms/af-core 0.22.165 → 0.22.167

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);
             }
@@ -2005,6 +2011,9 @@ class Scriptable extends BaseNode {
     getCompiledEvent(eName) {
         if (!(eName in this._events)) {
             let eString = this._jsonModel.events?.[eName];
+            if (eName === 'custom:setProperty' && typeof eString === 'undefined') {
+                eString = ['$event.payload'];
+            }
             if (typeof eString === 'string' && eString.length > 0) {
                 eString = [eString];
             }
@@ -2778,7 +2787,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/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.js

@@ -47,6 +47,9 @@ class Scriptable extends BaseNode_1.BaseNode {
         var _a;
         if (!(eName in this._events)) {
             let eString = (_a = this._jsonModel.events) === null || _a === void 0 ? void 0 : _a[eName];
+            if (eName === 'custom:setProperty' && typeof eString === 'undefined') {
+                eString = ['$event.payload'];
+            }
             if (typeof eString === 'string' && eString.length > 0) {
                 eString = [eString];
             }

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.165",
+  "version": "0.22.167",
   "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.165"
+    "@aemforms/af-formatters": "^0.22.167"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",