framework-do-dede 5.2.2 → 5.3.3

package/dist/infra/model/model.d.ts

@@ -7,7 +7,8 @@ export declare abstract class Model<TTable = string> {
     table: TTable;
     columns: ColumnDefinition[];
     [property: string]: any;
-    constructor(input?: Record<string, any> | Entity);
+    fromModel(input: Record<string, any>): Model;
+    abstract fromEntity(entity: Entity): Model;
     toModel(): Record<string, any>;
     abstract toEntity(): Entity;
 }

package/dist/infra/model/model.js

@@ -1,18 +1,12 @@
-import { Entity } from "../../application";
 export class Model {
-    constructor(input) {
-        if (!input)
-            return;
-        let data = {};
-        if (input instanceof Entity) {
-            data = input.from();
-        }
-        else {
-            data = input;
-        }
-        for (const [property, value] of Object.entries(data)) {
-            this[property] = value;
+    fromModel(input) {
+        const columns = this.columns ?? [];
+        const columnByName = new Map(columns.map((column) => [column.column, column.property]));
+        for (const [property, value] of Object.entries(input)) {
+            const mappedProperty = columnByName.get(property);
+            this[mappedProperty ?? property] = value;
         }
+        return this;
     }
     toModel() {
         const record = {};

package/dist/infra/serialization/entity.d.ts

@@ -1,11 +1,10 @@
 import { Entity as DomainEntity } from "../../domain/entity";
 export declare abstract class Entity extends DomainEntity {
     [x: string]: any;
-    from(): Record<string, any>;
-    to(transform?: boolean): Record<string, any>;
+    data(transform?: boolean): Promise<Record<string, any>>;
     protected generateGetters(): void;
 }
 export declare function Restrict(): (target: any, propertyKey: string) => void;
 export declare function VirtualProperty(propertyName: string): (target: any, methodName: string) => void;
-export declare function Transform(callback: (value: any) => any): PropertyDecorator;
+export declare function Transform(callback: (value: any) => any | Promise<any>): PropertyDecorator;
 export declare function GetterPrefix(prefix: string): (target: any, propertyKey: string) => void;

package/dist/infra/serialization/entity.js

@@ -1,40 +1,6 @@
 import { Entity as DomainEntity } from "../../domain/entity";
 export class Entity extends DomainEntity {
-    from() {
-        // @ts-ignore
-        const propertiesConfigs = this.constructor.propertiesConfigs;
-        const result = {};
-        for (const [propName] of Object.entries(this)) {
-            let propertyName = propName;
-            let value = this[propName];
-            if (typeof value === 'function')
-                continue;
-            if (value === undefined)
-                continue;
-            // @ts-ignore
-            if (propertiesConfigs && propertiesConfigs[propName]?.transform && value) {
-                const transformedValue = propertiesConfigs[propName].transform(value);
-                if (transformedValue && typeof transformedValue === 'object' && !Array.isArray(transformedValue)) {
-                    const entries = Object.entries(transformedValue);
-                    for (const [transformedKey, transformedPropValue] of entries) {
-                        let currentValue = transformedPropValue;
-                        if (!currentValue)
-                            currentValue = null;
-                        result[transformedKey] = currentValue;
-                    }
-                    continue;
-                }
-                else {
-                    value = transformedValue;
-                }
-            }
-            if (value === undefined || value === null)
-                value = null;
-            result[propertyName] = value;
-        }
-        return result;
-    }
-    to(transform = true) {
+    async data(transform = true) {
         // @ts-ignore
         const propertiesConfigs = this.constructor.propertiesConfigs;
         // @ts-ignore
@@ -48,7 +14,7 @@ export class Entity extends DomainEntity {
             // @ts-ignore
             let value = this[propName];
             if (transform && propertiesConfigs && propertiesConfigs[propName]?.transform && value) {
-                value = propertiesConfigs[propName].transform(value);
+                value = await propertiesConfigs[propName].transform(value);
             }
             result[propName] = value;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-do-dede",
-  "version": "5.2.2",
+  "version": "5.3.3",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",