mapper-factory 3.1.1 → 3.1.2

package/dist/field-decorators/array.decorator.d.ts

@@ -0,0 +1,2 @@
+import { MapInterface } from "../class.decorator";
+export declare function ArrayField<T extends MapInterface<T>>(clsFactory: () => new () => T): PropertyDecorator;

package/dist/field-decorators/array.decorator.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArrayField = ArrayField;
+const field_decorator_1 = require("./field.decorator");
+function ArrayField(clsFactory) {
+    const Ctor = clsFactory();
+    return (0, field_decorator_1.MapField)({
+        transformer: (arr) => Array.isArray(arr)
+            ? arr.map((item) => new Ctor().from(item))
+            : [],
+        reverser: (arr) => Array.isArray(arr) ? arr.map((item) => item.toMap()) : [],
+    });
+}

package/dist/field-decorators/date.decorator.d.ts

@@ -0,0 +1 @@
+export declare function DateField(): PropertyDecorator;

package/dist/field-decorators/date.decorator.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateField = DateField;
+const field_decorator_1 = require("./field.decorator");
+function DateField() {
+    return (0, field_decorator_1.MapField)({
+        transformer: (dateISO) => dateISO ? new Date(dateISO) : null,
+        reverser: (date) => date?.toISOString() ?? null,
+    });
+}

package/dist/field-decorators/field.decorator.d.ts

@@ -0,0 +1,22 @@
+import 'reflect-metadata';
+import { ClassType } from '../types';
+export declare const MAP_FIELD: unique symbol;
+export interface MapperMetadata<T = any> {
+    src?: keyof T;
+    initialize?: boolean;
+    transformer?: {
+        (input: any, ref: any): any;
+    };
+    reverser?: {
+        (input: any): any;
+    };
+}
+export declare function isClass(func: any): func is ClassType;
+export declare function getPrototype(target: Record<string, unknown> | ClassType): any;
+export declare const MapField: <T = any>({ transformer, reverser, src, initialize, }?: MapperMetadata<T>) => PropertyDecorator;
+export declare const getMapFieldMetadataList: (target: Record<string, unknown> | ClassType | any) => {
+    [key: string]: MapperMetadata;
+} | undefined;
+export declare const hasMapFieldMetadataList: (target: Record<string, unknown> | ClassType) => boolean;
+export declare const getMapFieldMetadata: (target: Record<string, unknown> | ClassType, propertyName: string | symbol) => MapperMetadata | undefined;
+export declare const hasMapFieldMetadata: (target: Record<string, unknown> | ClassType, propertyName: string) => boolean;

package/dist/field-decorators/field.decorator.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasMapFieldMetadata = exports.getMapFieldMetadata = exports.hasMapFieldMetadataList = exports.getMapFieldMetadataList = exports.MapField = exports.MAP_FIELD = void 0;
+exports.isClass = isClass;
+exports.getPrototype = getPrototype;
+require("reflect-metadata");
+exports.MAP_FIELD = Symbol('MAP_FIELD');
+function isClass(func) {
+    return (typeof func === 'function' &&
+        /^class\s/.test(Function.prototype.toString.call(func)));
+}
+function getPrototype(target) {
+    return isClass(target) || !target?.prototype ? !target?.constructor ? target : target?.constructor : target?.prototype;
+}
+const MapField = ({ transformer, reverser, src, initialize = false, } = {}) => {
+    return (target, property) => {
+        const classConstructor = target.constructor;
+        const propertyName = property.toString();
+        const metadata = Reflect.getMetadata(exports.MAP_FIELD, classConstructor) || {};
+        // create new object reference to avoid this issue: https://github.com/rbuckton/reflect-metadata/issues/62
+        const newMetadata = { ...metadata };
+        const previousValues = metadata[propertyName];
+        newMetadata[propertyName] = {
+            ...previousValues,
+            src,
+            initialize,
+            transformer,
+            reverser,
+        };
+        Reflect.defineMetadata(exports.MAP_FIELD, newMetadata, classConstructor);
+    };
+};
+exports.MapField = MapField;
+const getMapFieldMetadataList = (target) => {
+    return Reflect.getMetadata(exports.MAP_FIELD, getPrototype(target));
+};
+exports.getMapFieldMetadataList = getMapFieldMetadataList;
+const hasMapFieldMetadataList = (target) => {
+    return Reflect.hasMetadata(exports.MAP_FIELD, getPrototype(target));
+};
+exports.hasMapFieldMetadataList = hasMapFieldMetadataList;
+const getMapFieldMetadata = (target, propertyName) => {
+    const metadata = (0, exports.getMapFieldMetadataList)(target);
+    const name = propertyName.toString();
+    if (!metadata || !metadata[name])
+        return undefined;
+    return metadata[name];
+};
+exports.getMapFieldMetadata = getMapFieldMetadata;
+const hasMapFieldMetadata = (target, propertyName) => {
+    const metadata = Reflect.getMetadata(exports.MAP_FIELD, getPrototype(target));
+    return metadata && !!metadata[propertyName];
+};
+exports.hasMapFieldMetadata = hasMapFieldMetadata;

