vintasend 0.1.13 → 0.1.14

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { Notification } from "./types/notification";
-export { NotificationService } from "./services/notification-service";
+export { VintaSendFactory } from "./services/notification-service";
+export type { VintaSend } from "./services/notification-service";
 export type { ContextGenerator } from "./types/notification-context-generators";
 export type { BaseNotificationTypeConfig } from "./types/notification-type-config";
 export type { BaseNotificationQueueService } from "./services/notification-queue-service/base-notification-queue-service";

package/dist/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotificationService = void 0;
+exports.VintaSendFactory = void 0;
 var notification_service_1 = require("./services/notification-service");
-Object.defineProperty(exports, "NotificationService", { enumerable: true, get: function () { return notification_service_1.NotificationService; } });
+Object.defineProperty(exports, "VintaSendFactory", { enumerable: true, get: function () { return notification_service_1.VintaSendFactory; } });

package/dist/services/notification-context-generators-map.d.ts

@@ -0,0 +1,8 @@
+import type { ContextGenerator } from "../types/notification-context-generators";
+export declare class NotificationContextGeneratorsMap<ContextMapType extends {
+    [key: string]: ContextGenerator;
+}> {
+    private contextGenerators;
+    constructor(contextGenerators: ContextMapType);
+    getContextGenerator<ContextName extends string & keyof ContextMapType>(contextName: ContextName): ContextMapType[ContextName];
+}

package/dist/services/notification-context-generators-map.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotificationContextGeneratorsMap = void 0;
+class NotificationContextGeneratorsMap {
+    constructor(contextGenerators) {
+        this.contextGenerators = contextGenerators;
+    }
+    getContextGenerator(contextName) {
+        return this.contextGenerators[contextName];
+    }
+}
+exports.NotificationContextGeneratorsMap = NotificationContextGeneratorsMap;

package/dist/services/notification-service.d.ts

@@ -1,24 +1,26 @@
 import type { DatabaseNotification, Notification } from '../types/notification';
-import type { ContextGenerator } from '../types/notification-context-generators';
-import type { JsonObject, JsonPrimitive } from '../types/json-values';
+import type { JsonObject } from '../types/json-values';
 import type { BaseNotificationTypeConfig } from '../types/notification-type-config';
 import type { BaseNotificationAdapter } from './notification-adapters/base-notification-adapter';
 import type { BaseNotificationTemplateRenderer } from './notification-template-renderers/base-notification-template-renderer';
 import type { BaseNotificationBackend } from './notification-backends/base-notification-backend';
 import type { BaseLogger } from './loggers/base-logger';
 import type { BaseNotificationQueueService } from './notification-queue-service/base-notification-queue-service';
