@aemforms/af-core 0.22.16 → 0.22.18

package/lib/FileUpload.js

@@ -22,8 +22,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Controller_1 = require("./controller/Controller");
 const Field_1 = __importDefault(require("./Field"));
 const FormUtils_1 = require("./utils/FormUtils");
-const ValidationUtils_1 = require("./utils/ValidationUtils");
 const FileObject_1 = require("./FileObject");
+const ValidationUtils_1 = require("./utils/ValidationUtils");
 function addNameToDataURL(dataURL, name) {
     return dataURL.replace(';base64', `;name=${encodeURIComponent(name)};base64`);
 }
@@ -32,7 +32,7 @@ function processFiles(files) {
 }
 function processFile(file) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { name, size, mediaType } = file;
+        const { name, size, type } = file;
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const fileObj = yield new Promise((resolve, reject) => {
             const reader = new FileReader();
@@ -40,7 +40,7 @@ function processFile(file) {
                 resolve(new FileObject_1.FileObject({
                     // @ts-ignore
                     data: addNameToDataURL(event.target.result, name),
-                    mediaType: mediaType,
+                    type,
                     name,
                     size
                 }));
@@ -56,7 +56,10 @@ function processFile(file) {
 class FileUpload extends Field_1.default {
     //private _files: FileObject[];
     _getDefaults() {
-        return Object.assign(Object.assign({}, super._getDefaults()), { accept: ['audio/*', 'video/*', 'image/*', 'text/*', 'application/pdf'], maxFileSize: '2MB', type: 'file' });
+        return Object.assign(Object.assign({}, super._getDefaults()), { accept: ['audio/*', 'video/*', 'image/*', 'text/*', 'application/pdf'], maxFileSize: '2MB' });
+    }
+    _getFallbackType() {
+        return 'file';
     }
     /**
      * Returns the max file size in bytes as per IEC specification
@@ -99,124 +102,23 @@ class FileUpload extends Field_1.default {
             return acc;
         }, {});
     }
-    typeCheck(value) {
-        const type = this._jsonModel.type || 'file';
-        switch (type) {
-            case 'string':
-                return { valid: true, value: value };
-            default:
-                return ValidationUtils_1.Constraints.type(type, value);
-        }
+    getInternalType() {
+        var _a;
+        return ((_a = this.type) === null || _a === void 0 ? void 0 : _a.endsWith('[]')) ? 'file[]' : 'file';
     }
-    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 trimmedAccept = accept.trim();
-            const prefixAccept = trimmedAccept.split('/')[0];
-            const suffixAccept = trimmedAccept.split('.')[1];
-            if ((trimmedAccept.includes('*') && type.startsWith(prefixAccept)) ||
-                (trimmedAccept.includes('.') && type.endsWith(suffixAccept)) ||
-                (trimmedAccept === type)) {
-                validFileType = true;
+    getDataNodeValue(typedValue) {
+        var _a;
+        let dataNodeValue = typedValue;
+        if (dataNodeValue != null) {
+            if (this.type === 'string') {
+                dataNodeValue = (_a = dataNodeValue.data) === null || _a === void 0 ? void 0 : _a.toString();
             }
-        });
-        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);
-        if (this._jsonModel.value === undefined) {
-            return null;
-        }
-        let val = this._jsonModel.value;
-        // always return file object irrespective of data schema
-        if (val != null) {
-            // @ts-ignore
-            val = this.coerce((val instanceof Array ? val : [val])
-                .map(file => {
-                let retVal = file;
-                if (!(retVal instanceof FileObject_1.FileObject)) {
-                    retVal = new FileObject_1.FileObject({
-                        'name': file.name,
-                        'mediaType': file.mediaType,
-                        'size': file.size,
-                        'data': file.data
-                    });
-                }
-                // define serialization here
-                /*
-                Object.defineProperty(retVal, 'data', {
-                    get: async function() {
-                        if (file.data instanceof File) {
-                            return processFile(file);
-                        } else {
-                            return file.data;
-                        }
-                    }
-                });
-                */
-                return retVal;
-            }));
-        }
-        return val;
-    }
-    set value(value) {
-        if (value !== undefined) {
-            // store file list here
-            const typeRes = this.typeCheck(value);
-            const acceptRes = this.acceptCheck(value);
-            let fileInfoPayload = (0, FormUtils_1.extractFileInfo)(value);
-            fileInfoPayload = this.coerce(fileInfoPayload);
-            const changes = this._setProperty('value', fileInfoPayload, false);
-            if (changes.length > 0) {
-                const dataNode = this.getDataNode();
-                if (typeof dataNode !== 'undefined') {
-                    let val = this._jsonModel.value;
-                    const retVal = (val instanceof Array ? val : [val]).map(file => {
-                        if (this.type === 'file' || this.type === 'file[]') {
-                            return file;
-                        }
-                        else if (this.type === 'string' || this.type === 'string[]') {
-                            // @ts-ignore
-                            return file.data.toString();
-                        }
-                    });
-                    val = this.coerce(retVal);
-                    if (dataNode !== undefined) {
-                        dataNode.setValue(val, this._jsonModel.value);
-                    }
-                }
-                let updates;
-                if (typeRes.valid && acceptRes.valid) {
-                    updates = this.evaluateConstraints();
-                }
-                else {
-                    const changes = {
-                        'valid': typeRes.valid && acceptRes.valid,
-                        'errorMessage': typeRes.valid && acceptRes.valid ? '' : this.getErrorMessage('type')
-                    };
-                    updates = this._applyUpdates(['valid', 'errorMessage'], changes);
-                }
-                if (updates.valid) {
-                    this.triggerValidationEvent(updates);
-                }
-                const changeAction = new Controller_1.Change({ changes: changes.concat(Object.values(updates)) });
-                this.dispatch(changeAction);
+            else if (this.type === 'string[]') {
+                dataNodeValue = dataNodeValue instanceof Array ? dataNodeValue : [dataNodeValue];
+                dataNodeValue = dataNodeValue.map((_) => { var _a; return (_a = _ === null || _ === void 0 ? void 0 : _.data) === null || _a === void 0 ? void 0 : _a.toString(); });
             }
         }
+        return dataNodeValue;
     }
     _serialize() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -229,28 +131,24 @@ class FileUpload extends Field_1.default {
             return filesInfo;
         });
     }
