@aemforms/af-core 0.22.10 → 0.22.12

package/lib/BaseNode.js

@@ -314,7 +314,7 @@ class BaseNode {
             return;
         }
         const dataRef = this._jsonModel.dataRef;
-        let _data;
+        let _data, _parent = contextualDataModel, _key = '';
         if (dataRef === null) { // null data binding
             _data = EmptyDataValue_1.default;
         }
@@ -330,13 +330,18 @@ class BaseNode {
                 const name = this._tokens[this._tokens.length - 1].value;
                 const create = this.defaultDataModel(name);
                 _data = (0, DataRefParser_1.resolveData)(searchData, this._tokens, create);
+                // @ts-ignore
+                _parent = (0, DataRefParser_1.resolveData)(searchData, this._tokens.slice(0, -1));
+                _key = name;
             }
         }
         else { // name data binding
             if ( //@ts-ignore
             contextualDataModel !== EmptyDataValue_1.default) {
+                _parent = contextualDataModel;
                 const name = this._jsonModel.name || '';
                 const key = contextualDataModel.$type === 'array' ? this.index : name;
+                _key = key;
                 if (key !== '') {
                     const create = this.defaultDataModel(key);
                     if (create !== undefined) {
@@ -353,8 +358,10 @@ class BaseNode {
             }
         }
         if (_data) {
-            if (!this.isContainer) {
+            //@ts-ignore
+            if (!this.isContainer && _parent !== EmptyDataValue_1.default && _data !== EmptyDataValue_1.default) {
                 _data = _data === null || _data === void 0 ? void 0 : _data.$convertToDataValue();
+                _parent.$addDataNode(_key, _data, true);
             }
             _data === null || _data === void 0 ? void 0 : _data.$bindToField(this);
             this._data = _data;

package/lib/data/DataGroup.d.ts

@@ -18,7 +18,7 @@ export default class DataGroup extends DataValue {
     };
     get $length(): number;
     $convertToDataValue(): DataValue;
-    $addDataNode(name: string | number, value: DataGroup | DataValue): void;
+    $addDataNode(name: string | number, value: DataGroup | DataValue, override?: boolean): void;
     $removeDataNode(name: string | number): void;
     $getDataNode(name: string | number): any;
     $containsDataNode(name: string | number): boolean;

package/lib/data/DataGroup.js

@@ -57,11 +57,16 @@ class DataGroup extends DataValue_1.default {
     $convertToDataValue() {
         return new DataValue_1.default(this.$name, this.$value, this.$type);
     }
-    $addDataNode(name, value) {
+    $addDataNode(name, value, override = false) {
         if (value !== EmptyDataValue_1.default) {
             if (this.$type === 'array') {
                 const index = name;
-                this.$_items.splice(index, 0, value);
+                if (!override) {
+                    this.$_items.splice(index, 0, value);
+                }
+                else {
+                    this.$_items[name] = value;
+                }
             }
             else {
                 this.$_items[name] = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.10",
+  "version": "0.22.12",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "^0.1.44",
-    "@aemforms/af-formatters": "^0.22.9"
+    "@aemforms/af-formatters": "^0.22.12"
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",