package/dist/field-decorators/object.decorator.d.ts

@@ -0,0 +1,2 @@
+import { MapInterface } from "../class.decorator";
+export declare function ObjectField<T extends MapInterface<T>>(clsFactory: () => new () => T): PropertyDecorator;

package/dist/field-decorators/object.decorator.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObjectField = ObjectField;
+const field_decorator_1 = require("./field.decorator");
+function ObjectField(clsFactory) {
+    const Ctor = clsFactory();
+    return (0, field_decorator_1.MapField)({
+        transformer: (obj) => (obj ? new Ctor().from(obj) : null),
+        reverser: (obj) => obj?.toMap?.() ?? null,
+    });
+}

package/dist/functions.d.ts

@@ -1,8 +1,8 @@
 /**
-* Convert the instance of this class to JSON Object.
-*
-* @returns JSON object mapped considering metadata "src" and "reverser"
-*/
+ * Convert the instance of this class to JSON Object.
+ *
+ * @returns JSON object mapped considering metadata "src" and "reverser"
+ */
 export declare function toMap(): any;
 /**
  * Convert a JSON Object to an instance of this class.

package/dist/functions.js

@@ -8,12 +8,12 @@ exports.get = get;
 exports.set = set;
 exports.copy = copy;
 exports.from = from;
-const field_decorator_1 = require("./field.decorator");
+const field_decorator_1 = require("./field-decorators/field.decorator");
 /**
-* Convert the instance of this class to JSON Object.
-*
-* @returns JSON object mapped considering metadata "src" and "reverser"
-*/
+ * Convert the instance of this class to JSON Object.
+ *
+ * @returns JSON object mapped considering metadata "src" and "reverser"
+ */
 function toMap() {
     const metadataList = (0, field_decorator_1.getMapFieldMetadataList)(this);
     let obj = {};
@@ -22,11 +22,14 @@ function toMap() {
         for (let i = 0; i < propsStereoid.length; i++) {
             const prop = propsStereoid[i];
             if (prop.isArray) {
-                let arrIndex = prop.arrIndex.split(/\[(\w+)\]/g).filter(index => index !== '');
+                let arrIndex = prop.arrIndex
+                    .split(/\[(\w+)\]/g)
+                    .filter((index) => index !== "");
                 objCopy[prop.prop] = objCopy[prop.prop] || [];
                 objCopy = objCopy[prop.prop];
                 arrIndex.forEach((index, i) => {
-                    objCopy[index] = objCopy[index] || (i == arrIndex.length - 1 ? {} : []);
+                    objCopy[index] =
+                        objCopy[index] || (i == arrIndex.length - 1 ? {} : []);
                     if (i != arrIndex.length - 1)
                         objCopy = objCopy[index];
                     else
@@ -43,34 +46,38 @@ function toMap() {
         }
         objCopy[lastIndex] = reverser ? reverser(value, this) : value;
     };
-    this && Object.keys(this).forEach(propertyName => {
-        const metadata = metadataList && metadataList[propertyName];
-        const src = metadata?.src || propertyName;
-        if (metadata) {
-            if (src.includes('.')) {
-                let props = src.split('.');
-                let propsStereoid = props.map(prop => ({
-                    prop: prop.includes('[') ? prop.substring(0, prop.indexOf('[')) : prop,
-                    isArray: prop.includes('[') && prop.includes(']'),
-                    arrIndex: prop.substring(prop.indexOf('[')),
-                }));
-                processProperty(obj, propsStereoid, this[propertyName], metadata.reverser);
+    this &&
+        Object.keys(this).forEach((propertyName) => {
+            const metadata = metadataList && metadataList[propertyName];
+            const src = metadata?.src || propertyName;
+            if (metadata) {
+                if (src.includes(".")) {
+                    let props = src.split(".");
+                    let propsStereoid = props.map((prop) => ({
+                        prop: prop.includes("[")
+                            ? prop.substring(0, prop.indexOf("["))
+                            : prop,
+                        isArray: prop.includes("[") && prop.includes("]"),
+                        arrIndex: prop.substring(prop.indexOf("[")),
+                    }));
+                    processProperty(obj, propsStereoid, this[propertyName], metadata.reverser);
+                }
+                else {
+                    obj[src] =
+                        Array.isArray(this[propertyName]) && !metadata.reverser
+                            ? this[propertyName].map((item) => item?.toMap ? item.toMap() : item)
+                            : metadata.reverser
+                                ? metadata.reverser(this[propertyName], this)
+                                : this[propertyName]?.toMap
+                                    ? this[propertyName].toMap()
+                                    : this[propertyName];
+                }
             }
             else {
-                obj[src] = Array.isArray(this[propertyName]) && !metadata.reverser
-                    ? this[propertyName].map(item => item?.toMap ? item.toMap() : item)
-                    : metadata.reverser
-                        ? metadata.reverser(this[propertyName], this)
-                        : this[propertyName]?.toMap
-                            ? this[propertyName].toMap()
-                            : this[propertyName];
+                if (this[propertyName] != undefined)
+                    obj[propertyName] = this[propertyName];
             }
-        }
-        else {
-            if (this[propertyName] != undefined)
-                obj[propertyName] = this[propertyName];
-        }
-    });
+        });
     return obj;
 }
 /**
@@ -82,10 +89,10 @@ function toMap() {
 function objToModel(obj) {
     if (!obj)
         return this;
-    Object.keys(obj).forEach(propertyName => {
+    Object.keys(obj).forEach((propertyName) => {
         const value = obj[propertyName];
         this[propertyName] = Array.isArray(value)
-            ? value.map(item => item)
+            ? value.map((item) => item)
             : value;
     });
     return this;
@@ -96,7 +103,7 @@ function objToModel(obj) {
  * @returns true or false
  */
 function empty() {
-    return !Object.keys(this).some(propertyName => this[propertyName] !== undefined && this[propertyName] !== null);
+    return !Object.keys(this).some((propertyName) => this[propertyName] !== undefined && this[propertyName] !== null);
 }
 /**
  * Check if this instance is filled.
@@ -104,7 +111,8 @@ function empty() {
  * @returns true or false
  */
 function filled() {
-    return Object.keys(this).length > 0 && Object.keys(this).every(propertyName => this[propertyName] !== undefined && this[propertyName] !== null);
+    return (Object.keys(this).length > 0 &&
+        Object.keys(this).every((propertyName) => this[propertyName] !== undefined && this[propertyName] !== null));
 }
 /**
  * GET property value from a string path.
@@ -113,7 +121,7 @@ function filled() {
  * @returns Value of the property
  */
 function get(path) {
-    const props = path.replace(/\[(\w+)\]/g, '.$1').split('.');
+    const props = path.replace(/\[(\w+)\]/g, ".$1").split(".");
     return props.reduce((acc, prop) => acc && acc[prop], this);
 }
 /**
@@ -123,9 +131,9 @@ function get(path) {
  * @param value Value of the property
  */
 function set(path, value) {
-    const props = path.replace(/\[(\w+)\]/g, '.$1').split('.');
+    const props = path.replace(/\[(\w+)\]/g, ".$1").split(".");
     let obj = this;
-    props.slice(0, -1).forEach(prop => {
+    props.slice(0, -1).forEach((prop) => {
         if (!obj[prop])
             obj[prop] = {};
         obj = obj[prop];
@@ -149,9 +157,11 @@ function from(object) {
         for (let i = 0; i < propsStereoid.length; i++) {
             const prop = propsStereoid[i];
             if (prop.isArray) {
-                let arrIndex = prop.arrIndex.split(/\[(\w+)\]/g).filter(index => index !== '');
+                let arrIndex = prop.arrIndex
+                    .split(/\[(\w+)\]/g)
+                    .filter((index) => index !== "");
                 objCopy = objCopy[prop.prop];
-                arrIndex.forEach(index => {
+                arrIndex.forEach((index) => {
                     objCopy = objCopy[index];
                 });
             }
@@ -173,39 +183,47 @@ function from(object) {
                 this[metaKey] = value;
         }
     };
-    object && Object.keys(object).forEach(propertyName => {
-        let metaKeys = metadataList && Object.keys(metadataList).filter(metadata => metadataList[metadata]?.src?.split('.')?.includes(propertyName));
-        if (metaKeys?.length) {
-            metaKeys.forEach(metaKey => {
-                const metaProp = metadataList?.[metaKey];
-                if (metaProp) {
-                    const props = metaProp.src.split('.');
-                    const propsStereoid = props.map(prop => ({
-                        prop: prop.includes('[') ? prop.substring(0, prop.indexOf('[')) : prop,
-                        isArray: prop.includes('[') && prop.includes(']'),
-                        arrIndex: prop.substring(prop.indexOf('[')),
-                    }));
-                    const value = processProperty({ ...object }, propsStereoid);
-                    setProperty(metaKey, value, object);
-                }
-            });
-        }
-        else {
-            let metaKey = metadataList && Object.keys(metadataList).find(metadata => metadataList[metadata]?.src == propertyName);
-            if (metaKey) {
-                const src = metadataList?.[metaKey].src || propertyName;
-                setProperty(metaKey, object[src], object);
+    object &&
+        Object.keys(object).forEach((propertyName) => {
+            let metaKeys = metadataList &&
+                Object.keys(metadataList).filter((metadata) => metadataList[metadata]?.src?.split(".")?.includes(propertyName));
+            if (metaKeys?.length) {
+                metaKeys.forEach((metaKey) => {
+                    const metaProp = metadataList?.[metaKey];
+                    if (metaProp) {
+                        const props = metaProp.src.split(".");
+                        const propsStereoid = props.map((prop) => ({
+                            prop: prop.includes("[")
+                                ? prop.substring(0, prop.indexOf("["))
+                                : prop,
+                            isArray: prop.includes("[") && prop.includes("]"),
+                            arrIndex: prop.substring(prop.indexOf("[")),
+                        }));
+                        const value = processProperty({ ...object }, propsStereoid);
+                        setProperty(metaKey, value, object);
+                    }
+                });
             }
             else {
-                setProperty(propertyName, object[propertyName], object);
+                let metaKey = metadataList &&
+                    Object.keys(metadataList).find((metadata) => metadataList[metadata]?.src == propertyName);
+                if (metaKey) {
+                    const src = metadataList?.[metaKey].src || propertyName;
+                    setProperty(metaKey, object[src], object);
+                }
+                else {
+                    setProperty(propertyName, object[propertyName], object);
+                }
             }
-        }
-    });
+        });
     // Initialize properties with "initialize" metadata
-    metadataList && Object.keys(metadataList).forEach(metaName => {
-        if (metadataList[metaName]?.initialize && metadataList[metaName]?.transformer && this[metaName] === undefined) {
-            this[metaName] = metadataList[metaName].transformer(null, object);
-        }
-    });
+    metadataList &&
+        Object.keys(metadataList).forEach((metaName) => {
+            if (metadataList[metaName]?.initialize &&
+                metadataList[metaName]?.transformer &&
+                this[metaName] === undefined) {
+                this[metaName] = metadataList[metaName].transformer(null, object);
+            }
+        });
     return this;
 }

package/dist/index.d.ts

@@ -1,10 +1,13 @@
 import { MapClass, MapInterface } from "./class.decorator";
-import { MapField } from "./field.decorator";
+import { MapField } from "./field-decorators/field.decorator";
+import { ArrayField } from "./field-decorators/array.decorator";
+import { DateField } from "./field-decorators/date.decorator";
+import { ObjectField } from "./field-decorators/object.decorator";
 import { ClassType } from "./types";
-export { ClassType, MapClass, MapField, MapInterface };
+export { ClassType, MapInterface, MapClass, MapField, DateField, ArrayField, ObjectField, };
 /**
  * npx tsc
- * npx ts-node src/example.ts
+ * npx ts-node src/test.ts
  * npm version ( patch | minor | major )
  * npm publish
- */ 
+ */

package/dist/index.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MapField = exports.MapClass = void 0;
+exports.ObjectField = exports.ArrayField = exports.DateField = exports.MapField = exports.MapClass = void 0;
 const class_decorator_1 = require("./class.decorator");
 Object.defineProperty(exports, "MapClass", { enumerable: true, get: function () { return class_decorator_1.MapClass; } });
-const field_decorator_1 = require("./field.decorator");
+const field_decorator_1 = require("./field-decorators/field.decorator");
 Object.defineProperty(exports, "MapField", { enumerable: true, get: function () { return field_decorator_1.MapField; } });
+const array_decorator_1 = require("./field-decorators/array.decorator");
+Object.defineProperty(exports, "ArrayField", { enumerable: true, get: function () { return array_decorator_1.ArrayField; } });
+const date_decorator_1 = require("./field-decorators/date.decorator");
+Object.defineProperty(exports, "DateField", { enumerable: true, get: function () { return date_decorator_1.DateField; } });
+const object_decorator_1 = require("./field-decorators/object.decorator");
+Object.defineProperty(exports, "ObjectField", { enumerable: true, get: function () { return object_decorator_1.ObjectField; } });
 /**
  * npx tsc
- * npx ts-node src/example.ts
+ * npx ts-node src/test.ts
  * npm version ( patch | minor | major )
  * npm publish
- */ 
+ */

package/dist/test.js

@@ -10,7 +10,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const class_decorator_1 = require("./class.decorator");
-const field_decorator_1 = require("./field.decorator");
+const array_decorator_1 = require("./field-decorators/array.decorator");
+const date_decorator_1 = require("./field-decorators/date.decorator");
+const field_decorator_1 = require("./field-decorators/field.decorator");
+const object_decorator_1 = require("./field-decorators/object.decorator");
 //MAPPER FACTORY - TEST
 console.log("\nMAPPER FACTORY - TEST");
 console.log("\n");
@@ -30,14 +33,16 @@ __decorate([
 ], History.prototype, "name", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        src: "control"
+        src: "control",
     }),
     __metadata("design:type", String)
 ], History.prototype, "testControl", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
         initialize: true,
-        transformer: (arr, obj) => { return [obj.monday, obj.tuesday]; },
+        transformer: (arr, obj) => {
+            return [obj.monday, obj.tuesday];
+        },
         reverser: (arr) => {
             return { monday: arr && arr[0], tuesday: arr && arr[1] };
         },
@@ -46,7 +51,7 @@ __decorate([
 ], History.prototype, "daysActive", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        src: "test.concatenation"
+        src: "test.concatenation",
     }),
     __metadata("design:type", String)
 ], History.prototype, "testConcatenation", void 0);
@@ -65,40 +70,40 @@ let User = class User {
 };
 __decorate([
     (0, field_decorator_1.MapField)({
-        src: 'firstName'
+        src: "firstName",
     }),
     __metadata("design:type", String)
 ], User.prototype, "name", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        src: 'lastName'
+        src: "lastName",
     }),
     __metadata("design:type", String)
 ], User.prototype, "surname", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        src: 'rolesToMap',
-        transformer: (arr) => arr?.map(role => role + " TEST TRASFORMER"),
-        reverser: (arr) => arr?.map(role => role.replace(" TEST TRASFORMER", "")),
+        src: "rolesToMap",
+        transformer: (arr) => arr?.map((role) => role + " TEST TRASFORMER"),
+        reverser: (arr) => arr?.map((role) => role.replace(" TEST TRASFORMER", "")),
     }),
     __metadata("design:type", Array)
 ], User.prototype, "roles", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        transformer: (arr) => arr?.map(user => new User().from(user))
+        transformer: (arr) => arr?.map((user) => new User().from(user)),
     }),
     __metadata("design:type", Array)
 ], User.prototype, "employees", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        transformer: (user) => new User().from(user)
