@orion-js/echoes 3.2.3 → 3.2.4

package/lib/echo/index.d.ts

@@ -1,6 +1,6 @@
-import { Echo, EchoConfig } from '../types';
+import { EchoType, EchoConfig } from '../types';
 declare const echo: {
-    (options: EchoConfig): Echo;
+    (options: EchoConfig): EchoType;
     types: {
         event: string;
         request: string;

package/lib/index.d.ts

@@ -3,4 +3,5 @@ import publish from './publish';
 import echo from './echo';
 import request from './request';
 export * from './types';
+export * from './service';
 export { publish, startService, echo, request };

package/lib/index.js

@@ -23,3 +23,4 @@ exports.echo = echo_1.default;
 const request_1 = __importDefault(require("./request"));
 exports.request = request_1.default;
 __exportStar(require("./types"), exports);
+__exportStar(require("./service"), exports);

package/lib/requestsHandler/getEcho.d.ts

@@ -1 +1 @@
-export default function (method: string): import("..").Echo;
+export default function (method: string): import("..").EchoType;

package/lib/requestsHandler/index.d.ts

@@ -1,3 +1,3 @@
 import { EchoesOptions } from '../types';
-declare const _default: (options: EchoesOptions) => import("@orion-js/http").Route;
+declare const _default: (options: EchoesOptions) => import("@orion-js/http").RouteType;
 export default _default;

package/lib/service/index.d.ts

@@ -0,0 +1,8 @@
+import { EchoConfig, EchoesMap } from '../types';
+export declare function Echoes(): ClassDecorator;
+export interface EchoesPropertyDescriptor extends Omit<PropertyDecorator, 'value'> {
+    value?: EchoConfig['resolve'];
+}
+export declare function EchoRequest(options?: Omit<EchoConfig, 'resolve' | 'type'>): (target: any, propertyKey: string, descriptor: EchoesPropertyDescriptor) => void;
+export declare function EchoEvent(options?: Omit<EchoConfig, 'resolve' | 'type'>): (target: any, propertyKey: string, descriptor: EchoesPropertyDescriptor) => void;
+export declare function getServiceEchoes(target: any): EchoesMap;

package/lib/service/index.js

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

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

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/lib/service/index.test.js

@@ -0,0 +1,51 @@
+"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 });
+require("reflect-metadata");
+const _1 = require(".");
+describe('Echoes with service injections', () => {
+    it('Should define a echoes map using services', async () => {
+        let ExampleEchoesService = class ExampleEchoesService {
+            async echo() {
+                return 1;
+            }
+            async echoEvent() {
+                return 2;
+            }
+        };
+        __decorate([
+            (0, _1.EchoRequest)(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Promise)
+        ], ExampleEchoesService.prototype, "echo", null);
+        __decorate([
+            (0, _1.EchoEvent)(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Promise)
+        ], ExampleEchoesService.prototype, "echoEvent", null);
+        ExampleEchoesService = __decorate([
+            (0, _1.Echoes)()
+        ], ExampleEchoesService);
+        const echoes = (0, _1.getServiceEchoes)(ExampleEchoesService);
+        expect(echoes).toMatchObject({
+            echo: {
+                type: 'request',
+                onRequest: expect.any(Function)
+            },
+            echoEvent: {
+                type: 'event',
+                resolve: expect.any(Function)
+            }
+        });
+    });
+});

package/lib/types.d.ts

@@ -3,7 +3,7 @@ export interface EchoConfig {
     type: 'event' | 'request';
     resolve(params: any, context?: any): Promise<any>;
 }
-export interface Echo extends EchoConfig {
+export interface EchoType extends EchoConfig {
     onMessage(messageData: EachMessagePayload): Promise<void>;
     onRequest(serializedParams: string): any;
 }
@@ -54,20 +54,19 @@ export interface RequestsConfig {
      */
     makeRequest?: RequestMaker;
 }
+export interface EchoesMap {
+    [key: string]: EchoType;
+}
 export interface EchoesOptions {
     client?: KafkaConfig;
     producer?: ProducerConfig;
     consumer?: ConsumerConfig;
     requests?: RequestsConfig;
-    echoes: {
-        [key: string]: Echo;
-    };
+    echoes: EchoesMap;
 }
 export interface EchoesConfigHandler {
     producer?: Producer;
     consumer?: Consumer;
     requests?: RequestsConfig;
-    echoes?: {
-        [key: string]: Echo;
-    };
+    echoes?: EchoesMap;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/echoes",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -18,10 +18,12 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.2.0",
-    "@orion-js/http": "^3.2.3",
+    "@orion-js/http": "^3.2.4",
+    "@orion-js/services": "^3.2.0",
     "axios": "^0.24.0",
     "jssha": "^3.2.0",
     "kafkajs": "^1.15.0",
+    "lodash": "^4.17.21",
     "serialize-javascript": "^6.0.0"
   },
   "devDependencies": {
@@ -29,6 +31,7 @@
     "@types/jest": "27.0.2",
     "@types/supertest": "2.0.11",
     "jest": "27.3.1",
+    "reflect-metadata": "^0.1.13",
     "supertest": "^6.1.6",
     "ts-jest": "27.0.7",
     "typescript": "^4.4.4"
@@ -36,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "169123c560388991a3e2d3d7c96682dcb3713523"
+  "gitHead": "a1c4cff581b31f24896ec96a0a180d043dbf802a"
 }