@orion-js/http 3.2.4 → 3.2.10

package/lib/service/index.d.ts

@@ -1,7 +1,4 @@
-import { OrionRouteOptions, RoutesMap } from '../types';
+import { OrionRouteOptions, RouteResolve, RoutesMap } from '../types';
 export declare function Routes(): ClassDecorator;
-export interface RoutesPropertyDescriptor extends Omit<PropertyDecorator, 'value'> {
-    value?: OrionRouteOptions['resolve'];
-}
-export declare function Route(options: Omit<OrionRouteOptions, 'resolve'>): (target: any, propertyKey: string, descriptor: RoutesPropertyDescriptor) => void;
+export declare function Route(options: Omit<OrionRouteOptions, 'resolve'>): (target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<RouteResolve>) => void;
 export declare function getServiceRoutes(target: any): RoutesMap;

package/lib/service/index.js

@@ -20,9 +20,9 @@ function Route(options) {
         target.routes = target.routes || {};
         target.routes[propertyKey] = (0, route_1.default)({
             ...options,
-            resolve: async (params, viewer) => {
+            resolve: async (req, res, viewer) => {
                 const instance = (0, services_1.getInstance)(target.service);
-                return await instance[propertyKey](params, viewer);
+                return await instance[propertyKey](req, res, viewer);
             }
         });
     };

package/lib/types.d.ts

@@ -1,12 +1,14 @@
 import express from 'express';
 import * as bodyParser from 'body-parser';
-export interface RouteResponse {
+export interface RouteResponseObject {
     statusCode?: number;
     headers?: {
         [key: string]: string;
     };
     body: string | object;
 }
+export declare type RouteResponse = Promise<RouteResponseObject | void>;
+export declare type RouteResolve = (req: express.Request, res: express.Response, viewer: any) => RouteResponse;
 export interface OrionRouteOptions {
     /**
      * The http method of the requests to match.
@@ -30,7 +32,7 @@ export interface OrionRouteOptions {
      * for more information.
      */
     middlewares?: Array<express.RequestHandler>;
-    resolve: (req: express.Request, res: express.Response, viewer: any) => Promise<RouteResponse> | Promise<void>;
+    resolve: RouteResolve;
     /**
      * Pass another express app
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/http",
-  "version": "3.2.4",
+  "version": "3.2.10",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     "@orion-js/helpers": "^3.2.0",
     "@orion-js/resolvers": "^3.2.0",
     "@orion-js/schema": "^3.2.0",
-    "@orion-js/services": "^3.2.0",
+    "@orion-js/services": "^3.2.10",
     "body-parser": "1.19.0",
     "express": "4.17.1",
     "reflect-metadata": "^0.1.13"
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a1c4cff581b31f24896ec96a0a180d043dbf802a"
+  "gitHead": "cae0afccac10f4b9bdbdeb1faaac3884eaef730c"
 }