-    coerce(val) {
-        let retVal = val;
-        if ((this.type === 'string' || this.type === 'file') && retVal instanceof Array) {
-            // @ts-ignore
-            retVal = val[0];
-        }
-        return retVal;
-    }
     importData(dataModel) {
         this._bindToDataModel(dataModel);
         const dataNode = this.getDataNode();
         if (dataNode !== undefined) {
             const value = dataNode === null || dataNode === void 0 ? void 0 : dataNode.$value;
-            let newValue = value;
             // only if not undefined, proceed further
             if (value != null) {
-                const fileObj = (0, FormUtils_1.extractFileInfo)(value);
-                newValue = this.coerce(fileObj);
+                const res = ValidationUtils_1.Constraints.type(this.getInternalType(), value);
+                if (!res.valid) {
+                    this.form.logger.error(`unable to bind ${this.name} to data`);
+                }
                 // is this needed ?
-                this.form.getEventQueue().queue(this, (0, Controller_1.propertyChange)('value', newValue, this._jsonModel.value));
+                this.form.getEventQueue().queue(this, (0, Controller_1.propertyChange)('value', res.value, this._jsonModel.value));
+                this._jsonModel.value = res.value;
+            }
+            else {
+                this._jsonModel.value = null;
             }
-            this._jsonModel.value = newValue;
         }
     }
 }

package/lib/Form.d.ts

@@ -1,25 +1,9 @@
 import Container from './Container';
-import { Action, FieldJson, FieldModel, FieldsetJson, FieldsetModel, FormJson, FormModel, Items } from './types';
+import { Action, BaseModel, FieldJson, FieldModel, FieldsetJson, FieldsetModel, FormJson, FormModel, Items } from './types';
 import FormMetaData from './FormMetaData';
 import EventQueue from './controller/EventQueue';