+        transformer: (user) => new User().from(user),
     }),
     __metadata("design:type", User)
 ], User.prototype, "boss", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        transformer: histories => histories?.map(hst => new History().from(hst)),
-        reverser: histories => histories?.map(hst => hst.toMap()),
+        transformer: (histories) => histories?.map((hst) => new History().from(hst)),
+        reverser: (histories) => histories?.map((hst) => hst.toMap()),
     }),
     __metadata("design:type", Array)
 ], User.prototype, "histories", void 0);
@@ -107,49 +112,70 @@ User = __decorate([
 ], User);
 const emp1 = new User().from({ firstName: "Summer", lastName: "Smith" });
 const emp2 = new User().from({ firstName: "Morty", lastName: "Smith" });
-const JSONObject = { username: 'god', firstName: "Rick", lastName: "Sanchez", employees: [emp1.toMap(), emp2.toMap()], rolesToMap: ["CEO", "EMPLOYEE"], boss: { firstName: "Nello", lastName: "Stanco" } };
+const JSONObject = {
+    username: "god",
+    firstName: "Rick",
+    lastName: "Sanchez",
+    employees: [emp1.toMap(), emp2.toMap()],
+    rolesToMap: ["CEO", "EMPLOYEE"],
+    boss: { firstName: "Nello", lastName: "Stanco" },
+};
 //TEST constructor
 const u = new User().from(JSONObject);
 const constructorTest = u.username == JSONObject.username &&
     u.name == JSONObject.firstName &&
     u.surname == JSONObject.lastName &&
