@elysiumjs/core 0.1.1 → 0.3.0

package/src/repository.ts

@@ -24,7 +24,6 @@ import { pgTable } from 'drizzle-orm/pg-core';
 
 import { Application } from './app';
 import { Database } from './database';
-import { Tenancy } from './model';
 
 /**
  * Database's primary column type.
@@ -178,24 +177,12 @@ export const Repository = <
 			return db ?? Database.getConnection(connection);
 		}
 
-		/**
-		 * The drizzle's table schema wrapped by this repository.
-		 */
-		public static get table() {
-			if (model.supportTenancy) {
-				const tenant = Tenancy.getCurrentTenant() ?? 'public';
-				return Tenancy.withTenant(tenant, model);
-			}
-
-			return table;
-		}
-
 		/**
 		 * Retrieves all the records in the database.
 		 * @returns All the records in the database.
 		 */
 		public async all(): Promise<TSelect[]> {
-			return await this.db.select().from(R.table);
+			return await this.db.select().from(model.table);
 		}
 
 		/**
@@ -204,7 +191,7 @@ export const Repository = <
 		 * @returns The record with the given id.
 		 */
 		public async find(id: TId): Promise<TSelect | null> {
-			const [row] = await this.db.select().from(R.table).where(eq(R.table.id, id));
+			const [row] = await this.db.select().from(model.table).where(eq(model.table.id, id));
 			return (row ?? null) as TSelect | null;
 		}
 
@@ -214,7 +201,7 @@ export const Repository = <
 		 * @returns The inserted record.
 		 */
 		public async insert(data: TInsert): Promise<TSelect> {
-			const [row] = await this.db.insert(R.table).values(data).returning();
+			const [row] = await this.db.insert(model.table).values(data).returning();
 			return row as TSelect;
 		}
 
@@ -225,7 +212,11 @@ export const Repository = <
 		 * @returns The updated record.
 		 */
 		public async update(id: TId, data: TUpdate): Promise<TSelect> {
-			const [row] = await this.db.update(R.table).set(data).where(eq(R.table.id, id)).returning();
+			const [row] = await this.db
+				.update(model.table)
+				.set(data)
+				.where(eq(model.table.id, id))
+				.returning();
 			return row as TSelect;
 		}
 
@@ -235,7 +226,7 @@ export const Repository = <
 		 * @returns The updated records.
 		 */
 		public async updateAll(data: TUpdate): Promise<TSelect[]> {
-			return await this.db.update(R.table).set(data).returning();
+			return await this.db.update(model.table).set(data).returning();
 		}
 
 		/**
@@ -244,7 +235,7 @@ export const Repository = <
 		 * @returns The deleted record.
 		 */
 		public async delete(id: TId): Promise<TSelect> {
-			const [row] = await this.db.delete(R.table).where(eq(R.table.id, id)).returning();
+			const [row] = await this.db.delete(model.table).where(eq(model.table.id, id)).returning();
 			return row as TSelect;
 		}
 
@@ -253,7 +244,7 @@ export const Repository = <
 		 * @returns All the records in the database.
 		 */
 		public async deleteAll(): Promise<TSelect[]> {
-			return await this.db.delete(R.table).returning();
+			return await this.db.delete(model.table).returning();
 		}
 	}
 

package/src/utils.ts

@@ -14,6 +14,8 @@
 
 import type { Elysia } from 'elysia';
 
