@orion-js/http 3.2.3 → 3.2.4

package/lib/index.d.ts

@@ -14,3 +14,4 @@ declare const bodyParser: {
 };
 export { express, startServer, getApp, getViewer, setGetViewer, setOnError, onError, route, registerRoute, registerRoutes, bodyParser };
 export * from './types';
+export * from './service';

package/lib/index.js

@@ -35,3 +35,4 @@ const body_parser_1 = require("body-parser");
 const bodyParser = { json: body_parser_1.json, raw: body_parser_1.raw, text: body_parser_1.text, urlencoded: body_parser_1.urlencoded };
 exports.bodyParser = bodyParser;
 __exportStar(require("./types"), exports);
+__exportStar(require("./service"), exports);

package/lib/routes/executeRequest.d.ts

@@ -1,3 +1,3 @@
-import { Route } from './../types';
+import { RouteType } from './../types';
 import express from 'express';
-export declare function executeRequest(route: Route, req: express.Request, res: express.Response): Promise<void>;
+export declare function executeRequest(route: RouteType, req: express.Request, res: express.Response): Promise<void>;

package/lib/routes/registerRoute.d.ts

@@ -1,2 +1,2 @@
-import { Route } from '../types';
-export default function registerRoute(route: Route): void;
+import { RouteType } from '../types';
+export default function registerRoute(route: RouteType): void;

package/lib/routes/registerRoutes.d.ts

@@ -1,6 +1,2 @@
-import { Route } from '../types';
-interface OrionRoutesMap {
-    [key: string]: Route;
-}
-export default function registerRoutes(routesMap: OrionRoutesMap): void;
-export {};
+import { RoutesMap } from '../types';
+export default function registerRoutes(routesMap: RoutesMap): void;

package/lib/routes/route.d.ts

@@ -1,2 +1,2 @@
-import { Route, OrionRouteOptions } from '../types';
-export default function route(options: OrionRouteOptions): Route;
+import { RouteType, OrionRouteOptions } from '../types';
+export default function route(options: OrionRouteOptions): RouteType;

package/lib/service/index.d.ts

@@ -0,0 +1,7 @@
+import { OrionRouteOptions, 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 getServiceRoutes(target: any): RoutesMap;

package/lib/service/index.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getServiceRoutes = exports.Route = exports.Routes = void 0;
+const services_1 = require("@orion-js/services");
+const route_1 = __importDefault(require("../routes/route"));
+function Routes() {
+    return function (target) {
+        (0, services_1.Service)()(target);
+        target.prototype.service = target;
+    };
+}
+exports.Routes = Routes;
+function Route(options) {
+    return function (target, propertyKey, descriptor) {
+        if (!descriptor.value)
+            throw new Error(`You must pass resolver function to ${propertyKey}`);
+        target.routes = target.routes || {};
+        target.routes[propertyKey] = (0, route_1.default)({
+            ...options,
+            resolve: async (params, viewer) => {
+                const instance = (0, services_1.getInstance)(target.service);
+                return await instance[propertyKey](params, viewer);
+            }
+        });
+    };
+}
+exports.Route = Route;
+function getServiceRoutes(target) {
+    if (!target.prototype) {
+        throw new Error('You must pass a class to getServiceRoutes');
+    }
+    return target.prototype.routes || {};
+}
+exports.getServiceRoutes = getServiceRoutes;

package/lib/service/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/service/index.test.js

@@ -0,0 +1,40 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
+describe('Routes with service injections', () => {
+    it('Should define a routes map using services', async () => {
+        let RoutesService = class RoutesService {
+            async route1() {
+                return {
+                    statusCode: 200,
+                    body: 'route1'
+                };
+            }
+        };
+        __decorate([
+            (0, _1.Route)({ method: 'get', path: '/route1' }),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Promise)
+        ], RoutesService.prototype, "route1", null);
+        RoutesService = __decorate([
+            (0, _1.Routes)()
+        ], RoutesService);
+        const routes = (0, _1.getServiceRoutes)(RoutesService);
+        expect(routes).toMatchObject({
+            route1: {
+                method: 'get',
+                path: '/route1'
+            }
+        });
+    });
+});

package/lib/types.d.ts

@@ -36,7 +36,10 @@ export interface OrionRouteOptions {
      */
     app?: express.Application;
 }
-export interface Route extends OrionRouteOptions {
+export interface RouteType extends OrionRouteOptions {
+}
+export interface RoutesMap {
+    [key: string]: RouteType;
 }
 export declare type Request = express.Request;
 export declare type Response = express.Response;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/http",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -21,8 +21,10 @@
     "@orion-js/helpers": "^3.2.0",
     "@orion-js/resolvers": "^3.2.0",
     "@orion-js/schema": "^3.2.0",
+    "@orion-js/services": "^3.2.0",
     "body-parser": "1.19.0",
-    "express": "4.17.1"
+    "express": "4.17.1",
+    "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
     "@shelf/jest-mongodb": "^2.1.0",
@@ -40,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "169123c560388991a3e2d3d7c96682dcb3713523"
+  "gitHead": "a1c4cff581b31f24896ec96a0a180d043dbf802a"
 }