+import { Logger, LogLevel } from './controller/Logger';
 import RuleEngine from './rules/RuleEngine';
-declare type LogFunction = 'info' | 'warn' | 'error' | 'debug';
-/**
- * Logging levels.
- */
-export declare type LogLevel = 'off' | LogFunction;
-/**
- * @private
- */
-export declare class Logger {
-    debug(msg: string): void;
-    info(msg: string): void;
-    warn(msg: string): void;
-    error(msg: string): void;
-    log(msg: string, level: LogFunction): void;
-    private logLevel;
-    constructor(logLevel?: LogLevel);
-}
 /**
  * Defines `form model` which implements {@link FormModel | form model}
  */
@@ -54,6 +38,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     protected _createChild(child: FieldsetJson | FieldJson): FieldModel | FieldsetModel;
     importData(dataModel: any): void;
     exportData(): any;
+    setFocus(field: BaseModel): void;
     /**
      * Returns the current state of the form
      *
@@ -101,9 +86,13 @@ declare class Form extends Container<FormJson> implements FormModel {
         properties?: {
             [key: string]: any;
         } | undefined;
+        screenReaderText?: string | undefined;
+        tooltip?: string | undefined;
+        altText?: string | undefined;
     } & {
         items: (FieldJson | import("./types").ContainerJson)[];
         initialItems?: number | undefined;
+        activeChild?: string | undefined;
     } & {
         metadata?: import("./types").MetaDataJson | undefined;
         data?: any;
@@ -111,8 +100,10 @@ declare class Form extends Container<FormJson> implements FormModel {
         action?: string | undefined;
         adaptiveForm?: string | undefined;
     } & {
-        ':type': string;
         items: ({
+            id: string;
+            index: number;
+            ':type': string;
             description?: string | undefined;
             rules?: Items<string> | undefined;
             events?: Items<string | string[] | undefined> | undefined;
@@ -137,7 +128,6 @@ declare class Form extends Container<FormJson> implements FormModel {
             validationExpression?: string | undefined;
             uniqueItems?: boolean | undefined;
             dataRef?: string | null | undefined;
-            ':type': string;
             label?: import("./types").Label | undefined;
             enabled?: boolean | undefined;
             visible?: boolean | undefined;
@@ -148,7 +138,19 @@ declare class Form extends Container<FormJson> implements FormModel {
             properties?: {
                 [key: string]: any;
             } | undefined;
-            placeholder?: string | undefined;
+            screenReaderText?: string | undefined;
+            tooltip?: string | undefined;
+            altText?: string | undefined;
+            placeholder?: string | undefined; /**
+             * Returns the current state of the form
+             *
+             * To access the form data and attachments, one needs to use the `data` and `attachments` property.
+             * For example,
+             * ```
+             * const data = form.getState().data
+             * const attachments = form.getState().attachments
+             * ```
+             */
             readOnly?: boolean | undefined;
             valid?: boolean | undefined;
             default?: any;
