@orion-js/dogs 3.2.14 → 3.2.20

package/lib/service/index.d.ts

@@ -1,9 +1,10 @@
-import { JobDefinition } from '../types';
+import { EventJobDefinition, JobDefinition, RecurrentJobDefinition } from '../types';
 export declare function Jobs(): ClassDecorator;
 export interface JobsPropertyDescriptor extends Omit<PropertyDecorator, 'value'> {
     value?: JobDefinition['resolve'];
 }
-export declare function Job(options: Omit<JobDefinition, 'resolve'>): (target: any, propertyKey: string, descriptor: JobsPropertyDescriptor) => void;
+export declare function RecurrentJob(options: Omit<RecurrentJobDefinition, 'resolve' | 'type'>): (target: any, propertyKey: string, descriptor: JobsPropertyDescriptor) => void;
+export declare function EventJob(options?: Omit<EventJobDefinition, 'resolve' | 'type'>): (target: any, propertyKey: string, descriptor: JobsPropertyDescriptor) => void;
 export declare function getServiceJobs(target: any): {
     [key: string]: JobDefinition;
 };

package/lib/service/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServiceJobs = exports.Job = exports.Jobs = void 0;
+exports.getServiceJobs = exports.EventJob = exports.RecurrentJob = exports.Jobs = void 0;
 const services_1 = require("@orion-js/services");
 const defineJob_1 = require("../defineJob");
 function Jobs() {
@@ -10,13 +10,14 @@ function Jobs() {
     };
 }
 exports.Jobs = Jobs;
-function Job(options) {
+function RecurrentJob(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, defineJob_1.defineJob)({
             ...options,
+            type: 'recurrent',
             resolve: async (params, viewer) => {
                 const instance = (0, services_1.getInstance)(target.service);
                 return await instance[propertyKey](params, viewer);
@@ -24,7 +25,23 @@ function Job(options) {
         });
     };
 }
-exports.Job = Job;
+exports.RecurrentJob = RecurrentJob;
+function EventJob(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, defineJob_1.defineJob)({
+            ...options,
+            type: 'event',
+            resolve: async (params, viewer) => {
+                const instance = (0, services_1.getInstance)(target.service);
+                return await instance[propertyKey](params, viewer);
+            }
+        });
+    };
+}
+exports.EventJob = EventJob;
 function getServiceJobs(target) {
     if (!target.prototype) {
         throw new Error('You must pass a class to getServiceRoutes');

package/lib/service/index.test.js

@@ -16,13 +16,22 @@ describe('Jobs (dogs) with service injections', () => {
             async job1() {
                 return {};
             }
+            async job2() {
+                return {};
+            }
         };
         __decorate([
-            (0, _1.Job)({ type: 'event' }),
+            (0, _1.EventJob)(),
             __metadata("design:type", Function),
             __metadata("design:paramtypes", []),
             __metadata("design:returntype", Promise)
         ], ExampleJobsService.prototype, "job1", null);
+        __decorate([
+            (0, _1.RecurrentJob)({ runEvery: 1000 }),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Promise)
+        ], ExampleJobsService.prototype, "job2", null);
         ExampleJobsService = __decorate([
             (0, _1.Jobs)()
         ], ExampleJobsService);
@@ -31,6 +40,11 @@ describe('Jobs (dogs) with service injections', () => {
             job1: {
                 type: 'event',
                 resolve: expect.any(Function)
+            },
+            job2: {
+                type: 'recurrent',
+                runEvery: 1000,
+                resolve: expect.any(Function)
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/dogs",
-  "version": "3.2.14",
+  "version": "3.2.20",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.2.0",
-    "@orion-js/mongodb": "^3.2.14",
+    "@orion-js/mongodb": "^3.2.20",
     "@orion-js/services": "^3.2.10",
-    "@orion-js/typed-model": "^3.2.10"
+    "@orion-js/typed-model": "^3.2.18"
   },
   "peerDependencies": {
-    "@orion-js/logger": "3.1.0-alpha.12"
+    "@orion-js/logger": "*"
   },
   "devDependencies": {
-    "@orion-js/logger": "^3.2.0",
+    "@orion-js/logger": "^3.2.18",
     "@shelf/jest-mongodb": "^2.1.0",
     "@types/jest": "^27.0.2",
     "@types/lodash": "4.14.176",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "87d4cca0154b4beb6e6fa97f298b1440e0c3c231"
+  "gitHead": "4c4e24615699c336f041a4ff832ffb591e4a0537"
 }