@facteurjs/core 1.0.0-beta.4 → 2.0.0-beta.0

package/dist/channels/slack/{channel.js → channel.mjs}

@@ -1,4 +1,4 @@
-import { WebhookChannel } from "../webhook/provider.js";
+import { WebhookChannel } from "../webhook/provider.mjs";
 
 //#region src/channels/slack/channel.ts
 function slackWebhookChannel(options) {
@@ -12,4 +12,4 @@ var SlackWebhookChannel = class extends WebhookChannel {
 };
 
 //#endregion
-export { slackWebhookChannel };
+export { SlackWebhookChannel, slackWebhookChannel };

package/dist/channels/slack/{message.d.ts → message.d.mts}

@@ -1,4 +1,4 @@
-import { WebhookMessage } from "../webhook/message.js";
+import { WebhookMessage } from "../webhook/message.mjs";
 
 //#region src/channels/slack/message.d.ts
 declare class SlackMessage extends WebhookMessage {

package/dist/channels/slack/{message.js → message.mjs}

@@ -1,4 +1,4 @@
-import { WebhookMessage } from "../webhook/message.js";
+import { WebhookMessage } from "../webhook/message.mjs";
 
 //#region src/channels/slack/message.ts
 var SlackMessage = class SlackMessage extends WebhookMessage {

package/dist/channels/slack/{types.d.ts → types.d.mts}

@@ -1,4 +1,4 @@
-import { WebhookOptions, WebhookTargets } from "../webhook/types.js";
+import { WebhookOptions, WebhookTargets } from "../webhook/types.mjs";
 
 //#region src/channels/slack/types.d.ts
 type SlackOptions<WebhooksNames extends string> = WebhookOptions<WebhooksNames>;

package/dist/channels/slack/types.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/channels/slack.d.mts

@@ -0,0 +1,3 @@
+import { SlackMessage } from "./slack/message.mjs";
+import { SlackWebhookChannel, slackWebhookChannel } from "./slack/channel.mjs";
+export { SlackMessage, SlackWebhookChannel, slackWebhookChannel };

package/dist/channels/slack.mjs

@@ -0,0 +1,4 @@
+import { SlackMessage } from "./slack/message.mjs";
+import { SlackWebhookChannel, slackWebhookChannel } from "./slack/channel.mjs";
+
+export { SlackMessage, SlackWebhookChannel, slackWebhookChannel };

package/dist/channels/socketio/{channel.d.ts → channel.d.mts}

@@ -1,6 +1,6 @@
-import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.js";
-import { SocketIoMessage } from "./message.js";
-import { SocketIOConfig, SocketIOTargets } from "./types.js";
+import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import { SocketIoMessage } from "./message.mjs";
+import { SocketIOConfig, SocketIOTargets } from "./types.mjs";
 import { Server } from "socket.io";
 
 //#region src/channels/socketio/channel.d.ts

package/dist/channels/socketio/{channel.js → channel.mjs}

@@ -1,6 +1,5 @@
-import { errors } from "../../errors/index.js";
-import { kTargetSymbol } from "../../types/channel.js";
-import "../../types/index.js";
+import { errors } from "../../errors/index.mjs";
+import { kTargetSymbol } from "../../types/channel.mjs";
 
 //#region src/channels/socketio/channel.ts
 function socketIoChannel(config) {

package/dist/channels/socketio/types.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/channels/socketio.d.mts

@@ -0,0 +1,3 @@
+import { SocketIoMessage } from "./socketio/message.mjs";
+import { SocketIOChannel, socketIoChannel } from "./socketio/channel.mjs";
+export { SocketIOChannel, SocketIoMessage, socketIoChannel };

package/dist/channels/socketio.mjs

@@ -0,0 +1,4 @@
+import { SocketIoMessage } from "./socketio/message.mjs";
+import { SocketIOChannel, socketIoChannel } from "./socketio/channel.mjs";
+
+export { SocketIOChannel, SocketIoMessage, socketIoChannel };

package/dist/channels/transmit/{channel.d.ts → channel.d.mts}

@@ -1,6 +1,6 @@
-import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.js";
-import { TransmitMessage } from "./message.js";
-import { TransmitConfig, TransmitTargets } from "./types.js";
+import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import { TransmitMessage } from "./message.mjs";
+import { TransmitConfig, TransmitTargets } from "./types.mjs";
 
 //#region src/channels/transmit/channel.d.ts
 declare function transmitChannel(config: TransmitConfig): TransmitChannel;

package/dist/channels/transmit/{channel.js → channel.mjs}

@@ -1,6 +1,5 @@
-import { errors } from "../../errors/index.js";
-import { kTargetSymbol } from "../../types/channel.js";
-import "../../types/index.js";
+import { errors } from "../../errors/index.mjs";
+import { kTargetSymbol } from "../../types/channel.mjs";
 
 //#region src/channels/transmit/channel.ts
 function transmitChannel(config) {

package/dist/channels/transmit/types.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/channels/transmit.d.mts

@@ -0,0 +1,3 @@
+import { TransmitMessage } from "./transmit/message.mjs";
+import { TransmitChannel, transmitChannel } from "./transmit/channel.mjs";
+export { TransmitChannel, TransmitMessage, transmitChannel };

package/dist/channels/transmit.mjs

@@ -0,0 +1,4 @@
+import { TransmitMessage } from "./transmit/message.mjs";
+import { TransmitChannel, transmitChannel } from "./transmit/channel.mjs";
+
+export { TransmitChannel, TransmitMessage, transmitChannel };

package/dist/channels/twilio/{channel.d.ts → channel.d.mts}

@@ -1,6 +1,6 @@
-import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.js";
-import { TwilioMessage } from "./message.js";
-import { TwilioConfig, TwilioTargets } from "./types.js";
+import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import { TwilioMessage } from "./message.mjs";
+import { TwilioConfig, TwilioTargets } from "./types.mjs";
 
 //#region src/channels/twilio/channel.d.ts
 declare function twilioChannel(config: TwilioConfig): TwilioChannel;

package/dist/channels/twilio/{channel.js → channel.mjs}

@@ -1,6 +1,5 @@
-import { errors } from "../../errors/index.js";
-import { kTargetSymbol } from "../../types/channel.js";
-import "../../types/index.js";
+import { errors } from "../../errors/index.mjs";
+import { kTargetSymbol } from "../../types/channel.mjs";
 import Twilio from "twilio";
 
 //#region src/channels/twilio/channel.ts
@@ -32,8 +31,7 @@ var TwilioChannel = class {
 			});
 		} catch (error) {
 			if (this.config.ignoredErrorCodes && error.code) {
-				const isIgnored = this.config.ignoredErrorCodes.includes(error.code) || this.config.ignoredErrorCodes.includes("*");
-				if (isIgnored) return;
+				if (this.config.ignoredErrorCodes.includes(error.code) || this.config.ignoredErrorCodes.includes("*")) return;
 			}
 			throw error;
 		}
@@ -48,7 +46,6 @@ var TwilioChannel = class {
 		if (this.config.from) return this.config.from;
 		if (message.getAlphanumericSender()) return message.getAlphanumericSender();
 		if (this.config.alphanumericSender) return this.config.alphanumericSender;
-		return void 0;
 	}
 };
 

package/dist/channels/twilio/types.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/channels/twilio.d.mts

@@ -0,0 +1,4 @@
+import { TwilioMessage } from "./twilio/message.mjs";
+import { TwilioConfig, TwilioTargets } from "./twilio/types.mjs";
+import { TwilioChannel, twilioChannel } from "./twilio/channel.mjs";
+export { TwilioChannel, type TwilioConfig, TwilioMessage, type TwilioTargets, twilioChannel };

package/dist/channels/twilio.mjs

@@ -0,0 +1,4 @@
+import { TwilioMessage } from "./twilio/message.mjs";
+import { TwilioChannel, twilioChannel } from "./twilio/channel.mjs";
+
+export { TwilioChannel, TwilioMessage, twilioChannel };

package/dist/channels/webhook/{exceptions.d.ts → exceptions.d.mts}

@@ -1,4 +1,4 @@
-import { HTTPErrorInfo } from "../../errors/http_error.js";
+import { HTTPErrorInfo } from "../../errors/http_error.mjs";
 
 //#region src/channels/webhook/exceptions.d.ts
 

package/dist/channels/webhook/{provider.d.ts → provider.d.mts}

@@ -1,6 +1,6 @@
-import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.js";
-import { WebhookMessage } from "./message.js";
-import { WebhookOptions, WebhookTargets } from "./types.js";
+import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import { WebhookOptions, WebhookTargets } from "./types.mjs";
+import { WebhookMessage } from "./message.mjs";
 
 //#region src/channels/webhook/provider.d.ts
 declare function webhookChannel<Options extends WebhookOptions<any>>(options: Options & {

package/dist/channels/webhook/{provider.js → provider.mjs}

@@ -1,8 +1,7 @@
-import { errors } from "../../errors/index.js";
-import { kTargetSymbol } from "../../types/channel.js";
-import "../../types/index.js";
-import { WebhookRequestException } from "./exceptions.js";
-import { HTTPErrorExtractor } from "../../errors/http_error.js";
+import { errors } from "../../errors/index.mjs";
+import { kTargetSymbol } from "../../types/channel.mjs";
+import { WebhookRequestException } from "./exceptions.mjs";
+import { HTTPErrorExtractor } from "../../errors/http_error.mjs";
 import ky, { HTTPError } from "ky";
 
 //#region src/channels/webhook/provider.ts
@@ -19,8 +18,7 @@ var WebhookChannel = class {
 		this.#initWebhooksEndpoints(options);
 	}
 	#buildWebhookEntry(key, endpoint) {
-		const url = new URL(endpoint);
-		return [key, url];
+		return [key, new URL(endpoint)];
 	}
 	#initWebhooksEndpoints(options) {
 		if ("webhookUrl" in options) {
@@ -43,7 +41,7 @@ var WebhookChannel = class {
 	}
 	#normalizeTargets(targets) {
 		if (!targets) return [...this.#webhooksUrls.values()];
-		if ("webhookUrl" in targets) return [this.#buildWebhookEntry("default", targets.webhookUrl)[1]];
+		if ("webhookUrl" in targets && targets.webhookUrl) return [this.#buildWebhookEntry("default", targets.webhookUrl)[1]];
 		return Object.keys(targets).map((key) => this.#webhooksUrls.get(key)).filter(Boolean);
 	}
 	#resolveTargets(options) {

package/dist/channels/webhook/types.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/channels/webhook.d.mts

@@ -0,0 +1,4 @@
+import { WebhookMessage } from "./webhook/message.mjs";
+import { WebhookChannel, webhookChannel } from "./webhook/provider.mjs";
+import { WebhookRequestException, errors } from "./webhook/exceptions.mjs";
+export { WebhookChannel, WebhookMessage, WebhookRequestException, errors, webhookChannel };

package/dist/channels/webhook.mjs

@@ -0,0 +1,5 @@
+import { WebhookMessage } from "./webhook/message.mjs";
+import { WebhookRequestException, errors } from "./webhook/exceptions.mjs";
+import { WebhookChannel, webhookChannel } from "./webhook/provider.mjs";
+
+export { WebhookChannel, WebhookMessage, WebhookRequestException, errors, webhookChannel };

package/dist/channels/webpush/{channel.d.ts → channel.d.mts}

@@ -1,6 +1,6 @@
-import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.js";
-import { WebpushMessage } from "./message.js";
-import { WebpushConfig, WebpushTargets } from "./types.js";
+import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import { WebpushMessage } from "./message.mjs";
+import { WebpushConfig, WebpushTargets } from "./types.mjs";
 import webpush from "web-push";
 
 //#region src/channels/webpush/channel.d.ts

package/dist/channels/webpush/{channel.js → channel.mjs}

@@ -1,6 +1,5 @@
-import { errors } from "../../errors/index.js";
-import { kTargetSymbol } from "../../types/channel.js";
-import "../../types/index.js";
+import { errors } from "../../errors/index.mjs";
+import { kTargetSymbol } from "../../types/channel.mjs";
 import webpush from "web-push";
 
 //#region src/channels/webpush/channel.ts

package/dist/channels/webpush/types.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/channels/webpush.d.mts

@@ -0,0 +1,3 @@
+import { WebpushMessage } from "./webpush/message.mjs";
+import { WebpushChannel, webpushChannel } from "./webpush/channel.mjs";
+export { WebpushChannel, WebpushMessage, webpushChannel };

package/dist/channels/webpush.mjs

@@ -0,0 +1,4 @@
+import { WebpushMessage } from "./webpush/message.mjs";
+import { WebpushChannel, webpushChannel } from "./webpush/channel.mjs";
+
+export { WebpushChannel, WebpushMessage, webpushChannel };

package/dist/database/adapters/{knex.d.ts → knex.d.mts}

@@ -1,4 +1,4 @@
-import { DatabaseAdapter, KnexConfig } from "../types.js";
+import { DatabaseAdapter, KnexConfig } from "../types.mjs";
 
 //#region src/database/adapters/knex.d.ts
 declare function knexAdapter(config: KnexConfig): DatabaseAdapter;

package/dist/database/adapters/{knex.js → knex.mjs}

@@ -5,17 +5,23 @@ function knexAdapter(config) {
 var KnexAdapter = class {
 	#tableName = "notifications";
 	#preferencesTableName = "notification_preferences";
-	#connection;
+	#connectionResolver;
 	constructor(config) {
-		this.#connection = config.connection;
+		this.#connectionResolver = this.#isKnexInstance(config.connection) ? () => config.connection : config.connection;
 		this.#tableName = config.tableNames?.notifications || "notifications";
 		this.#preferencesTableName = config.tableNames?.preferences || "notification_preferences";
 	}
+	#isKnexInstance(connection) {
+		return "client" in connection;
+	}
+	#getConnection() {
+		return this.#connectionResolver();
+	}
 	setTableName(tableName) {
 		this.#tableName = tableName;
 	}
 	async save(options) {
-		await this.#connection.table(this.#tableName).insert({
+		await this.#getConnection().table(this.#tableName).insert({
 			notifiable_id: options.notifiableId,
 			tenant_id: options.tenantId || null,
 			type: options.type,
@@ -30,12 +36,11 @@ var KnexAdapter = class {
 		const page = options.page || 1;
 		const limit = Math.min(options.limit || 10, 100);
 		const offset = (page - 1) * limit;
-		let query = this.#connection.table(this.#tableName).where("notifiable_id", options.notifiableId);
+		let query = this.#getConnection().table(this.#tableName).where("notifiable_id", options.notifiableId);
 		if (options.tenantId) query.where("tenant_id", options.tenantId);
 		if (options.status) query.where("status", options.status);
 		if (options.tags) query.whereJsonSupersetOf("tags", JSON.stringify(options.tags));
-		const results = await query.orderBy("created_at", "desc").limit(limit).offset(offset).select("*");
-		return results.map((row) => ({
+		return (await query.orderBy("created_at", "desc").limit(limit).offset(offset).select("*")).map((row) => ({
 			id: row.id,
 			notifiableId: row.notifiable_id,
 			tenantId: row.tenant_id,
@@ -56,7 +61,7 @@ var KnexAdapter = class {
 		};
 		if (options.status === "read") updateData.read_at = /* @__PURE__ */ new Date();
 		else if (options.status === "seen") updateData.seen_at = /* @__PURE__ */ new Date();
-		await this.#connection.table(this.#tableName).where("id", options.id).update(updateData);
+		await this.#getConnection().table(this.#tableName).where("id", options.id).update(updateData);
 	}
 	async updateAllNotifications(options) {
 		const updateData = {
@@ -65,23 +70,22 @@ var KnexAdapter = class {
 		};
 		if (options.status === "read") updateData.read_at = /* @__PURE__ */ new Date();
 		else if (options.status === "seen") updateData.seen_at = /* @__PURE__ */ new Date();
-		let query = this.#connection.table(this.#tableName).where("notifiable_id", options.notifiableId);
+		let query = this.#getConnection().table(this.#tableName).where("notifiable_id", options.notifiableId);
 		if (options.tenantId) query = query.where("tenant_id", options.tenantId);
 		await query.update(updateData);
 	}
 	async pruneNotifications(options) {
-		let query = this.#connection.table(this.#tableName);
+		let query = this.#getConnection().table(this.#tableName);
 		if (options.notifiableId) query = query.where("notifiable_id", options.notifiableId);
 		if (options.tenantId) query = query.where("tenant_id", options.tenantId);
 		if (options.olderThan) query = query.where("created_at", "<", options.olderThan);
 		await query.del();
 	}
 	async getPreferences(options) {
-		const results = await this.#connection.table(this.#preferencesTableName).where("user_id", options.notifiableId).andWhere((builder) => {
-			if (options.tenantId) builder.where("tenant_id", options.tenantId);
-			else builder.whereNull("tenant_id");
-		}).select("*");
-		return results.map((row) => ({
+		return (await this.#getConnection().table(this.#preferencesTableName).where("user_id", options.notifiableId).andWhere((builder) => {
+			builder.whereNull("tenant_id");
+			if (options.tenantId) builder.orWhere("tenant_id", options.tenantId);
+		}).select("*")).map((row) => ({
 			id: row.id,
 			user_id: row.user_id,
 			tenant_id: row.tenant_id,
@@ -92,7 +96,7 @@ var KnexAdapter = class {
 		}));
 	}
 	async updatePreferences(options) {
-		await this.#connection.transaction(async (trx) => {
+		await this.#getConnection().transaction(async (trx) => {
 			const existing = await trx.table(this.#preferencesTableName).where("user_id", options.notifiableId).andWhere("notification_name", options.notificationName).andWhere((builder) => {
 				if (options.tenantId) builder.where("tenant_id", options.tenantId);
 				else builder.whereNull("tenant_id");

package/dist/database/adapters/{kysely.d.ts → kysely.d.mts}

@@ -1,4 +1,4 @@
-import { DatabaseAdapter, KyselyConfig } from "../types.js";
+import { DatabaseAdapter, KyselyConfig } from "../types.mjs";
 
 //#region src/database/adapters/kysely.d.ts
 declare function kyselyAdapter(config: KyselyConfig): DatabaseAdapter;

package/dist/database/adapters/{kysely.js → kysely.mjs}

@@ -30,8 +30,7 @@ var KyselyAdapter = class {
 		const page = options.page || 1;
 		const limit = Math.min(options.limit || 10, 100);
 		const offset = (page - 1) * limit;
-		const results = await this.#connection.selectFrom(this.#tableName).selectAll().where("notifiable_id", "=", options.notifiableId).$if(!!options.tenantId, (qb) => qb.where("tenant_id", "=", options.tenantId)).$if(!!options.status, (qb) => qb.where("status", "=", options.status)).$if(!!options.tags, (qb) => qb.where("tags", "@>", JSON.stringify(options.tags))).orderBy("created_at", "desc").limit(limit).offset(offset).execute();
-		return results.map((row) => ({
+		return (await this.#connection.selectFrom(this.#tableName).selectAll().where("notifiable_id", "=", options.notifiableId).$if(!!options.tenantId, (qb) => qb.where("tenant_id", "=", options.tenantId)).$if(!!options.status, (qb) => qb.where("status", "=", options.status)).$if(!!options.tags, (qb) => qb.where("tags", "@>", JSON.stringify(options.tags))).orderBy("created_at", "desc").limit(limit).offset(offset).execute()).map((row) => ({
 			id: row.id,
 			notifiableId: row.notifiable_id,
 			tenantId: row.tenant_id,
@@ -67,8 +66,7 @@ var KyselyAdapter = class {
 		await this.#connection.deleteFrom(this.#tableName).$if(!!options.notifiableId, (qb) => qb.where("notifiable_id", "=", options.notifiableId)).$if(!!options.tenantId, (qb) => qb.where("tenant_id", "=", options.tenantId)).$if(!!options.olderThan, (qb) => qb.where("created_at", "<", options.olderThan)).execute();
 	}
 	async getPreferences(options) {
-		const results = await this.#connection.selectFrom(this.#preferencesTableName).selectAll().where("user_id", "=", options.notifiableId).$if(!!options.tenantId, (qb) => qb.where("tenant_id", "=", options.tenantId)).$if(!options.tenantId, (qb) => qb.where("tenant_id", "is", null)).execute();
-		return results.map((row) => ({
+		return (await this.#connection.selectFrom(this.#preferencesTableName).selectAll().where("user_id", "=", options.notifiableId).where((eb) => eb.or([eb("tenant_id", "is", null), ...options.tenantId ? [eb("tenant_id", "=", options.tenantId)] : []])).execute()).map((row) => ({
 			id: row.id,
 			user_id: row.user_id,
 			tenant_id: row.tenant_id,

package/dist/database/{channel.d.ts → channel.d.mts}

@@ -1,6 +1,6 @@
-import { DatabaseConfig, Identifier } from "./types.js";
-import { Channel, ChannelSendParams, kTargetSymbol } from "../types/channel.js";
-import { DatabaseMessage } from "./message.js";
+import { Channel, ChannelSendParams, kTargetSymbol } from "../types/channel.mjs";
+import { DatabaseConfig, Identifier } from "./types.mjs";
+import { DatabaseMessage } from "./message.mjs";
 
 //#region src/database/channel.d.ts
 declare function databaseChannel(options: DatabaseConfig): DatabaseChannel;

package/dist/database/{channel.js → channel.mjs}

@@ -1,7 +1,6 @@
-import { errors } from "../errors/index.js";
-import { kTargetSymbol } from "../types/channel.js";
-import "../types/index.js";
-import { DatabaseMessage } from "./message.js";
+import { errors } from "../errors/index.mjs";
+import { kTargetSymbol } from "../types/channel.mjs";
+import { DatabaseMessage } from "./message.mjs";
 
 //#region src/database/channel.ts
 function databaseChannel(options) {
@@ -24,7 +23,7 @@ var DatabaseChannel = class {
 		const notifiableId = message.notifiableId || targets.notifiableId;
 		const tenantId = message.tenantId || targets.tenantId || options.tenantId;
 		if (!notifiableId) throw new Error("No notifiableId provided");
-		const result = await this.#adapter.save({
+		return await this.#adapter.save({
 			notifiableId,
 			tenantId,
 			content: message.content,
@@ -34,7 +33,6 @@ var DatabaseChannel = class {
 			createdAt: /* @__PURE__ */ new Date(),
 			updatedAt: /* @__PURE__ */ new Date()
 		});
-		return result;
 	}
 };
 

package/dist/database/{database.d.ts → database.d.mts}

@@ -1,6 +1,6 @@
-import { DatabaseAdapter, GetNotificationsParams, GetPreferencesParams, Notification, Preferences, UpdateAllNotificationsParams, UpdateNotificationParams, UpdatePreferencesParams } from "./types.js";
-import { FacteurOptions } from "../options.js";
-import { NotificationDiscoverer } from "../notifications/notification_discoverer.js";
+import { FacteurOptions } from "../options.mjs";
+import { NotificationDiscoverer } from "../notifications/notification_discoverer.mjs";
+import { DatabaseAdapter, GetNotificationsParams, GetPreferencesParams, Notification, Preferences, UpdateAllNotificationsParams, UpdateNotificationParams, UpdatePreferencesParams } from "./types.mjs";
 
 //#region src/database/database.d.ts
 declare class FacteurDatabase {

package/dist/database/{database.js → database.mjs}

@@ -31,8 +31,7 @@ var FacteurDatabase = class {
 	}
 	async #createEmptyPreferences(tenantId) {
 		const globalChannels = this.options.defaultPreferences.global.channels;
-		const notificationIdentities = await this.discoverer.getNotificationIdentities();
-		const notificationPreferences = notificationIdentities.map((identity) => ({
+		const notificationPreferences = (await this.discoverer.getNotificationIdentities()).map((identity) => ({
 			notification: {
 				name: identity.name,
 				identifier: identity.identifier
@@ -49,17 +48,18 @@ var FacteurDatabase = class {
 		} };
 		return preferences;
 	}
-	#processPreferenceRow(row, preferences, tenantId) {
+	#processPreferenceRow(row, preferences) {
 		const channels = row.channels;
 		const notificationName = row.notification_name;
-		if (tenantId && preferences.tenants) this.#updateTenantPreferences(preferences.tenants[tenantId], notificationName, channels);
-		else this.#updateGlobalPreferences(preferences.global, notificationName, channels);
+		const rowTenantId = row.tenant_id;
+		if (rowTenantId && preferences.tenants?.[rowTenantId]) this.#updateTenantPreferences(preferences.tenants[rowTenantId], notificationName, channels);
+		else if (!rowTenantId) this.#updateGlobalPreferences(preferences.global, notificationName, channels);
 	}
 	async getPreferences(options) {
 		const rawPreferences = await this.options.databaseAdapter?.getPreferences(options);
 		if (!rawPreferences) return await this.#createEmptyPreferences(options.tenantId);
 		const preferences = await this.#createEmptyPreferences(options.tenantId);
-		for (const row of rawPreferences) this.#processPreferenceRow(row, preferences, options.tenantId);
+		for (const row of rawPreferences) this.#processPreferenceRow(row, preferences);
 		return preferences;
 	}
 	#updateTenantPreferences(tenantPrefs, notificationName, channels) {
@@ -71,15 +71,18 @@ var FacteurDatabase = class {
 		else this.#updateNotificationPreferences(globalPrefs.notifications, notificationName, channels);
 	}
 	#updateNotificationPreferences(notifications, notificationName, channels) {
-		let notifPref = notifications.find((n) => n.notification.name === notificationName);
-		if (!notifPref) {
-			notifPref = {
-				notification: { name: notificationName },
+		let notificationPref = notifications.find((n) => n.notification.name === notificationName);
+		if (!notificationPref) {
+			notificationPref = {
+				notification: {
+					name: notificationName,
+					identifier: notificationName
+				},
 				channels: {}
 			};
-			notifications.push(notifPref);
+			notifications.push(notificationPref);
 		}
-		Object.assign(notifPref.channels, channels);
+		Object.assign(notificationPref.channels, channels);
 	}
 	updatePreferences(options) {
 		return this.options.databaseAdapter?.updatePreferences(options);

package/dist/database/{message.d.ts → message.d.mts}

@@ -1,5 +1,5 @@
-import { NotificationStatus } from "./types.js";
-import { DatabaseContent } from "../types/extend.js";
+import { DatabaseContent } from "../types/extend.mjs";
+import { NotificationStatus } from "./types.mjs";
 
 //#region src/database/message.d.ts
 declare class DatabaseMessage {

package/dist/database/{types.d.ts → types.d.mts}

@@ -1,6 +1,6 @@
-import { ChannelName } from "../types/extend.js";
-import { Knex } from "knex";
+import { ChannelName } from "../types/extend.mjs";
 import { Kysely } from "kysely";
+import { Knex } from "knex";
 
 //#region src/database/types.d.ts
 type NotificationStatus = 'read' | 'seen' | 'unread' | 'unseen';
@@ -79,7 +79,7 @@ interface KyselyConfig extends DatabaseAdapterCommonOptions {
  * Options accepted by the Knex adapter
  */
 interface KnexConfig extends DatabaseAdapterCommonOptions {
-  connection: Knex;
+  connection: Knex | (() => Knex);
 }
 interface GetPreferencesParams {
   notifiableId: Identifier;

package/dist/database/types.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/database.d.mts

@@ -0,0 +1,3 @@
+import { DatabaseMessage } from "./database/message.mjs";
+import { DatabaseChannel, databaseChannel } from "./database/channel.mjs";
+export { DatabaseChannel, DatabaseMessage, databaseChannel };

package/dist/database.mjs

@@ -0,0 +1,4 @@
+import { DatabaseMessage } from "./database/message.mjs";
+import { DatabaseChannel, databaseChannel } from "./database/channel.mjs";
+
+export { DatabaseChannel, DatabaseMessage, databaseChannel };

package/dist/errors/{duplicate_notification_exception.js → duplicate_notification_exception.mjs}

@@ -7,8 +7,7 @@ var E_DUPLICATE_NOTIFICATION = class extends Error {
 		for (const { notificationName, notifications = [] } of duplicates) {
 			errorMessage += `\n\nNotification name "${notificationName}" is used in multiple files:\n`;
 			errorMessage += notifications.map(({ file }) => {
-				const relativePath = fileURLToPath(file).replace(appRoot.pathname, "");
-				return `- ${relativePath}`;
+				return `- ${fileURLToPath(file).replace(appRoot.pathname, "")}`;
 			}).join("\n");
 		}
 		errorMessage += "\n\nEach notification must have a unique name. You can use a static \"notificationName\" property to customize the notification name.";

package/dist/errors/{http_error.d.ts → http_error.d.mts}

@@ -9,8 +9,5 @@ interface HTTPErrorInfo {
   statusText: string;
   responseBody: string;
 }
-/**
- * Extracts information from an HTTPError with async response body decoding
- */
 //#endregion
 export { HTTPErrorInfo };

package/dist/errors/{index.d.ts → index.d.mts}

@@ -1,4 +1,4 @@
-import { E_DUPLICATE_NOTIFICATION } from "./duplicate_notification_exception.js";
+import { E_DUPLICATE_NOTIFICATION } from "./duplicate_notification_exception.mjs";
 import * as _poppinss_exception0 from "@poppinss/exception";
 
 //#region src/errors/index.d.ts

package/dist/errors/{index.js → index.mjs}

@@ -1,4 +1,4 @@
-import { E_DUPLICATE_NOTIFICATION } from "./duplicate_notification_exception.js";
+import { E_DUPLICATE_NOTIFICATION } from "./duplicate_notification_exception.mjs";
 import { createError } from "@poppinss/exception";
 
 //#region src/errors/index.ts
@@ -23,8 +23,7 @@ var E_SEND_NOTIFICATION_FAILED = class extends AggregateError {
 	code = "E_SEND_NOTIFICATION_FAILED";
 	status = 500;
 	constructor(errors$1) {
-		const message = "Failed to send notification due to errors in one or more channels.";
-		super(errors$1, message);
+		super(errors$1, "Failed to send notification due to errors in one or more channels.");
 	}
 };
 const errors = {

package/dist/events/{events.d.ts → events.d.mts}

@@ -1,5 +1,5 @@
-import { ChannelName } from "../types/extend.js";
-import { Notification } from "../types/notifications.js";
+import { ChannelName } from "../types/extend.mjs";
+import { Notification } from "../types/notifications.mjs";
 
 //#region src/events/events.d.ts
 interface MessageEventOptions {