@holo-js/notifications 0.1.4 → 0.1.6

package/dist/contracts.d.ts

@@ -88,6 +88,9 @@ interface NotificationDefinition<TNotifiable = unknown, TBuild extends Notificat
     readonly queue?: boolean | NotificationQueueOptions | NotificationQueueResolver<TNotifiable, string>;
     readonly delay?: NotificationDelayValue | Partial<Record<Extract<keyof TBuild, string>, NotificationDelayValue>> | NotificationDelayResolver<TNotifiable, string>;
 }
+type NotificationDefinitionInput<TNotifiable, TBuild extends NotificationBuildFactories<TNotifiable>> = Omit<NotificationDefinition<TNotifiable, TBuild>, 'via'> & {
+    via(notifiable: TNotifiable, context: NotificationContext): readonly Extract<keyof TBuild, string>[];
+};
 type InferNotificationNotifiable<TNotification> = TNotification extends NotificationDefinition<infer TNotifiable, NotificationBuildFactories<unknown>> ? TNotifiable : TNotification extends NotificationDefinition<infer TNotifiable, infer _TBuild> ? TNotifiable : never;
 type InferNotificationChannels<TNotification> = TNotification extends NotificationDefinition<unknown, infer TBuild> ? Extract<keyof TBuild, string> : never;
 interface AnonymousNotificationTarget<TRoutes extends Partial<{
@@ -190,9 +193,9 @@ interface RegisteredNotificationChannel<TChannel extends string = string> {
 }
 declare function isNotificationDefinition(value: unknown): value is NotificationDefinition;
 declare function normalizeQueueOptions(value: NotificationQueueOptions | undefined): NotificationQueueOptions | undefined;
-declare function normalizeDelayConfig<TChannels extends string>(value: NotificationDefinition<unknown, NotificationBuildFactories<unknown>>['delay'] | undefined): NotificationDefinition<unknown, NotificationBuildFactories<unknown>>['delay'] | undefined;
-declare function normalizeNotificationDefinition<TNotifiable, TBuild extends NotificationBuildFactories<TNotifiable>>(definition: NotificationDefinition<TNotifiable, TBuild>): NotificationDefinition<TNotifiable, TBuild>;
-declare function defineNotification<TNotifiable, TBuild extends NotificationBuildFactories<TNotifiable>>(definition: NotificationDefinition<TNotifiable, TBuild>): NotificationDefinition<TNotifiable, TBuild>;
+declare function normalizeDelayConfig<TNotifiable, TChannels extends string>(value: NotificationDelayValue | Partial<Record<TChannels, NotificationDelayValue>> | NotificationDelayResolver<TNotifiable, string> | undefined): NotificationDelayValue | Partial<Record<TChannels, NotificationDelayValue>> | NotificationDelayResolver<TNotifiable, string> | undefined;
+declare function normalizeNotificationDefinition<TNotifiable, const TBuild extends NotificationBuildFactories<TNotifiable>>(definition: NotificationDefinitionInput<TNotifiable, TBuild>): NotificationDefinition<TNotifiable, TBuild>;
+declare function defineNotification<TNotifiable, const TBuild extends NotificationBuildFactories<TNotifiable>>(definition: NotificationDefinitionInput<TNotifiable, TBuild>): NotificationDefinition<TNotifiable, TBuild>;
 declare function createAnonymousNotificationTarget<TRoutes extends Partial<{
     readonly [TChannel in NotificationChannelName]: NotificationRouteFor<TChannel>;
 }>>(routes: TRoutes): AnonymousNotificationTarget<TRoutes>;

package/dist/index.d.ts

@@ -1,12 +1,30 @@
-import { NotificationRuntimeBindings, NotificationDatabaseRoute, NotificationRecord, NotificationDefinition, InferNotificationNotifiable, PendingNotificationDispatch, NotificationDispatchResult, PendingAnonymousNotification, NotificationChannelName, NotificationRouteFor, AnonymousNotificationTarget, NotificationDispatchTarget, NotificationDelayValue, NotificationChannel, NotificationBuildContext, NotificationSendContext, NotificationDispatchInput, NotificationBroadcastRoute, NotificationEmailRoute, NotificationDatabaseMessage, NotificationDispatchOptions, RegisteredNotificationChannel, RegisterNotificationChannelOptions } from './contracts.js';
-export { BuiltInNotificationChannelRegistry, HoloNotificationChannelRegistry, InferNotificationChannels, NotificationBroadcastMessage, NotificationBroadcaster, NotificationBuildFactories, NotificationChannelDispatchResult, NotificationContext, NotificationDelayResolver, NotificationJsonValue, NotificationMailMessage, NotificationMailSender, NotificationPayloadFor, NotificationQueueOptions, NotificationQueueResolver, NotificationResultFor, NotificationStore, defineNotification, isNotificationDefinition, normalizeNotificationDefinition, notificationsInternals } from './contracts.js';
+import { NotificationChannel, NotificationBuildContext, AnonymousNotificationTarget, NotificationBroadcastRoute, NotificationDatabaseRoute, NotificationEmailRoute, NotificationDatabaseMessage, NotificationRecord, NotificationRuntimeBindings, InferNotificationNotifiable, NotificationDefinition, PendingNotificationDispatch, NotificationDispatchResult, PendingAnonymousNotification, NotificationChannelName, NotificationRouteFor, NotificationDispatchTarget, NotificationDelayValue, NotificationSendContext, NotificationDispatchInput, NotificationDispatchOptions, NotificationQueueOptions, RegisteredNotificationChannel, RegisterNotificationChannelOptions } from './contracts.js';
+export { BuiltInNotificationChannelRegistry, HoloNotificationChannelRegistry, InferNotificationChannels, NotificationBroadcastMessage, NotificationBroadcaster, NotificationBuildFactories, NotificationChannelDispatchResult, NotificationContext, NotificationDelayResolver, NotificationJsonValue, NotificationMailMessage, NotificationMailSender, NotificationPayloadFor, NotificationQueueResolver, NotificationResultFor, NotificationStore, defineNotification, isNotificationDefinition, normalizeNotificationDefinition, notificationsInternals } from './contracts.js';
 import { HoloNotificationsConfig } from '@holo-js/config';
 export { HoloNotificationsConfig, NormalizedHoloNotificationsConfig } from '@holo-js/config';
 
-declare function normalizeOptionalString(value: string, label: string): string;
-declare function normalizeDelayValue(value: NotificationDelayValue, label: string): NotificationDelayValue;
+type RouteResolver = (notifiable: unknown) => unknown;
+type BuiltInChannelDefinition = NotificationChannel & {
+    readonly resolveRoute?: RouteResolver;
+};
 declare function isObject(value: unknown): value is Record<string, unknown>;
 declare function isAnonymousTarget(value: unknown): value is AnonymousNotificationTarget;
+declare function createNotificationContext(anonymous: boolean): {
+    readonly anonymous: boolean;
+};
+declare function createBuildContext<TChannel extends string>(channel: TChannel, anonymous: boolean): NotificationBuildContext<TChannel>;
+declare function normalizeEmailRouteFromValue(value: unknown): NotificationEmailRoute;
+declare function resolveEmailRouteFromNotifiable(notifiable: unknown): NotificationEmailRoute;
+declare function normalizeDatabaseRouteFromValue(value: unknown): NotificationDatabaseRoute;
+declare function resolveDatabaseRouteFromNotifiable(notifiable: unknown): NotificationDatabaseRoute;
+declare function normalizeBroadcastRouteFromValue(value: unknown): NotificationBroadcastRoute;
+declare function resolveBroadcastRouteFromNotifiable(notifiable: unknown): NotificationBroadcastRoute;
+declare function normalizeNotificationRecord(route: NotificationDatabaseRoute, payload: NotificationDatabaseMessage, notificationType: string | undefined): NotificationRecord;
+declare function normalizeNotificationRecordIds(ids: readonly string[]): readonly string[];
+
+declare function normalizeOptionalString(value: string, label: string): string;
+declare function normalizeOptionalString(value: string | undefined, label: string): string | undefined;
+declare function normalizeDelayValue(value: NotificationDelayValue, label: string): NotificationDelayValue;
 declare function getRuntimeBindings(): NotificationRuntimeBindings;
 type RuntimeState = {
     bindings?: NotificationRuntimeBindings;
@@ -31,7 +49,6 @@ type ResolvedTarget = {
     readonly notifiable: unknown;
     readonly routes?: Record<string, unknown>;
 };
-type RouteResolver = (notifiable: unknown) => unknown;
 type ResolvedChannelPlan = {
     readonly channel: string;
     readonly queued: boolean;
@@ -80,26 +97,11 @@ type QueuedNotificationDeliveryPayload = Readonly<{
     readonly payload: unknown;
     readonly targetIndex: number;
 }>;
-type BuiltInChannelDefinition = NotificationChannel & {
-    readonly resolveRoute?: RouteResolver;
-};
-declare function createNotificationContext(anonymous: boolean): {
-    readonly anonymous: boolean;
-};
-declare function createBuildContext<TChannel extends string>(channel: TChannel, anonymous: boolean): NotificationBuildContext<TChannel>;
-declare function normalizeEmailRouteFromValue(value: unknown): NotificationEmailRoute;
-declare function resolveEmailRouteFromNotifiable(notifiable: unknown): NotificationEmailRoute;
-declare function normalizeDatabaseRouteFromValue(value: unknown): NotificationDatabaseRoute;
-declare function resolveDatabaseRouteFromNotifiable(notifiable: unknown): NotificationDatabaseRoute;
-declare function normalizeBroadcastRouteFromValue(value: unknown): NotificationBroadcastRoute;
-declare function resolveBroadcastRouteFromNotifiable(notifiable: unknown): NotificationBroadcastRoute;
-declare function normalizeNotificationRecord(route: NotificationDatabaseRoute, payload: NotificationDatabaseMessage, notificationType: string | undefined): NotificationRecord;
-declare function normalizeNotificationRecordIds(ids: readonly string[]): readonly string[];
 declare function getNotificationChannel(name: string): NotificationChannel | BuiltInChannelDefinition | undefined;
 declare function resolveTargets(target: NotificationDispatchTarget): readonly ResolvedTarget[];
 declare function resolveChannels(notification: NotificationDefinition, target: ResolvedTarget): readonly string[];
 declare function resolvePayload(notification: NotificationDefinition, channel: string, target: ResolvedTarget): unknown;
-declare function resolveNotificationQueueOptions(notification: NotificationDefinition, target: ResolvedTarget, channel: string): boolean | NotificationDispatchOptions;
+declare function resolveNotificationQueueOptions(notification: NotificationDefinition, target: ResolvedTarget, channel: string): boolean | NotificationQueueOptions;
 declare function resolveNotificationDelay(notification: NotificationDefinition, target: ResolvedTarget, channel: string): NotificationDelayValue | undefined;
 declare function resolveRoute(channel: string, target: ResolvedTarget): unknown;
 declare function resolveChannelDispatchPlan(notification: NotificationDefinition, target: ResolvedTarget, channel: string, options: NotificationDispatchOptions): ResolvedChannelPlan;
@@ -148,8 +150,9 @@ interface NotificationRuntimeFacade {
 declare function configureNotificationsRuntime(bindings?: NotificationRuntimeBindings): void;
 declare function getNotificationsRuntimeBindings(): NotificationRuntimeBindings;
 declare function resetNotificationsRuntime(): void;
-declare function notify<TNotification extends NotificationDefinition<any, any>>(notifiable: InferNotificationNotifiable<TNotification>, notification: TNotification): PendingNotificationDispatch<NotificationDispatchResult>;
-declare function notifyMany<TNotification extends NotificationDefinition<any, any>>(notifiables: readonly InferNotificationNotifiable<TNotification>[] | Iterable<InferNotificationNotifiable<TNotification>>, notification: TNotification): PendingNotificationDispatch<NotificationDispatchResult>;
+type NotificationDefinitionLike<TNotification> = TNotification extends NotificationDefinition<infer _TNotifiable, infer _TBuild> ? TNotification : never;
+declare function notify<TNotification>(notifiable: InferNotificationNotifiable<TNotification>, notification: NotificationDefinitionLike<TNotification>): PendingNotificationDispatch<NotificationDispatchResult>;
+declare function notifyMany<TNotification>(notifiables: readonly InferNotificationNotifiable<TNotification>[] | Iterable<InferNotificationNotifiable<TNotification>>, notification: NotificationDefinitionLike<TNotification>): PendingNotificationDispatch<NotificationDispatchResult>;
 declare function notifyUsing(): PendingAnonymousNotification;
 declare function listNotifications(notifiable: NotificationDatabaseRoute | Record<string, unknown>): Promise<readonly NotificationRecord[]>;
 declare function unreadNotifications(notifiable: NotificationDatabaseRoute | Record<string, unknown>): Promise<readonly NotificationRecord[]>;
@@ -223,4 +226,4 @@ declare const notifications: Readonly<{
     unreadNotifications: typeof unreadNotifications;
 }>;
 
-export { AnonymousNotificationTarget, InferNotificationNotifiable, NotificationBroadcastRoute, NotificationBuildContext, NotificationChannel, NotificationChannelName, NotificationDatabaseMessage, NotificationDatabaseRoute, NotificationDefinition, NotificationDelayValue, NotificationDispatchInput, NotificationDispatchOptions, NotificationDispatchResult, NotificationDispatchTarget, NotificationEmailRoute, NotificationRecord, NotificationRouteFor, NotificationRuntimeBindings, NotificationSendContext, PendingAnonymousNotification, PendingNotificationDispatch, RegisterNotificationChannelOptions, RegisteredNotificationChannel, configureNotificationsRuntime, notifications as default, defineNotificationsConfig, deleteNotifications, getNotificationsRuntime, getNotificationsRuntimeBindings, getRegisteredNotificationChannel, listNotifications, listRegisteredNotificationChannels, markNotificationsAsRead, markNotificationsAsUnread, notificationRegistryInternals, notificationsRuntimeInternals, notify, notifyMany, notifyUsing, registerNotificationChannel, resetNotificationChannelRegistry, resetNotificationsRuntime, unreadNotifications };
+export { AnonymousNotificationTarget, InferNotificationNotifiable, NotificationBroadcastRoute, NotificationBuildContext, NotificationChannel, NotificationChannelName, NotificationDatabaseMessage, NotificationDatabaseRoute, NotificationDefinition, NotificationDelayValue, NotificationDispatchInput, NotificationDispatchOptions, NotificationDispatchResult, NotificationDispatchTarget, NotificationEmailRoute, NotificationQueueOptions, NotificationRecord, NotificationRouteFor, NotificationRuntimeBindings, NotificationSendContext, PendingAnonymousNotification, PendingNotificationDispatch, RegisterNotificationChannelOptions, RegisteredNotificationChannel, configureNotificationsRuntime, notifications as default, defineNotificationsConfig, deleteNotifications, getNotificationsRuntime, getNotificationsRuntimeBindings, getRegisteredNotificationChannel, listNotifications, listRegisteredNotificationChannels, markNotificationsAsRead, markNotificationsAsUnread, notificationRegistryInternals, notificationsRuntimeInternals, notify, notifyMany, notifyUsing, registerNotificationChannel, resetNotificationChannelRegistry, resetNotificationsRuntime, unreadNotifications };

package/dist/index.mjs

@@ -7,7 +7,6 @@ import {
 } from "./chunk-INGM2JYY.mjs";
 
 // src/runtime.ts
-import { randomUUID } from "crypto";
 import { holoNotificationsDefaults } from "@holo-js/config";
 
 // src/registry.ts
@@ -51,90 +50,14 @@ var notificationRegistryInternals = {
   normalizeChannelName
 };
 
-// src/runtime.ts
-var HOLO_NOTIFICATIONS_DELIVER_JOB = "holo.notifications.deliver";
-function normalizeOptionalString(value, label) {
-  const normalized = value.trim();
-  if (!normalized) {
-    throw new Error(`[@holo-js/notifications] ${label} must be a non-empty string.`);
-  }
-  return normalized;
-}
-function normalizeDelayValue(value, label) {
-  if (typeof value === "number") {
-    if (!Number.isFinite(value) || value < 0) {
-      throw new Error(`[@holo-js/notifications] ${label} must be a finite number greater than or equal to 0.`);
-    }
-    return value;
-  }
-  if (!(value instanceof Date) || Number.isNaN(value.getTime())) {
-    throw new Error(`[@holo-js/notifications] ${label} dates must be valid Date instances.`);
-  }
-  return value;
-}
+// src/runtime-channels.ts
+import { randomUUID } from "crypto";
 function isObject(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function isAnonymousTarget(value) {
   return isObject(value) && value.anonymous === true && isObject(value.routes);
 }
-function getRuntimeBindings() {
-  return getRuntimeState().bindings ?? {};
-}
-function getRuntimeState() {
-  const runtime = globalThis;
-  runtime.__holoNotificationsRuntime__ ??= {};
-  return runtime.__holoNotificationsRuntime__;
-}
-function getDispatchHandler() {
-  const bindings = getRuntimeBindings();
-  return bindings.dispatch ?? dispatchNotifications;
-}
-function dynamicImport(specifier) {
-  return import(specifier);
-}
-async function loadQueueModule() {
-  const override = getRuntimeState().loadQueueModule;
-  if (override) {
-    try {
-      return await override();
-    } catch (error) {
-      if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
-        throw new Error("[@holo-js/notifications] Queued or delayed notifications require @holo-js/queue to be installed.");
-      }
-      throw error;
-    }
-  }
-  try {
-    return await dynamicImport("@holo-js/queue");
-  } catch (error) {
-    if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
-      throw new Error("[@holo-js/notifications] Queued or delayed notifications require @holo-js/queue to be installed.");
-    }
-    throw error;
-  }
-}
-async function loadDbModule() {
-  const override = getRuntimeState().loadDbModule;
-  if (override) {
-    try {
-      return await override();
-    } catch (error) {
-      if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
-        return null;
-      }
-      throw error;
-    }
-  }
-  try {
-    return await dynamicImport("@holo-js/db");
-  } catch (error) {
-    if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
-      return null;
-    }
-    throw error;
-  }
-}
 function createNotificationContext(anonymous) {
   return Object.freeze({ anonymous });
 }
@@ -286,47 +209,156 @@ function normalizeNotificationRecordIds(ids) {
   });
   return Object.freeze([...new Set(normalized)]);
 }