-type NotificationServiceOptions = {
+type VintaSendOptions = {
     raiseErrorOnFailedSend: boolean;
 };
-export declare class NotificationService<Config extends BaseNotificationTypeConfig<ContextGeneratorsMap>, ContextGeneratorsMap extends Record<string, ContextGenerator<Parameters<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>[0] extends Record<string, JsonPrimitive> ? Parameters<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>[0] : never, ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']> extends JsonObject ? ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']> : Awaited<ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>> extends JsonObject ? Awaited<ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>> : never>>> {
+export declare class VintaSendFactory<Config extends BaseNotificationTypeConfig> {
+    create<AdaptersList extends BaseNotificationAdapter<BaseNotificationTemplateRenderer<Config>, Config>[], Backend extends BaseNotificationBackend<Config>, Logger extends BaseLogger, QueueService extends BaseNotificationQueueService<Config>>(adapters: AdaptersList, backend: Backend, logger: Logger, contextGeneratorsMap: BaseNotificationTypeConfig['ContextMap'], queueService?: QueueService, options?: VintaSendOptions): VintaSend<Config, AdaptersList, Backend, Logger, QueueService>;
+}
+export declare class VintaSend<Config extends BaseNotificationTypeConfig, AdaptersList extends BaseNotificationAdapter<BaseNotificationTemplateRenderer<Config>, Config>[], Backend extends BaseNotificationBackend<Config>, Logger extends BaseLogger, QueueService extends BaseNotificationQueueService<Config>> {
     private adapters;
     private backend;
     private logger;
-    private contextGeneratorsMap;
     private queueService?;
     private options;
-    constructor(adapters: BaseNotificationAdapter<BaseNotificationTemplateRenderer<Config>, Config>[], backend: BaseNotificationBackend<Config>, logger: BaseLogger, contextGeneratorsMap: ContextGeneratorsMap, queueService?: BaseNotificationQueueService<Config> | undefined, options?: NotificationServiceOptions);
-    registerQueueService(queueService: BaseNotificationQueueService<Config>): void;
+    private contextGeneratorsMap;
+    constructor(adapters: AdaptersList, backend: Backend, logger: Logger, contextGeneratorsMap: Config['ContextMap'], queueService?: QueueService | undefined, options?: VintaSendOptions);
+    registerQueueService(queueService: QueueService): void;
     send(notification: DatabaseNotification<Config>): Promise<void>;
     createNotification(notification: Omit<Notification<Config>, 'id'>): Promise<DatabaseNotification<Config>>;
     updateNotification(notificationId: Config['NotificationIdType'], notification: Partial<Omit<Notification<Config>, 'id'>>): Promise<DatabaseNotification<Config>>;
@@ -26,7 +28,7 @@ export declare class NotificationService<Config extends BaseNotificationTypeConf
     getAllFutureNotificationsFromUser(userId: Config['NotificationIdType']): Promise<DatabaseNotification<Config>[]>;
     getFutureNotificationsFromUser(userId: Config['NotificationIdType']): Promise<DatabaseNotification<Config>[]>;
     getFutureNotifications(): Promise<DatabaseNotification<Config>[]>;
-    getNotificationContext<ContextName extends keyof Config['ContextMap']>(contextName: ContextName, parameters: Parameters<ContextGeneratorsMap[ContextName]['generate']>[0]): Promise<ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]["generate"]> extends JsonObject ? ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]["generate"]> : Awaited<ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]["generate"]>> extends JsonObject ? Awaited<ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]["generate"]>> : never>;
+    getNotificationContext<ContextName extends string & keyof Config['ContextMap']>(contextName: ContextName, parameters: Parameters<ReturnType<typeof this.contextGeneratorsMap.getContextGenerator<ContextName>>['generate']>[0]): Promise<JsonObject>;
     sendPendingNotifications(): Promise<void>;
     getPendingNotifications(): Promise<DatabaseNotification<Config>[]>;
     getNotification(notificationId: Config['NotificationIdType'], forUpdate?: boolean): Promise<DatabaseNotification<Config> | null>;
@@ -36,8 +38,4 @@ export declare class NotificationService<Config extends BaseNotificationTypeConf
     resendNotification(notificationId: Config['NotificationIdType'], useStoredContextIfAvailable?: boolean): Promise<DatabaseNotification<Config> | undefined>;
     delayedSend(notificationId: Config['NotificationIdType']): Promise<void>;
 }
-export declare class NotificationServiceSingleton {
-    private static instance;
-    static getInstance<Config extends BaseNotificationTypeConfig<ContextGeneratorsMap>, ContextGeneratorsMap extends Record<string, ContextGenerator<Parameters<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>[0] extends Record<string, JsonPrimitive> ? Parameters<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>[0] : never, ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']> extends JsonObject ? ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']> : Awaited<ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>> extends JsonObject ? Awaited<ReturnType<ContextGeneratorsMap[keyof ContextGeneratorsMap]['generate']>> : never>>>(...args: ConstructorParameters<typeof NotificationService> | []): NotificationService<Config, ContextGeneratorsMap>;
-}
 export {};

package/dist/services/notification-service.js

