@aemforms/af-core 0.21.0 → 0.22.4

package/lib/BaseNode.d.ts

@@ -53,6 +53,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     get ruleEngine(): import("./rules/RuleEngine").default;
     get label(): import("./types").Label | undefined;
     set label(l: import("./types").Label | undefined);
+    get uniqueItems(): boolean | undefined;
     /**
      * Transparent form fields are meant only for creation of view. They are also not part of data
      */

package/lib/BaseNode.js

@@ -109,6 +109,10 @@ class BaseNode {
             //look for property
             if (prop.startsWith('$')) {
                 prop = prop.substr(1);
+                if (prop === 'parent') {
+                    return this[prop].getRuleNode();
+                }
+                //@ts-ignore
                 //@todo: create a list of properties that are allowed
                 //@ts-ignore
                 // return only non functional properties in this object
@@ -185,6 +189,9 @@ class BaseNode {
             this.notifyDependents(changeAction);
         }
     }
+    get uniqueItems() {
+        return this._jsonModel.uniqueItems;
+    }
     /**
      * Transparent form fields are meant only for creation of view. They are also not part of data
      */

package/lib/Container.d.ts

@@ -56,6 +56,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
             step?: number | undefined;
             type?: string | undefined;
             validationExpression?: string | undefined;
+            uniqueItems?: boolean | undefined;
             dataRef?: string | null | undefined;
             ':type': string;
             label?: import("./types").Label | undefined;
@@ -98,6 +99,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
             step?: number | undefined;
             type?: "object" | "array" | undefined;
             validationExpression?: string | undefined;
+            uniqueItems?: boolean | undefined;
             dataRef?: string | null | undefined;
             ':type'?: string | undefined;
             label?: import("./types").Label | undefined;
@@ -133,6 +135,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                 step?: number | undefined;
                 type?: string | undefined;
                 validationExpression?: string | undefined;
+                uniqueItems?: boolean | undefined;
             } & {
                 dataRef?: string | null | undefined;
                 ':type'?: string | undefined;
@@ -180,6 +183,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                 step?: number | undefined;
                 type?: string | undefined;
                 validationExpression?: string | undefined;
+                uniqueItems?: boolean | undefined;
             } & {
                 dataRef?: string | null | undefined;
                 ':type'?: string | undefined;
@@ -221,6 +225,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                     step?: number | undefined;
                     type?: string | undefined;
                     validationExpression?: string | undefined;
+                    uniqueItems?: boolean | undefined;
                 } & {
                     dataRef?: string | null | undefined;
                     ':type'?: string | undefined;
@@ -268,6 +273,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                     step?: number | undefined;
                     type?: string | undefined;
                     validationExpression?: string | undefined;
+                    uniqueItems?: boolean | undefined;
                 } & {
                     dataRef?: string | null | undefined;
                     ':type'?: string | undefined;

package/lib/Container.js

@@ -199,7 +199,7 @@ class Container extends Scriptable_1.default {
      */
     removeItem(action) {
         if (action.type === 'removeItem' && this._itemTemplate != null) {
-            const index = action.payload || this._children.length - 1;
+            const index = typeof action.payload === 'number' ? action.payload : this._children.length - 1;
             const state = this._children[index].getState();
             //@ts-ignore
             if (this._children.length > this._jsonModel.minItems) {
@@ -237,13 +237,7 @@ class Container extends Scriptable_1.default {
      * @private
      */
     dispatch(action) {
-        var _a;
         super.dispatch(action);
-        if ((_a = action.metadata) === null || _a === void 0 ? void 0 : _a.dispatch) {
-            this.items.forEach(x => {
-                x.dispatch(action);
-            });
-        }
     }
     /**
      * @private

package/lib/Field.d.ts

@@ -79,12 +79,6 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
             valid: boolean;
             value: number;
         };
-        /**
-         *
-         * @param value
-         * @param constraints
-         * @private
-         */
         maximum: (constraint: number, value: number) => {
             valid: boolean;
             value: number;
@@ -110,7 +104,9 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
             value: T_2[];
         };
         minLength: (constraint: number, value: string) => {
-            value: string;
+            value: string; /**
+             * returns the format constraint
+             */
             valid: boolean;
         };
         maxLength: (constraint: number, value: string) => {

package/lib/Field.js

@@ -176,19 +176,24 @@ class Field extends Scriptable_1.default {
         const Constraints = this._getConstraintObject();
         const typeRes = Constraints.type(this._jsonModel.type || 'string', v);
         const changes = this._setProperty('value', typeRes.value, false);
+        let uniqueRes = { valid: true };
         if (changes.length > 0) {
             const dataNode = this.getDataNode();
             if (typeof dataNode !== 'undefined') {
                 dataNode.setValue(this.isEmpty() ? this.emptyValue : this._jsonModel.value, this._jsonModel.value);
             }
+            if (this.parent.uniqueItems && this.parent.type === 'array') {
+                // @ts-ignore
+                uniqueRes = Constraints.uniqueItems(this.parent.uniqueItems, this.parent.getDataNode().$value);
+            }
             let updates;
-            if (typeRes.valid) {
+            if (typeRes.valid && uniqueRes.valid) {
                 updates = this.evaluateConstraints();
             }
             else {
                 const changes = {
-                    'valid': typeRes.valid,
-                    'errorMessage': typeRes.valid ? '' : this.getErrorMessage('type')
+                    'valid': typeRes.valid && uniqueRes.valid,
+                    'errorMessage': typeRes.valid && uniqueRes.valid ? '' : this.getErrorMessage('type')
                 };
                 updates = this._applyUpdates(['valid', 'errorMessage'], changes);
             }
@@ -332,7 +337,12 @@ class Field extends Scriptable_1.default {
                     // @ts-ignore
                     const fn = Constraints[key];
                     if (value instanceof Array && this.isArrayType()) {
-                        return value.some(x => !(fn(restriction, x).valid));
+                        if (ValidationUtils_1.ValidConstraints.array.indexOf(key) !== -1) {
+                            return !fn(restriction, value).valid;
+                        }
+                        else {
+                            return value.some(x => !(fn(restriction, x).valid));
+                        }
                     }
                     else if (typeof fn === 'function') {
                         return !fn(restriction, value).valid;

package/lib/Fieldset.d.ts

@@ -28,4 +28,7 @@ export declare class Fieldset extends Container<FieldsetJson> implements Fieldse
     protected _createChild(child: FieldsetJson | FieldJson, options: any): FieldModel | FieldsetModel;
     get items(): (FieldModel | FieldsetModel)[];
     get value(): null;
+    get fieldType(): string;
+    get enabled(): boolean | undefined;
+    set enabled(e: boolean | undefined);
 }

package/lib/Fieldset.js

@@ -74,6 +74,9 @@ class Fieldset extends Container_1.default {
                 this._jsonModel[key] = value;
             }
         });
+        if (this._jsonModel.dataRef && this._jsonModel.type === undefined) {
+            this._jsonModel.type = 'object';
+        }
     }
     get type() {
         const ret = super.type;
@@ -93,5 +96,14 @@ class Fieldset extends Container_1.default {
     get value() {
         return null;
     }
+    get fieldType() {
+        return 'panel';
+    }
+    get enabled() {
+        return this._jsonModel.enabled;
+    }
+    set enabled(e) {
+        this._setProperty('enabled', e);
+    }
 }
 exports.Fieldset = Fieldset;

package/lib/FileUpload.d.ts

@@ -33,6 +33,11 @@ declare class FileUpload extends Field implements FieldModel {
         valid: boolean;
         value: any;
     };
+    checkFileType(type: any): boolean;
+    acceptCheck(value: any): {
+        valid: boolean;
+        value: any;
+    };
     get value(): any;
     set value(value: any);
     private _serialize;

package/lib/FileUpload.js

@@ -177,6 +177,32 @@ class FileUpload extends Field_1.default {
                 return ValidationUtils_1.Constraints.type(type, value);
         }
     }
+    checkFileType(type) {
+        let accepts = this.accept || '';
+        let validFileType = false;
+        if (!accepts || !type) {
+            return true;
+        }
+        accepts = Array.isArray(accepts) ? accepts : accepts.split(',');
+        accepts.forEach((accept) => {
+            const prefixAccept = accept.split('/')[0];
+            const suffixAccept = accept.split('.')[1];
+            if ((accept.includes('*') && type.startsWith(prefixAccept)) ||
+                (accept.includes('.') && type.endsWith(suffixAccept)) ||
+                (accept === type)) {
+                validFileType = true;
+            }
+        });
+        return validFileType;
+    }
+    acceptCheck(value) {
+        const tempValue = value instanceof Array ? value : [value];
+        const invalidFile = tempValue.some((file) => !this.checkFileType(file.type || file.mediaType));
+        return {
+            valid: !invalidFile,
+            value
+        };
+    }
     get value() {
         // @ts-ignore
         this.ruleEngine.trackDependency(this);
@@ -219,6 +245,7 @@ class FileUpload extends Field_1.default {
         if (value !== undefined) {
             // store file list here
             const typeRes = this.typeCheck(value);
+            const acceptRes = this.acceptCheck(value);
             const changes = this._setProperty('value', typeRes.value, false);
             let fileInfoPayload = FileUpload.extractFileInfo(value);
             fileInfoPayload = this.coerce(fileInfoPayload);
@@ -242,13 +269,13 @@ class FileUpload extends Field_1.default {
                     }
                 }
                 let updates;
-                if (typeRes.valid) {
+                if (typeRes.valid && acceptRes.valid) {
                     updates = this.evaluateConstraints();
                 }
                 else {
                     const changes = {
-                        'valid': typeRes.valid,
-                        'errorMessage': typeRes.valid ? '' : this.getErrorMessage('type')
+                        'valid': typeRes.valid && acceptRes.valid,
+                        'errorMessage': typeRes.valid && acceptRes.valid ? '' : this.getErrorMessage('type')
                     };
                     updates = this._applyUpdates(['valid', 'errorMessage'], changes);
                 }

package/lib/Form.d.ts

@@ -70,6 +70,9 @@ declare class Form extends Container<FormJson> implements FormModel {
         enum?: any[] | undefined;
     } & {
         accept?: string[] | undefined;
+        /**
+         * @private
+         */
         enforceEnum?: boolean | undefined;
         exclusiveMinimum?: number | undefined;
         exclusiveMaximum?: number | undefined;
@@ -86,6 +89,7 @@ declare class Form extends Container<FormJson> implements FormModel {
         step?: number | undefined;
         type?: string | undefined;
         validationExpression?: string | undefined;
+        uniqueItems?: boolean | undefined;
     } & {
         dataRef?: string | null | undefined;
         ':type'?: string | undefined;
@@ -117,6 +121,9 @@ declare class Form extends Container<FormJson> implements FormModel {
             enumNames?: string[] | undefined;
             enum?: any[] | undefined;
             accept?: string[] | undefined;
+            /**
+             * @private
+             */
             enforceEnum?: boolean | undefined;
             exclusiveMinimum?: number | undefined;
             exclusiveMaximum?: number | undefined;
@@ -133,6 +140,7 @@ declare class Form extends Container<FormJson> implements FormModel {
             step?: number | undefined;
             type?: string | undefined;
             validationExpression?: string | undefined;
+            uniqueItems?: boolean | undefined;
             dataRef?: string | null | undefined;
             ':type': string;
             label?: import("./types").Label | undefined;
@@ -159,6 +167,9 @@ declare class Form extends Container<FormJson> implements FormModel {
             enumNames?: string[] | undefined;
             enum?: any[] | undefined;
             accept?: string[] | undefined;
+            /**
+             * @private
+             */
             enforceEnum?: boolean | undefined;
             exclusiveMinimum?: number | undefined;
             exclusiveMaximum?: number | undefined;
@@ -175,6 +186,7 @@ declare class Form extends Container<FormJson> implements FormModel {
             step?: number | undefined;
             type?: "object" | "array" | undefined;
             validationExpression?: string | undefined;
+            uniqueItems?: boolean | undefined;
             dataRef?: string | null | undefined;
             ':type'?: string | undefined;
             label?: import("./types").Label | undefined;
@@ -194,6 +206,9 @@ declare class Form extends Container<FormJson> implements FormModel {
                 enum?: any[] | undefined;
             } & {
                 accept?: string[] | undefined;
+                /**
+                 * @private
+                 */
                 enforceEnum?: boolean | undefined;
                 exclusiveMinimum?: number | undefined;
                 exclusiveMaximum?: number | undefined;
@@ -210,6 +225,7 @@ declare class Form extends Container<FormJson> implements FormModel {
                 step?: number | undefined;
                 type?: string | undefined;
                 validationExpression?: string | undefined;
+                uniqueItems?: boolean | undefined;
             } & {
                 dataRef?: string | null | undefined;
                 ':type'?: string | undefined;
@@ -241,6 +257,9 @@ declare class Form extends Container<FormJson> implements FormModel {
                 enum?: any[] | undefined;
             } & {
                 accept?: string[] | undefined;
+                /**
+                 * @private
+                 */
                 enforceEnum?: boolean | undefined;
                 exclusiveMinimum?: number | undefined;
                 exclusiveMaximum?: number | undefined;
@@ -257,6 +276,7 @@ declare class Form extends Container<FormJson> implements FormModel {
                 step?: number | undefined;
                 type?: string | undefined;
                 validationExpression?: string | undefined;
+                uniqueItems?: boolean | undefined;
             } & {
                 dataRef?: string | null | undefined;
                 ':type'?: string | undefined;
@@ -282,6 +302,9 @@ declare class Form extends Container<FormJson> implements FormModel {
                     enum?: any[] | undefined;
                 } & {
                     accept?: string[] | undefined;
+                    /**
+                     * @private
+                     */
                     enforceEnum?: boolean | undefined;
                     exclusiveMinimum?: number | undefined;
                     exclusiveMaximum?: number | undefined;
@@ -298,6 +321,7 @@ declare class Form extends Container<FormJson> implements FormModel {
                     step?: number | undefined;
                     type?: string | undefined;
                     validationExpression?: string | undefined;
+                    uniqueItems?: boolean | undefined;
                 } & {
                     dataRef?: string | null | undefined;
                     ':type'?: string | undefined;
@@ -329,6 +353,9 @@ declare class Form extends Container<FormJson> implements FormModel {
                     enum?: any[] | undefined;
                 } & {
                     accept?: string[] | undefined;
+                    /**
+                     * @private
+                     */
                     enforceEnum?: boolean | undefined;
                     exclusiveMinimum?: number | undefined;
                     exclusiveMaximum?: number | undefined;
@@ -345,6 +372,7 @@ declare class Form extends Container<FormJson> implements FormModel {
                     step?: number | undefined;
                     type?: string | undefined;
                     validationExpression?: string | undefined;
+                    uniqueItems?: boolean | undefined;
                 } & {
                     dataRef?: string | null | undefined;
                     ':type'?: string | undefined;

package/lib/Form.js

@@ -79,6 +79,7 @@ class Form extends Container_1.default {
         this._ids = (0, FormUtils_1.IdGenerator)();
         this._bindToDataModel(new DataGroup_1.default('$form', {}));
         this._initialize();
+        this.queueEvent(new controller_1.FormLoad());
     }
     get logger() {
         return this._logger;

package/lib/FormInstance.d.ts

@@ -14,9 +14,21 @@ export declare const createFormInstance: (formModel: any, callback?: ((f: FormMo
  * Validates Form model definition with the given data
  * @param formModel     form model definition
  * @param data          form data
+ * @deprecated use validateFormData
  * @returns `true`, if form is valid against the given form data, `false` otherwise
  */
 export declare const validateFormInstance: (formModel: any, data: any) => boolean;
+/**
+* Validates Form model definition with the given data
+* @param formModel     form model definition
+* @param data          form data
+* @deprecated use validateFormData
+* @returns {messages: [], valid: boolean}
+*/
+export declare const validateFormData: (formModel: any, data: any) => {
+    messages: any[];
+    valid: boolean;
+};
 /**
  * Helper API to fetch form model definition from an AEM instance
  * @param url       URL of the instance

package/lib/FormInstance.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchForm = exports.validateFormInstance = exports.createFormInstance = void 0;
+exports.fetchForm = exports.validateFormData = exports.validateFormInstance = exports.createFormInstance = void 0;
 const Form_1 = __importStar(require("./Form"));
 const JsonUtils_1 = require("./utils/JsonUtils");
 const Fetch_1 = require("./utils/Fetch");
@@ -79,6 +79,7 @@ exports.createFormInstance = createFormInstance;
  * Validates Form model definition with the given data
  * @param formModel     form model definition
  * @param data          form data
+ * @deprecated use validateFormData
  * @returns `true`, if form is valid against the given form data, `false` otherwise
  */
 const validateFormInstance = (formModel, data) => {
@@ -94,6 +95,30 @@ const validateFormInstance = (formModel, data) => {
     }
 };
 exports.validateFormInstance = validateFormInstance;
+/**
+* Validates Form model definition with the given data
+* @param formModel     form model definition
+* @param data          form data
+* @deprecated use validateFormData
+* @returns {messages: [], valid: boolean}
+*/
+const validateFormData = (formModel, data) => {
+    try {
+        const f = new Form_1.default(Object.assign({}, formModel), new RuleEngine_1.default());
+        if (data) {
+            f.importData(data);
+        }
+        const res = f.validate();
+        return {
+            messages: res,
+            valid: res.length === 0
+        };
+    }
+    catch (e) {
+        throw new Error(e);
+    }
+};
+exports.validateFormData = validateFormData;
 /**
  * Helper API to fetch form model definition from an AEM instance
  * @param url       URL of the instance

package/lib/controller/Controller.d.ts

@@ -109,6 +109,15 @@ export declare class Initialize extends ActionImpl {
      */
     constructor(payload?: any, dispatch?: boolean);
 }
+/**
+ * Implementation of `load` event. The event is when the form initialization is complete
+ */
+export declare class FormLoad extends ActionImpl {
+    /**
+     * @constructor
+     */
+    constructor();
+}
 /**
  * Implementation of `click` event. The event is triggered when user clicks on an element.
  */

package/lib/controller/Controller.js

@@ -7,7 +7,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ADOBE NOR ITS THIRD PARTY PROVIDERS AND PARTNERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoveItem = exports.AddItem = exports.CustomEvent = exports.FieldChanged = exports.Submit = exports.ValidationComplete = exports.Blur = exports.Click = exports.Initialize = exports.propertyChange = exports.ExecuteRule = exports.Valid = exports.Invalid = exports.Change = exports.ActionImpl = void 0;
+exports.RemoveItem = exports.AddItem = exports.CustomEvent = exports.FieldChanged = exports.Submit = exports.ValidationComplete = exports.Blur = exports.Click = exports.FormLoad = exports.Initialize = exports.propertyChange = exports.ExecuteRule = exports.Valid = exports.Invalid = exports.Change = exports.ActionImpl = void 0;
 /**
  * Implementation of generic event
  * @private
@@ -136,6 +136,18 @@ class Initialize extends ActionImpl {
     }
 }
 exports.Initialize = Initialize;
+/**
+ * Implementation of `load` event. The event is when the form initialization is complete
+ */
+class FormLoad extends ActionImpl {
+    /**
+     * @constructor
+     */
+    constructor() {
+        super({}, 'load', { dispatch: false });
+    }
+}
+exports.FormLoad = FormLoad;
 /**
  * Implementation of `click` event. The event is triggered when user clicks on an element.
  */

package/lib/rules/FunctionRuntime.d.ts

@@ -26,6 +26,14 @@ declare class FunctionRuntimeImpl {
             _func: (args: unknown, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
+        exportData: {
+            _func: (args: unknown, data: unknown, interpreter: any) => any;
+            _signature: never[];
+        };
+        importData: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
+            _signature: never[];
+        };
         submitForm: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];

package/lib/rules/FunctionRuntime.js

@@ -210,10 +210,28 @@ class FunctionRuntimeImpl {
             },
             getData: {
                 _func: (args, data, interpreter) => {
+                    // deprecated. left for backward compatability.
+                    interpreter.globals.form.logger.warn('The `getData` function is depricated. Use `exportData` instead.');
                     return interpreter.globals.form.exportData();
                 },
                 _signature: []
             },
+            exportData: {
+                _func: (args, data, interpreter) => {
+                    return interpreter.globals.form.exportData();
+                },
+                _signature: []
+            },
+            importData: {
+                _func: (args, data, interpreter) => {
+                    const inputData = args[0];
+                    if (typeof inputData === 'object' && inputData !== null) {
+                        interpreter.globals.form.importData(inputData);
+                    }
+                    return {};
+                },
+                _signature: []
+            },
             submitForm: {
                 _func: (args, data, interpreter) => {
                     // success: string, error: string, submit_as: 'json' | 'multipart' = 'json', data: any = null

package/lib/types/Json.d.ts

@@ -37,6 +37,7 @@ export declare type ConstraintsJson = TranslationConstraintsJson & {
     step?: number;
     type?: string;
     validationExpression?: string;
+    uniqueItems?: boolean;
 };
 /** Type for `constraint messages` based on `adaptive form specification` */
 export declare type ConstraintsMessages = {

package/lib/types/Json.js

@@ -9,7 +9,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constraintProps = exports.translationProps = void 0;
 /** Constant for all properties which can be translated based on `adaptive form specification` */
-exports.translationProps = ['description', 'placeholder', 'enum', 'enumNames', 'label.value'];
+exports.translationProps = ['description', 'placeholder', 'enum', 'enumNames', 'label.value', 'constraintMessages.accept',
+    'constraintMessages.enum', 'constraintMessages.exclusiveMinimum', 'constraintMessages.exclusiveMaximum', 'constraintMessages.format', 'constraintMessages.maxFileSize', 'constraintMessages.maxLength',
+    'constraintMessages.maximum', 'constraintMessages.maxItems', 'constraintMessages.minLength', 'constraintMessages.minimum', 'constraintMessages.minItems', 'constraintMessages.pattern', 'constraintMessages.required',
+    'constraintMessages.step', 'constraintMessages.type', 'constraintMessages.validationExpression'];
 /** Constant for all properties which are constraints based on `adaptive form specification` */
 exports.constraintProps = ['accept', 'enum', 'exclusiveMinimum', 'exclusiveMaximum',
     'format', 'maxFileSize', 'maxLength', 'maximum', 'maxItems',

package/lib/utils/TranslationUtils.d.ts

@@ -22,7 +22,7 @@ export declare const addTranslationId: (input: formElementJson, additionalTransl
  * @param key               key to return from input object (key could be comma separated, example, label.value)
  * @param defaultValue      default value
  */
-export declare const getOrElse: (input: any, key: string, defaultValue?: any) => any;
+export declare const getOrElse: (input: any, key: string | string[], defaultValue?: any) => any;
 /**
  * @param input
  * @param additionalTranslationProps

package/lib/utils/TranslationUtils.js

@@ -59,7 +59,15 @@ exports.addTranslationId = addTranslationId;
 const _createTranslationId = (input, path, transProps) => {
     Object.entries(input).forEach(([key, value]) => {
         if (typeof value == 'object') {
-            _createTranslationId(value, ((key === 'items') ? path : `${path === '' ? path : path + exports.TRANSLATION_TOKEN}${key}${exports.TRANSLATION_TOKEN}${Math.floor(Math.random() * 10000) + 1}`), transProps);
+            if (input instanceof Array) {
+                if (value && 'name' in value) {
+                    // @ts-ignore
+                    _createTranslationId(value, `${path === '' ? path : path + exports.TRANSLATION_TOKEN}${value.name}`, transProps);
+                }
+            }
+            else {
+                _createTranslationId(value, ((key === 'items') ? path : `${path === '' ? path : path + exports.TRANSLATION_TOKEN}${key}`), transProps);
+            }
         }
         else {
             // set it only if either of type or fieldType properties is present
@@ -131,7 +139,7 @@ const getOrElse = (input, key, defaultValue = null) => {
     if (!key) {
         return defaultValue;
     }
-    const arr = key.split('.');
+    const arr = Array.isArray(key) ? key : key.split('.');
     let objValue = input, index = 0;
     while (index < arr.length && objValue.hasOwnProperty(arr[index])) {
         objValue = objValue[arr[index]];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.21.0",
+  "version": "0.22.4",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",