@venok/integration 2.1.0 → 2.2.0-next.2

package/dist/index.d.ts

@@ -255,6 +255,7 @@ type DiscoveryOptions = FilterByInclude | FilterByMetadataKey;
 type ExplorerSettings = Partial<{
     contextType: string;
     isRequestScopeSupported: boolean;
+    returnProxyValueFromRequestScope: boolean;
     requestContextArgIndex: number;
     options: ExternalContextOptions;
     exceptionsFilterClass: typeof VenokExceptionFilterContext;
@@ -342,6 +343,7 @@ declare abstract class ExplorerService<T = any> extends Reflector {
     protected readonly requestArgIndex: number;
     protected readonly options: Omit<ExternalContextOptions, "callback">;
     protected readonly metadataKey: string;
+    protected readonly returnProxyValueFromRequestScope: boolean;
     protected readonly exceptionsFilterClass: typeof VenokExceptionFilterContext;
     protected readonly contextCreatorClass: typeof VenokContextCreator;
     protected readonly exceptionsFilter: VenokExceptionFilterContext;
@@ -355,7 +357,8 @@ declare abstract class ExplorerService<T = any> extends Reflector {
     protected createCallback(wrapper: InstanceWrapper, methodName: string): (...args: any[]) => Promise<any>;
     protected createContextCallback(instance: object, callback: (...args: any[]) => any, methodName: string, contextId?: _venok_core.ContextId, inquirerId?: string | undefined): (...args: any[]) => Promise<any>;
     protected getContextArgForRequest(args: any[]): any;
-    private createRequestScopeContextCallback;
+    protected getOriginalArgsForHandler(args: any[]): any[];
+    protected createRequestScopeContextCallback(wrapper: InstanceWrapper, methodName: string): (...args: any[]) => Promise<any>;
 }
 
 /**

package/dist/services/explorer.service.js

@@ -36,6 +36,7 @@ class ExplorerService extends Reflector {
   requestArgIndex;
   options;
   metadataKey;
+  returnProxyValueFromRequestScope;
   exceptionsFilterClass;
   contextCreatorClass;
   exceptionsFilter;
@@ -54,7 +55,8 @@ class ExplorerService extends Reflector {
       isRequestScopeSupported = false,
       options = { guards: true, filters: true, interceptors: true, callback: undefined },
       requestContextArgIndex = 0,
-      metadataKey = ROUTE_ARGS_METADATA
+      metadataKey = ROUTE_ARGS_METADATA,
+      returnProxyValueFromRequestScope = false
     } = this.getSettings();
     this.options = options;
     this.type = contextType;
@@ -63,6 +65,7 @@ class ExplorerService extends Reflector {
     this.contextCreatorClass = contextCreatorClass;
     this.withRequestScope = isRequestScopeSupported;
     this.exceptionsFilterClass = exceptionsFilterClass;
+    this.returnProxyValueFromRequestScope = returnProxyValueFromRequestScope;
     this.contextCreator = this.contextCreatorClass.fromContainer(container, this.contextCreatorClass, this.exceptionsFilterClass);
     this.exceptionsFilter = new this.exceptionsFilterClass(this.container, this.container.applicationConfig);
     this.wrappers = this.discoveryService.getProviders().filter((wrapper) => {
@@ -86,8 +89,11 @@ class ExplorerService extends Reflector {
   getContextArgForRequest(args) {
     return this.paramsFactory.exchangeKeyForValue(this.requestArgIndex, undefined, args);
   }
+  getOriginalArgsForHandler(args) {
+    return args;
+  }
   createRequestScopeContextCallback(wrapper, methodName) {
-    const { instance } = wrapper;
+    const instance = wrapper.instance;
     const moduleKey = this.contextCreator.getContextModuleKey(instance.constructor);
     const moduleRef = this.container.getModuleByKey(moduleKey);
     const collection = moduleRef.injectables;
@@ -97,14 +103,20 @@ class ExplorerService extends Reflector {
         const contextArg = this.getContextArgForRequest(args);
         const contextId = this.container.getContextId(contextArg, isTreeDurable);
         const contextInstance = await new Injector().loadPerContext(instance, moduleRef, collection, contextId);
-        await this.createContextCallback(contextInstance, contextInstance[methodName], methodName, contextId, wrapper.id)(...args);
+        const proxy = this.createContextCallback(contextInstance, contextInstance[methodName], methodName, contextId, wrapper.id);
+        const originalArgs = this.getOriginalArgsForHandler(args);
+        const result = await proxy(...originalArgs);
+        if (this.returnProxyValueFromRequestScope)
+          return result;
       } catch (err) {
         let exceptionFilter = this.exceptionFiltersCache.get(instance[methodName]);
         if (!exceptionFilter) {
           exceptionFilter = this.exceptionsFilter.create(instance, instance[methodName], moduleKey);
           this.exceptionFiltersCache.set(instance[methodName], exceptionFilter);
         }
-        const host = new ExecutionContextHost(args);
+        const originalArgs = this.getOriginalArgsForHandler(args);
+        const host = new ExecutionContextHost(originalArgs);
+        host.setType(this.type);
         exceptionFilter.next(err, host);
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@venok/integration",
-  "version": "2.1.0",
+  "version": "2.2.0-next.2",
   "description": "",
   "author": "shiz-ceo",
   "type": "module",
@@ -34,7 +34,7 @@
     "test": "bun test ./test/"
   },
   "peerDependencies": {
-    "@venok/core": "2.0.1",
+    "@venok/core": "2.1.0",
     "uuid": "^13.0.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1"