@@ -1,16 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotificationServiceSingleton = exports.NotificationService = void 0;
-class NotificationService {
+exports.VintaSend = exports.VintaSendFactory = void 0;
+const notification_context_generators_map_1 = require("./notification-context-generators-map");
+class VintaSendFactory {
+    create(adapters, backend, logger, contextGeneratorsMap, queueService, options = {
+        raiseErrorOnFailedSend: false,
+    }) {
+        return new VintaSend(adapters, backend, logger, contextGeneratorsMap, queueService, options);
+    }
+}
+exports.VintaSendFactory = VintaSendFactory;
+class VintaSend {
     constructor(adapters, backend, logger, contextGeneratorsMap, queueService, options = {
         raiseErrorOnFailedSend: false,
     }) {
         this.adapters = adapters;
         this.backend = backend;
         this.logger = logger;
-        this.contextGeneratorsMap = contextGeneratorsMap;
         this.queueService = queueService;
         this.options = options;
+        this.contextGeneratorsMap = new notification_context_generators_map_1.NotificationContextGeneratorsMap(contextGeneratorsMap);
         for (const adapter of adapters) {
             adapter.injectBackend(backend);
         }
@@ -123,7 +132,7 @@ class NotificationService {
         return this.backend.getFutureNotifications();
     }
     async getNotificationContext(contextName, parameters) {
-        const context = this.contextGeneratorsMap[contextName].generate(parameters);
+        const context = this.contextGeneratorsMap.getContextGenerator(contextName).generate(parameters);
         if (context instanceof Promise) {
             return await context;
         }
@@ -160,7 +169,7 @@ class NotificationService {
             }
             return;
         }
-        if ((notification === null || notification === void 0 ? void 0 : notification.sendAfter) && notification.sendAfter > new Date()) {
+        if (notification.sendAfter && notification.sendAfter > new Date()) {
             this.logger.error(`Notification ${notificationId} is scheduled for the future`);
             if (this.options.raiseErrorOnFailedSend) {
                 throw new Error(`Notification ${notificationId} is scheduled for the future`);
@@ -174,21 +183,32 @@ class NotificationService {
             }
             return;
         }
-        const notificationResendInput = {
+        const notificationResendInputWithoutContext = {
             userId: notification.userId,
             notificationType: notification.notificationType,
             title: notification.title,
             bodyTemplate: notification.bodyTemplate,
             contextName: notification.contextName,
             contextParameters: notification.contextParameters,
-            contextUsed: useStoredContextIfAvailable && notification.contextUsed
-                ? notification.contextUsed
-                : await this.getNotificationContext(notification.contextName, notification.contextParameters),
             sendAfter: null,
             subjectTemplate: notification.subjectTemplate,
             extraParams: notification.extraParams,
         };
-        const createdNotification = await this.backend.persistNotification(notificationResendInput);
+        let createdNotification;
+        if (useStoredContextIfAvailable && notification.contextUsed) {
+            const notificationResendInput = {
+                ...notificationResendInputWithoutContext,
+                contextUsed: notification.contextUsed,
+            };
+            createdNotification = await this.backend.persistNotification(notificationResendInput);
+        }
+        else {
+            const notificationResendInput = {
+                ...notificationResendInputWithoutContext,
+                contextUsed: await this.getNotificationContext(notification.contextName, notification.contextParameters),
+            };
+            createdNotification = await this.backend.persistNotification(notificationResendInput);
+        }
         this.logger.info(`Notification ${createdNotification.id} created for resending notification ${notificationId}`);
         this.send(createdNotification);
         return createdNotification;
@@ -239,17 +259,4 @@ class NotificationService {
         }
     }
 }
-exports.NotificationService = NotificationService;
-// biome-ignore lint/complexity/noStaticOnlyClass: <explanation>
-class NotificationServiceSingleton {
-    static getInstance(...args) {
-        if (!NotificationServiceSingleton.instance) {
-            if (!args || args.length === 0) {
-                throw new Error('NotificationServiceSingleton is not initialized. Please call getInstance with the required arguments');
-            }
-            NotificationServiceSingleton.instance = new NotificationService(...args);
-        }
-        return NotificationServiceSingleton.instance;
-    }
-}
-exports.NotificationServiceSingleton = NotificationServiceSingleton;
+exports.VintaSend = VintaSend;

package/dist/types/notification-context-generators.d.ts

@@ -1,4 +1,4 @@
 import type { JsonObject, JsonPrimitive } from './json-values';
-export interface ContextGenerator<Params extends Record<string, JsonPrimitive> = Record<string, JsonPrimitive>, Context extends JsonObject = JsonObject> {
-    generate(params: Params): Context | Promise<Context>;
+export interface ContextGenerator<Params extends Record<string, JsonPrimitive> = Record<string, JsonPrimitive>> {
+    generate(params: Params): JsonObject | Promise<JsonObject>;
 }

package/dist/types/notification-type-config.d.ts

@@ -1,7 +1,7 @@
 import type { ContextGenerator } from "./notification-context-generators";
 import type { Identifier } from "./identifier";
-export type BaseNotificationTypeConfig<ContextMapType extends Record<string, ContextGenerator> = Record<string, ContextGenerator>> = {
-    ContextMap: ContextMapType;
+export type BaseNotificationTypeConfig = {
+    ContextMap: Record<string, ContextGenerator>;
     NotificationIdType: Identifier;
     UserIdType: Identifier;
 };

package/dist/types/notification.d.ts

@@ -1,4 +1,4 @@
-import type { InputJsonValue, JsonObject, JsonValue } from './json-values';
+import type { InputJsonValue, JsonValue } from './json-values';
 import type { NotificationStatus } from './notification-status';
 import type { NotificationType } from './notification-type';
 import type { BaseNotificationTypeConfig } from './notification-type-config';
@@ -7,7 +7,7 @@ export type NotificationInput<Config extends BaseNotificationTypeConfig> = {
     notificationType: NotificationType;
     title: string | null;
     bodyTemplate: string;
-    contextName: keyof Config['ContextMap'];
+    contextName: string & keyof Config['ContextMap'];
     contextParameters: Parameters<Config['ContextMap'][NotificationInput<Config>['contextName']]['generate']>[0];
     sendAfter: Date | null;
     subjectTemplate: string | null;
@@ -18,9 +18,9 @@ export type NotificationResendWithContextInput<Config extends BaseNotificationTy
     notificationType: NotificationType;
     title: string | null;
     bodyTemplate: string;
-    contextName: keyof Config['ContextMap'];
+    contextName: string & keyof Config['ContextMap'];
     contextParameters: Parameters<Config['ContextMap'][NotificationResendWithContextInput<Config>['contextName']]['generate']>[0];
-    contextUsed: ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']> extends JsonObject ? ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']> : Awaited<ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']>>;
+    contextUsed: ReturnType<Config['ContextMap'][NotificationResendWithContextInput<Config>['contextName']]['generate']> extends Promise<infer T> ? T : ReturnType<Config['ContextMap'][NotificationResendWithContextInput<Config>['contextName']]['generate']>;
     sendAfter: Date | null;
     subjectTemplate: string | null;
     extraParams: InputJsonValue | null;
@@ -31,12 +31,12 @@ export type DatabaseNotification<Config extends BaseNotificationTypeConfig> = {
     notificationType: NotificationType;
     title: string | null;
     bodyTemplate: string;
-    contextName: keyof Config['ContextMap'];
+    contextName: string & keyof Config['ContextMap'];
     contextParameters: Parameters<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']>[0];
     sendAfter: Date | null;
     subjectTemplate: string | null;
     status: NotificationStatus;
-    contextUsed: ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']> extends JsonObject ? ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']> : Awaited<ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']>>;
+    contextUsed: ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']> extends Promise<infer T> ? T : ReturnType<Config['ContextMap'][DatabaseNotification<Config>['contextName']]['generate']>;
     extraParams: JsonValue;
     adapterUsed: string | null;
     sentAt: Date | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vintasend",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "main": "dist/index.js",
   "files": [
     "dist"