+import { isObject, isPrimitive } from 'radash';
+
 export namespace Symbols {
 	export const app = Symbol('app');
 
@@ -39,3 +41,53 @@ export namespace Symbols {
 export const nextTick = () => new Promise((resolve) => process.nextTick(resolve));
 
 export type ElysiaPlugin = () => Promise<Elysia>;
+
+/**
+ * Deeply merges objects from right to left
+ * Arrays are also merged if they are found in child objects
+ *
+ * @param target The target object to merge into
+ * @param sources One or more source objects to merge from
+ * @returns The merged object (same reference as target)
+ */
+export function deepMerge<T extends Record<string, any | any[]>>(target: T, ...sources: T[]): T {
+	if (!sources.length) return target;
+
+	const source = sources.shift();
+	if (source === undefined) return target;
+
+	if (isObject(target) && isObject(source)) {
+		for (const key in source) {
+			if (isObject(source[key])) {
+				if (!target[key]) {
+					Object.assign(target, { [key]: source[key] });
+				}
+			} else if (Array.isArray(source[key])) {
+				if (!Array.isArray(target[key])) {
+					target[key] = [] as any;
+				}
+				// Merge arrays by concatenating and removing duplicates for primitive values
+				if (source[key].length > 0 && !isObject(source[key][0])) {
+					target[key] = [...new Set([...target[key], ...source[key]])] as any;
+				} else {
+					// For arrays of objects, merge each item
+					source[key].forEach((item: any, index: number) => {
+						if (isObject(item) && target[key][index]) {
+							target[key][index] = deepMerge(target[key][index], item);
+						} else {
+							if (!target[key].includes(item)) {
+								target[key].push(item);
+							}
+						}
+					});
+				}
+			} else if (isPrimitive(source[key])) {
+				target[key] ??= source[key];
+			} else {
+				deepMerge(target[key], source[key]);
+			}
+		}
+	}
+
+	return deepMerge(target, ...sources);
+}

package/src/wamp.ts

@@ -223,43 +223,47 @@ export namespace Wamp {
 					onReconnectSuccess: metadata.reconnectSuccess?.bind(controller)
 				});
 
-				const registrations: WampRegistration[] = metadata.registrations ?? [];
-				const subscriptions: WampSubscription[] = metadata.subscriptions ?? [];
-
-				for (const registration of registrations) {
-					w.register(
-						registration.topic,
-						registration.handler.bind(controller),
-						registration.options
-					).then((r: { topic: string; requestId: string; registrationId: string }) => {
-						// TODO: Use the logger service here
-						console.log(`Registered ${registration.topic} with id ${r.registrationId}`);
-					});
-				}
-
-				for (const subscription of subscriptions) {
-					w.subscribe(
-						subscription.topic,
-						subscription.handler.bind(controller),
-						subscription.options
-					).then(
-						(s: {
-							topic: string;
-							requestId: string;
-							subscriptionId: string;
-							subscriptionKey: string;
-						}) => {
-							// TODO: Use the logger service here
-							console.log(`Subscribed ${subscription.topic} with id ${s.subscriptionId}`);
-						}
-					);
-				}
-
 				const app = new Elysia();
 
 				app.onStart(async (_) => {
-					await w.connect();
-					metadata.open?.call(controller);
+					try {
+						await w.connect();
+						metadata.open?.call(controller);
+
+						const registrations: WampRegistration[] = metadata.registrations ?? [];
+						const subscriptions: WampSubscription[] = metadata.subscriptions ?? [];
+
+						for (const registration of registrations) {
+							w.register(
+								registration.topic,
+								registration.handler.bind(controller),
+								registration.options
+							).then((r: { topic: string; requestId: string; registrationId: string }) => {
+								// TODO: Use the logger service here
+								console.log(`Registered ${registration.topic} with id ${r.registrationId}`);
+							});
+						}
+
+						for (const subscription of subscriptions) {
+							w.subscribe(
+								subscription.topic,
+								subscription.handler.bind(controller),
+								subscription.options
+							).then(
+								(s: {
+									topic: string;
+									requestId: string;
+									subscriptionId: string;
+									subscriptionKey: string;
+								}) => {
+									// TODO: Use the logger service here
+									console.log(`Subscribed ${subscription.topic} with id ${s.subscriptionId}`);
+								}
+							);
+						}
+					} catch (error) {
+						// noop
+					}
 				});
 
 				return app;

package/src/websocket.ts

@@ -108,10 +108,11 @@ export namespace Websocket {
 
 	/**
 	 * Marks a method as the websocket "open" event handler.
-	 * @author Axel Nana <axel.nana@workbud.com>
 	 *
 	 * This decorator should be used on a websocket controller method. Only one "open" event handler
 	 * can be defined per websocket controller.
+	 *
+	 * @author Axel Nana <axel.nana@workbud.com>
 	 */
 	export const onOpen = (): MethodDecorator => {
 		return function (target, propertyKey, descriptor) {
@@ -123,10 +124,11 @@ export namespace Websocket {
 
 	/**
 	 * Marks a method as the websocket "close" event handler.
-	 * @author Axel Nana <axel.nana@workbud.com>
 	 *
 	 * This decorator should be used on a websocket controller method. Only one "close" event handler
 	 * can be defined per websocket controller.
+	 *
+	 * @author Axel Nana <axel.nana@workbud.com>
 	 */
 	export const onClose = (): MethodDecorator => {
 		return function (target, propertyKey, descriptor) {
@@ -138,14 +140,15 @@ export namespace Websocket {
 
 	/**
 	 * Marks a method as the websocket "message" event handler.
-	 * @author Axel Nana <axel.nana@workbud.com>
 	 *
 	 * This decorator should be used on a websocket controller method. Only one "message" event handler
 	 * can be defined per websocket controller.
 	 *
+	 * @author Axel Nana <axel.nana@workbud.com>
+	 *
 	 * @param schema The schema of the message body.
 	 */
-	export const onMessage = (schema: TSchema): MethodDecorator => {
+	export const onMessage = (schema?: TSchema): MethodDecorator => {
 		return function (target, propertyKey, descriptor) {
 			const metadata = Reflect.getMetadata(Symbols.websocket, target.constructor) ?? {};
 			metadata.message = descriptor.value;
@@ -156,10 +159,11 @@ export namespace Websocket {
 
 	/**
 	 * Marks a method as the websocket "drain" event handler.
-	 * @author Axel Nana <axel.nana@workbud.com>
 	 *
 	 * This decorator should be used on a websocket controller method. Only one "drain" event handler
 	 * can be defined per websocket controller.
+	 *
+	 * @author Axel Nana <axel.nana@workbud.com>
 	 */
 	export const onDrain = (): MethodDecorator => {
 		return function (target, propertyKey, descriptor) {
@@ -171,10 +175,11 @@ export namespace Websocket {
 
 	/**
 	 * Marks a method as the websocket "error" event handler.
-	 * @author Axel Nana <axel.nana@workbud.com>
 	 *
 	 * This decorator should be used on a websocket controller method. Only one "error" event handler
 	 * can be defined per websocket controller.
+	 *
+	 * @author Axel Nana <axel.nana@workbud.com>
 	 */
 	export const onError = (): MethodDecorator => {
 		return function (target, propertyKey, descriptor) {

package/src/worker.ts

@@ -665,8 +665,6 @@ export class Worker extends InteractsWithConsole {
  * @author Axel Nana <axel.nana@workbud.com>
  */
 export class WorkerPool extends InteractsWithConsole {
-	#jobFiles: string[] = [];
-
 	private workers: BunWorker[] = [];
 	private currentWorkerIndex = 0;
 	private queueWorkerMap: Map<string, BunWorker[]> = new Map();
@@ -681,9 +679,7 @@ export class WorkerPool extends InteractsWithConsole {
 	 * Initialize the worker pool.
 	 */
 	public async init() {
-		// Preload all job files to make them available in worker thread.
-		this.#jobFiles = await Array.fromAsync(new Bun.Glob('./src/**/*.job.ts').scan());
-		this.debug(`WorkerPool initialized: found ${this.#jobFiles.length} job files`);
+		// noop for now
 	}
 
 	/**
@@ -691,10 +687,21 @@ export class WorkerPool extends InteractsWithConsole {
 	 * @param queues The queues to listen from the worker.
 	 */
 	public async addWorker(queues: string[] = []): Promise<void> {
-		const worker = new BunWorker('./index.ts', {
-			preload: this.#jobFiles,
-			argv: ['work', ...queues.map((queue) => `--queue=${queue}`)]
-		});
+		let worker: BunWorker;
+
+		if (ELYSIUM_BUILD) {
+			worker = new BunWorker('./index.js', {
+				argv: ['work', ...queues.map((queue) => `--queue=${queue}`)]
+			});
+		} else {
+			// Preload all job files to make them available in worker thread.
+			const jobFiles = await Array.fromAsync(new Bun.Glob('./src/**/*.job.ts').scan());
+
+			worker = new BunWorker('./index.ts', {
+				preload: jobFiles,
+				argv: ['work', ...queues.map((queue) => `--queue=${queue}`)]
+			});
+		}
 
 		worker.addEventListener('error', (e) => {
 			this.trace({

package/types.d.ts

@@ -0,0 +1,35 @@
+// Copyright (c) 2025-present Workbud Technologies Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+declare namespace globalThis {
+	/**
+	 * A macro indicating if the code is running from a build.
+	 * @author Axel Nana <axel.nana@workbud.com>
+	 */
+	var ELYSIUM_BUILD: boolean;
+}
+
+declare module '@elysiumjs/core' {
+	/**
+	 * The type for all registered environment variables.
+	 * @author Axel Nana <axel.nana@workbud.com>
+	 */
+	type AppEnv = Record<string, unknown>;
+
+	/**
+	 * The type for the context of the application.
+	 * @author Axel Nana <axel.nana@workbud.com>
+	 */
+	type AppHttpContext = import('elysia').SingletonBase;
+}

package/.prettierignore

@@ -1,5 +0,0 @@
-# Package Managers
-package-lock.json
-pnpm-lock.yaml
-yarn.lock
-bun.lock

package/.prettierrc

@@ -1,25 +0,0 @@
-{
-	"useTabs": true,
-	"singleQuote": true,
-	"trailingComma": "none",
-	"printWidth": 100,
-	"plugins": [
-		"@ianvs/prettier-plugin-sort-imports"
-	],
-	"importOrder": [
-		"<TYPES>^(node:)",
-		"<TYPES>",
-		"<TYPES>^[.]",
-		"",
-		"<BUILTIN_MODULES>",
-		"",
-		"<THIRD_PARTY_MODULES>",
-		"",
-		"^\\$",
-		"",
-		"^[.]"
-	],
-	"importOrderParserPlugins": ["typescript", "decorators-legacy"],
-	"importOrderTypeScriptVersion": "5.8.0",
-	"overrides": []
-}