@aemforms/af-core 0.22.155 → 0.22.157

package/esm/afb-runtime.js

@@ -1038,7 +1038,28 @@ const replaceTemplatePlaceholders = (str, values = []) => {
     });
 };
 const sanitizeName = (name) => {
-    const nameRegex = /^[A-Za-z_$][A-Za-z0-9_.]*$/;
+    const nameRegex = /^[A-Za-z0-9_$][A-Za-z0-9_.[\]]*$/;
+    if (name.includes('.')) {
+        const parts = name.split('.');
+        const sanitizedParts = parts.map((part) => {
+            if (part.includes('[')) {
+                const bracketIndex = part.indexOf('[');
+                const namePart = part.substring(0, bracketIndex);
+                const bracketPart = part.substring(bracketIndex);
+                if (!nameRegex.test(namePart)) {
+                    return `"${namePart}"${bracketPart}`;
+                }
+                return part;
+            }
+            else {
+                if (!nameRegex.test(part)) {
+                    return `"${part}"`;
+                }
+                return part;
+            }
+        });
+        return sanitizedParts.join('.');
+    }
     if (!nameRegex.test(name)) {
         return `"${name}"`;
     }
@@ -2509,18 +2530,11 @@ class Container extends Scriptable {
                 return;
             }
             this._data = dataGroup;
-            const result = this.syncDataAndFormModel(dataGroup);
+            this.syncDataAndFormModel(dataGroup);
             const newLength = this.items.length;
-            result.added.forEach((item) => {
-                this.notifyDependents(propertyChange('items', item.getState(), null));
-                item.dispatch(new Initialize());
-            });
             for (let i = 0; i < newLength; i += 1) {
                 this._children[i].dispatch(new ExecuteRule());
             }
-            result.removed.forEach((item) => {
-                this.notifyDependents(propertyChange('items', null, item.getState()));
-            });
         }
         else if (typeof this._data === 'undefined') {
             console.warn(`Data node is null, hence importData did not work for panel "${this.name}". Check if parent has a dataRef set to null.`);
@@ -2550,6 +2564,13 @@ class Container extends Scriptable {
                     result.removed.push(this._children.pop());
                 }
             }
+            result.added.forEach((item) => {
+                this.notifyDependents(propertyChange('items', item.getState(), null));
+                item.dispatch(new Initialize());
+            });
+            result.removed.forEach((item) => {
+                this.notifyDependents(propertyChange('items', null, item.getState()));
+            });
         }
         this._children.forEach(x => {
             let dataModel = x.bindToDataModel(contextualDataModel);

package/lib/Container.js

@@ -367,18 +367,11 @@ class Container extends Scriptable_1.default {
                 return;
             }
             this._data = dataGroup;
-            const result = this.syncDataAndFormModel(dataGroup);
+            this.syncDataAndFormModel(dataGroup);
             const newLength = this.items.length;
-            result.added.forEach((item) => {
-                this.notifyDependents((0, Events_1.propertyChange)('items', item.getState(), null));
-                item.dispatch(new Events_1.Initialize());
-            });
             for (let i = 0; i < newLength; i += 1) {
                 this._children[i].dispatch(new Events_1.ExecuteRule());
             }
-            result.removed.forEach((item) => {
-                this.notifyDependents((0, Events_1.propertyChange)('items', null, item.getState()));
-            });
         }
         else if (typeof this._data === 'undefined') {
             console.warn(`Data node is null, hence importData did not work for panel "${this.name}". Check if parent has a dataRef set to null.`);
@@ -408,6 +401,13 @@ class Container extends Scriptable_1.default {
                     result.removed.push(this._children.pop());
                 }
             }
+            result.added.forEach((item) => {
+                this.notifyDependents((0, Events_1.propertyChange)('items', item.getState(), null));
+                item.dispatch(new Events_1.Initialize());
+            });
+            result.removed.forEach((item) => {
+                this.notifyDependents((0, Events_1.propertyChange)('items', null, item.getState()));
+            });
         }
         this._children.forEach(x => {
             let dataModel = x.bindToDataModel(contextualDataModel);

package/lib/utils/FormUtils.js

@@ -286,7 +286,28 @@ const replaceTemplatePlaceholders = (str, values = []) => {
 };
 exports.replaceTemplatePlaceholders = replaceTemplatePlaceholders;
 const sanitizeName = (name) => {
-    const nameRegex = /^[A-Za-z_$][A-Za-z0-9_.]*$/;
+    const nameRegex = /^[A-Za-z0-9_$][A-Za-z0-9_.[\]]*$/;
+    if (name.includes('.')) {
+        const parts = name.split('.');
+        const sanitizedParts = parts.map((part) => {
+            if (part.includes('[')) {
+                const bracketIndex = part.indexOf('[');
+                const namePart = part.substring(0, bracketIndex);
+                const bracketPart = part.substring(bracketIndex);
+                if (!nameRegex.test(namePart)) {
+                    return `"${namePart}"${bracketPart}`;
+                }
+                return part;
+            }
+            else {
+                if (!nameRegex.test(part)) {
+                    return `"${part}"`;
+                }
+                return part;
+            }
+        });
+        return sanitizedParts.join('.');
+    }
     if (!nameRegex.test(name)) {
         return `"${name}"`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.155",
+  "version": "0.22.157",
   "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.155"
+    "@aemforms/af-formatters": "^0.22.157"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",