@aemforms/af-core 0.22.16 → 0.22.17

package/lib/BaseNode.d.ts

@@ -10,6 +10,7 @@ export declare const editableProperties: string[];
  */
 export declare const dynamicProps: string[];
 export declare const target: unique symbol;
+export declare const qualifiedName: unique symbol;
 export declare function dependencyTracked(): (target: BaseNode<any>, propertyKey: string, descriptor: PropertyDescriptor) => void;
 /**
  * Defines a generic base class which all objects of form runtime model should extend from.
@@ -125,4 +126,14 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
      * @private
      */
     _initialize(): void;
+    /**
+     * Checks whether there are any updates in the properties. If there are applies them to the
+     * json model as well.
+     * @param propNames
+     * @param updates
+     * @private
+     */
+    protected _applyUpdates(propNames: string[], updates: any): any;
+    get qualifiedName(): any;
+    focus(): void;
 }

package/lib/BaseNode.js

@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseNode = exports.dependencyTracked = exports.target = exports.dynamicProps = exports.editableProperties = void 0;
+exports.BaseNode = exports.dependencyTracked = exports.qualifiedName = exports.target = exports.dynamicProps = exports.editableProperties = void 0;
 const controller_1 = require("./controller");
 const DataRefParser_1 = require("./utils/DataRefParser");
 const EmptyDataValue_1 = __importDefault(require("./data/EmptyDataValue"));
