framework-do-dede 1.0.29 → 1.0.31

package/dist/decorators/services.js

@@ -2,28 +2,27 @@ import { Registry } from "../di/registry";
 import { StorageGateway } from "../protocols/StorageGateway";
 export function Storage(gatewayName) {
     return function (target, propertyKey) {
-        Registry.whenLoaded(() => {
-            if (!Registry.has(gatewayName)) {
-                throw new Error(`StorageGateway ${gatewayName} not registered`);
-            }
-            const GatewayClass = Registry.resolve(gatewayName);
-            if (!(GatewayClass instanceof StorageGateway)) {
-                throw new Error(`${gatewayName} is not a valid StorageGateway`);
-            }
-            const instanceSymbol = Symbol();
-            Object.defineProperty(target, propertyKey, {
-                get: function () {
-                    if (!this[instanceSymbol]) {
-                        this[instanceSymbol] = GatewayClass;
+        const instanceSymbol = Symbol();
+        Object.defineProperty(target, propertyKey, {
+            get: function () {
+                if (!this[instanceSymbol]) {
+                    // Lazy load the gateway when the property is first accessed
+                    if (!Registry.has(gatewayName)) {
+                        throw new Error(`StorageGateway ${gatewayName} not registered`);
                     }
-                    return this[instanceSymbol];
-                },
-                set: () => {
-                    throw new Error('Cannot assign new value to @Storage() property');
-                },
-                enumerable: true,
-                configurable: true
-            });
+                    const GatewayClass = Registry.resolve(gatewayName);
+                    if (!(GatewayClass instanceof StorageGateway)) {
+                        throw new Error(`${gatewayName} is not a valid StorageGateway`);
+                    }
+                    this[instanceSymbol] = GatewayClass;
+                }
+                return this[instanceSymbol];
+            },
+            set: () => {
+                throw new Error('Cannot assign new value to @Storage() property');
+            },
+            enumerable: true,
+            configurable: true
         });
     };
 }

package/dist/di/registry.d.ts

@@ -12,7 +12,6 @@ declare class ComponentRegistry {
     classLoader<T>(target: new (...args: any[]) => T): T;
     inject(token: string): (target: any, propertyKey: string | symbol | undefined, parameterIndex: number) => void;
     loaded(): void;
-    whenLoaded(callback: () => void): void;
 }
 export declare const Registry: ComponentRegistry;
 export {};

package/dist/di/registry.js

@@ -47,11 +47,5 @@ class ComponentRegistry {
     loaded() {
         this.isLoading = false;
     }
-    whenLoaded(callback) {
-        while (this.isLoading) {
-            setTimeout(callback, 100);
-        }
-        callback();
-    }
 }
 export const Registry = ComponentRegistry.getInstance();

package/dist/domain/Entity.d.ts

@@ -1,6 +1,6 @@
 export declare abstract class Entity {
     get(): Promise<Record<string, any>>;
-    toSave(): Promise<Record<string, any>>;
+    toEntity(): Promise<Record<string, any>>;
+    toMap(properties: string[]): Promise<Record<string, any>>;
     protected beforeSave(): Promise<void>;
-    protected beforeGet(): Promise<void>;
 }

package/dist/domain/Entity.js

@@ -5,7 +5,6 @@ export class Entity {
         const virtualProperties = ctor._virtualProperties || new Map();
         const exposeConfigs = ctor._exposeConfigs || new Map();
         const attributes = {};
-        await this.beforeGet();
         for (const [key, value] of Object.entries(this)) {
             if (!restrictedProps.has(key)) {
                 attributes[key] = value;
@@ -52,7 +51,7 @@ export class Entity {
         }
         return attributes;
     }
-    async toSave() {
+    async toEntity() {
         await this.beforeSave();
         const result = {};
         const processedKeys = new Set();
@@ -83,6 +82,42 @@ export class Entity {
         }
         return result;
     }
+    async toMap(properties) {
+        const ctor = this.constructor;
+        const exposeConfigs = ctor._exposeConfigs || new Map();
+        const attributes = {};
+        for (const property of properties) {
+            if (exposeConfigs.has(property)) {
+                const rawValue = this[property];
+                const config = exposeConfigs.get(property);
+                try {
+                    let value = config.deserialize ? await config.deserialize(rawValue) : rawValue;
+                    if (config.mapping) {
+                        if (typeof config.mapping === "string") {
+                            attributes[config.mapping] = value;
+                        }
+                        else {
+                            Object.entries(config.mapping).forEach(([srcKey, destKey]) => {
+                                // @ts-ignore
+                                attributes[destKey] = value[srcKey];
+                            });
+                        }
+                    }
+                    else {
+                        if (typeof value === "object" && value !== null) {
+                            Object.assign(attributes, value);
+                        }
+                        else {
+                            attributes[property] = value;
+                        }
+                    }
+                }
+                catch (error) {
+                    console.error(`Error in @Expose for ${String(property)}:`, error);
+                }
+            }
+        }
+        return attributes;
+    }
     async beforeSave() { }
-    async beforeGet() { }
 }

package/package.json

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