@aemforms/af-core 0.22.97 → 0.22.99

package/esm/afb-runtime.js

@@ -78,19 +78,21 @@ const isButton = function (item) {
     return item?.fieldType === 'button';
 };
 function deepClone(obj, idGenerator) {
-    let result;
-    if (obj instanceof Array) {
-        result = [];
-        result = obj.map(x => deepClone(x, idGenerator));
+    if (obj === null || typeof obj !== 'object') {
+        return obj;
     }
-    else if (typeof obj === 'object' && obj !== null) {
-        result = {};
-        Object.entries(obj).forEach(([key, value]) => {
-            result[key] = deepClone(value, idGenerator);
-        });
+    let result;
+    if (Array.isArray(obj)) {
+        result = new Array(obj.length);
+        for (let i = 0; i < obj.length; i++) {
+            result[i] = deepClone(obj[i], idGenerator);
+        }
     }
     else {
-        result = obj;
+        result = {};
+        for (const key of Object.keys(obj)) {
+            result[key] = deepClone(obj[key], idGenerator);
+        }
     }
     if (idGenerator && result && result.id) {
         result.id = idGenerator();
@@ -1225,6 +1227,9 @@ class BaseNode {
     get name() {
         return this._jsonModel.name;
     }
+    get screenReaderText() {
+        return this._jsonModel.screenReaderText;
+    }
     get description() {
         return this._jsonModel.description;
     }
@@ -1946,7 +1951,7 @@ class Container extends Scriptable {
     _canHaveRepeatingChildren(mode = 'create') {
         const items = this._jsonModel.items;
         return this._jsonModel.type == 'array' && this.getDataNode() != null &&
-            (items.length === 1 || (items[0].repeatable == true && mode === 'restore'));
+            (items.length === 1 || (items.length > 0 && items[0].repeatable == true && mode === 'restore'));
     }
     _initialize(mode) {
         super._initialize(mode);
@@ -2141,12 +2146,11 @@ class Container extends Scriptable {
         }
     }
     get enabled() {
-        if (this.parent?.enabled !== undefined) {
-            return !this.parent?.enabled ? false : this._jsonModel.enabled;
-        }
-        else {
-            return this._jsonModel.enabled;
+        const parentEnabled = this.parent?.enabled;
+        if (parentEnabled !== undefined) {
+            return parentEnabled ? this._jsonModel.enabled : false;
         }
+        return this._jsonModel.enabled;
     }
     set enabled(e) {
         this._setProperty('enabled', e, true, this.notifyChildren);
@@ -3605,12 +3609,11 @@ class Field extends Scriptable {
         this._setProperty('readOnly', e);
     }
     get enabled() {
-        if (this.parent.enabled !== undefined) {
-            return this.parent.enabled === false ? false : this._jsonModel.enabled;
-        }
-        else {
-            return this._jsonModel.enabled;
+        const parentEnabled = this.parent?.enabled;
+        if (parentEnabled !== undefined) {
+            return parentEnabled ? this._jsonModel.enabled : false;
         }
+        return this._jsonModel.enabled;
     }
     set enabled(e) {
         this._setProperty('enabled', e);
@@ -3861,9 +3864,6 @@ class Field extends Scriptable {
         this._setProperty('errorMessage', e);
         this._setProperty('validationMessage', e);
     }
-    get screenReaderText() {
-        return this._jsonModel.screenReaderText;
-    }
     _getConstraintObject() {
         return Constraints;
     }
@@ -4089,6 +4089,9 @@ class Field extends Scriptable {
         if (this.visible === false) {
             return [];
         }
+        if (this.valid === false && this.errorMessage && this?.validity?.customConstraint) {
+            return [new ValidationError(this.id, [this._jsonModel.errorMessage])];
+        }
         const changes = this.evaluateConstraints();
         this.#triggerValidationEvent();
         if (changes.validity) {

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

@@ -40,6 +40,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     get fieldType(): string;
     get ':type'(): string;
     get name(): string | undefined;
+    get screenReaderText(): string | undefined;
     get description(): string | undefined;
     set description(d: string | undefined);
     get dataRef(): string | null | undefined;

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

@@ -65,7 +65,6 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     getErrorMessage(constraint: keyof (ConstraintsMessages)): string;
     get errorMessage(): string | undefined;
     set errorMessage(e: string | undefined);
-    get screenReaderText(): string | undefined;
     _getConstraintObject(): {
         enum: (constraint: any, inputVal: any) => {
             valid: boolean;

package/lib/BaseNode.d.ts

@@ -40,6 +40,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     get fieldType(): string;
     get ':type'(): string;
     get name(): string | undefined;
+    get screenReaderText(): string | undefined;
     get description(): string | undefined;
     set description(d: string | undefined);
     get dataRef(): string | null | undefined;

package/lib/BaseNode.js

@@ -203,6 +203,9 @@ class BaseNode {
     get name() {
         return this._jsonModel.name;
     }
+    get screenReaderText() {
+        return this._jsonModel.screenReaderText;
+    }
     get description() {
         return this._jsonModel.description;
     }

package/lib/Container.js

@@ -199,7 +199,7 @@ class Container extends Scriptable_1.default {
     _canHaveRepeatingChildren(mode = 'create') {
         const items = this._jsonModel.items;
         return this._jsonModel.type == 'array' && this.getDataNode() != null &&
-            (items.length === 1 || (items[0].repeatable == true && mode === 'restore'));
+            (items.length === 1 || (items.length > 0 && items[0].repeatable == true && mode === 'restore'));
     }
     _initialize(mode) {
         super._initialize(mode);
@@ -395,13 +395,12 @@ class Container extends Scriptable_1.default {
         }
     }
     get enabled() {
-        var _a, _b;
-        if (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.enabled) !== undefined) {
-            return !((_b = this.parent) === null || _b === void 0 ? void 0 : _b.enabled) ? false : this._jsonModel.enabled;
-        }
-        else {
-            return this._jsonModel.enabled;
+        var _a;
+        const parentEnabled = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.enabled;
+        if (parentEnabled !== undefined) {
+            return parentEnabled ? this._jsonModel.enabled : false;
         }
+        return this._jsonModel.enabled;
     }
     set enabled(e) {
         this._setProperty('enabled', e, true, this.notifyChildren);

package/lib/Field.d.ts

@@ -65,7 +65,6 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     getErrorMessage(constraint: keyof (ConstraintsMessages)): string;
     get errorMessage(): string | undefined;
     set errorMessage(e: string | undefined);
-    get screenReaderText(): string | undefined;
     _getConstraintObject(): {
         enum: (constraint: any, inputVal: any) => {
             valid: boolean;

package/lib/Field.js

@@ -210,12 +210,12 @@ class Field extends Scriptable_1.default {
         this._setProperty('readOnly', e);
     }
     get enabled() {
-        if (this.parent.enabled !== undefined) {
-            return this.parent.enabled === false ? false : this._jsonModel.enabled;
-        }
-        else {
-            return this._jsonModel.enabled;
+        var _a;
+        const parentEnabled = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.enabled;
+        if (parentEnabled !== undefined) {
+            return parentEnabled ? this._jsonModel.enabled : false;
         }
+        return this._jsonModel.enabled;
     }
     set enabled(e) {
         this._setProperty('enabled', e);
@@ -463,9 +463,6 @@ class Field extends Scriptable_1.default {
         this._setProperty('errorMessage', e);
         this._setProperty('validationMessage', e);
     }
-    get screenReaderText() {
-        return this._jsonModel.screenReaderText;
-    }
     _getConstraintObject() {
         return ValidationUtils_1.Constraints;
     }
@@ -674,9 +671,13 @@ class Field extends Scriptable_1.default {
         }
     }
     validate() {
+        var _a;
         if (this.visible === false) {
             return [];
         }
+        if (this.valid === false && this.errorMessage && ((_a = this === null || this === void 0 ? void 0 : this.validity) === null || _a === void 0 ? void 0 : _a.customConstraint)) {
+            return [new types_1.ValidationError(this.id, [this._jsonModel.errorMessage])];
+        }
         const changes = this.evaluateConstraints();
         __classPrivateFieldGet(this, _Field_instances, "m", _Field_triggerValidationEvent).call(this);
         if (changes.validity) {

package/lib/utils/JsonUtils.js

@@ -56,19 +56,21 @@ const isButton = function (item) {
 };
 exports.isButton = isButton;
 function deepClone(obj, idGenerator) {
-    let result;
-    if (obj instanceof Array) {
-        result = [];
-        result = obj.map(x => deepClone(x, idGenerator));
+    if (obj === null || typeof obj !== 'object') {
+        return obj;
     }
-    else if (typeof obj === 'object' && obj !== null) {
-        result = {};
-        Object.entries(obj).forEach(([key, value]) => {
-            result[key] = deepClone(value, idGenerator);
-        });
+    let result;
+    if (Array.isArray(obj)) {
+        result = new Array(obj.length);
+        for (let i = 0; i < obj.length; i++) {
+            result[i] = deepClone(obj[i], idGenerator);
+        }
     }
     else {
-        result = obj;
+        result = {};
+        for (const key of Object.keys(obj)) {
+            result[key] = deepClone(obj[key], idGenerator);
+        }
     }
     if (idGenerator && result && result.id) {
         result.id = idGenerator();

package/package.json

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