-    u.employees?.map(emp => emp.name == emp1.name) &&
-    u.roles?.map(role => role == "CEO") &&
+    u.employees?.map((emp) => emp.name == emp1.name) &&
+    u.roles?.map((role) => role == "CEO") &&
     u.boss.name == "Nello" &&
     u.boss.surname == "Stanco";
-console.log("TEST CONSTRUCTOR", constructorTest ? '✅' : '❌');
+console.log("TEST CONSTRUCTOR", constructorTest ? "✅" : "❌");
 //TEST toModel method with JS Object
 const u1 = new User().toModel(u);
-const toModelTest = u1.name == JSONObject.firstName && u1.surname == JSONObject.lastName && u1.employees?.map(emp => emp.name == emp1.name) && u1.roles?.map(role => role == "CEO") && u1.boss.name == "Nello" && u1.boss.surname == "Stanco";
-console.log("TEST TO MODEL USER", toModelTest ? '✅' : '❌');
+const toModelTest = u1.name == JSONObject.firstName &&
+    u1.surname == JSONObject.lastName &&
+    u1.employees?.map((emp) => emp.name == emp1.name) &&
+    u1.roles?.map((role) => role == "CEO") &&
+    u1.boss.name == "Nello" &&
+    u1.boss.surname == "Stanco";
+console.log("TEST TO MODEL USER", toModelTest ? "✅" : "❌");
 //TEST [GET, SET] METHODS
 u.set("employees[1].name", "name editato");
 const toModelTest1 = u.get("employees[1].name") == "name editato";
