@tsed/agenda 7.0.0-beta.11 → 7.0.0-beta.14

package/jest.config.js

@@ -0,0 +1,14 @@
+// For a detailed explanation regarding each configuration property, visit:
+// https://jestjs.io/docs/en/configuration.html
+
+module.exports = {
+  ...require("@tsed/jest-config")(__dirname, "agenda"),
+  coverageThreshold: {
+    global: {
+      statements: 96.96,
+      branches: 86.66,
+      functions: 100,
+      lines: 96.77
+    }
+  }
+};

package/lib/cjs/AgendaModule.js

@@ -7,6 +7,10 @@ const di_1 = require("@tsed/di");
 const constants_1 = require("./constants/constants");
 const AgendaFactory_1 = require("./services/AgendaFactory");
 let AgendaModule = class AgendaModule {
+    logger;
+    injector;
+    agenda;
+    loadAgenda;
     async $afterListen() {
         if (this.loadAgenda) {
             const providers = this.getProviders();
@@ -14,7 +18,7 @@ let AgendaModule = class AgendaModule {
             this.logger.info("Agenda add definitions...");
             await this.agenda.start();
             this.logger.info("Agenda add scheduled jobs...");
-            providers.forEach((provider) => this.scheduleJobsForProvider(provider));
+            await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));
         }
         else {
             this.logger.info("Agenda jobs disabled...");
@@ -31,28 +35,27 @@ let AgendaModule = class AgendaModule {
         return this.injector.getProviders(constants_1.PROVIDER_TYPE_AGENDA);
     }
     addAgendaDefinitionsForProvider(provider) {
-        const store = provider.store.get("agenda");
+        const store = provider.store.get("agenda", {});
         if (!store.define) {
             return;
         }
-        const jobsToDefine = Object.entries(store.define);
-        for (const [propertyKey, { name, ...options }] of jobsToDefine) {
+        Object.entries(store.define).forEach(([propertyKey, { name, ...options }]) => {
             const instance = this.injector.get(provider.token);
             const jobProcessor = instance[propertyKey].bind(instance);
             const jobName = this.getNameForJob(propertyKey, store.namespace, name);
             this.agenda.define(jobName, options, jobProcessor);
-        }
+        });
     }
     async scheduleJobsForProvider(provider) {
-        const store = provider.store.get("agenda");
+        const store = provider.store.get("agenda", {});
         if (!store.every) {
             return;
         }
-        const jobsToSchedule = Object.entries(store.every);
-        await Promise.all(jobsToSchedule.map(([propertyKey, { interval, name, ...options }]) => {
+        const promises = Object.entries(store.every).map(([propertyKey, { interval, name, ...options }]) => {
             const jobName = this.getNameForJob(propertyKey, store.namespace, name);
             return this.agenda.every(interval, jobName, {}, options);
-        }));
+        });
+        await Promise.all(promises);
     }
     getNameForJob(propertyKey, namespace, customName) {
         const name = customName || propertyKey;

package/lib/cjs/AgendaModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {AfterListen, Logger, OnDestroy} from \"@tsed/common\";\nimport {Constant, Inject, InjectorService, Module, Provider} from \"@tsed/di\";\nimport {Processor} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"./constants/constants\";\nimport {AgendaStore} from \"./interfaces/AgendaStore\";\nimport {AgendaService} from \"./services/AgendaFactory\";\n\n@Module()\nexport class AgendaModule implements OnDestroy, AfterListen {\n  @Inject()\n  protected logger: Logger;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected agenda: AgendaService;\n\n  @Constant(\"agenda.enabled\", false)\n  private loadAgenda: boolean;\n\n  async $afterListen(): Promise<any> {\n    if (this.loadAgenda) {\n      const providers = this.getProviders();\n      providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));\n\n      this.logger.info(\"Agenda add definitions...\");\n      await this.agenda.start();\n\n      this.logger.info(\"Agenda add scheduled jobs...\");\n      providers.forEach((provider) => this.scheduleJobsForProvider(provider));\n    } else {\n      this.logger.info(\"Agenda jobs disabled...\");\n    }\n  }\n\n  async $onDestroy(): Promise<any> {\n    if (this.loadAgenda) {\n      await this.agenda.stop();\n      await this.agenda.close({force: true});\n\n      this.logger.info(\"Agenda jobs stopped...\");\n    }\n  }\n\n  protected getProviders(): Provider<any>[] {\n    return this.injector.getProviders(PROVIDER_TYPE_AGENDA);\n  }\n\n  protected addAgendaDefinitionsForProvider(provider: Provider): void {\n    const store = provider.store.get<AgendaStore>(\"agenda\");\n\n    if (!store.define) {\n      return;\n    }\n\n    const jobsToDefine = Object.entries(store.define);\n\n    for (const [propertyKey, {name, ...options}] of jobsToDefine) {\n      const instance = this.injector.get(provider.token);\n\n      const jobProcessor: Processor = instance[propertyKey].bind(instance) as Processor;\n      const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n      this.agenda.define(jobName, options, jobProcessor);\n    }\n  }\n\n  protected async scheduleJobsForProvider(provider: Provider<any>): Promise<void> {\n    const store = provider.store.get<AgendaStore>(\"agenda\");\n    if (!store.every) {\n      return;\n    }\n\n    const jobsToSchedule = Object.entries(store.every);\n    await Promise.all(\n      jobsToSchedule.map(([propertyKey, {interval, name, ...options}]) => {\n        const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n        return this.agenda.every(interval, jobName, {}, options);\n      })\n    );\n  }\n\n  protected getNameForJob(propertyKey: string, namespace?: string, customName?: string): string {\n    const name = customName || propertyKey;\n    return namespace ? `${namespace}.${name}` : name;\n  }\n}\n"]}
+{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {AfterListen, Logger, OnDestroy} from \"@tsed/common\";\nimport {Constant, Inject, InjectorService, Module, Provider} from \"@tsed/di\";\nimport {Processor} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"./constants/constants\";\nimport {AgendaStore} from \"./interfaces/AgendaStore\";\nimport {AgendaService} from \"./services/AgendaFactory\";\n\n@Module()\nexport class AgendaModule implements OnDestroy, AfterListen {\n  @Inject()\n  protected logger: Logger;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected agenda: AgendaService;\n\n  @Constant(\"agenda.enabled\", false)\n  private loadAgenda: boolean;\n\n  async $afterListen(): Promise<any> {\n    if (this.loadAgenda) {\n      const providers = this.getProviders();\n      providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));\n\n      this.logger.info(\"Agenda add definitions...\");\n      await this.agenda.start();\n\n      this.logger.info(\"Agenda add scheduled jobs...\");\n      await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));\n    } else {\n      this.logger.info(\"Agenda jobs disabled...\");\n    }\n  }\n\n  async $onDestroy(): Promise<any> {\n    if (this.loadAgenda) {\n      await this.agenda.stop();\n      await this.agenda.close({force: true});\n\n      this.logger.info(\"Agenda jobs stopped...\");\n    }\n  }\n\n  protected getProviders(): Provider<any>[] {\n    return this.injector.getProviders(PROVIDER_TYPE_AGENDA);\n  }\n\n  protected addAgendaDefinitionsForProvider(provider: Provider): void {\n    const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n    if (!store.define) {\n      return;\n    }\n\n    Object.entries(store.define).forEach(([propertyKey, {name, ...options}]) => {\n      const instance = this.injector.get(provider.token);\n\n      const jobProcessor: Processor = instance[propertyKey].bind(instance) as Processor;\n      const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n      this.agenda.define(jobName, options, jobProcessor);\n    });\n  }\n\n  protected async scheduleJobsForProvider(provider: Provider<any>): Promise<void> {\n    const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n    if (!store.every) {\n      return;\n    }\n\n    const promises = Object.entries(store.every).map(([propertyKey, {interval, name, ...options}]) => {\n      const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n\n      return this.agenda.every(interval, jobName, {}, options);\n    });\n\n    await Promise.all(promises);\n  }\n\n  protected getNameForJob(propertyKey: string, namespace?: string, customName?: string): string {\n    const name = customName || propertyKey;\n    return namespace ? `${namespace}.${name}` : name;\n  }\n}\n"]}

