@aemforms/af-core 0.22.127 → 0.22.128

package/esm/afb-runtime.js

@@ -1673,6 +1673,13 @@ class BaseNode {
         }
         return nonTransparentParent;
     }
+    _isAncestorRepeatable() {
+        let parent = this.parent;
+        while (parent && !parent.repeatable) {
+            parent = parent.parent;
+        }
+        return Boolean(parent);
+    }
     _initialize(mode) {
         if (typeof this._data === 'undefined') {
             let dataNode, parent = this.parent;
@@ -1701,13 +1708,17 @@ class BaseNode {
             return this[qualifiedName];
         }
         const parent = this.getNonTransparentParent();
+        let qn;
         if (parent && parent.type === 'array') {
-            this[qualifiedName] = `${parent.qualifiedName}[${this.index}]`;
+            qn = `${parent.qualifiedName}[${this.index}]`;
         }
         else {
-            this[qualifiedName] = `${parent.qualifiedName}.${this.name}`;
+            qn = `${parent.qualifiedName}.${this.name}`;
         }
-        return this[qualifiedName];
+        if (!this._isAncestorRepeatable()) {
+            this[qualifiedName] = qn;
+        }
+        return qn;
     }
     focus() {
         if (this.parent) {
@@ -3234,7 +3245,7 @@ class FunctionRuntimeImpl {
             addInstance: {
                 _func: (args, data, interpreter) => {
                     const element = args[0];
-                    const payload = args.length > 2 ? valueOf(args[2]) : undefined;
+                    const payload = args.length > 1 ? valueOf(args[1]) : undefined;
                     try {
                         const formElement = interpreter.globals.form.getElement(element.$id);
                         const action = createAction('addInstance', payload);
@@ -3249,7 +3260,7 @@ class FunctionRuntimeImpl {
             removeInstance: {
                 _func: (args, data, interpreter) => {
                     const element = args[0];
-                    const payload = args.length > 2 ? valueOf(args[2]) : undefined;
+                    const payload = args.length > 1 ? valueOf(args[1]) : undefined;
                     try {
                         const formElement = interpreter.globals.form.getElement(element.$id);
                         const action = createAction('removeInstance', payload);
@@ -3379,6 +3390,29 @@ class FunctionRuntimeImpl {
                     }
                 },
                 _signature: []
+            },
+            getRelativeInstanceIndex: {
+                _func: (args, data, interpreter) => {
+                    if (!Array.isArray(args[0]) || args[0].length === 0) {
+                        return -1;
+                    }
+                    const instanceManager = valueOf(args[0])[0].$parent;
+                    const field = interpreter.globals.$field;
+                    const baseName = instanceManager.$qualifiedName;
+                    const qn = field.$qualifiedName;
+                    if (qn.startsWith(baseName + '[')) {
+                        const startBracket = baseName.length + 1;
+                        const endBracket = qn.indexOf(']', startBracket);
+                        if (endBracket !== -1) {
+                            const idx = Number(qn.slice(startBracket, endBracket));
+                            if (!Number.isNaN(idx)) {
+                                return idx;
+                            }
+                        }
+                    }
+                    return instanceManager.length - 1;
+                },
+                _signature: []
             }
         };
         return { ...defaultFunctions, ...FunctionRuntimeImpl.getInstance().customFunctions };
@@ -3556,11 +3590,23 @@ class Form extends Container {
                 captchaInfoObj[field.qualifiedName] = field.value;
             }
         });
+        const additionalMeta = {};
         const draftId = this.properties['fd:draftId'] || '';
         if (draftId) {
-            this.setAdditionalSubmitMetadata({
-                'fd:draftId': draftId
-            });
+            additionalMeta['fd:draftId'] = draftId;
+        }
+        const dorProps = this.properties['fd:dor'];
+        if (dorProps && dorProps.dorType !== 'none') {
+            const excludeFromDoRIfHidden = dorProps.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);
         }
         const options = {
             lang: this.lang,

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

@@ -98,6 +98,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     abstract defaultDataModel(name: string | number): DataValue | undefined;
     abstract syncDataAndFormModel(a?: DataValue | DataGroup): any;
     getNonTransparentParent(): ContainerModel;
+    _isAncestorRepeatable(): boolean;
     _initialize(mode?: FormCreationMode): void;
     protected _applyUpdates(propNames: string[], updates: any): any;
     get qualifiedName(): any;

package/esm/types/src/rules/FunctionRuntime.d.ts

@@ -95,6 +95,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
+        getRelativeInstanceIndex: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => number;
+            _signature: never[];
+        };
     };
 }
 export declare const FunctionRuntime: FunctionRuntimeImpl;

package/lib/BaseNode.d.ts

@@ -98,6 +98,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     abstract defaultDataModel(name: string | number): DataValue | undefined;
     abstract syncDataAndFormModel(a?: DataValue | DataGroup): any;
     getNonTransparentParent(): ContainerModel;
+    _isAncestorRepeatable(): boolean;
     _initialize(mode?: FormCreationMode): void;
     protected _applyUpdates(propNames: string[], updates: any): any;
     get qualifiedName(): any;

package/lib/BaseNode.js

@@ -468,6 +468,13 @@ class BaseNode {
         }
         return nonTransparentParent;
     }
+    _isAncestorRepeatable() {
+        let parent = this.parent;
+        while (parent && !parent.repeatable) {
+            parent = parent.parent;
+        }
+        return Boolean(parent);
+    }
     _initialize(mode) {
         if (typeof this._data === 'undefined') {
             let dataNode, parent = this.parent;
@@ -496,13 +503,17 @@ class BaseNode {
             return this[exports.qualifiedName];
         }
         const parent = this.getNonTransparentParent();
+        let qn;
         if (parent && parent.type === 'array') {
-            this[exports.qualifiedName] = `${parent.qualifiedName}[${this.index}]`;
+            qn = `${parent.qualifiedName}[${this.index}]`;
         }
         else {
-            this[exports.qualifiedName] = `${parent.qualifiedName}.${this.name}`;
+            qn = `${parent.qualifiedName}.${this.name}`;
+        }
+        if (!this._isAncestorRepeatable()) {
+            this[exports.qualifiedName] = qn;
         }
-        return this[exports.qualifiedName];
+        return qn;
     }
     focus() {
         if (this.parent) {

package/lib/Form.js

@@ -156,11 +156,23 @@ class Form extends Container_1.default {
                 captchaInfoObj[field.qualifiedName] = field.value;
             }
         });
+        const additionalMeta = {};
         const draftId = this.properties['fd:draftId'] || '';
         if (draftId) {
-            this.setAdditionalSubmitMetadata({
-                'fd:draftId': draftId
-            });
+            additionalMeta['fd:draftId'] = draftId;
+        }
+        const dorProps = this.properties['fd:dor'];
+        if (dorProps && dorProps.dorType !== 'none') {
+            const excludeFromDoRIfHidden = dorProps.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);
         }
         const options = Object.assign({ lang: this.lang, captchaInfo: captchaInfoObj }, this.additionalSubmitMetadata);
         return new SubmitMetaData_1.default(options);

package/lib/rules/FunctionRuntime.d.ts

@@ -95,6 +95,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
+        getRelativeInstanceIndex: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => number;
+            _signature: never[];
+        };
     };
 }
 export declare const FunctionRuntime: FunctionRuntimeImpl;