@@ -158,8 +160,10 @@ declare class Form extends Container<FormJson> implements FormModel {
             editValue?: string | undefined;
             displayValue?: string | undefined;
             emptyValue?: "" | "undefined" | "null" | undefined;
-            id: string;
         } | {
+            id: string;
+            index: number;
+            ':type': string;
             description?: string | undefined;
             rules?: Items<string> | undefined;
             events?: Items<string | string[] | undefined> | undefined;
@@ -184,7 +188,6 @@ declare class Form extends Container<FormJson> implements FormModel {
             validationExpression?: string | undefined;
             uniqueItems?: boolean | undefined;
             dataRef?: string | null | undefined;
-            ':type'?: string | undefined;
             label?: import("./types").Label | undefined;
             enabled?: boolean | undefined;
             visible?: boolean | undefined;
@@ -195,197 +198,22 @@ declare class Form extends Container<FormJson> implements FormModel {
             properties?: {
                 [key: string]: any;
             } | undefined;
-            items: (FieldJson | import("./types").ContainerJson)[] & (({
-                description?: string | undefined;
-            } & import("./types").RulesJson & {
-                enumNames?: string[] | undefined;
-                enum?: any[] | undefined;
-            } & {
-                accept?: string[] | undefined;
-                enforceEnum?: boolean | undefined;
-                exclusiveMinimum?: number | undefined;
-                exclusiveMaximum?: number | undefined;
-                format?: string | undefined;
-                maxFileSize?: string | number | undefined;
-                maxLength?: number | undefined;
-                maximum?: number | undefined;
-                maxItems?: number | undefined;
-                minLength?: number | undefined;
-                minimum?: number | undefined;
-                minItems?: number | undefined;
-                pattern?: string | undefined;
-                required?: boolean | undefined;
-                step?: number | undefined;
-                type?: string | undefined;
-                validationExpression?: string | undefined;
-                uniqueItems?: boolean | undefined;
-            } & {
-                dataRef?: string | null | undefined;
-                ':type'?: string | undefined;
-                label?: import("./types").Label | undefined;
-                enabled?: boolean | undefined;
-                visible?: boolean | undefined;
-                name?: string | undefined;
-                constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                fieldType?: string | undefined;
-                errorMessage?: string | undefined;
-                properties?: {
-                    [key: string]: any;
-                } | undefined;
-            } & {
-                placeholder?: string | undefined;
-            } & {
-                readOnly?: boolean | undefined;
-                valid?: boolean | undefined;
-                default?: any;
-                value?: any;
-                displayFormat?: string | undefined;
-                editFormat?: string | undefined;
-                editValue?: string | undefined;
-                displayValue?: string | undefined;
-                emptyValue?: "" | "undefined" | "null" | undefined;
-            } & {
-                id: string;
-                ':type': string;
-            }) | ({
-                description?: string | undefined;
-            } & import("./types").RulesJson & {
-                enumNames?: string[] | undefined;
-                enum?: any[] | undefined;
-            } & {
-                accept?: string[] | undefined;
-                enforceEnum?: boolean | undefined;
-                exclusiveMinimum?: number | undefined;
-                exclusiveMaximum?: number | undefined;
-                format?: string | undefined;
-                maxFileSize?: string | number | undefined;
-                maxLength?: number | undefined;
-                maximum?: number | undefined;
-                maxItems?: number | undefined;
-                minLength?: number | undefined;
-                minimum?: number | undefined;
-                minItems?: number | undefined;
-                pattern?: string | undefined;
-                required?: boolean | undefined;
-                step?: number | undefined;
-                type?: string | undefined;
-                validationExpression?: string | undefined;
-                uniqueItems?: boolean | undefined;
-            } & {
-                dataRef?: string | null | undefined;
-                ':type'?: string | undefined;
-                label?: import("./types").Label | undefined;
-                enabled?: boolean | undefined;
-                visible?: boolean | undefined;
-                name?: string | undefined;
-                constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                fieldType?: string | undefined;
-                errorMessage?: string | undefined;
-                properties?: {
-                    [key: string]: any;
-                } | undefined;
-            } & {
-                items: (FieldJson | import("./types").ContainerJson)[];
-                initialItems?: number | undefined;
-            } & {
-                id: string;
-                items: (({
-                    description?: string | undefined;
-                } & import("./types").RulesJson & {
-                    enumNames?: string[] | undefined;
-                    enum?: any[] | undefined;
-                } & {
-                    accept?: string[] | undefined;
-                    enforceEnum?: boolean | undefined;
-                    exclusiveMinimum?: number | undefined;
-                    exclusiveMaximum?: number | undefined;
-                    format?: string | undefined;
-                    maxFileSize?: string | number | undefined;
-                    maxLength?: number | undefined;
-                    maximum?: number | undefined;
-                    maxItems?: number | undefined;
-                    minLength?: number | undefined;
-                    minimum?: number | undefined;
-                    minItems?: number | undefined;
-                    pattern?: string | undefined;
-                    required?: boolean | undefined;
-                    step?: number | undefined;
-                    type?: string | undefined;
-                    validationExpression?: string | undefined;
-                    uniqueItems?: boolean | undefined;
-                } & {
-                    dataRef?: string | null | undefined;
-                    ':type'?: string | undefined;
-                    label?: import("./types").Label | undefined;
-                    enabled?: boolean | undefined;
-                    visible?: boolean | undefined;
-                    name?: string | undefined;
-                    constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                    fieldType?: string | undefined;
-                    errorMessage?: string | undefined;
-                    properties?: {
-                        [key: string]: any;
-                    } | undefined;
-                } & {
-                    placeholder?: string | undefined;
-                } & {
-                    readOnly?: boolean | undefined;
-                    valid?: boolean | undefined;
-                    default?: any;
-                    value?: any;
-                    displayFormat?: string | undefined;
-                    editFormat?: string | undefined;
-                    editValue?: string | undefined;
-                    displayValue?: string | undefined;
-                    emptyValue?: "" | "undefined" | "null" | undefined;
-                } & {
-                    id: string;
-                    ':type': string;
-                }) | ({
-                    description?: string | undefined;
-                } & import("./types").RulesJson & {
-                    enumNames?: string[] | undefined;
-                    enum?: any[] | undefined;
-                } & {
-                    accept?: string[] | undefined;
-                    enforceEnum?: boolean | undefined;
-                    exclusiveMinimum?: number | undefined;
-                    exclusiveMaximum?: number | undefined;
-                    format?: string | undefined;
-                    maxFileSize?: string | number | undefined;
-                    maxLength?: number | undefined;
-                    maximum?: number | undefined;
-                    maxItems?: number | undefined;
-                    minLength?: number | undefined;
-                    minimum?: number | undefined;
-                    minItems?: number | undefined;
-                    pattern?: string | undefined;
-                    required?: boolean | undefined;
-                    step?: number | undefined;
-                    type?: string | undefined;
-                    validationExpression?: string | undefined;
-                    uniqueItems?: boolean | undefined;
-                } & {
-                    dataRef?: string | null | undefined;
-                    ':type'?: string | undefined;
-                    label?: import("./types").Label | undefined;
-                    enabled?: boolean | undefined;
-                    visible?: boolean | undefined;
-                    name?: string | undefined;
-                    constraintMessages?: import("./types").ConstraintsMessages | undefined;
-                    fieldType?: string | undefined;
-                    errorMessage?: string | undefined;
-                    properties?: {
-                        [key: string]: any;
-                    } | undefined;
-                } & {
-                    items: (FieldJson | import("./types").ContainerJson)[];
-                    initialItems?: number | undefined;
-                } & any))[];
-            }))[];
+            screenReaderText?: string | undefined;
+            tooltip?: string | undefined;
+            altText?: string | undefined;
+            items: (FieldJson | import("./types").ContainerJson)[] & import("./types").State<FieldJson | import("./types").ContainerJson>[];
             initialItems?: number | undefined;
-            id: string;
+            activeChild?: string | undefined;
         })[];
+        properties: {
+            [key: string]: any;
+        };
+        index: number;
+        parent: undefined;
+        qualifiedName: any;
+        events: {};
+        rules: {};
+        ':type': string;
         id: string;
     };
     get type(): string;