@@ -52,7 +52,8 @@ exports.editableProperties = [
 exports.dynamicProps = [
     ...exports.editableProperties,
     'valid',
-    'index'
+    'index',
+    'activeChild'
 ];
 /**
  * Implementation of action with target
@@ -92,6 +93,7 @@ class ActionImplWithTarget {
     }
 }
 exports.target = Symbol('target');
+exports.qualifiedName = Symbol('qualifiedName');
 function dependencyTracked() {
     return function (target, propertyKey, descriptor) {
         const get = descriptor.get;
@@ -123,6 +125,8 @@ class BaseNode {
         this._callbacks = {};
         this._dependents = [];
         this._tokens = [];
+        //@ts-ignore
+        this[exports.qualifiedName] = null;
         this._jsonModel = Object.assign(Object.assign({}, params), { 
             //@ts-ignore
             id: 'id' in params ? params.id : this.form.getUniqueId() });
@@ -454,6 +458,51 @@ class BaseNode {
             this._bindToDataModel(dataNode);
         }
     }
+    /**
+     * Checks whether there are any updates in the properties. If there are applies them to the
+     * json model as well.
+     * @param propNames
+     * @param updates
+     * @private
+     */
+    _applyUpdates(propNames, updates) {
+        return propNames.reduce((acc, propertyName) => {
+            //@ts-ignore
+            const currentValue = updates[propertyName];
+            const changes = this._setProperty(propertyName, currentValue, false);
+            if (changes.length > 0) {
+                acc[propertyName] = changes[0];
+            }
+            return acc;
+        }, {});
+    }
+    get qualifiedName() {
+        if (this.isTransparent()) {
+            return null;
+        }
+        // @ts-ignore
+        if (this[exports.qualifiedName] !== null) {
+            // @ts-ignore
+            return this[exports.qualifiedName];
+        }
+        // use qualified name
+        const parent = this.getNonTransparentParent();
+        if (parent && parent.type === 'array') {
+            //@ts-ignore
+            this[exports.qualifiedName] = `${parent.qualifiedName}[${this.index}]`;
+        }
+        else {
+            //@ts-ignore
+            this[exports.qualifiedName] = `${parent.qualifiedName}.${this.name}`;
+        }
+        //@ts-ignore
+        return this[exports.qualifiedName];
+    }
+    focus() {
+        if (this.parent) {
+            this.parent.activeChild = this;
+        }
+    }
 }
 __decorate([
     dependencyTracked()

package/lib/Checkbox.d.ts

@@ -64,6 +64,14 @@ declare class Checkbox extends Field {
             valid: boolean;
             value: any;
         };
+        accept: (constraint: string[], value: any) => {
+            valid: boolean;
+            value: any;
+        };
+        maxFileSize: (constraint: string | number, value: any) => {
+            valid: boolean;
+            value: any;
+        };
     };
     protected _getDefaults(): {
         enforceEnum: boolean;

package/lib/Container.d.ts

@@ -1,4 +1,4 @@
-import { Action, ContainerJson, ContainerModel, FieldJson, FieldModel, FieldsetJson, FieldsetModel, RulesJson } from './types';
+import { Action, BaseModel, ContainerJson, ContainerModel, FieldJson, FieldModel, FieldsetJson, FieldsetModel, RulesJson } from './types';
 import Scriptable from './Scriptable';
 import DataGroup from './data/DataGroup';
 /**
@@ -30,6 +30,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
      */
     hasDynamicItems(): boolean;
     get isContainer(): boolean;
+    private _activeChild;
     /**
      * Returns the current container state
      */
@@ -55,6 +56,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
             minItems?: number | undefined;
             pattern?: string | undefined;
             required?: boolean | undefined;
+            /**
+             * @private
+             */
             step?: number | undefined;
             type?: string | undefined;
             validationExpression?: string | undefined;
@@ -66,7 +70,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
             visible?: boolean | undefined;
             name?: string | undefined;
             constraintMessages?: import("./types").ConstraintsMessages | undefined;
-            fieldType?: string | undefined;
+            fieldType?: string | undefined; /**
+             * Returns the current container state
+             */
             errorMessage?: string | undefined;
             properties?: {
                 [key: string]: any;
@@ -102,6 +108,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
             minItems?: number | undefined;
             pattern?: string | undefined;
             required?: boolean | undefined;
+            /**
+             * @private
+             */
             step?: number | undefined;
             type?: "object" | "array" | undefined;
             validationExpression?: string | undefined;
@@ -113,7 +122,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
             visible?: boolean | undefined;
             name?: string | undefined;
             constraintMessages?: import("./types").ConstraintsMessages | undefined;
-            fieldType?: string | undefined;
+            fieldType?: string | undefined; /**
+             * Returns the current container state
+             */
             errorMessage?: string | undefined;
             properties?: {
                 [key: string]: any;
@@ -138,6 +149,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                 minItems?: number | undefined;
                 pattern?: string | undefined;
                 required?: boolean | undefined;
+                /**
+                 * @private
+                 */
                 step?: number | undefined;
                 type?: string | undefined;
                 validationExpression?: string | undefined;
@@ -150,7 +164,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                 visible?: boolean | undefined;
                 name?: string | undefined;
                 constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                fieldType?: string | undefined;
+                fieldType?: string | undefined; /**
+                 * Returns the current container state
+                 */
                 errorMessage?: string | undefined;
                 properties?: {
                     [key: string]: any;
@@ -190,6 +206,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                 minItems?: number | undefined;
                 pattern?: string | undefined;
                 required?: boolean | undefined;
+                /**
+                 * @private
+                 */
                 step?: number | undefined;
                 type?: string | undefined;
                 validationExpression?: string | undefined;
@@ -202,7 +221,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                 visible?: boolean | undefined;
                 name?: string | undefined;
                 constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                fieldType?: string | undefined;
+                fieldType?: string | undefined; /**
+                 * Returns the current container state
+                 */
                 errorMessage?: string | undefined;
                 properties?: {
                     [key: string]: any;
@@ -210,6 +231,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
             } & {
                 items: (FieldJson | ContainerJson)[];
                 initialItems?: number | undefined;
+                activeChild?: string | undefined;
             } & {
                 id: string;
                 items: (({
@@ -232,6 +254,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                     minItems?: number | undefined;
                     pattern?: string | undefined;
                     required?: boolean | undefined;
+                    /**
+                     * @private
+                     */
                     step?: number | undefined;
                     type?: string | undefined;
                     validationExpression?: string | undefined;
@@ -244,7 +269,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                     visible?: boolean | undefined;
                     name?: string | undefined;
                     constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                    fieldType?: string | undefined;
+                    fieldType?: string | undefined; /**
+                     * Returns the current container state
+                     */
                     errorMessage?: string | undefined;
                     properties?: {
                         [key: string]: any;
@@ -284,6 +311,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                     minItems?: number | undefined;
                     pattern?: string | undefined;
                     required?: boolean | undefined;
+                    /**
+                     * @private
+                     */
                     step?: number | undefined;
                     type?: string | undefined;
                     validationExpression?: string | undefined;
@@ -296,7 +326,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                     visible?: boolean | undefined;
                     name?: string | undefined;
                     constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                    fieldType?: string | undefined;
+                    fieldType?: string | undefined; /**
+                     * Returns the current container state
+                     */
                     errorMessage?: string | undefined;
                     properties?: {
                         [key: string]: any;
@@ -304,9 +336,11 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
                 } & {
                     items: (FieldJson | ContainerJson)[];
                     initialItems?: number | undefined;
+                    activeChild?: string | undefined;
                 } & any))[];
             }))[];
             initialItems?: number | undefined;
+            activeChild?: string | undefined;
             id: string;
         })[];
         id: string;
@@ -352,5 +386,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
      * @private
      */
     syncDataAndFormModel(contextualDataModel?: DataGroup): void;
+    get activeChild(): BaseModel | null;
+    set activeChild(c: BaseModel | null);
 }
 export default Container;

package/lib/Container.js

@@ -30,6 +30,7 @@ class Container extends Scriptable_1.default {
         super(...arguments);
         this._children = [];
         this._itemTemplate = null;
+        this._activeChild = null;
     }
     /**
      * @private
@@ -301,6 +302,26 @@ class Container extends Scriptable_1.default {
             x.importData(contextualDataModel);
         });
     }
+    get activeChild() {
+        return this._activeChild;
+    }
+    set activeChild(c) {
+        if (c !== this._activeChild) {
+            let activeChild = this._activeChild;
+            while (activeChild instanceof Container) {
+                const temp = activeChild.activeChild;
+                activeChild.activeChild = null;
+                activeChild = temp;
+            }
+            const change = (0, controller_1.propertyChange)('activeChild', c, this._activeChild);
+            this._activeChild = c;
+            if (this.parent && c !== null) {
+                this.parent.activeChild = this;
+            }
+            this._jsonModel.activeChild = c === null || c === void 0 ? void 0 : c.id;
+            this.notifyDependents(change);
+        }
+    }
 }
 __decorate([
     (0, BaseNode_1.dependencyTracked)()
@@ -308,4 +329,7 @@ __decorate([
 __decorate([
     (0, BaseNode_1.dependencyTracked)()
 ], Container.prototype, "minItems", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Container.prototype, "activeChild", null);
 exports.default = Container;

package/lib/Field.d.ts

@@ -61,8 +61,11 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     private isEmpty;
     get editValue(): any;
     get displayValue(): any;
+    protected getDataNodeValue(typedValue: any): any;
     get value(): any;
     set value(v: any);
+    protected _updateRuleNodeReference(value: any): void;
+    protected getInternalType(): string | undefined;
     valueOf(): any;
     toString(): any;
     /**
@@ -105,10 +108,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         };
         maxItems: <T_1>(constraint: number, value: T_1[]) => {
             valid: boolean;
-            value: T_1[]; /**
-             * Returns the error message for a given constraint
-             * @param constraint
-             */
+            value: T_1[];
         };
         uniqueItems: <T_2>(constraint: boolean, value: T_2[]) => {
             valid: boolean;
@@ -134,6 +134,14 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
             valid: boolean;
             value: any;
         };
+        accept: (constraint: string[], value: any) => {
+            valid: boolean;
+            value: any;
+        };
+        maxFileSize: (constraint: string | number, value: any) => {
+            valid: boolean;
+            value: any;
+        };
     };
     /**
      * returns whether the field is array type or not
@@ -174,14 +182,6 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
      */
     protected evaluateConstraints(): any;
     triggerValidationEvent(changes: any): void;
