@elysiumjs/mnemosyne-drizzle 0.1.4 → 0.3.1

package/dist/model.d.ts

@@ -1,5 +1,5 @@
 import type { ModelAdapter } from '@elysiumjs/mnemosyne';
-import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import type { PgTable, PgTableWithColumns } from 'drizzle-orm/pg-core';
 /**
  * Drizzle-specific model adapter.
  *
@@ -21,7 +21,7 @@ export declare const drizzleAdapter: ModelAdapter<PgTableWithColumns<any>>;
  * @returns An Elysia validation schema.
  */
 export declare const createSchemaFromDrizzle: (table: PgTableWithColumns<any>, opts?: {
-    mode?: "create" | "update" | "select";
+    mode?: 'create' | 'update' | 'select';
 }) => import("@sinclair/typebox").TObject<{}>;
 /**
  * Options for creating a DrizzleModel.
@@ -41,21 +41,21 @@ export interface DrizzleModelOptions {
  * @param options Model configuration options.
  * @returns A model class with Drizzle-backed static metadata.
  */
-export declare const DrizzleModel: <TTable extends PgTableWithColumns<any>>(table: TTable, options?: DrizzleModelOptions) => {
+export declare const DrizzleModel: <TTable extends PgTable>(table: TTable, options?: DrizzleModelOptions) => {
     new (): {};
     readonly $inferSelect: unknown;
     readonly $inferInsert: unknown;
     readonly $inferUpdate: unknown;
-    readonly table: PgTableWithColumns<any>;
+    readonly table: any;
     readonly tableName: string;
-    readonly columns: Record<string, import("drizzle-orm/pg-core").PgColumnBuilderBase<import("drizzle-orm").ColumnBuilderBaseConfig<import("drizzle-orm").ColumnDataType, string>, object>>;
+    readonly columns: Record<string, import("drizzle-orm/pg-core").AnyPgColumnBuilder>;
     readonly insertSchema: import("@sinclair/typebox").TObject<{}>;
     readonly updateSchema: import("@sinclair/typebox").TObject<{}>;
     readonly selectSchema: import("@sinclair/typebox").TObject<{}>;
     readonly supportTenancy: boolean;
 } & {
-    readonly $inferSelect: TTable["$inferSelect"];
-    readonly $inferInsert: TTable["$inferInsert"];
-    readonly $inferUpdate: Partial<TTable["$inferInsert"]>;
+    readonly $inferSelect: { [Key in keyof TTable["_"]["columns"] & string]: TTable["_"]["columns"][Key]["_"]["notNull"] extends true ? TTable["_"]["columns"][Key]["_"]["data"] : TTable["_"]["columns"][Key]["_"]["data"] | null; } extends infer T ? { [K in keyof T]: T[K]; } : never;
+    readonly $inferInsert: { [Key in keyof TTable["_"]["columns"] & string as import("drizzle-orm").RequiredKeyOnly<Key, TTable["_"]["columns"][Key]>]: TTable["_"]["columns"][Key]["_"]["notNull"] extends true ? TTable["_"]["columns"][Key]["_"]["data"] : TTable["_"]["columns"][Key]["_"]["data"] | null; } & { [Key in keyof TTable["_"]["columns"] & string as import("drizzle-orm").OptionalKeyOnly<Key, TTable["_"]["columns"][Key], false>]?: (TTable["_"]["columns"][Key]["_"]["notNull"] extends true ? TTable["_"]["columns"][Key]["_"]["data"] : TTable["_"]["columns"][Key]["_"]["data"] | null) | undefined; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never;
+    readonly $inferUpdate: Partial<{ [Key in keyof TTable["_"]["columns"] & string as import("drizzle-orm").RequiredKeyOnly<Key, TTable["_"]["columns"][Key]>]: TTable["_"]["columns"][Key]["_"]["notNull"] extends true ? TTable["_"]["columns"][Key]["_"]["data"] : TTable["_"]["columns"][Key]["_"]["data"] | null; } & { [Key in keyof TTable["_"]["columns"] & string as import("drizzle-orm").OptionalKeyOnly<Key, TTable["_"]["columns"][Key], false>]?: (TTable["_"]["columns"][Key]["_"]["notNull"] extends true ? TTable["_"]["columns"][Key]["_"]["data"] : TTable["_"]["columns"][Key]["_"]["data"] | null) | undefined; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
     readonly table: TTable;
 };

package/dist/model.js

@@ -0,0 +1 @@
+import{AbstractModel,createSchemaFromModel}from"@elysiumjs/mnemosyne";import{getTableConfig}from"drizzle-orm/pg-core";import{getTableBuilders}from"./table";import{wrapTenantSchema}from"./tenancy";const mapDrizzleDataType=(col)=>{if(col.columnType==="PgUUID")return"uuid";if(col.dimensions)return"array";const[kind,constraint]=col.dataType.split(" ");switch(kind){case"number":return"number";case"boolean":return"boolean";case"array":return"array";case"bigint":return"bigint";case"object":switch(constraint){case"json":return"json";case"date":return"date";case"buffer":return"buffer";default:return"string"}default:return"string"}};export const drizzleAdapter={getTableName(table){return getTableConfig(table).name},getColumns(table){const config=getTableConfig(table);return config.columns.map((col)=>({name:col.name,dataType:mapDrizzleDataType(col),nullable:!col.notNull,hasDefault:col.hasDefault,isPrimaryKey:col.primary||config.primaryKeys.some((pk)=>pk.columns.some((c)=>c.name===col.name))}))},createTenantTable(table,tenant){const builders=getTableBuilders(table);if(!builders){throw new Error(`No column builders registered for table. `+`Use pgTable() from '@elysiumjs/mnemosyne-drizzle' for tenant support.`)}const config=getTableConfig(table);return wrapTenantSchema(tenant,config.name,builders)}};export const createSchemaFromDrizzle=(table,opts)=>{return createSchemaFromModel(drizzleAdapter.getColumns(table),opts)};export const DrizzleModel=(table,options)=>{const config=getTableConfig(table);const builders=getTableBuilders(table);const Base=AbstractModel(config.name,builders??{},drizzleAdapter,table);if(options?.supportTenancy!==undefined){Base.supportTenancy=options.supportTenancy}return Base};

package/dist/repository.d.ts

@@ -1,19 +1,34 @@
 import type { IdType, ModelClass } from '@elysiumjs/mnemosyne';
-import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import type { PgColumn, PgTable } from 'drizzle-orm/pg-core';
 import type { DrizzleConnection } from './database';
 /**
  * Drizzle-specific repository mixin with concrete CRUD operations.
  *
  * Extends the abstract repository with Drizzle query builder calls
- * for all standard CRUD methods.
+ * for all standard CRUD methods. The model table must have an `id` column, used as the
+ * primary key by `find`, `update`, `delete` and `exists`.
  *
  * @author Axel Nana <axel.nana@workbud.com>
  * @template TModel The model class type.
  * @param model The model class to create the repository for.
  * @returns A concrete repository class with CRUD methods.
  */
-export declare const DrizzleRepository: <TModel extends ModelClass<any, any, any, PgTableWithColumns<any>>>(model: TModel) => {
+export declare const DrizzleRepository: <TModel extends ModelClass<any, any, any, PgTable & {
+    id: PgColumn;
+}>>(model: TModel) => {
     new (): {
+        /**
+         * Runs a database operation on the repository connection.
+         *
+         * In RLS tenancy mode, an operation that runs outside a transaction is wrapped in one
+         * scoped to the current tenant (through the tenancy strategy's `withIsolation`), so RLS
+         * policies apply to it. Inside an open transaction, the operation joins it when the
+         * transaction is bound to the current tenant, and throws `TenantMismatchError` otherwise
+         * (see `DrizzleRLSTenancy.withIsolation`).
+         * @param operation The operation to run with the connection to use.
+         * @returns The return value of the operation.
+         */
+        withConnection<T>(operation: (db: DrizzleConnection) => Promise<T>): Promise<T>;
         all(): Promise<TModel["$inferSelect"][]>;
         paginate(count: number, page?: number): Promise<{
             page: number;
@@ -23,9 +38,9 @@ export declare const DrizzleRepository: <TModel extends ModelClass<any, any, any
         find(id: IdType): Promise<TModel["$inferSelect"] | null>;
         findBy<TKey extends keyof TModel["$inferSelect"]>(column: TKey, value: TModel["$inferSelect"][TKey]): Promise<TModel["$inferSelect"] | null>;
         insert(data: TModel["$inferInsert"]): Promise<TModel["$inferSelect"]>;
-        update(id: IdType, data: TModel["$inferUpdate"]): Promise<TModel["$inferSelect"]>;
+        update(id: IdType, data: TModel["$inferUpdate"]): Promise<TModel["$inferSelect"] | null>;
         updateAll(data: TModel["$inferUpdate"]): Promise<TModel["$inferSelect"][]>;
-        delete(id: IdType): Promise<TModel["$inferSelect"]>;
+        delete(id: IdType): Promise<TModel["$inferSelect"] | null>;
         deleteAll(): Promise<TModel["$inferSelect"][]>;
         exists(id: IdType): Promise<boolean>;
         readonly db: DrizzleConnection;

package/dist/repository.js

@@ -0,0 +1 @@
+import{AbstractRepository,getCurrentTenant,getTenancyConfig,getTenancyStrategy}from"@elysiumjs/mnemosyne";import{eq}from"drizzle-orm";import{Database}from"./database";import{DrizzleRLSTenancy}from"./tenancy";export const DrizzleRepository=(model)=>{const table=()=>model.table;class R extends AbstractRepository(model,Database){async withConnection(operation){const name=this.constructor.connection;if(getTenancyConfig().mode!=="rls")return operation(this.db);const strategy=getTenancyStrategy()??new DrizzleRLSTenancy;return strategy.withIsolation(Database.getBaseConnection(name),getCurrentTenant()??"public",()=>operation(this.db))}async all(){return this.withConnection((db)=>db.select().from(table()))}async paginate(count,page=1){const offset=Math.max(page-1,0)*count;return this.withConnection(async(db)=>({page,total:await db.$count(table()),data:await db.select().from(table()).offset(offset).limit(count)}))}async find(id){const[row]=await this.withConnection((db)=>db.select().from(table()).where(eq(table().id,id)));return row??null}async findBy(column,value){const[row]=await this.withConnection((db)=>db.select().from(table()).where(eq(table()[column],value)));return row??null}async insert(data){const[row]=await this.withConnection((db)=>db.insert(table()).values(data).returning());return row}async update(id,data){const[row]=await this.withConnection((db)=>db.update(table()).set(data).where(eq(table().id,id)).returning());return row??null}async updateAll(data){return this.withConnection((db)=>db.update(table()).set(data).returning())}async delete(id){const[row]=await this.withConnection((db)=>db.delete(table()).where(eq(table().id,id)).returning());return row??null}async deleteAll(){return this.withConnection((db)=>db.delete(table()).returning())}async exists(id){const count=await this.withConnection((db)=>db.$count(table(),eq(table().id,id)));return count>0}}return R};

package/dist/table.d.ts

@@ -1,10 +1,10 @@
-import type { PgColumnBuilderBase, PgTableWithColumns } from 'drizzle-orm/pg-core';
+import type { AnyPgColumnBuilder, PgTableWithColumns } from 'drizzle-orm/pg-core';
 /**
  * Retrieves the original column builders for a table.
  * @param table The table created with enhanced pgTable.
  * @returns The original column builder definitions, or `undefined`.
  */
-export declare const getTableBuilders: (table: PgTableWithColumns<any>) => Record<string, PgColumnBuilderBase> | undefined;
+export declare const getTableBuilders: (table: PgTableWithColumns<any>) => Record<string, AnyPgColumnBuilder> | undefined;
 /**
  * Creates a PostgreSQL table with automatic column builder registration.
  *
@@ -17,129 +17,53 @@ export declare const getTableBuilders: (table: PgTableWithColumns<any>) => Recor
  * @param extraConfig Optional extra Drizzle table configuration.
  * @returns A Drizzle PostgreSQL table with registered column builders.
  */
-export declare const pgTable: <TTableName extends string, TColumns extends Record<string, PgColumnBuilderBase>>(tableName: TTableName, columns: TColumns, extraConfig?: (table: any) => any) => PgTableWithColumns<{
+export declare const pgTable: <TTableName extends string, TColumns extends Record<string, AnyPgColumnBuilder>>(tableName: TTableName, columns: TColumns, extraConfig?: (table: any) => any) => PgTableWithColumns<{
     name: TTableName;
     schema: undefined;
-    columns: { [Key in keyof TColumns]: import("drizzle-orm/pg-core").PgColumn<{
-        name: (Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        })["name"];
+    columns: { [Key in keyof TColumns]: import("drizzle-orm/pg-core").PgBuildColumn<TTableName, TColumns[Key], {
+        name: string;
         tableName: TTableName;
-        dataType: (Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        })["dataType"];
-        columnType: (Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        })["columnType"];
-        data: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T ? T extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T extends {
+        dataType: TColumns[Key]["_"]["dataType"];
+        data: TColumns[Key]["_"]["dimensions"] extends 1 | 2 | 3 | 4 | 5 ? TColumns[Key]["_"]["dimensions"] extends infer T ? T extends TColumns[Key]["_"]["dimensions"] ? T extends 1 ? (TColumns[Key]["_"] extends infer T_1 ? T_1 extends TColumns[Key]["_"] ? T_1 extends {
             $type: infer U;
-        } ? U : T["data"] : never : never;
-        driverParam: (Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        })["driverParam"];
-        notNull: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_1 ? T_1 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_1 extends {
-            notNull: true;
-        } ? true : false : never : never;
-        hasDefault: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_2 ? T_2 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_2 extends {
-            hasDefault: true;
-        } ? true : false : never : never;
-        isPrimaryKey: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_3 ? T_3 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_3 extends {
-            isPrimaryKey: true;
-        } ? true : false : never : never;
-        isAutoincrement: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_4 ? T_4 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_4 extends {
-            isAutoincrement: true;
-        } ? true : false : never : never;
-        hasRuntimeDefault: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_5 ? T_5 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_5 extends {
-            hasRuntimeDefault: true;
-        } ? true : false : never : never;
-        enumValues: (Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        })["enumValues"];
-        baseColumn: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_6 ? T_6 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_6 extends {
-            baseBuilder: infer U_1 extends import("drizzle-orm").ColumnBuilderBase;
-        } ? import("drizzle-orm").Column<{
-            name: U_1["_"]["name"];
-            tableName: TTableName;
-            dataType: U_1["_"]["dataType"];
-            columnType: U_1["_"]["columnType"];
-            data: U_1["_"] extends infer T_7 ? T_7 extends U_1["_"] ? T_7 extends {
-                $type: infer U;
-            } ? U : T_7["data"] : never : never;
-            driverParam: U_1["_"]["driverParam"];
-            notNull: U_1["_"] extends infer T_8 ? T_8 extends U_1["_"] ? T_8 extends {
-                notNull: true;
-            } ? true : false : never : never;
-            hasDefault: U_1["_"] extends infer T_9 ? T_9 extends U_1["_"] ? T_9 extends {
-                hasDefault: true;
-            } ? true : false : never : never;
-            isPrimaryKey: U_1["_"] extends infer T_10 ? T_10 extends U_1["_"] ? T_10 extends {
-                isPrimaryKey: true;
-            } ? true : false : never : never;
-            isAutoincrement: U_1["_"] extends infer T_11 ? T_11 extends U_1["_"] ? T_11 extends {
-                isAutoincrement: true;
-            } ? true : false : never : never;
-            hasRuntimeDefault: U_1["_"] extends infer T_12 ? T_12 extends U_1["_"] ? T_12 extends {
-                hasRuntimeDefault: true;
-            } ? true : false : never : never;
-            enumValues: U_1["_"]["enumValues"];
-            baseColumn: U_1["_"] extends infer T_13 ? T_13 extends U_1["_"] ? T_13 extends {
-                baseBuilder: infer U_1 extends import("drizzle-orm").ColumnBuilderBase;
-            } ? import("drizzle-orm").Column</*elided*/ any, {}, Omit<U_1["_"], "name" | "data" | "driverParam" | "tableName" | "notNull" | "hasDefault" | "isPrimaryKey" | "isAutoincrement" | "hasRuntimeDefault" | "dataType" | "columnType" | "enumValues" | "identity" | "dialect" | "baseColumn" | "generated" | "brand"> extends infer T_14 ? { [K in keyof T_14]: T_14[K]; } : never> : never : never : never;
-            identity: U_1["_"] extends infer T_15 ? T_15 extends U_1["_"] ? T_15 extends {
-                identity: "always";
-            } ? "always" : T_15 extends {
-                identity: "byDefault";
-            } ? "byDefault" : undefined : never : never;
-            generated: U_1["_"] extends infer T_16 ? T_16 extends U_1["_"] ? T_16 extends {
-                generated: infer G;
-            } ? unknown extends G ? undefined : G extends undefined ? undefined : G : undefined : never : never;
-        }, {}, Omit<U_1["_"], "name" | "data" | "driverParam" | "tableName" | "notNull" | "hasDefault" | "isPrimaryKey" | "isAutoincrement" | "hasRuntimeDefault" | "dataType" | "columnType" | "enumValues" | "identity" | "dialect" | "baseColumn" | "generated" | "brand"> extends infer T_17 ? { [K in keyof T_17]: T_17[K]; } : never> : never : never : never;
-        identity: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_18 ? T_18 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_18 extends {
-            identity: "always";
-        } ? "always" : T_18 extends {
-            identity: "byDefault";
-        } ? "byDefault" : undefined : never : never;
-        generated: Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } extends infer T_19 ? T_19 extends Omit<TColumns[Key]["_"], "name"> & {
-            name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-        } ? T_19 extends {
-            generated: infer G;
-        } ? unknown extends G ? undefined : G extends undefined ? undefined : G : undefined : never : never;
-    }, {}, Omit<Omit<TColumns[Key]["_"], "name"> & {
-        name: TColumns[Key]["_"]["name"] extends "" ? import("drizzle-orm").Assume<Key, string> : TColumns[Key]["_"]["name"];
-    }, "name" | "data" | "driverParam" | "tableName" | "notNull" | "hasDefault" | "isPrimaryKey" | "isAutoincrement" | "hasRuntimeDefault" | "dataType" | "columnType" | "enumValues" | "identity" | "dialect" | "baseColumn" | "generated" | "brand"> extends infer T_20 ? { [K_1 in keyof T_20]: T_20[K_1]; } : never>; };
-    dialect: "pg";
+        } ? U : T_1 extends {
+            data: infer D;
+        } ? D : unknown : never : never)[] : T extends 2 ? (TColumns[Key]["_"] extends infer T_1 ? T_1 extends TColumns[Key]["_"] ? T_1 extends {
+            $type: infer U;
+        } ? U : T_1 extends {
+            data: infer D;
+        } ? D : unknown : never : never)[][] : T extends 3 ? (TColumns[Key]["_"] extends infer T_1 ? T_1 extends TColumns[Key]["_"] ? T_1 extends {
+            $type: infer U;
+        } ? U : T_1 extends {
+            data: infer D;
+        } ? D : unknown : never : never)[][][] : T extends 4 ? (TColumns[Key]["_"] extends infer T_1 ? T_1 extends TColumns[Key]["_"] ? T_1 extends {
+            $type: infer U;
+        } ? U : T_1 extends {
+            data: infer D;
+        } ? D : unknown : never : never)[][][][] : T extends 5 ? (TColumns[Key]["_"] extends infer T_1 ? T_1 extends TColumns[Key]["_"] ? T_1 extends {
+            $type: infer U;
+        } ? U : T_1 extends {
+            data: infer D;
+        } ? D : unknown : never : never)[][][][][] : TColumns[Key]["_"] extends infer T_1 ? T_1 extends TColumns[Key]["_"] ? T_1 extends {
+            $type: infer U;
+        } ? U : T_1 extends {
+            data: infer D;
+        } ? D : unknown : never : never : never : never : TColumns[Key]["_"] extends infer T_1 ? T_1 extends TColumns[Key]["_"] ? T_1 extends {
+            $type: infer U;
+        } ? U : T_1 extends {
+            data: infer D;
+        } ? D : unknown : never : never;
+        driverParam: TColumns[Key]["_"]["dimensions"] extends 1 | 2 | 3 | 4 | 5 ? string | (TColumns[Key]["_"]["dimensions"] extends infer T_2 ? T_2 extends TColumns[Key]["_"]["dimensions"] ? T_2 extends 1 ? TColumns[Key]["_"]["driverParam"][] : T_2 extends 2 ? TColumns[Key]["_"]["driverParam"][][] : T_2 extends 3 ? TColumns[Key]["_"]["driverParam"][][][] : T_2 extends 4 ? TColumns[Key]["_"]["driverParam"][][][][] : T_2 extends 5 ? TColumns[Key]["_"]["driverParam"][][][][][] : TColumns[Key]["_"]["driverParam"] : never : never) : TColumns[Key]["_"]["driverParam"];
+        notNull: TColumns[Key]["_"]["notNull"] extends true ? true : false;
+        hasDefault: TColumns[Key]["_"]["hasDefault"] extends true ? true : false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: TColumns[Key]["_"] extends infer T_3 ? T_3 extends TColumns[Key]["_"] ? T_3 extends {
+            enumValues: infer E extends string[];
+        } ? E : undefined : never : never;
+        identity: TColumns[Key]["_"]["identity"] extends "always" | "byDefault" ? TColumns[Key]["_"]["identity"] : undefined;
+        generated: TColumns[Key]["_"]["generated"] extends true ? true : undefined;
+    }>; };
+    dialect: 'pg';
 }>;

package/dist/table.js

@@ -0,0 +1 @@
+import{pgTable as drizzlePgTable}from"drizzle-orm/pg-core";const tableRegistry=new WeakMap;export const getTableBuilders=(table)=>{return tableRegistry.get(table)};export const pgTable=(tableName,columns,extraConfig)=>{const table=drizzlePgTable(tableName,columns,extraConfig);tableRegistry.set(table,columns);return table};

package/dist/tenancy.d.ts

@@ -1,11 +1,12 @@
 import type { TenancyStrategy } from '@elysiumjs/mnemosyne';
-import type { PgColumnBuilderBase, PgSchema, PgTable, PgTransaction } from 'drizzle-orm/pg-core';
+import type { AnyPgColumnBuilder, PgAsyncTransaction, PgSchema, PgTable } from 'drizzle-orm/pg-core';
 import type { DrizzleConnection } from './database';
 /**
  * Returns the Drizzle `PgSchema` for the given tenant, creating it if needed.
  * @author Axel Nana <axel.nana@workbud.com>
  * @param tenant The tenant identifier.
  * @returns The tenant's PostgreSQL schema.
+ * @throws {Error} If the tenant identifier is malformed.
  */
 export declare const getTenantSchema: (tenant: string) => PgSchema;
 /**
@@ -13,6 +14,7 @@ export declare const getTenantSchema: (tenant: string) => PgSchema;
  * @author Axel Nana <axel.nana@workbud.com>
  * @param tenant The tenant identifier.
  * @returns The newly registered (or existing) `PgSchema`.
+ * @throws {Error} If the tenant identifier is malformed.
  */
 export declare const registerTenantSchema: (tenant: string) => PgSchema;
 /**
@@ -26,26 +28,27 @@ export declare const registerTenantSchema: (tenant: string) => PgSchema;
  * @param tableName The table name.
  * @param columns The column definitions.
  * @returns A tenant-scoped `PgTable`.
+ * @throws {Error} If the tenant identifier is malformed.
  */
-export declare const wrapTenantSchema: <TTableName extends string, TColumnsMap extends Record<string, PgColumnBuilderBase>>(tenant: string, tableName: TTableName, columns: TColumnsMap) => PgTable;
+export declare const wrapTenantSchema: <TTableName extends string, TColumnsMap extends Record<string, AnyPgColumnBuilder>>(tenant: string, tableName: TTableName, columns: TColumnsMap) => PgTable;
 /**
  * Executes a callback within an RLS-scoped transaction for the given tenant.
+ *
+ * The transaction is registered in the async context, so repositories and
+ * `Database.getConnection()` use it inside the callback. When a transaction is already open on the
+ * connection, the callback joins it if it is bound to the same tenant. Work for several tenants
+ * (such as an admin fan-out) must use one `withRLS()` per tenant, outside any transaction.
  * @author Axel Nana <axel.nana@workbud.com>
  * @param tenant The tenant identifier (or `null` for 'public').
  * @param callback The function to execute within the transaction.
  * @param connectionName The database connection name.
  * @returns The return value of the callback.
+ * @throws {TenantMismatchError} If the open transaction is bound to another tenant.
  */
-export declare const withRLS: <T>(tenant: string | null, callback: (tx: PgTransaction<any, any, any>) => Promise<T>, connectionName?: string) => Promise<T>;
-/**
- * Sets the current tenant on a persistent database connection (session-level).
- * @author Axel Nana <axel.nana@workbud.com>
- * @param tenant The tenant identifier (or `null` for 'public').
- * @param connectionName The database connection name.
- */
-export declare const setConnectionTenant: (tenant: string | null, connectionName?: string) => Promise<void>;
+export declare const withRLS: <T>(tenant: string | null, callback: (tx: PgAsyncTransaction<any, any>) => Promise<T>, connectionName?: string) => Promise<T>;
 /**
- * Reads the current tenant from the PostgreSQL session variable.
+ * Reads the current tenant from the PostgreSQL tenant variable, on the open transaction when
+ * there is one.
  * @author Axel Nana <axel.nana@workbud.com>
  * @param connectionName The database connection name.
  * @returns The current tenant identifier, or `null`.
@@ -84,5 +87,19 @@ export declare class DrizzleSchemaTenancy implements TenancyStrategy<PgTable, Dr
 export declare class DrizzleRLSTenancy implements TenancyStrategy<PgTable, DrizzleConnection> {
     readonly mode = "rls";
     resolveTable(table: PgTable, _tenant: string): PgTable;
+    /**
+     * Runs a callback in a transaction scoped to the given tenant.
+     *
+     * The transaction is bound to the tenant for its whole life, registered in the async context
+     * for the connection, and the tenant set as the current tenant, for the duration of the
+     * callback. When a transaction is already open on the connection, the callback joins it, which
+     * is only allowed when that transaction is bound to the same tenant.
+     * @author Axel Nana <axel.nana@workbud.com>
+     * @param connection The base connection (see `Database.getBaseConnection`).
+     * @param tenant The tenant identifier.
+     * @param callback The function to execute within the isolated context.
+     * @returns The return value of the callback.
+     * @throws {TenantMismatchError} If the open transaction is bound to another tenant.
+     */
     withIsolation<T>(connection: DrizzleConnection, tenant: string, callback: () => Promise<T>): Promise<T>;
 }

package/dist/tenancy.js

@@ -0,0 +1 @@
+import{getTenancyConfig,isValidTenantId,withTenant}from"@elysiumjs/mnemosyne";import{sql}from"drizzle-orm";import{getTableConfig,pgPolicy,pgSchema,pgTable}from"drizzle-orm/pg-core";import{assertTransactionTenant,bindTransactionTenant,Database}from"./database";import{getTableBuilders}from"./table";const tenantSchemas=new Map;const schemaRegistry=new Map;const assertTenantId=(tenant)=>{if(!isValidTenantId(tenant)){throw new Error(`Invalid tenant identifier: ${JSON.stringify(tenant.slice(0,64))}`)}};export const getTenantSchema=(tenant)=>{assertTenantId(tenant);return schemaRegistry.get(tenant)??registerTenantSchema(tenant)};export const registerTenantSchema=(tenant)=>{assertTenantId(tenant);if(schemaRegistry.has(tenant)){return schemaRegistry.get(tenant)}const tenantSchema=pgSchema(tenant);schemaRegistry.set(tenant,tenantSchema);return tenantSchema};export const wrapTenantSchema=(tenant,tableName,columns)=>{assertTenantId(tenant);if(tenant==="public"){return pgTable(tableName,columns)}const fullTableName=`${tenant}.${tableName}`;if(tenantSchemas.has(fullTableName)){return tenantSchemas.get(fullTableName)}const tenantSchema=getTenantSchema(tenant);const schemaTable=tenantSchema.table(tableName,columns);tenantSchemas.set(fullTableName,schemaTable);return schemaTable};export const withRLS=async(tenant,callback,connectionName="default")=>{return new DrizzleRLSTenancy().withIsolation(Database.getBaseConnection(connectionName),tenant??"public",()=>callback(Database.getConnection(connectionName)))};export const getSessionTenant=async(connectionName="default")=>{const db=Database.getConnection(connectionName);const config=getTenancyConfig();const varName=config.rls?.sessionVariable??"app.current_tenant";const[row]=await db.execute(sql`SELECT current_setting(${varName}, true) as tenant`);return row?.tenant||null};export const createRLSPolicy=(tableName,columnName,policyName)=>{const config=getTenancyConfig();const varName=config.rls?.sessionVariable??"app.current_tenant";const column=columnName??config.rls?.defaultColumn??"tenant_id";const name=policyName??`${tableName}_tenant_isolation`;return pgPolicy(name,{for:"all",to:"public",using:sql`${sql.identifier(column)} = current_setting(${varName}, true)::text`,withCheck:sql`${sql.identifier(column)} = current_setting(${varName}, true)::text`})};export class DrizzleSchemaTenancy{mode="schema";resolveTable(table,tenant){const builders=getTableBuilders(table);if(!builders){throw new Error(`No column builders registered for table. `+`Use pgTable() from '@elysiumjs/mnemosyne-drizzle' for tenant support.`)}const config=getTableConfig(table);return wrapTenantSchema(tenant,config.name,builders)}async withIsolation(_connection,_tenant,callback){return callback()}}export class DrizzleRLSTenancy{mode="rls";resolveTable(table,_tenant){return table}async withIsolation(connection,tenant,callback){const active=Database.getActiveTransaction(connection);if(active!==undefined){assertTransactionTenant(active,tenant);return withTenant(tenant,callback)}return connection.transaction(async(tx)=>{await bindTransactionTenant(tx,tenant);return withTenant(tenant,()=>Database.runInTransaction(connection,tx,callback))})}}

package/package.json

@@ -1,23 +1,28 @@
 {
 	"name": "@elysiumjs/mnemosyne-drizzle",
-	"version": "0.1.4",
+	"version": "0.3.1",
 	"license": "Apache-2.0",
 	"description": "Drizzle ORM driver for @elysiumjs/mnemosyne",
 	"private": false,
 	"author": "Workbud Technologies Inc.",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/workbud/elysium"
+		"url": "git+https://github.com/na2axl/elysiumjs.git",
+		"directory": "@elysiumjs/mnemosyne-drizzle"
+	},
+	"homepage": "https://github.com/na2axl/elysiumjs/tree/main/@elysiumjs/mnemosyne-drizzle#readme",
+	"bugs": {
+		"url": "https://github.com/na2axl/elysiumjs/issues"
 	},
-	"homepage": "https://github.com/workbud/elysium",
 	"scripts": {
 		"format": "prettier --write \"./src/**/*.ts\"",
 		"clean": "rimraf dist",
-		"build:js": "bun build ./src/index.ts --outdir ./dist --target bun --packages external --root ./src --minify",
-		"build:ts": "tsc",
-		"build": "bun run clean && bun run build:js && bun run build:ts",
-		"typecheck": "tsc --noEmit",
-		"prepublishOnly": "bun run build"
+		"build": "bun run clean && tsc && bun run build:minify",
+		"build:minify": "bun scripts/minify.ts",
+		"typecheck": "tsc --noEmit && tsc -p tsconfig.types.json",
+		"prepublishOnly": "bun run build",
+		"test": "bun test",
+		"test:coverage": "bun test --coverage"
 	},
 	"keywords": [
 		"elysium",
@@ -29,16 +34,23 @@
 	"module": "dist/index.js",
 	"type": "module",
 	"types": "dist/index.d.ts",
+	"files": [
+		"dist",
+		"CHANGELOG.md"
+	],
 	"sideEffects": false,
 	"peerDependencies": {
-		"@elysiumjs/core": "^0.7.0",
-		"@elysiumjs/mnemosyne": "^0.1.1"
+		"@elysiumjs/core": "^0.10.0",
+		"@elysiumjs/mnemosyne": "^0.3.1"
 	},
 	"dependencies": {
-		"drizzle-orm": "^0.45.1"
+		"drizzle-orm": "^1.0.0-rc.5",
+		"prompts": "^2.4.2",
+		"radash": "^12.1.1"
 	},
 	"devDependencies": {
-		"@elysiumjs/core": "0.7.0",
-		"@elysiumjs/mnemosyne": "0.1.1"
+		"@types/prompts": "^2.4.9",
+		"@elysiumjs/core": "0.10.0",
+		"@elysiumjs/mnemosyne": "0.3.1"
 	}
 }

package/.turbo/turbo-build.log

@@ -1,9 +0,0 @@
-
-$ bun run clean && bun run build:js && bun run build:ts
-$ rimraf dist
-$ bun build ./src/index.ts --outdir ./dist --target bun --packages external --root ./src --minify
-Bundled 4 modules in 2ms
-
-  index.js  3.27 KB  (entry point)
-
-$ tsc

package/.turbo/turbo-typecheck.log

@@ -1 +0,0 @@
-$ tsc --noEmit

package/coverage/.lcov.info.01ffde0d9f956dce.tmp

@@ -1,14 +0,0 @@
-TN:
-SF:tests/setup.ts
-FNF:1
-FNH:0
-DA:1,25
-DA:3,32
-DA:5,0
-DA:6,0
-DA:7,0
-DA:8,0
-DA:10,2
-LF:7
-LH:3
-end_of_record