@elysiumjs/core 0.2.0 → 0.3.1

package/README.md

@@ -109,4 +109,4 @@ Feel free to open issues for any bugs or questions you may have. Pull requests a
 
 ## License
 
-This project is licensed under the Apache License, Version 2.0. See the [LICENSE](LICENSE) file for more information.
+This project is licensed under the Apache License, Version 2.0. See the [LICENSE](../../LICENSE) file for more information.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@elysiumjs/core",
-	"version": "0.2.0",
+	"version": "0.3.1",
 	"license": "Apache-2.0",
 	"description": "A super-charged web framework for Bun, built on top of ElysiaJS.",
 	"private": false,
@@ -41,7 +41,7 @@
 		"@types/bun": "latest"
 	},
 	"peerDependencies": {
-		"typescript": "^5"
+		"typescript": "^5.8.3"
 	},
 	"trustedDependencies": [
 		"es5-ext"

package/src/model.ts

@@ -119,6 +119,12 @@ export type ModelClass<
 	 */
 	readonly $inferUpdate: Partial<TTable['$inferSelect']>;
 
+	/**
+	 * The drizzle's table schema wrapped by this model.
+	 * Will be automatically wrapped by the `Tenancy.withTenant()` function when the current tenant is not `public`.
+	 */
+	readonly table: TTable;
+
 	/**
 	 * The name of the table wrapped by the model.
 	 */
@@ -189,6 +195,24 @@ export const Model = <TColumnsMap extends Record<string, PgColumnBuilderBase>>(
 		 */
 		public static readonly $inferUpdate: Partial<typeof table.$inferInsert> = table.$inferInsert;
 
+		/**
+		 * The drizzle's table schema wrapped by this model.
+		 */
+		public static get table(): ReturnType<typeof pgTable<string, TColumnsMap>> {
+			// If we are not inside an Application context, we can't use the tenancy system
+			if (!Application.instance || !Application.context.getStore) {
+				return table;
+			}
+
+			if (this.supportTenancy) {
+				const tenant = Tenancy.getCurrentTenant() ?? 'public';
+				// @ts-expect-error typeof this strangely doesn't match the ModelClass type
+				return Tenancy.withTenant(tenant, this);
+			}
+
+			return table;
+		}
+
 		/**
 		 * The name of the table wrapped by the model.
 		 */

package/src/redis.ts

@@ -26,7 +26,7 @@ import { Service } from './service';
  * Properties used to create a new redis connection.
  * @author Axel Nana <axel.nana@workbud.com>
  */
-export type RedisConnectionProps = Bun.RedisOptions;
+export type RedisConnectionProps = Bun.RedisOptions & { url: string };
 
 /**
  * Keyv adapter for redis. This adapter is based on the Bun's Redis client.
@@ -361,7 +361,7 @@ export namespace Redis {
 	 * @param config The configuration for the redis connection.
 	 * @returns The newly created and registered redis connection.
 	 */
-	export const registerConnection = (name: string, config: Bun.RedisOptions) => {
+	export const registerConnection = (name: string, config: RedisConnectionProps) => {
 		if (Service.exists(getConnectionName(name))) {
 			// TODO: Use logger service here
 			console.error(`A connection with the name ${name} has already been registered.`);

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(): ReturnType<typeof pgTable<string, TColumnsMap>> {
-			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();
 		}
 	}