-console.log("TEST [GET, SET] METHODS", toModelTest1 ? '✅' : '❌');
+console.log("TEST [GET, SET] METHODS", toModelTest1 ? "✅" : "❌");
 //TEST TRANSFORMER/REVERSER
 const h1 = new History().from({ name: "h1" });
 const h2 = new History().from({ name: "h2" });
 u.histories = [h1, h2];
 const uMapped = u.toMap();
-const toModelTest2 = uMapped.histories?.map(h => h.name == " TEST REVERSER") && u.histories?.map(h => h.name == " TEST TRASFORMER");
-console.log("TEST TRANSFORMER/REVERSER", toModelTest2 ? '✅' : '❌');
+const toModelTest2 = uMapped.histories?.map((h) => h.name == " TEST REVERSER") &&
+    u.histories?.map((h) => h.name == " TEST TRASFORMER");
+console.log("TEST TRANSFORMER/REVERSER", toModelTest2 ? "✅" : "❌");
 //TEST REF
-const hTest = new History().from({ monday: "0", tuesday: "1", control: "control" });
-hTest.daysActive = ['1', '0'];
-const toModelTest3 = hTest.toMap().daysActive.monday == '1' && hTest.toMap().daysActive.tuesday == '0';
-console.log("TEST REF", toModelTest3 ? '✅' : '❌');
+const hTest = new History().from({
+    monday: "0",
+    tuesday: "1",
+    control: "control",
+});
+hTest.daysActive = ["1", "0"];
+const toModelTest3 = hTest.toMap().daysActive.monday == "1" &&
+    hTest.toMap().daysActive.tuesday == "0";
+console.log("TEST REF", toModelTest3 ? "✅" : "❌");
 //TEST CONCAT WITH POINT