-    /**
-     * Checks whether there are any updates in the properties. If there are applies them to the
-     * json model as well.
-     * @param propNames
-     * @param updates
-     * @private
-     */
-    protected _applyUpdates(propNames: string[], updates: any): any;
     /**
      * Validates the current form object
      */

package/lib/Field.js

@@ -88,7 +88,8 @@ class Field extends Scriptable_1.default {
         });
         const value = this._jsonModel.value;
         if (value === undefined) {
-            this._jsonModel.value = this._jsonModel.default;
+            const typedRes = ValidationUtils_1.Constraints.type(this.getInternalType() || 'string', this._jsonModel.default);
+            this._jsonModel.value = typedRes.value;
         }
         if (this._jsonModel.fieldType === undefined) {
             //@ts-ignore
@@ -211,6 +212,9 @@ class Field extends Scriptable_1.default {
             return this.value;
         }
     }
+    getDataNodeValue(typedValue) {
+        return this.isEmpty() ? this.emptyValue : typedValue;
+    }
     get value() {
         if (this._jsonModel.value === undefined) {
             return null;
@@ -220,30 +224,15 @@ class Field extends Scriptable_1.default {
         }
     }
     set value(v) {
-        var _a;
         const Constraints = this._getConstraintObject();
-        const typeRes = Constraints.type(this._jsonModel.type || 'string', v);
+        const typeRes = Constraints.type(this.getInternalType() || 'string', v);
         const changes = this._setProperty('value', typeRes.value, false);
         let uniqueRes = { valid: true };
         if (changes.length > 0) {
-            if ((_a = this.type) === null || _a === void 0 ? void 0 : _a.endsWith('[]')) {
-                if (typeRes.value != null) {
-                    typeRes.value.forEach((val, index) => {
-                        this._ruleNodeReference[index] = val;
-                    });
-                    while (typeRes.value.length !== this._ruleNodeReference.length) {
-                        this._ruleNodeReference.pop();
-                    }
-                }
-                else {
-                    while (this._ruleNodeReference.length !== 0) {
-                        this._ruleNodeReference.pop();
-                    }
-                }
-            }
+            this._updateRuleNodeReference(typeRes.value);
             const dataNode = this.getDataNode();
             if (typeof dataNode !== 'undefined') {
-                dataNode.setValue(this.isEmpty() ? this.emptyValue : this._jsonModel.value, this._jsonModel.value);
+                dataNode.setValue(this.getDataNodeValue(this._jsonModel.value), this._jsonModel.value, this);
             }
             if (this.parent.uniqueItems && this.parent.type === 'array') {
                 // @ts-ignore
@@ -267,6 +256,27 @@ class Field extends Scriptable_1.default {
             this.dispatch(changeAction);
         }
     }
+    _updateRuleNodeReference(value) {
+        var _a;
+        if ((_a = this.type) === null || _a === void 0 ? void 0 : _a.endsWith('[]')) {
+            if (value != null) {
+                value.forEach((val, index) => {
+                    this._ruleNodeReference[index] = val;
+                });
+                while (value.length !== this._ruleNodeReference.length) {
+                    this._ruleNodeReference.pop();
+                }
+            }
+            else {
+                while (this._ruleNodeReference.length !== 0) {
+                    this._ruleNodeReference.pop();
+                }
+            }
+        }
+    }
+    getInternalType() {
+        return this.type;
+    }
     valueOf() {
         // @ts-ignore
         const obj = this[BaseNode_1.target];
@@ -363,7 +373,10 @@ class Field extends Scriptable_1.default {
                     default:
                         return ValidationUtils_1.ValidConstraints.string;
                 }
+            case 'file':
+                return ValidationUtils_1.ValidConstraints.file;
             case 'number':
+            case 'integer':
                 return ValidationUtils_1.ValidConstraints.number;
         }
         if (this.isArrayType()) {
@@ -455,24 +468,6 @@ class Field extends Scriptable_1.default {
             }
         }
     }
-    /**
-     * Checks whether there are any updates in the properties. If there are applies them to the
-     * json model as well.
-     * @param propNames
-     * @param updates
-     * @private
-     */
-    _applyUpdates(propNames, updates) {
-        return propNames.reduce((acc, propertyName) => {
-            //@ts-ignore
-            const currentValue = updates[propertyName];
-            const changes = this._setProperty(propertyName, currentValue, false);
-            if (changes.length > 0) {
-                acc[propertyName] = changes[0];
-            }
-            return acc;
-        }, {});
-    }
     /**
      * Validates the current form object
      */
@@ -499,7 +494,7 @@ class Field extends Scriptable_1.default {
      * @private
      */
     defaultDataModel(name) {
-        return new DataValue_1.default(name, this.isEmpty() ? this.emptyValue : this._jsonModel.value, this.type || 'string');
+        return new DataValue_1.default(name, this.getDataNodeValue(this._jsonModel.value), this.type || 'string');
     }
     getState() {
         return Object.assign(Object.assign({}, super.getState()), { editValue: this.editValue, displayValue: this.displayValue });

package/lib/FileObject.d.ts

@@ -4,14 +4,15 @@ import { IFileObject } from './types';
  */
 export declare class FileObject implements IFileObject {
     data: any;
-    mediaType: string;
+    type: string;
     name: string;
     size: number;
     constructor(init?: Partial<FileObject>);
     toJSON(): {
         name: string;
         size: number;
-        mediaType: string;
+        type: string;
         data: any;
     };
+    equals(obj: IFileObject): boolean;
 }

package/lib/FileObject.js

@@ -13,7 +13,7 @@ exports.FileObject = void 0;
  */
 class FileObject {
     constructor(init) {
-        this.mediaType = 'application/octet-stream';
+        this.type = 'application/octet-stream';
         this.name = 'unknown';
         this.size = 0;
         Object.assign(this, init);
@@ -22,9 +22,15 @@ class FileObject {
         return {
             'name': this.name,
             'size': this.size,
-            'mediaType': this.mediaType,
+            'type': this.type,
             'data': this.data.toString()
         };
     }
+    equals(obj) {
+        return (this.data === obj.data &&
+            this.type === obj.type &&
+            this.name === obj.name &&
+            this.size === obj.size);
+    }
 }
 exports.FileObject = FileObject;

package/lib/FileUpload.d.ts

@@ -28,19 +28,9 @@ declare class FileUpload extends Field implements FieldModel {
      * @private
      */
     protected _applyUpdates(propNames: string[], updates: any): any;
-    typeCheck(value: any): {
-        valid: boolean;
-        value: any;
-    };
-    checkFileType(type: any): boolean;
-    acceptCheck(value: any): {
-        valid: boolean;
-        value: any;
-    };
-    get value(): any;
-    set value(value: any);
+    protected getInternalType(): "file" | "file[]";
+    protected getDataNodeValue(typedValue: any): any;
     private _serialize;
-    private coerce;
     importData(dataModel: DataGroup): void;
 }
 export default FileUpload;