@aemforms/af-core 0.22.142 → 0.22.144

package/esm/afb-runtime.js

@@ -3050,10 +3050,9 @@ class FunctionRuntimeImpl {
                             event: interpreter.globals.$event,
                             functions: {
                                 setProperty: (target, payload) => {
-                                    const field = interpreter.globals.form.getElement(target.$id);
-                                    Object.entries(payload).forEach(([key, value]) => {
-                                        field[key] = value;
-                                    });
+                                    const eventName = 'custom:setProperty';
+                                    const args = [target, eventName, payload];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().dispatchEvent._func.call(undefined, args, data, interpreter);
                                 },
                                 reset: (target) => {
                                     const eventName = 'reset';
@@ -3638,6 +3637,10 @@ class FunctionRuntimeImpl {
 }
 const FunctionRuntime = FunctionRuntimeImpl.getInstance();
 
+const transformFieldName = (fieldName) => {
+    return fieldName.split('.').slice(1).map(p => p.match(/\[\d+\]$/) ? p : p !== '' ? `${p}[0]` : p).join('.');
+};
+
 class Version {
     #minor;
     #major;
@@ -3805,36 +3808,39 @@ class Form extends Container {
         return foundFormElement;
     }
     exportSubmitMetaData() {
-        const captchaInfoObj = {};
-        this.visit(field => {
-            if (field.fieldType === 'captcha') {
-                captchaInfoObj[field.qualifiedName] = field.value;
+        return this.withDependencyTrackingControl(true, () => {
+            const captchaInfoObj = {};
+            this.visit(field => {
+                if (field.fieldType === 'captcha') {
+                    captchaInfoObj[field.qualifiedName] = field.value;
+                }
+            });
+            const additionalMeta = {};
+            const draftId = this.properties['fd:draftId'] || '';
+            if (draftId) {
+                additionalMeta['fd:draftId'] = draftId;
+            }
+            const dorProps = this.properties['fd:dor'];
+            if (dorProps && dorProps.dorType !== 'none') {
+                const excludeFromDoRIfHidden = dorProps['fd:excludeFromDoRIfHidden'];
+                let excludeFromDoR = [];
+                excludeFromDoR = Object.values(this._fields)
+                    .filter(field => field.enabled === false || (excludeFromDoRIfHidden && field.visible === false))
+                    .map(field => transformFieldName(field.qualifiedName));
+                if (excludeFromDoR && excludeFromDoR.length > 0) {
+                    additionalMeta.excludeFromDoR = excludeFromDoR;
+                }
             }
-        });
-        const additionalMeta = {};
-        const draftId = this.properties['fd:draftId'] || '';
-        if (draftId) {
-            additionalMeta['fd:draftId'] = draftId;
-        }
-        const dorProps = this.properties['fd:dor'];
-        if (dorProps && dorProps.dorType !== 'none') {
-            const excludeFromDoRIfHidden = dorProps['fd:excludeFromDoRIfHidden'];
-            const excludeFromDoR = Object.values(this._fields)
-                .filter(field => field.enabled === false || (excludeFromDoRIfHidden && field.visible === false))
-                .map(field => field.qualifiedName);
-            if (excludeFromDoR && excludeFromDoR.length > 0) {
-                additionalMeta.excludeFromDoR = excludeFromDoR;
+            if (Object.keys(additionalMeta).length > 0) {
+                this.setAdditionalSubmitMetadata(additionalMeta);
             }
-        }
-        if (Object.keys(additionalMeta).length > 0) {
-            this.setAdditionalSubmitMetadata(additionalMeta);
-        }
-        const options = {
-            lang: this.lang,
-            captchaInfo: captchaInfoObj,
-            ...this.additionalSubmitMetadata
-        };
-        return new SubmitMetaData(options);
+            const options = {
+                lang: this.lang,
+                captchaInfo: captchaInfoObj,
+                ...this.additionalSubmitMetadata
+            };
+            return new SubmitMetaData(options);
+        });
     }
     #getNavigableChildren(children) {
         return children.filter(child => child.visible === true);

package/esm/types/src/utils/DorUtils.d.ts

@@ -0,0 +1 @@
+export declare const transformFieldName: (fieldName: string) => string;

package/lib/Form.js

@@ -29,6 +29,7 @@ const DataGroup_1 = __importDefault(require("./data/DataGroup"));
 const FunctionRuntime_1 = require("./rules/FunctionRuntime");
 const index_1 = require("./types/index");
 const FormUtils_1 = require("./utils/FormUtils");
+const DorUtils_1 = require("./utils/DorUtils");
 const Version_1 = require("./utils/Version");
 exports.currentVersion = new Version_1.Version('0.13');
 const changeEventVersion = new Version_1.Version('0.13');
@@ -153,32 +154,35 @@ class Form extends Container_1.default {
         return foundFormElement;
     }
     exportSubmitMetaData() {
-        const captchaInfoObj = {};
-        this.visit(field => {
-            if (field.fieldType === 'captcha') {
-                captchaInfoObj[field.qualifiedName] = field.value;
+        return this.withDependencyTrackingControl(true, () => {
+            const captchaInfoObj = {};
+            this.visit(field => {
+                if (field.fieldType === 'captcha') {
+                    captchaInfoObj[field.qualifiedName] = field.value;
+                }
+            });
+            const additionalMeta = {};
+            const draftId = this.properties['fd:draftId'] || '';
+            if (draftId) {
+                additionalMeta['fd:draftId'] = draftId;
             }
-        });
-        const additionalMeta = {};
-        const draftId = this.properties['fd:draftId'] || '';
-        if (draftId) {
-            additionalMeta['fd:draftId'] = draftId;
-        }
-        const dorProps = this.properties['fd:dor'];
-        if (dorProps && dorProps.dorType !== 'none') {
-            const excludeFromDoRIfHidden = dorProps['fd:excludeFromDoRIfHidden'];
-            const excludeFromDoR = Object.values(this._fields)
-                .filter(field => field.enabled === false || (excludeFromDoRIfHidden && field.visible === false))
-                .map(field => field.qualifiedName);
-            if (excludeFromDoR && excludeFromDoR.length > 0) {
-                additionalMeta.excludeFromDoR = excludeFromDoR;
+            const dorProps = this.properties['fd:dor'];
+            if (dorProps && dorProps.dorType !== 'none') {
+                const excludeFromDoRIfHidden = dorProps['fd:excludeFromDoRIfHidden'];
+                let excludeFromDoR = [];
+                excludeFromDoR = Object.values(this._fields)
+                    .filter(field => field.enabled === false || (excludeFromDoRIfHidden && field.visible === false))
+                    .map(field => (0, DorUtils_1.transformFieldName)(field.qualifiedName));
+                if (excludeFromDoR && excludeFromDoR.length > 0) {
+                    additionalMeta.excludeFromDoR = excludeFromDoR;
+                }
             }
-        }
-        if (Object.keys(additionalMeta).length > 0) {
-            this.setAdditionalSubmitMetadata(additionalMeta);
-        }
-        const options = Object.assign({ lang: this.lang, captchaInfo: captchaInfoObj }, this.additionalSubmitMetadata);
-        return new SubmitMetaData_1.default(options);
+            if (Object.keys(additionalMeta).length > 0) {
+                this.setAdditionalSubmitMetadata(additionalMeta);
+            }
+            const options = Object.assign({ lang: this.lang, captchaInfo: captchaInfoObj }, this.additionalSubmitMetadata);
+            return new SubmitMetaData_1.default(options);
+        });
     }
     setFocus(field, focusOption) {
         const dependencyTracking = this._ruleEngine.getDependencyTracking();

package/lib/rules/FunctionRuntime.js

@@ -248,10 +248,9 @@ class FunctionRuntimeImpl {
                             event: interpreter.globals.$event,
                             functions: {
                                 setProperty: (target, payload) => {
-                                    const field = interpreter.globals.form.getElement(target.$id);
-                                    Object.entries(payload).forEach(([key, value]) => {
-                                        field[key] = value;
-                                    });
+                                    const eventName = 'custom:setProperty';
+                                    const args = [target, eventName, payload];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().dispatchEvent._func.call(undefined, args, data, interpreter);
                                 },
                                 reset: (target) => {
                                     const eventName = 'reset';

package/lib/utils/DorUtils.d.ts

@@ -0,0 +1 @@
+export declare const transformFieldName: (fieldName: string) => string;

package/lib/utils/DorUtils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformFieldName = void 0;
+const transformFieldName = (fieldName) => {
+    return fieldName.split('.').slice(1).map(p => p.match(/\[\d+\]$/) ? p : p !== '' ? `${p}[0]` : p).join('.');
+};
+exports.transformFieldName = transformFieldName;

package/package.json

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