-const hTest2 = new History().from({ test: { concatenation: "resolve " }, control: "control" });
-const toModelTest4 = hTest2.toMap().test.concatenation == 'resolve ';
-console.log("TEST CONCAT WITH POINT", toModelTest4 ? '✅' : '❌');
+const hTest2 = new History().from({
+    test: { concatenation: "resolve " },
+    control: "control",
+});
+const toModelTest4 = hTest2.toMap().test.concatenation == "resolve ";
+console.log("TEST CONCAT WITH POINT", toModelTest4 ? "✅" : "❌");
 let Test = class Test {
     a;
 };
 __decorate([
     (0, field_decorator_1.MapField)({
-        src: 'b',
-        transformer: value => 'test transformer',
-        reverser: value => ({ a: 'test reverser' }),
+        src: "b",
+        transformer: (value) => "test transformer",
+        reverser: (value) => ({ a: "test reverser" }),
     }),
     __metadata("design:type", String)
 ], Test.prototype, "a", void 0);
@@ -157,33 +183,33 @@ Test = __decorate([
     (0, class_decorator_1.MapClass)()
 ], Test);
 const testEmpty = new Test().from();
-const testFilled = new Test().from({ b: 'filled' });
-const checkTest1 = (testEmpty && testEmpty.empty() == true && testEmpty.filled() == false);
-const checkTest2 = (testFilled && testFilled.empty() == false && testFilled.filled() == true);
-console.log("TEST EMPTY/FILLED WITH INITIALIZE", (checkTest1 && checkTest2) ? '✅' : '❌');
-const model3 = new Test().toModel({ a: 'test to model' });
-console.log("TEST TO MODEL WITH INITIALIZE", (model3.a == 'test to model') ? '✅' : '❌');
+const testFilled = new Test().from({ b: "filled" });
+const checkTest1 = testEmpty && testEmpty.empty() == true && testEmpty.filled() == false;
+const checkTest2 = testFilled && testFilled.empty() == false && testFilled.filled() == true;
+console.log("TEST EMPTY/FILLED WITH INITIALIZE", checkTest1 && checkTest2 ? "✅" : "❌");
+const model3 = new Test().toModel({ a: "test to model" });
+console.log("TEST TO MODEL WITH INITIALIZE", model3.a == "test to model" ? "✅" : "❌");
 const model4 = model3.toMap();