package/lib/rules/FunctionRuntime.js

@@ -584,7 +584,7 @@ class FunctionRuntimeImpl {
             addInstance: {
                 _func: (args, data, interpreter) => {
                     const element = args[0];
-                    const payload = args.length > 2 ? valueOf(args[2]) : undefined;
+                    const payload = args.length > 1 ? valueOf(args[1]) : undefined;
                     try {
                         const formElement = interpreter.globals.form.getElement(element.$id);
                         const action = createAction('addInstance', payload);
@@ -599,7 +599,7 @@ class FunctionRuntimeImpl {
             removeInstance: {
                 _func: (args, data, interpreter) => {
                     const element = args[0];
-                    const payload = args.length > 2 ? valueOf(args[2]) : undefined;
+                    const payload = args.length > 1 ? valueOf(args[1]) : undefined;
                     try {
                         const formElement = interpreter.globals.form.getElement(element.$id);
                         const action = createAction('removeInstance', payload);
@@ -732,6 +732,29 @@ class FunctionRuntimeImpl {
                     }
                 },
                 _signature: []
+            },
+            getRelativeInstanceIndex: {
+                _func: (args, data, interpreter) => {
+                    if (!Array.isArray(args[0]) || args[0].length === 0) {
+                        return -1;
+                    }
+                    const instanceManager = valueOf(args[0])[0].$parent;
+                    const field = interpreter.globals.$field;
+                    const baseName = instanceManager.$qualifiedName;
+                    const qn = field.$qualifiedName;
+                    if (qn.startsWith(baseName + '[')) {
+                        const startBracket = baseName.length + 1;
+                        const endBracket = qn.indexOf(']', startBracket);
+                        if (endBracket !== -1) {
+                            const idx = Number(qn.slice(startBracket, endBracket));
+                            if (!Number.isNaN(idx)) {
+                                return idx;
+                            }
+                        }
+                    }
+                    return instanceManager.length - 1;
+                },
+                _signature: []
             }
         };
         return Object.assign(Object.assign({}, defaultFunctions), FunctionRuntimeImpl.getInstance().customFunctions);

package/package.json

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