@@ -421,6 +249,7 @@ declare class Form extends Container<FormJson> implements FormModel {
      */
     submit(action: Action, context: any): void;
     getElement(id: string): FieldModel | FieldsetModel | this;
+    get qualifiedName(): string;
     /**
      * @private
      */

package/lib/Form.js

@@ -10,48 +10,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logger = void 0;
 const Container_1 = __importDefault(require("./Container"));
 const FormMetaData_1 = __importDefault(require("./FormMetaData"));
 const Fieldset_1 = require("./Fieldset");
 const EventQueue_1 = __importDefault(require("./controller/EventQueue"));
+const Logger_1 = require("./controller/Logger");
 const FormUtils_1 = require("./utils/FormUtils");
 const DataGroup_1 = __importDefault(require("./data/DataGroup"));
 const FunctionRuntime_1 = require("./rules/FunctionRuntime");
 const controller_1 = require("./controller");
-const levels = {
-    off: 0,
-    debug: 1,
-    info: 2,
-    warn: 3,
-    error: 4
-};
-/**
- * @private
- */
-class Logger {
-    constructor(logLevel = 'off') {
-        this.logLevel = levels[logLevel];
-    }
-    debug(msg) {
-        this.log(msg, 'debug');
-    }
-    info(msg) {
-        this.log(msg, 'info');
-    }
-    warn(msg) {
-        this.log(msg, 'warn');
-    }
-    error(msg) {
-        this.log(msg, 'error');
-    }
-    log(msg, level) {
-        if (this.logLevel !== 0 && this.logLevel <= levels[level]) {
-            console[level](msg);
-        }
-    }
-}
-exports.Logger = Logger;
 /**
  * Defines `form model` which implements {@link FormModel | form model}
  */
@@ -77,7 +44,7 @@ class Form extends Container_1.default {
          */
         this._invalidFields = [];
         this.dataRefRegex = /("[^"]+?"|[^.]+?)(?:\.|$)/g;
-        this._logger = new Logger(logLevel);
+        this._logger = new Logger_1.Logger(logLevel);
         this.queueEvent(new controller_1.Initialize());
         this.queueEvent(new controller_1.ExecuteRule());
         this._ids = (0, FormUtils_1.IdGenerator)();
@@ -107,6 +74,13 @@ class Form extends Container_1.default {
         var _a;
         return (_a = this.getDataNode()) === null || _a === void 0 ? void 0 : _a.$value;
     }
+    setFocus(field) {
+        const parent = field.parent;
+        const currentField = field;
+        while (parent != null && parent.activeChild != currentField) {
+            parent.activeChild = currentField;
+        }
+    }
     /**
      * Returns the current state of the form
      *
@@ -231,6 +205,9 @@ class Form extends Container_1.default {
         }
         return this._fields[id];
     }
+    get qualifiedName() {
+        return '$form';
+    }
     /**
      * @private
      */

package/lib/FormInstance.d.ts

@@ -1,5 +1,5 @@
-import { LogLevel } from './Form';
 import { FormModel } from './types';
+import { LogLevel } from './controller/Logger';
 /**
  * Creates form instance using form model definition as per `adaptive form specification`
  * @param formModel form model definition

package/lib/FormInstance.js

@@ -6,39 +6,17 @@
  *
  * 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.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchForm = exports.validateFormData = exports.validateFormInstance = exports.createFormInstance = void 0;
-const Form_1 = __importStar(require("./Form"));
+const Form_1 = __importDefault(require("./Form"));
 const JsonUtils_1 = require("./utils/JsonUtils");
 const Fetch_1 = require("./utils/Fetch");
 const RuleEngine_1 = __importDefault(require("./rules/RuleEngine"));
 const EventQueue_1 = __importDefault(require("./controller/EventQueue"));
+const Logger_1 = require("./controller/Logger");
 /**
  * Creates form instance using form model definition as per `adaptive form specification`
  * @param formModel form model definition
@@ -52,7 +30,7 @@ const createFormInstance = (formModel, callback, logLevel = 'error', fModel = un
     try {
         let f = fModel;
         if (f == null) {
-            f = new Form_1.default(Object.assign({}, formModel), new RuleEngine_1.default(), new EventQueue_1.default(new Form_1.Logger(logLevel)), logLevel);
+            f = new Form_1.default(Object.assign({}, formModel), new RuleEngine_1.default(), new EventQueue_1.default(new Logger_1.Logger(logLevel)), logLevel);
         }
         const formData = formModel === null || formModel === void 0 ? void 0 : formModel.data;
         if (formData) {