-console.log("TEST TO MAP WITH INITIALIZE", (model4.b.a == 'test reverser') ? '✅' : '❌');
+console.log("TEST TO MAP WITH INITIALIZE", model4.b.a == "test reverser" ? "✅" : "❌");
 const model5 = model3.copy();
-console.log("TEST COPY WITH INITIALIZE", (Object.keys(model5).every(k => model5[k] == model3[k])) ? '✅' : '❌');
+console.log("TEST COPY WITH INITIALIZE", Object.keys(model5).every((k) => model5[k] == model3[k]) ? "✅" : "❌");
 let TestFlag = class TestFlag {
     flTest;
     a;
 };
 __decorate([
     (0, field_decorator_1.MapField)({
-        transformer: (num) => num == '1',
-        reverser: bool => bool ? '1' : '0',
+        transformer: (num) => num == "1",
+        reverser: (bool) => (bool ? "1" : "0"),
         initialize: true,
     }),
     __metadata("design:type", Boolean)
 ], TestFlag.prototype, "flTest", void 0);
 __decorate([
     (0, field_decorator_1.MapField)({
-        src: 'b',
-        transformer: value => 'test transformer',
-        reverser: value => ({ a: 'test reverser' }),
+        src: "b",
+        transformer: (value) => "test transformer",
+        reverser: (value) => ({ a: "test reverser" }),
         initialize: true,
     }),
     __metadata("design:type", String)
@@ -192,16 +218,16 @@ TestFlag = __decorate([
     (0, class_decorator_1.MapClass)()
 ], TestFlag);
 const testFlagInitialize = new TestFlag().from();
-console.log("TEST INITIALIZE", (testFlagInitialize && testFlagInitialize.a == 'test transformer') ? '✅' : '❌');
+console.log("TEST INITIALIZE", testFlagInitialize && testFlagInitialize.a == "test transformer" ? "✅" : "❌");
 const testFlag0 = new TestFlag().from();
 const testFlag0Map = testFlag0.toMap();
-console.log("TEST FLAG0", ((testFlag0.flTest === false) && testFlag0Map.flTest == '0') ? '✅' : '❌');
-const testFlag1 = new TestFlag().from({ flTest: '1' });
+console.log("TEST FLAG0", testFlag0.flTest === false && testFlag0Map.flTest == "0" ? "✅" : "❌");
+const testFlag1 = new TestFlag().from({ flTest: "1" });
 const testFlag1Map = testFlag1.toMap();
-console.log("TEST FLAG1", (testFlag1.flTest && testFlag1Map.flTest == '1') ? '✅' : '❌');
-const testFlag2 = new TestFlag().from({ flTest: '0' });
+console.log("TEST FLAG1", testFlag1.flTest && testFlag1Map.flTest == "1" ? "✅" : "❌");
+const testFlag2 = new TestFlag().from({ flTest: "0" });
 const testFlag2Map = testFlag2.toMap();
-console.log("TEST FLAG2", (!testFlag2.flTest && testFlag2Map.flTest == '0') ? '✅' : '❌');
+console.log("TEST FLAG2", !testFlag2.flTest && testFlag2Map.flTest == "0" ? "✅" : "❌");
 let TestWithoutMapField = class TestWithoutMapField {
     id;
     name;
@@ -210,9 +236,54 @@ TestWithoutMapField = __decorate([
     (0, class_decorator_1.MapClass)()
 ], TestWithoutMapField);
 const JSONObject2 = {
-    id: '1',
-    name: 'Supplier 1',
+    id: "1",
+    name: "Supplier 1",
 };
 const testWOMF = new TestWithoutMapField().from(JSONObject2);
-console.log("TEST WITHOUT MAP FIELD", (testWOMF) ? '✅' : '❌');
+console.log("TEST WITHOUT MAP FIELD", testWOMF ? "✅" : "❌");
+let ObjDecorator = class ObjDecorator {
+    id;
+    testObject;
+};
+__decorate([
+    (0, object_decorator_1.ObjectField)(() => ObjDecorator),
+    __metadata("design:type", ObjDecorator)
+], ObjDecorator.prototype, "testObject", void 0);
+ObjDecorator = __decorate([
+    (0, class_decorator_1.MapClass)()
+], ObjDecorator);
+let TestDecorators = class TestDecorators {
+    date;
+    objList;
+    obj;
+};
+__decorate([
+    (0, date_decorator_1.DateField)(),
+    __metadata("design:type", Date)
+], TestDecorators.prototype, "date", void 0);
+__decorate([
+    (0, array_decorator_1.ArrayField)(() => ObjDecorator),
+    __metadata("design:type", Array)
+], TestDecorators.prototype, "objList", void 0);
+__decorate([
+    (0, object_decorator_1.ObjectField)(() => ObjDecorator),
+    __metadata("design:type", ObjDecorator)
+], TestDecorators.prototype, "obj", void 0);
+TestDecorators = __decorate([
+    (0, class_decorator_1.MapClass)()
+], TestDecorators);
+const JSONTestDecorators = {
+    date: "2023-10-01T00:00:00Z",
+    objList: [
+        { id: "1", testObject: { id: "2" } },
+        { id: "3", testObject: { id: "4" } },
+    ],
+    obj: { id: "5", testObject: { id: "6" } },
+};
+const testDecorators = new TestDecorators().from(JSONTestDecorators);
+console.log("TEST WITH DECORATORS", (testDecorators.date.toISOString() &&
+    testDecorators.objList?.length === 2 &&
+    testDecorators.obj instanceof ObjDecorator &&
+    testDecorators.objList[0] instanceof ObjDecorator &&
+    testDecorators.objList[0].testObject instanceof ObjDecorator) ? "✅" : "❌");
 console.log("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapper-factory",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "mapper for typescript object",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",