framework-do-dede 2.0.17 → 2.0.19

package/dist/decorators/usecase.d.ts

@@ -1,4 +1,4 @@
 import { UseCase } from "../protocols";
 export declare const USE_CASE_DECORATORS: unique symbol;
 export declare function Context(middlewareKey: string): (target: any, propertyKey: string) => void;
-export declare function DecorateUseCase(useCases: (new (...args: any[]) => UseCase<any, any> | UseCase<any, any>) | Array<new (...args: any[]) => UseCase<any, any> | UseCase<any, any>>): ClassDecorator;
+export declare function DecorateUseCase(useCases: UseCase<any, any> | (new (...args: any[]) => UseCase<any, any>) | Array<UseCase<any, any> | (new (...args: any[]) => UseCase<any, any>)>): ClassDecorator;

package/dist/handlers/usecase.handler.js

@@ -4,37 +4,40 @@ export default class UseCaseHandler {
     static load(useCaseClass, request) {
         const useCaseDecorators = Reflect.getMetadata(USE_CASE_DECORATORS, useCaseClass) || [];
         const useCaseDecoratorsInstances = [];
+        // Processa decorators
         for (const useCaseDecorator of useCaseDecorators) {
+            let instance;
             if (typeof useCaseDecorator === 'function') {
-                const instanceDecorator = Registry.classLoader(useCaseDecorator);
-                const context = request;
-                const contextDecoratorsMetadata = Reflect.getMetadata('context', useCaseDecorator) || [];
-                contextDecoratorsMetadata.forEach(({ propertyKey, middlewareKey }) => {
-                    if (context?.middlewareData?.[middlewareKey]) {
-                        instanceDecorator[propertyKey] = context.middlewareData[middlewareKey];
-                    }
-                });
-                useCaseDecoratorsInstances.push(instanceDecorator);
+                // Cria instância via DI
+                instance = Registry.classLoader(useCaseDecorator);
             }
             else {
-                useCaseDecoratorsInstances.push(useCaseDecorator);
+                // Usa instância existente
+                instance = useCaseDecorator;
             }
+            // Injeta contexto na instância (seja nova ou existente)
+            injectContext(instance, request);
+            useCaseDecoratorsInstances.push(instance);
         }
+        // Cria e configura a instância principal
         const instance = Registry.classLoader(useCaseClass);
-        const context = request;
-        const contextMetadata = Reflect.getMetadata('context', useCaseClass) || [];
-        contextMetadata.forEach(({ propertyKey, middlewareKey }) => {
-            if (context?.middlewareData?.[middlewareKey]) {
-                instance[propertyKey] = context.middlewareData[middlewareKey];
-            }
-        });
+        injectContext(instance, request);
+        // Decora o método execute
         const originalExecute = instance.execute.bind(instance);
         instance.execute = async (input) => {
-            for await (const useCaseDecoratorsInstance of useCaseDecoratorsInstances) {
-                await useCaseDecoratorsInstance.execute(input);
+            for (const decoratorInstance of useCaseDecoratorsInstances) {
+                await decoratorInstance.execute(input);
             }
             return originalExecute(input);
         };
         return instance;
     }
 }
+function injectContext(instance, request) {
+    const contextMetadata = Reflect.getMetadata('context', instance.constructor) || [];
+    contextMetadata.forEach(({ propertyKey, middlewareKey }) => {
+        if (request?.middlewareData?.[middlewareKey]) {
+            instance[propertyKey] = request.middlewareData[middlewareKey];
+        }
+    });
+}

package/package.json

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