-var builtInChannels = Object.freeze({
-  email: Object.freeze({
-    resolveRoute: resolveEmailRouteFromNotifiable,
-    async send(input) {
-      await requireMailer(getRuntimeBindings()).send(
-        input.payload,
-        input
-      );
-    }
-  }),
-  database: Object.freeze({
-    resolveRoute: resolveDatabaseRouteFromNotifiable,
-    async send(input) {
-      const route = input.route;
-      if (!route) {
-        throw new Error("[@holo-js/notifications] Database notifications require a resolved route.");
+function createBuiltInChannels(getBindings) {
+  return Object.freeze({
+    email: Object.freeze({
+      resolveRoute: resolveEmailRouteFromNotifiable,
+      async send(input) {
+        await requireMailer(getBindings()).send(
+          input.payload,
+          input
+        );
       }
-      await requireStore(getRuntimeBindings()).create(
-        normalizeNotificationRecord(
-          route,
+    }),
+    database: Object.freeze({
+      resolveRoute: resolveDatabaseRouteFromNotifiable,
+      async send(input) {
+        const route = input.route;
+        if (!route) {
+          throw new Error("[@holo-js/notifications] Database notifications require a resolved route.");
+        }
+        await requireStore(getBindings()).create(
+          normalizeNotificationRecord(
+            route,
+            input.payload,
+            input.notificationType
+          )
+        );
+      }
+    }),
+    broadcast: Object.freeze({
+      resolveRoute: resolveBroadcastRouteFromNotifiable,
+      async send(input) {
+        await requireBroadcaster(getBindings()).send(
           input.payload,
-          input.notificationType
-        )
-      );
+          input
+        );
+      }
+    })
+  });
+}
+
+// src/runtime.ts
+var HOLO_NOTIFICATIONS_DELIVER_JOB = "holo.notifications.deliver";
+function normalizeOptionalString(value, label) {
+  if (typeof value === "undefined") {
+    return void 0;
+  }
+  const normalized = value.trim();
+  if (!normalized) {
+    throw new Error(`[@holo-js/notifications] ${label} must be a non-empty string.`);
+  }
+  return normalized;
+}
+function normalizeDelayValue(value, label) {
+  if (typeof value === "number") {
+    if (!Number.isFinite(value) || value < 0) {
+      throw new Error(`[@holo-js/notifications] ${label} must be a finite number greater than or equal to 0.`);
+    }
+    return value;
+  }
+  if (!(value instanceof Date) || Number.isNaN(value.getTime())) {
+    throw new Error(`[@holo-js/notifications] ${label} dates must be valid Date instances.`);
+  }
+  return value;
+}
+function normalizeOptionalBoolean(value, label) {
+  if (typeof value === "undefined") {
+    return void 0;
+  }
+  if (typeof value !== "boolean") {
+    throw new Error(`[@holo-js/notifications] ${label} must be a boolean.`);
+  }
+  return value;
+}
+function normalizeQueueOptions(value) {
+  if (typeof value === "undefined") {
+    return void 0;
+  }
+  return Object.freeze({
+    connection: normalizeOptionalString(value.connection, "Notification queue connection"),
+    queue: normalizeOptionalString(value.queue, "Notification queue name"),
+    ...typeof value.delay === "undefined" ? {} : { delay: normalizeDelayValue(value.delay, "Notification queue delay") },
+    ...typeof normalizeOptionalBoolean(value.afterCommit, "Notification queue afterCommit") === "undefined" ? {} : { afterCommit: value.afterCommit }
+  });
+}
+function getRuntimeBindings() {
+  return getRuntimeState().bindings ?? {};
+}
+function getRuntimeState() {
+  const runtime = globalThis;
+  runtime.__holoNotificationsRuntime__ ??= {};
+  return runtime.__holoNotificationsRuntime__;
+}
+function getDispatchHandler() {
+  const bindings = getRuntimeBindings();
+  return bindings.dispatch ?? dispatchNotifications;
+}
+function dynamicImport(specifier) {
+  return import(specifier);
+}
+async function loadQueueModule() {
+  const override = getRuntimeState().loadQueueModule;
+  if (override) {
+    try {
+      return await override();
+    } catch (error) {
+      if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
+        throw new Error("[@holo-js/notifications] Queued or delayed notifications require @holo-js/queue to be installed.");
+      }
+      throw error;
     }
-  }),
-  broadcast: Object.freeze({
-    resolveRoute: resolveBroadcastRouteFromNotifiable,
-    async send(input) {
-      await requireBroadcaster(getRuntimeBindings()).send(
-        input.payload,
-        input
-      );
+  }
+  try {
+    return await dynamicImport("@holo-js/queue");
+  } catch (error) {
+    if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
+      throw new Error("[@holo-js/notifications] Queued or delayed notifications require @holo-js/queue to be installed.");
     }
-  })
-});
+    throw error;
+  }
+}
+async function loadDbModule() {
+  const override = getRuntimeState().loadDbModule;
+  if (override) {
+    try {
+      return await override();
+    } catch (error) {
+      if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
+        return null;
+      }
+      throw error;
+    }
+  }
+  try {
+    return await dynamicImport("@holo-js/db");
+  } catch (error) {
+    if (error && typeof error === "object" && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
+      return null;
+    }
+    throw error;
+  }
+}
+var builtInChannels = createBuiltInChannels(getRuntimeBindings);
 function getNotificationChannel(name) {
+  const registered = getRegisteredNotificationChannel(name)?.channel;
+  if (registered) {
+    return registered;
+  }
   if (name in builtInChannels) {
     return builtInChannels[name];
   }
-  return getRegisteredNotificationChannel(name)?.channel;
+  return void 0;
 }
 function resolveTargets(target) {
   if (target.kind === "anonymous") {
@@ -383,22 +415,24 @@ function resolvePayload(notification, channel, target) {
   return factory(target.notifiable, createBuildContext(channel, target.anonymous));
 }
 function resolveNotificationQueueOptions(notification, target, channel) {
-  if (typeof notification.queue === "function") {
-    return notification.queue(
-      target.notifiable,
-      channel,
-      createNotificationContext(target.anonymous)
-    );
+  const queue = typeof notification.queue === "function" ? notification.queue(
+    target.notifiable,
+    channel,
+    createNotificationContext(target.anonymous)
+  ) : notification.queue ?? false;
+  if (typeof queue === "boolean") {
+    return queue;
   }
-  return notification.queue ?? false;
+  return normalizeQueueOptions(queue) ?? false;
 }
 function resolveNotificationDelay(notification, target, channel) {
   if (typeof notification.delay === "function") {
-    return notification.delay(
+    const delay = notification.delay(
       target.notifiable,
       channel,
       createNotificationContext(target.anonymous)
     );
+    return typeof delay === "undefined" ? void 0 : normalizeDelayValue(delay, "Notification delay");
   }
   if (typeof notification.delay === "undefined") {
     return void 0;
@@ -414,6 +448,10 @@ function resolveRoute(channel, target) {
       throw new Error(`[@holo-js/notifications] Anonymous notifications must define a route for channel "${channel}".`);
     }
     const route = target.routes?.[channel];
+    const registered2 = getRegisteredNotificationChannel(channel)?.channel;
+    if (registered2) {
+      return typeof registered2.validateRoute === "function" ? registered2.validateRoute(route) : route;
+    }
     if (channel === "email") {
       return normalizeEmailRouteFromValue(route);
     }
@@ -461,10 +499,10 @@ function resolveChannelDispatchPlan(notification, target, channel, options) {
   const notificationQueueOptions = notificationQueue && notificationQueue !== true ? notificationQueue : void 0;
   const config = getRuntimeBindings().config ?? holoNotificationsDefaults;
   const resolvedDelay = options.delayByChannel?.[channel] ?? options.delay ?? resolveNotificationDelay(notification, target, channel);
-  const resolvedConnection = options.connection ?? notificationQueueOptions?.connection ?? config.queue.connection;
-  const resolvedQueue = options.queue ?? notificationQueueOptions?.queue ?? config.queue.queue;
-  const afterCommit = options.afterCommit ?? notificationQueueOptions?.afterCommit ?? config.queue.afterCommit;
-  const queued = notificationQueue === true || !!notificationQueueOptions || typeof resolvedDelay !== "undefined" || typeof resolvedConnection !== "undefined" || typeof resolvedQueue !== "undefined";
+  const queued = notificationQueue === true || !!notificationQueueOptions || typeof options.connection !== "undefined" || typeof options.queue !== "undefined" || typeof resolvedDelay !== "undefined";
+  const resolvedConnection = queued ? options.connection ?? notificationQueueOptions?.connection ?? config.queue.connection : void 0;
+  const resolvedQueue = queued ? options.queue ?? notificationQueueOptions?.queue ?? config.queue.queue : void 0;
+  const afterCommit = options.afterCommit ?? notificationQueueOptions?.afterCommit ?? (queued ? config.queue.afterCommit : false);
   return Object.freeze({
     channel,
     queued,
@@ -573,7 +611,11 @@ function shouldDeferDispatchAfterCommit(notification, targets, options) {
     return true;
   }
   return targets.some((target) => resolveChannels(notification, target).some((channel) => {
-    return resolveChannelDispatchPlan(notification, target, channel, options).afterCommit;
+    try {
+      return resolveChannelDispatchPlan(notification, target, channel, options).afterCommit;
+    } catch {
+      return false;
+    }
   }));
 }
 async function dispatchNotifications(input, execution = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/notifications",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Holo-JS Framework - notification contracts, channels, and fluent dispatch helpers",
   "type": "module",
   "license": "MIT",
@@ -28,12 +28,16 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@holo-js/config": "^0.1.4"
+    "@holo-js/config": "^0.1.6"
   },
   "peerDependencies": {
-    "@holo-js/queue": "^0.1.4"
+    "@holo-js/db": "^0.1.6",
+    "@holo-js/queue": "^0.1.6"
   },
   "peerDependenciesMeta": {
+    "@holo-js/db": {
+      "optional": true
+    },
     "@holo-js/queue": {
       "optional": true
     }
@@ -42,6 +46,6 @@
     "@types/node": "^22.10.2",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
-    "vitest": "^2.1.8"
+    "vitest": "^4.1.5"
   }
 }