package/lib/cjs/decorators/agenda.js

@@ -5,7 +5,7 @@ const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
 const constants_1 = require("../constants/constants");
 function Agenda(options) {
-    return (0, core_1.useDecorators)((0, core_1.StoreMerge)("agenda", { namespace: options === null || options === void 0 ? void 0 : options.namespace }), (0, di_1.Injectable)({
+    return (0, core_1.useDecorators)(options?.namespace && (0, core_1.StoreMerge)("agenda", options), (0, di_1.Injectable)({
         type: constants_1.PROVIDER_TYPE_AGENDA
     }));
 }

package/lib/cjs/decorators/agenda.js.map

@@ -1 +1 @@
-{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":";;;AAAA,qCAAqD;AACrD,iCAAoC;AAEpC,sDAA4D;AAiB5D,SAAgB,MAAM,CAAC,OAAuB;IAC5C,OAAO,IAAA,oBAAa,EAClB,IAAA,iBAAU,EAAC,QAAQ,EAAE,EAAC,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAC,CAAC,EACrD,IAAA,eAAU,EAAC;QACT,IAAI,EAAE,gCAAoB;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC;AAPD,wBAOC","sourcesContent":["import {StoreMerge, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {AgendaConfig} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"../constants/constants\";\n\ndeclare global {\n  namespace TsED {\n    interface Configuration {\n      agenda?: {\n        /** * Enable Agenda jobs. Default false. */\n        enabled?: boolean;\n      } & AgendaConfig;\n    }\n  }\n}\n\ninterface AgendaOptions {\n  namespace?: string;\n}\n\nexport function Agenda(options?: AgendaOptions): ClassDecorator {\n  return useDecorators(\n    StoreMerge(\"agenda\", {namespace: options?.namespace}),\n    Injectable({\n      type: PROVIDER_TYPE_AGENDA\n    })\n  );\n}\n"]}
+{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":";;;AAAA,qCAAqD;AACrD,iCAAoC;AAEpC,sDAA4D;AAiB5D,SAAgB,MAAM,CAAC,OAAuB;IAC5C,OAAO,IAAA,oBAAa,EAClB,OAAO,EAAE,SAAS,IAAI,IAAA,iBAAU,EAAC,QAAQ,EAAE,OAAO,CAAC,EACnD,IAAA,eAAU,EAAC;QACT,IAAI,EAAE,gCAAoB;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC;AAPD,wBAOC","sourcesContent":["import {StoreMerge, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {AgendaConfig} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"../constants/constants\";\n\ndeclare global {\n  namespace TsED {\n    interface Configuration {\n      agenda?: {\n        /** * Enable Agenda jobs. Default false. */\n        enabled?: boolean;\n      } & AgendaConfig;\n    }\n  }\n}\n\ninterface AgendaOptions {\n  namespace?: string;\n}\n\nexport function Agenda(options?: AgendaOptions): ClassDecorator {\n  return useDecorators(\n    options?.namespace && StoreMerge(\"agenda\", options),\n    Injectable({\n      type: PROVIDER_TYPE_AGENDA\n    })\n  );\n}\n"]}

package/lib/esm/AgendaModule.js

@@ -4,6 +4,10 @@ import { Constant, Inject, InjectorService, Module } from "@tsed/di";
 import { PROVIDER_TYPE_AGENDA } from "./constants/constants.js";
 import { AgendaService } from "./services/AgendaFactory.js";
 let AgendaModule = class AgendaModule {
+    logger;
+    injector;
+    agenda;
+    loadAgenda;
     async $afterListen() {
         if (this.loadAgenda) {
             const providers = this.getProviders();
@@ -11,7 +15,7 @@ let AgendaModule = class AgendaModule {
             this.logger.info("Agenda add definitions...");
             await this.agenda.start();
             this.logger.info("Agenda add scheduled jobs...");
-            providers.forEach((provider) => this.scheduleJobsForProvider(provider));
+            await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));
         }
         else {
             this.logger.info("Agenda jobs disabled...");
@@ -28,28 +32,27 @@ let AgendaModule = class AgendaModule {
         return this.injector.getProviders(PROVIDER_TYPE_AGENDA);
     }
     addAgendaDefinitionsForProvider(provider) {
-        const store = provider.store.get("agenda");
+        const store = provider.store.get("agenda", {});
         if (!store.define) {
             return;
         }
-        const jobsToDefine = Object.entries(store.define);
-        for (const [propertyKey, { name, ...options }] of jobsToDefine) {
+        Object.entries(store.define).forEach(([propertyKey, { name, ...options }]) => {
             const instance = this.injector.get(provider.token);
             const jobProcessor = instance[propertyKey].bind(instance);
             const jobName = this.getNameForJob(propertyKey, store.namespace, name);
             this.agenda.define(jobName, options, jobProcessor);
-        }
+        });
     }
     async scheduleJobsForProvider(provider) {
-        const store = provider.store.get("agenda");
+        const store = provider.store.get("agenda", {});
         if (!store.every) {
             return;
         }
-        const jobsToSchedule = Object.entries(store.every);
-        await Promise.all(jobsToSchedule.map(([propertyKey, { interval, name, ...options }]) => {
+        const promises = Object.entries(store.every).map(([propertyKey, { interval, name, ...options }]) => {
             const jobName = this.getNameForJob(propertyKey, store.namespace, name);
             return this.agenda.every(interval, jobName, {}, options);
-        }));
+        });
+        await Promise.all(promises);
     }
     getNameForJob(propertyKey, namespace, customName) {
         const name = customName || propertyKey;

package/lib/esm/AgendaModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {AfterListen, Logger, OnDestroy} from \"@tsed/common\";\nimport {Constant, Inject, InjectorService, Module, Provider} from \"@tsed/di\";\nimport {Processor} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"./constants/constants\";\nimport {AgendaStore} from \"./interfaces/AgendaStore\";\nimport {AgendaService} from \"./services/AgendaFactory\";\n\n@Module()\nexport class AgendaModule implements OnDestroy, AfterListen {\n  @Inject()\n  protected logger: Logger;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected agenda: AgendaService;\n\n  @Constant(\"agenda.enabled\", false)\n  private loadAgenda: boolean;\n\n  async $afterListen(): Promise<any> {\n    if (this.loadAgenda) {\n      const providers = this.getProviders();\n      providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));\n\n      this.logger.info(\"Agenda add definitions...\");\n      await this.agenda.start();\n\n      this.logger.info(\"Agenda add scheduled jobs...\");\n      providers.forEach((provider) => this.scheduleJobsForProvider(provider));\n    } else {\n      this.logger.info(\"Agenda jobs disabled...\");\n    }\n  }\n\n  async $onDestroy(): Promise<any> {\n    if (this.loadAgenda) {\n      await this.agenda.stop();\n      await this.agenda.close({force: true});\n\n      this.logger.info(\"Agenda jobs stopped...\");\n    }\n  }\n\n  protected getProviders(): Provider<any>[] {\n    return this.injector.getProviders(PROVIDER_TYPE_AGENDA);\n  }\n\n  protected addAgendaDefinitionsForProvider(provider: Provider): void {\n    const store = provider.store.get<AgendaStore>(\"agenda\");\n\n    if (!store.define) {\n      return;\n    }\n\n    const jobsToDefine = Object.entries(store.define);\n\n    for (const [propertyKey, {name, ...options}] of jobsToDefine) {\n      const instance = this.injector.get(provider.token);\n\n      const jobProcessor: Processor = instance[propertyKey].bind(instance) as Processor;\n      const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n      this.agenda.define(jobName, options, jobProcessor);\n    }\n  }\n\n  protected async scheduleJobsForProvider(provider: Provider<any>): Promise<void> {\n    const store = provider.store.get<AgendaStore>(\"agenda\");\n    if (!store.every) {\n      return;\n    }\n\n    const jobsToSchedule = Object.entries(store.every);\n    await Promise.all(\n      jobsToSchedule.map(([propertyKey, {interval, name, ...options}]) => {\n        const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n        return this.agenda.every(interval, jobName, {}, options);\n      })\n    );\n  }\n\n  protected getNameForJob(propertyKey: string, namespace?: string, customName?: string): string {\n    const name = customName || propertyKey;\n    return namespace ? `${namespace}.${name}` : name;\n  }\n}\n"]}
+{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {AfterListen, Logger, OnDestroy} from \"@tsed/common\";\nimport {Constant, Inject, InjectorService, Module, Provider} from \"@tsed/di\";\nimport {Processor} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"./constants/constants\";\nimport {AgendaStore} from \"./interfaces/AgendaStore\";\nimport {AgendaService} from \"./services/AgendaFactory\";\n\n@Module()\nexport class AgendaModule implements OnDestroy, AfterListen {\n  @Inject()\n  protected logger: Logger;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected agenda: AgendaService;\n\n  @Constant(\"agenda.enabled\", false)\n  private loadAgenda: boolean;\n\n  async $afterListen(): Promise<any> {\n    if (this.loadAgenda) {\n      const providers = this.getProviders();\n      providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));\n\n      this.logger.info(\"Agenda add definitions...\");\n      await this.agenda.start();\n\n      this.logger.info(\"Agenda add scheduled jobs...\");\n      await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));\n    } else {\n      this.logger.info(\"Agenda jobs disabled...\");\n    }\n  }\n\n  async $onDestroy(): Promise<any> {\n    if (this.loadAgenda) {\n      await this.agenda.stop();\n      await this.agenda.close({force: true});\n\n      this.logger.info(\"Agenda jobs stopped...\");\n    }\n  }\n\n  protected getProviders(): Provider<any>[] {\n    return this.injector.getProviders(PROVIDER_TYPE_AGENDA);\n  }\n\n  protected addAgendaDefinitionsForProvider(provider: Provider): void {\n    const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n    if (!store.define) {\n      return;\n    }\n\n    Object.entries(store.define).forEach(([propertyKey, {name, ...options}]) => {\n      const instance = this.injector.get(provider.token);\n\n      const jobProcessor: Processor = instance[propertyKey].bind(instance) as Processor;\n      const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n      this.agenda.define(jobName, options, jobProcessor);\n    });\n  }\n\n  protected async scheduleJobsForProvider(provider: Provider<any>): Promise<void> {\n    const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n    if (!store.every) {\n      return;\n    }\n\n    const promises = Object.entries(store.every).map(([propertyKey, {interval, name, ...options}]) => {\n      const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n\n      return this.agenda.every(interval, jobName, {}, options);\n    });\n\n    await Promise.all(promises);\n  }\n\n  protected getNameForJob(propertyKey: string, namespace?: string, customName?: string): string {\n    const name = customName || propertyKey;\n    return namespace ? `${namespace}.${name}` : name;\n  }\n}\n"]}

package/lib/esm/decorators/agenda.js

@@ -2,7 +2,7 @@ import { StoreMerge, useDecorators } from "@tsed/core";
 import { Injectable } from "@tsed/di";
 import { PROVIDER_TYPE_AGENDA } from "../constants/constants.js";
 export function Agenda(options) {
-    return useDecorators(StoreMerge("agenda", { namespace: options === null || options === void 0 ? void 0 : options.namespace }), Injectable({
+    return useDecorators(options?.namespace && StoreMerge("agenda", options), Injectable({
         type: PROVIDER_TYPE_AGENDA
     }));
 }

package/lib/esm/decorators/agenda.js.map

@@ -1 +1 @@
-{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAiB5D,MAAM,UAAU,MAAM,CAAC,OAAuB;IAC5C,OAAO,aAAa,CAClB,UAAU,CAAC,QAAQ,EAAE,EAAC,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAC,CAAC,EACrD,UAAU,CAAC;QACT,IAAI,EAAE,oBAAoB;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC","sourcesContent":["import {StoreMerge, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {AgendaConfig} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"../constants/constants\";\n\ndeclare global {\n  namespace TsED {\n    interface Configuration {\n      agenda?: {\n        /** * Enable Agenda jobs. Default false. */\n        enabled?: boolean;\n      } & AgendaConfig;\n    }\n  }\n}\n\ninterface AgendaOptions {\n  namespace?: string;\n}\n\nexport function Agenda(options?: AgendaOptions): ClassDecorator {\n  return useDecorators(\n    StoreMerge(\"agenda\", {namespace: options?.namespace}),\n    Injectable({\n      type: PROVIDER_TYPE_AGENDA\n    })\n  );\n}\n"]}
+{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAiB5D,MAAM,UAAU,MAAM,CAAC,OAAuB;IAC5C,OAAO,aAAa,CAClB,OAAO,EAAE,SAAS,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,EACnD,UAAU,CAAC;QACT,IAAI,EAAE,oBAAoB;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC","sourcesContent":["import {StoreMerge, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {AgendaConfig} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"../constants/constants\";\n\ndeclare global {\n  namespace TsED {\n    interface Configuration {\n      agenda?: {\n        /** * Enable Agenda jobs. Default false. */\n        enabled?: boolean;\n      } & AgendaConfig;\n    }\n  }\n}\n\ninterface AgendaOptions {\n  namespace?: string;\n}\n\nexport function Agenda(options?: AgendaOptions): ClassDecorator {\n  return useDecorators(\n    options?.namespace && StoreMerge(\"agenda\", options),\n    Injectable({\n      type: PROVIDER_TYPE_AGENDA\n    })\n  );\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/agenda",
-  "version": "7.0.0-beta.11",
+  "version": "7.0.0-beta.14",
   "description": "Agenda package for Ts.ED framework",
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
@@ -17,16 +17,16 @@
     "build:cjs": "tsc --build tsconfig.compile.json",
     "build:esm": "tsc --build tsconfig.compile.esm.json",
     "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
-    "test": "cross-env NODE_ENV=test nyc mocha"
+    "test": "cross-env NODE_ENV=test yarn jest --runInBand"
   },
   "dependencies": {
-    "tslib": "2.3.1"
+    "tslib": "2.4.0"
   },
   "private": false,
   "devDependencies": {
-    "@tsed/common": "7.0.0-beta.11",
-    "@tsed/core": "7.0.0-beta.11",
-    "@tsed/di": "7.0.0-beta.11",
+    "@tsed/common": "7.0.0-beta.14",
+    "@tsed/core": "7.0.0-beta.14",
+    "@tsed/di": "7.0.0-beta.14",
     "agenda": "^4.1.3"
   },
   "peerDependencies": {
@@ -38,5 +38,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed/tree/beta/packages/third-parties/agenda",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "beta"
+  }
 }

package/readme.md

@@ -12,7 +12,8 @@
 [![npm version](https://badge.fury.io/js/%40tsed%2Fcommon.svg)](https://badge.fury.io/js/%40tsed%2Fcommon)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![backers](https://opencollective.com/tsed/tiers/badge.svg)](https://opencollective.com/tsed)
+[![github](https://img.shields.io/static/v1?label=Github%20sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/romakita)
+[![opencollective](https://img.shields.io/static/v1?label=OpenCollective%20sponsor&message=%E2%9D%A4&logo=OpenCollective&color=%23fe8e86)](https://opencollective.com/tsed)
 
 </div>
 

package/src/AgendaModule.ts

@@ -28,7 +28,7 @@ export class AgendaModule implements OnDestroy, AfterListen {
       await this.agenda.start();
 
       this.logger.info("Agenda add scheduled jobs...");
-      providers.forEach((provider) => this.scheduleJobsForProvider(provider));
+      await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));
     } else {
       this.logger.info("Agenda jobs disabled...");
     }
@@ -48,36 +48,35 @@ export class AgendaModule implements OnDestroy, AfterListen {
   }
 
   protected addAgendaDefinitionsForProvider(provider: Provider): void {
-    const store = provider.store.get<AgendaStore>("agenda");
+    const store = provider.store.get<AgendaStore>("agenda", {});
 
     if (!store.define) {
       return;
     }
 
-    const jobsToDefine = Object.entries(store.define);
-
-    for (const [propertyKey, {name, ...options}] of jobsToDefine) {
+    Object.entries(store.define).forEach(([propertyKey, {name, ...options}]) => {
       const instance = this.injector.get(provider.token);
 
       const jobProcessor: Processor = instance[propertyKey].bind(instance) as Processor;
       const jobName = this.getNameForJob(propertyKey, store.namespace, name);
       this.agenda.define(jobName, options, jobProcessor);
-    }
+    });
   }
 
   protected async scheduleJobsForProvider(provider: Provider<any>): Promise<void> {
-    const store = provider.store.get<AgendaStore>("agenda");
+    const store = provider.store.get<AgendaStore>("agenda", {});
+
     if (!store.every) {
       return;
     }
 
-    const jobsToSchedule = Object.entries(store.every);
-    await Promise.all(
-      jobsToSchedule.map(([propertyKey, {interval, name, ...options}]) => {
-        const jobName = this.getNameForJob(propertyKey, store.namespace, name);
-        return this.agenda.every(interval, jobName, {}, options);
-      })
-    );
+    const promises = Object.entries(store.every).map(([propertyKey, {interval, name, ...options}]) => {
+      const jobName = this.getNameForJob(propertyKey, store.namespace, name);
+
+      return this.agenda.every(interval, jobName, {}, options);
+    });
+
+    await Promise.all(promises);
   }
 
   protected getNameForJob(propertyKey: string, namespace?: string, customName?: string): string {

package/src/decorators/agenda.spec.ts

@@ -1,5 +1,4 @@
 import {Store} from "@tsed/core";
-import {expect} from "chai";
 import {Agenda} from "./agenda";
 
 describe("@Agenda()", () => {
@@ -8,16 +7,14 @@ describe("@Agenda()", () => {
     class Test {}
 
     const store = Store.from(Test);
-    expect(store.get("agenda")).to.deep.eq({
-      namespace: undefined
-    });
+    expect(store.get("agenda")).toEqual(undefined);
   });
   it("should set namespace metadata", () => {
     @Agenda({namespace: "nsp1"})
     class Test {}
 
     const store = Store.from(Test);
-    expect(store.get("agenda")).to.deep.eq({
+    expect(store.get("agenda")).toEqual({
       namespace: "nsp1"
     });
   });

package/src/decorators/agenda.ts

@@ -20,7 +20,7 @@ interface AgendaOptions {
 
 export function Agenda(options?: AgendaOptions): ClassDecorator {
   return useDecorators(
-    StoreMerge("agenda", {namespace: options?.namespace}),
+    options?.namespace && StoreMerge("agenda", options),
     Injectable({
       type: PROVIDER_TYPE_AGENDA
     })

package/src/decorators/define.spec.ts

@@ -1,5 +1,4 @@
 import {Store} from "@tsed/core";
-import {expect} from "chai";
 import {Agenda} from "./agenda";
 import {Define} from "./define";
 
@@ -20,7 +19,7 @@ describe("@Define()", () => {
 
     const store = Store.from(Test);
 
-    expect(store.get("agenda").define).to.deep.eq({
+    expect(store.get("agenda").define).toEqual({
       testDefineDecorator: {},
       testDefineDecorator2: {}
     });
@@ -39,7 +38,7 @@ describe("@Define()", () => {
     }
 
     const store = Store.from(Test);
-    expect(store.get("agenda").define).to.deep.eq({
+    expect(store.get("agenda").define).toEqual({
       test: {
         name: "testDefineDecoratorCustomName",
         priority: 20

package/src/decorators/every.spec.ts

@@ -1,5 +1,4 @@
 import {descriptorOf, Store} from "@tsed/core";
-import {expect} from "chai";
 import {Agenda} from "./agenda";
 import {Every} from "./every";
 
@@ -20,12 +19,12 @@ describe("@Every()", () => {
 
     const store = Store.from(Test);
 
-    expect(store.get("agenda").define).to.deep.eq({
+    expect(store.get("agenda").define).toEqual({
       testEveryDecorator: {},
       testEveryDecorator2: {}
     });
 
-    expect(store.get("agenda").every).to.deep.eq({
+    expect(store.get("agenda").every).toEqual({
       testEveryDecorator: {
         interval: "60 seconds"
       },

package/.mocharc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  ...require("@tsed/mocha-config")(),
-  spec: ["{src,test}/**/*.spec.ts"],
-  exclude: []
-};

package/.nycrc

@@ -1,27 +0,0 @@
-{
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "**/*.spec.ts",
-    "**/*.d.ts",
-    "node_modules",
-    "**/interfaces/**",
-    "**/index.ts"
-  ],
-  "extension": [
-    ".ts"
-  ],
-  "require": [],
-  "reporter": [
-    "text-summary",
-    "html",
-    "lcov",
-    "json"
-  ],
-  "check-coverage": true,
-  "statements": 100,
-  "branches": 90.62,
-  "functions": 100,
-  "lines": 100
-}