@usebetterdev/tenant-drizzle 0.2.0-beta.9 → 0.3.0-beta.3

package/README.md

@@ -13,34 +13,38 @@ pnpm add @usebetterdev/tenant drizzle-orm pg
 ```ts
 import { drizzle } from "drizzle-orm/node-postgres";
 import { betterTenant } from "@usebetterdev/tenant";
-import {
-  drizzleAdapter,
-  createGetTenantRepository,
-  tenantsTable,
-} from "@usebetterdev/tenant/drizzle";
+import { drizzleDatabase } from "@usebetterdev/tenant/drizzle";
 
 const pool = new Pool({ connectionString: process.env.DATABASE_URL });
 const db = drizzle(pool);
 
-const adapter = drizzleAdapter(db);
 const tenant = betterTenant({
-  adapter,
+  database: drizzleDatabase(db),
   tenantResolver: { header: "x-tenant-id" },
-  getTenantRepository: createGetTenantRepository(tenantsTable),
 });
 
 // tenant.api.createTenant, updateTenant, listTenants, deleteTenant now work (via runAsSystem).
-// In middleware: resolve tenantId, then runWithTenantAndDatabase(tenantId, adapter, next).
 // In handlers: tenant.getDatabase() returns the transaction handle; tenant.getContext().tenant is the loaded Tenant (set loadTenant: false to skip loading).
 ```
 
-Table shape for tenants must match the CLI-generated schema: `id` (UUID), `name`, `slug`, `created_at`. Use the exported `tenantsTable` or pass your own table with the same column contract to `createGetTenantRepository`.
+`drizzleDatabase(db)` bundles the adapter and tenant repository into a single `DatabaseProvider`. If you use a custom tenants table, pass it via the `table` option:
+
+```ts
+import { drizzleDatabase } from "@usebetterdev/tenant/drizzle";
+
+const tenant = betterTenant({
+  database: drizzleDatabase(db, { table: myCustomTenantsTable }),
+  tenantResolver: { header: "x-tenant-id" },
+});
+```
+
+Table shape for tenants must match the CLI-generated schema: `id` (UUID), `name`, `slug`, `created_at`. Use the exported `tenantsTable` or pass your own table with the same column contract.
 
 ## Behaviour
 
 - **runWithTenant(tenantId, fn)** — Starts a transaction, runs `SELECT set_config('app.current_tenant', tenantId, true)`, then calls `fn(tx)`. The `tx` handle is the Drizzle transaction; use only this for tenant-scoped tables so RLS sees the tenant.
 - **runAsSystem(fn)** — Starts a transaction, runs `SELECT set_config('app.bypass_rls', 'true', true)`, then calls `fn(tx)`. Use for admin/cron only (e.g. tenant.api.\*). RLS policies must allow rows when `current_setting('app.bypass_rls', true) = 'true'` (CLI generates this bypass policy).
-- **loadTenant** — When `getTenantRepository` is set, `runWithTenantAndDatabase` loads the full Tenant row by default and sets `getContext().tenant`. Set `loadTenant: false` to opt out (saves one query per request).
+- **loadTenant** — The full Tenant row is loaded by default into `getContext().tenant`. Set `loadTenant: false` to opt out (saves one query per request).
 - The handle passed to `fn` is the same type as your Drizzle db but transaction-scoped (full Drizzle API on `tx`).
 
 ## Testing
@@ -51,4 +55,4 @@ Integration tests in `src/adapter.integration.test.ts` use [@testcontainers/post
 
 ## Peer dependency
 
-Requires `pg` (node-postgres). Install it in your app when using this adapter.
+Requires either `pg` (node-postgres) or `postgres` (postgres.js). Install whichever driver you use.

package/dist/index.cjs

@@ -20,8 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  createGetTenantRepository: () => createGetTenantRepository,
-  drizzleAdapter: () => drizzleAdapter,
+  drizzleDatabase: () => drizzleDatabase,
+  tenantId: () => tenantId,
   tenantsTable: () => tenantsTable
 });
 module.exports = __toCommonJS(index_exports);
@@ -30,10 +30,10 @@ module.exports = __toCommonJS(index_exports);
 var import_drizzle_orm = require("drizzle-orm");
 function drizzleAdapter(database) {
   return {
-    async runWithTenant(tenantId, fn) {
+    async runWithTenant(tenantId2, fn) {
       return database.transaction(async (tx) => {
         await tx.execute(
-          import_drizzle_orm.sql`SELECT set_config('app.current_tenant', ${tenantId}, true)`
+          import_drizzle_orm.sql`SELECT set_config('app.current_tenant', ${tenantId2}, true)`
         );
         return fn(tx);
       });
@@ -49,27 +49,37 @@ function drizzleAdapter(database) {
   };
 }
 
+// src/repository.ts
+var import_drizzle_orm3 = require("drizzle-orm");
+
 // src/schema.ts
+var import_drizzle_orm2 = require("drizzle-orm");
 var import_pg_core = require("drizzle-orm/pg-core");
 var tenantsTable = (0, import_pg_core.pgTable)("tenants", {
   id: (0, import_pg_core.uuid)("id").primaryKey().defaultRandom(),
   name: (0, import_pg_core.text)("name").notNull(),
   slug: (0, import_pg_core.text)("slug").notNull().unique(),
   createdAt: (0, import_pg_core.timestamp)("created_at", { withTimezone: true }).defaultNow().notNull()
-});
+}).enableRLS();
+var tenantId = {
+  tenantId: (0, import_pg_core.uuid)("tenant_id").notNull().references(() => tenantsTable.id).default(import_drizzle_orm2.sql`(current_setting('app.current_tenant', true))::uuid`)
+};
 
 // src/repository.ts
-var import_drizzle_orm2 = require("drizzle-orm");
 function rowToTenant(row) {
+  const createdAt = row.createdAt ?? row.created_at;
+  if (createdAt === void 0 || createdAt === null) {
+    throw new Error("better-tenant: row missing created_at / createdAt");
+  }
   return {
     id: String(row.id),
     name: String(row.name),
     slug: String(row.slug),
-    createdAt: row.createdAt ?? row.created_at,
+    createdAt,
     ...row
   };
 }
-function createGetTenantRepository(table) {
+function createGetTenantRepository(table = tenantsTable) {
   return (database) => {
     const db = database;
     return {
@@ -84,27 +94,35 @@ function createGetTenantRepository(table) {
         }
         return rowToTenant(row);
       },
-      async update(tenantId, data) {
+      async update(tenantId2, data) {
         const set = {};
         if (data.name !== void 0) set.name = data.name;
         if (data.slug !== void 0) set.slug = data.slug;
         if (Object.keys(set).length === 0) {
-          const rows2 = await db.select().from(table).where((0, import_drizzle_orm2.eq)(table.id, tenantId)).limit(1);
+          const rows2 = await db.select().from(table).where((0, import_drizzle_orm3.eq)(table.id, tenantId2)).limit(1);
           const row2 = Array.isArray(rows2) ? rows2[0] : void 0;
           if (!row2 || typeof row2 !== "object") {
             throw new Error("better-tenant: tenant not found");
           }
           return rowToTenant(row2);
         }
-        const rows = await db.update(table).set(set).where((0, import_drizzle_orm2.eq)(table.id, tenantId)).returning();
+        const rows = await db.update(table).set(set).where((0, import_drizzle_orm3.eq)(table.id, tenantId2)).returning();
         const row = rows[0];
         if (!row || typeof row !== "object") {
           throw new Error("better-tenant: tenant not found");
         }
         return rowToTenant(row);
       },
-      async getById(tenantId) {
-        const rows = await db.select().from(table).where((0, import_drizzle_orm2.eq)(table.id, tenantId)).limit(1);
+      async getById(tenantId2) {
+        const rows = await db.select().from(table).where((0, import_drizzle_orm3.eq)(table.id, tenantId2)).limit(1);
+        const row = Array.isArray(rows) ? rows[0] : void 0;
+        if (!row || typeof row !== "object") {
+          return null;
+        }
+        return rowToTenant(row);
+      },
+      async getBySlug(slug) {
+        const rows = await db.select().from(table).where((0, import_drizzle_orm3.eq)(table.slug, slug)).limit(1);
         const row = Array.isArray(rows) ? rows[0] : void 0;
         if (!row || typeof row !== "object") {
           return null;
@@ -112,23 +130,36 @@ function createGetTenantRepository(table) {
         return rowToTenant(row);
       },
       async list(options = {}) {
-        const limit = Math.min(options.limit ?? 50, 50);
+        const limit = options.limit ?? 50;
         const offset = Math.max(0, options.offset ?? 0);
         const rows = await db.select().from(table).limit(limit).offset(offset);
         return (Array.isArray(rows) ? rows : []).map(
           (r) => rowToTenant(r)
         );
       },
-      async delete(tenantId) {
-        await db.delete(table).where((0, import_drizzle_orm2.eq)(table.id, tenantId));
+      async count() {
+        const result = await db.select({ value: (0, import_drizzle_orm3.count)() }).from(table);
+        const row = result[0];
+        return Number(row?.value ?? 0);
+      },
+      async delete(tenantId2) {
+        await db.delete(table).where((0, import_drizzle_orm3.eq)(table.id, tenantId2));
       }
     };
   };
 }
+
+// src/database.ts
+function drizzleDatabase(db, options) {
+  return {
+    adapter: drizzleAdapter(db),
+    getTenantRepository: createGetTenantRepository(options?.table)
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createGetTenantRepository,
-  drizzleAdapter,
+  drizzleDatabase,
+  tenantId,
   tenantsTable
 });
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/adapter.ts","../src/schema.ts","../src/repository.ts"],"sourcesContent":["export { drizzleAdapter } from \"./adapter.js\";\nexport type { DrizzlePgDatabase, DrizzlePgTransaction } from \"./adapter.js\";\nexport { tenantsTable } from \"./schema.js\";\nexport {\n  createGetTenantRepository,\n  type TenantsTableLike,\n} from \"./repository.js\";\n","import { sql } from \"drizzle-orm\";\nimport type { TenantAdapter } from \"@usebetterdev/tenant-core\";\n\n/**\n * Minimal shape for a Drizzle pg transaction: must support execute(sql).\n * The actual Drizzle transaction extends this with insert, select, etc.\n */\nexport interface DrizzlePgTransaction {\n  execute(query: ReturnType<typeof sql> | unknown): Promise<unknown>;\n}\n\n/**\n * Minimal shape for a Drizzle pg database: must support transaction().\n * Generic over TTx so the full transaction type (with insert, select, etc.) is preserved.\n */\nexport interface DrizzlePgDatabase<TTx extends DrizzlePgTransaction = DrizzlePgTransaction> {\n  transaction<T>(\n    callback: (tx: TTx) => Promise<T>,\n  ): Promise<T>;\n}\n\n/**\n * Creates a TenantAdapter for Drizzle (PostgreSQL).\n *\n * Uses a transaction per runWithTenant: BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n * The handle passed to fn is the transaction runner; use only this handle for tenant-scoped queries so RLS applies.\n *\n * runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = true so RLS policies that allow\n * when current_setting('app.bypass_rls', true) = 'true' permit access (CLI generates this bypass policy).\n *\n * @param database - Drizzle pg database (from drizzle(pool) or similar)\n * @returns TenantAdapter implementation\n */\nexport function drizzleAdapter<TTx extends DrizzlePgTransaction>(\n  database: DrizzlePgDatabase<TTx>,\n): TenantAdapter<TTx, TTx> {\n  return {\n    async runWithTenant<T>(\n      tenantId: string,\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.current_tenant', ${tenantId}, true)`,\n        );\n        return fn(tx);\n      });\n    },\n\n    async runAsSystem<T>(\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.bypass_rls', 'true', true)`,\n        );\n        return fn(tx);\n      });\n    },\n  };\n}\n","import { pgTable, text, timestamp, uuid } from \"drizzle-orm/pg-core\";\n\n/**\n * Standard tenants table schema matching the CLI-generated shape.\n * Columns: id (UUID), name, slug, created_at.\n * Use this table or provide your own with the same column contract for createGetTenantRepository.\n */\nexport const tenantsTable = pgTable(\"tenants\", {\n  id: uuid(\"id\").primaryKey().defaultRandom(),\n  name: text(\"name\").notNull(),\n  slug: text(\"slug\").notNull().unique(),\n  createdAt: timestamp(\"created_at\", { withTimezone: true }).defaultNow().notNull(),\n});\n","import { eq } from \"drizzle-orm\";\nimport type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport type { tenantsTable } from \"./schema.js\";\n\n/** Table shape expected by createGetTenantRepository: id, name, slug, createdAt (or created_at). */\nexport type TenantsTableLike = typeof tenantsTable;\n\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n  return {\n    id: String(row.id),\n    name: String(row.name),\n    slug: String(row.slug),\n    createdAt: (row.createdAt ?? row.created_at) as Date | string,\n    ...row,\n  };\n}\n\n/**\n * Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n * Pass the tenants table (e.g. tenantsTable from this package or your own with id, name, slug, created_at).\n * The returned function is called by core with the system database handle (from adapter.runAsSystem).\n */\nexport function createGetTenantRepository(\n  table: TenantsTableLike,\n): (database: unknown) => TenantRepository {\n  return (database: unknown) => {\n    const db = database as {\n      insert: (t: TenantsTableLike) => {\n        values: (v: { name: string; slug: string }) => {\n          returning: () => Promise<unknown[]>;\n        };\n      };\n      update: (t: TenantsTableLike) => {\n        set: (v: Partial<{ name: string; slug: string }>) => {\n          where: (c: unknown) => { returning: () => Promise<unknown[]> };\n        };\n      };\n      select: () => {\n        from: (t: TenantsTableLike) => {\n          where: (c: unknown) => { limit: (n: number) => Promise<unknown[]> };\n          limit: (n: number) => { offset: (n: number) => Promise<unknown[]> };\n        };\n      };\n      delete: (t: TenantsTableLike) => {\n        where: (c: unknown) => Promise<unknown>;\n      };\n    };\n\n    return {\n      async create(data) {\n        const rows = await db\n          .insert(table)\n          .values({\n            name: data.name,\n            slug: data.slug,\n          })\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: createTenant failed to return row\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async update(tenantId, data) {\n        const set: Partial<{ name: string; slug: string }> = {};\n        if (data.name !== undefined) set.name = data.name;\n        if (data.slug !== undefined) set.slug = data.slug;\n        if (Object.keys(set).length === 0) {\n          const rows = await db\n            .select()\n            .from(table)\n            .where(eq(table.id, tenantId))\n            .limit(1);\n          const row = Array.isArray(rows) ? rows[0] : undefined;\n          if (!row || typeof row !== \"object\") {\n            throw new Error(\"better-tenant: tenant not found\");\n          }\n          return rowToTenant(row as Record<string, unknown>);\n        }\n        const rows = await db\n          .update(table)\n          .set(set)\n          .where(eq(table.id, tenantId))\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: tenant not found\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async getById(tenantId: string) {\n        const rows = await db\n          .select()\n          .from(table)\n          .where(eq(table.id, tenantId))\n          .limit(1);\n        const row = Array.isArray(rows) ? rows[0] : undefined;\n        if (!row || typeof row !== \"object\") {\n          return null;\n        }\n\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async list(options = {}) {\n        const limit = Math.min(options.limit ?? 50, 50);\n        const offset = Math.max(0, options.offset ?? 0);\n        const rows = await db.select().from(table).limit(limit).offset(offset);\n        return (Array.isArray(rows) ? rows : []).map((r) =>\n          rowToTenant(r as Record<string, unknown>),\n        );\n      },\n\n      async delete(tenantId) {\n        await db.delete(table).where(eq(table.id, tenantId));\n      },\n    };\n  };\n}\n"],"mappings":"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","names":["import_drizzle_orm","rows","row"]}
+{"version":3,"sources":["../src/index.ts","../src/adapter.ts","../src/repository.ts","../src/schema.ts","../src/database.ts"],"sourcesContent":["export { drizzleDatabase } from \"./database.js\";\nexport { tenantsTable, tenantId } from \"./schema.js\";\n","import { sql } from \"drizzle-orm\";\nimport type { TenantAdapter } from \"@usebetterdev/tenant-core\";\n\n/**\n * Minimal shape for a Drizzle pg transaction: must support execute(sql).\n * The actual Drizzle transaction extends this with insert, select, etc.\n */\nexport interface DrizzlePgTransaction {\n  execute(query: ReturnType<typeof sql> | unknown): Promise<unknown>;\n}\n\n/**\n * Minimal shape for a Drizzle pg database: must support transaction().\n * Generic over TTx so the full transaction type (with insert, select, etc.) is preserved.\n */\nexport interface DrizzlePgDatabase<TTx extends DrizzlePgTransaction = DrizzlePgTransaction> {\n  transaction<T>(\n    callback: (tx: TTx) => Promise<T>,\n  ): Promise<T>;\n}\n\n/**\n * Creates a TenantAdapter for Drizzle (PostgreSQL).\n *\n * Uses a transaction per runWithTenant: BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n * The handle passed to fn is the transaction runner; use only this handle for tenant-scoped queries so RLS applies.\n *\n * runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = true so RLS policies that allow\n * when current_setting('app.bypass_rls', true) = 'true' permit access (CLI generates this bypass policy).\n *\n * @param database - Drizzle pg database (from drizzle(pool) or similar)\n * @returns TenantAdapter implementation\n */\nexport function drizzleAdapter<TTx extends DrizzlePgTransaction>(\n  database: DrizzlePgDatabase<TTx>,\n): TenantAdapter<TTx, TTx> {\n  return {\n    async runWithTenant<T>(\n      tenantId: string,\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.current_tenant', ${tenantId}, true)`,\n        );\n        return fn(tx);\n      });\n    },\n\n    async runAsSystem<T>(\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.bypass_rls', 'true', true)`,\n        );\n        return fn(tx);\n      });\n    },\n  };\n}\n","import { eq, count } from \"drizzle-orm\";\nimport type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport { tenantsTable } from \"./schema.js\";\n\n/** Table shape expected by createGetTenantRepository: id, name, slug, createdAt (or created_at). */\nexport type TenantsTableLike = typeof tenantsTable;\n\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n  const createdAt = row.createdAt ?? row.created_at;\n  if (createdAt === undefined || createdAt === null) {\n    throw new Error(\"better-tenant: row missing created_at / createdAt\");\n  }\n  return {\n    id: String(row.id),\n    name: String(row.name),\n    slug: String(row.slug),\n    createdAt: createdAt as Date | string,\n    ...row,\n  };\n}\n\n/**\n * Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n * Pass the tenants table (e.g. tenantsTable from this package or your own with id, name, slug, created_at).\n * The returned function is called by core with the system database handle (from adapter.runAsSystem).\n */\nexport function createGetTenantRepository(\n  table: TenantsTableLike = tenantsTable,\n): (database: unknown) => TenantRepository {\n  return (database: unknown) => {\n    const db = database as {\n      insert: (t: TenantsTableLike) => {\n        values: (v: { name: string; slug: string }) => {\n          returning: () => Promise<unknown[]>;\n        };\n      };\n      update: (t: TenantsTableLike) => {\n        set: (v: Partial<{ name: string; slug: string }>) => {\n          where: (c: unknown) => { returning: () => Promise<unknown[]> };\n        };\n      };\n      select: {\n        (): {\n          from: (t: TenantsTableLike) => {\n            where: (c: unknown) => { limit: (n: number) => Promise<unknown[]> };\n            limit: (n: number) => { offset: (n: number) => Promise<unknown[]> };\n          };\n        };\n        (fields: Record<string, unknown>): {\n          from: (t: TenantsTableLike) => Promise<unknown[]>;\n        };\n      };\n      delete: (t: TenantsTableLike) => {\n        where: (c: unknown) => Promise<unknown>;\n      };\n    };\n\n    return {\n      async create(data) {\n        const rows = await db\n          .insert(table)\n          .values({\n            name: data.name,\n            slug: data.slug,\n          })\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: createTenant failed to return row\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async update(tenantId, data) {\n        const set: Partial<{ name: string; slug: string }> = {};\n        if (data.name !== undefined) set.name = data.name;\n        if (data.slug !== undefined) set.slug = data.slug;\n        if (Object.keys(set).length === 0) {\n          const rows = await db\n            .select()\n            .from(table)\n            .where(eq(table.id, tenantId))\n            .limit(1);\n          const row = Array.isArray(rows) ? rows[0] : undefined;\n          if (!row || typeof row !== \"object\") {\n            throw new Error(\"better-tenant: tenant not found\");\n          }\n          return rowToTenant(row as Record<string, unknown>);\n        }\n        const rows = await db\n          .update(table)\n          .set(set)\n          .where(eq(table.id, tenantId))\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: tenant not found\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async getById(tenantId: string) {\n        const rows = await db\n          .select()\n          .from(table)\n          .where(eq(table.id, tenantId))\n          .limit(1);\n        const row = Array.isArray(rows) ? rows[0] : undefined;\n        if (!row || typeof row !== \"object\") {\n          return null;\n        }\n\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async getBySlug(slug: string) {\n        const rows = await db\n          .select()\n          .from(table)\n          .where(eq(table.slug, slug))\n          .limit(1);\n        const row = Array.isArray(rows) ? rows[0] : undefined;\n        if (!row || typeof row !== \"object\") {\n          return null;\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async list(options = {}) {\n        const limit = options.limit ?? 50;\n        const offset = Math.max(0, options.offset ?? 0);\n        const rows = await db.select().from(table).limit(limit).offset(offset);\n        return (Array.isArray(rows) ? rows : []).map((r) =>\n          rowToTenant(r as Record<string, unknown>),\n        );\n      },\n\n      async count() {\n        const result = await db.select({ value: count() }).from(table);\n        const row = result[0] as { value: number | string } | undefined;\n        return Number(row?.value ?? 0);\n      },\n\n      async delete(tenantId) {\n        await db.delete(table).where(eq(table.id, tenantId));\n      },\n    };\n  };\n}\n","import { sql } from \"drizzle-orm\";\nimport { pgTable, text, timestamp, uuid } from \"drizzle-orm/pg-core\";\n\n/**\n * Standard tenants table schema matching the CLI-generated shape.\n * Columns: id (UUID), name, slug, created_at.\n * Use this table or provide your own with the same column contract for createGetTenantRepository.\n */\nexport const tenantsTable = pgTable(\"tenants\", {\n  id: uuid(\"id\").primaryKey().defaultRandom(),\n  name: text(\"name\").notNull(),\n  slug: text(\"slug\").notNull().unique(),\n  createdAt: timestamp(\"created_at\", { withTimezone: true }).defaultNow().notNull(),\n}).enableRLS();\n\n/**\n * Pre-configured tenant_id column for use in tenant-scoped tables.\n * References tenants.id and auto-populates from the current session variable.\n *\n * Usage:\n * ```ts\n * import { tenantId } from \"@usebetterdev/tenant/drizzle\";\n *\n * export const projectsTable = pgTable(\"projects\", {\n *   id: serial(\"id\").primaryKey(),\n *   name: text(\"name\").notNull(),\n *   ...tenantId,\n * }).enableRLS();\n * ```\n */\nexport const tenantId = {\n  tenantId: uuid(\"tenant_id\")\n    .notNull()\n    .references(() => tenantsTable.id)\n    .default(sql`(current_setting('app.current_tenant', true))::uuid`),\n} as const;\n","import type { DatabaseProvider } from \"@usebetterdev/tenant-core\";\nimport { drizzleAdapter } from \"./adapter.js\";\nimport type { DrizzlePgDatabase, DrizzlePgTransaction } from \"./adapter.js\";\nimport { createGetTenantRepository, type TenantsTableLike } from \"./repository.js\";\n\n/**\n * Creates a DatabaseProvider for Drizzle (PostgreSQL).\n *\n * Bundles drizzleAdapter + createGetTenantRepository into a single config value\n * for use with `betterTenant({ database: drizzleDatabase(db) })`.\n *\n * @param db - Drizzle pg database (from drizzle(pool) or similar)\n * @param options - Optional: custom tenants table\n */\nexport function drizzleDatabase<TTx extends DrizzlePgTransaction>(\n  db: DrizzlePgDatabase<TTx>,\n  options?: { table?: TenantsTableLike },\n): DatabaseProvider<TTx, TTx> {\n  return {\n    adapter: drizzleAdapter(db),\n    getTenantRepository: createGetTenantRepository(options?.table),\n  };\n}\n"],"mappings":"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","names":["tenantId","import_drizzle_orm","import_drizzle_orm","tenantId","rows","row"]}

package/dist/index.d.cts

@@ -1,5 +1,6 @@
+import { DatabaseProvider } from '@usebetterdev/tenant-core';
+import * as drizzle_orm from 'drizzle-orm';
 import { sql } from 'drizzle-orm';
-import { TenantAdapter, TenantRepository } from '@usebetterdev/tenant-core';
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
 
 /**
@@ -16,26 +17,13 @@ interface DrizzlePgTransaction {
 interface DrizzlePgDatabase<TTx extends DrizzlePgTransaction = DrizzlePgTransaction> {
     transaction<T>(callback: (tx: TTx) => Promise<T>): Promise<T>;
 }
-/**
- * Creates a TenantAdapter for Drizzle (PostgreSQL).
- *
- * Uses a transaction per runWithTenant: BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.
- * The handle passed to fn is the transaction runner; use only this handle for tenant-scoped queries so RLS applies.
- *
- * runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = true so RLS policies that allow
- * when current_setting('app.bypass_rls', true) = 'true' permit access (CLI generates this bypass policy).
- *
- * @param database - Drizzle pg database (from drizzle(pool) or similar)
- * @returns TenantAdapter implementation
- */
-declare function drizzleAdapter<TTx extends DrizzlePgTransaction>(database: DrizzlePgDatabase<TTx>): TenantAdapter<TTx, TTx>;
 
 /**
  * Standard tenants table schema matching the CLI-generated shape.
  * Columns: id (UUID), name, slug, created_at.
  * Use this table or provide your own with the same column contract for createGetTenantRepository.
  */
-declare const tenantsTable: drizzle_orm_pg_core.PgTableWithColumns<{
+declare const tenantsTable: Omit<drizzle_orm_pg_core.PgTableWithColumns<{
     name: "tenants";
     schema: undefined;
     columns: {
@@ -109,15 +97,40 @@ declare const tenantsTable: drizzle_orm_pg_core.PgTableWithColumns<{
         }, {}, {}>;
     };
     dialect: "pg";
-}>;
+}>, "enableRLS">;
+/**
+ * Pre-configured tenant_id column for use in tenant-scoped tables.
+ * References tenants.id and auto-populates from the current session variable.
+ *
+ * Usage:
+ * ```ts
+ * import { tenantId } from "@usebetterdev/tenant/drizzle";
+ *
+ * export const projectsTable = pgTable("projects", {
+ *   id: serial("id").primaryKey(),
+ *   name: text("name").notNull(),
+ *   ...tenantId,
+ * }).enableRLS();
+ * ```
+ */
+declare const tenantId: {
+    readonly tenantId: drizzle_orm.HasDefault<drizzle_orm.NotNull<drizzle_orm_pg_core.PgUUIDBuilderInitial<"tenant_id">>>;
+};
 
 /** Table shape expected by createGetTenantRepository: id, name, slug, createdAt (or created_at). */
 type TenantsTableLike = typeof tenantsTable;
+
 /**
- * Creates getTenantRepository for use with betterTenant({ getTenantRepository }).
- * Pass the tenants table (e.g. tenantsTable from this package or your own with id, name, slug, created_at).
- * The returned function is called by core with the system database handle (from adapter.runAsSystem).
+ * Creates a DatabaseProvider for Drizzle (PostgreSQL).
+ *
+ * Bundles drizzleAdapter + createGetTenantRepository into a single config value
+ * for use with `betterTenant({ database: drizzleDatabase(db) })`.
+ *
+ * @param db - Drizzle pg database (from drizzle(pool) or similar)
+ * @param options - Optional: custom tenants table
  */
-declare function createGetTenantRepository(table: TenantsTableLike): (database: unknown) => TenantRepository;
+declare function drizzleDatabase<TTx extends DrizzlePgTransaction>(db: DrizzlePgDatabase<TTx>, options?: {
+    table?: TenantsTableLike;
+}): DatabaseProvider<TTx, TTx>;
 
-export { type DrizzlePgDatabase, type DrizzlePgTransaction, type TenantsTableLike, createGetTenantRepository, drizzleAdapter, tenantsTable };
+export { drizzleDatabase, tenantId, tenantsTable };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
+import { DatabaseProvider } from '@usebetterdev/tenant-core';
+import * as drizzle_orm from 'drizzle-orm';
 import { sql } from 'drizzle-orm';
-import { TenantAdapter, TenantRepository } from '@usebetterdev/tenant-core';
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
 
 /**
@@ -16,26 +17,13 @@ interface DrizzlePgTransaction {
 interface DrizzlePgDatabase<TTx extends DrizzlePgTransaction = DrizzlePgTransaction> {
     transaction<T>(callback: (tx: TTx) => Promise<T>): Promise<T>;
 }
-/**
- * Creates a TenantAdapter for Drizzle (PostgreSQL).
- *
- * Uses a transaction per runWithTenant: BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.
- * The handle passed to fn is the transaction runner; use only this handle for tenant-scoped queries so RLS applies.
- *
- * runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = true so RLS policies that allow
- * when current_setting('app.bypass_rls', true) = 'true' permit access (CLI generates this bypass policy).
- *
- * @param database - Drizzle pg database (from drizzle(pool) or similar)
- * @returns TenantAdapter implementation
- */
-declare function drizzleAdapter<TTx extends DrizzlePgTransaction>(database: DrizzlePgDatabase<TTx>): TenantAdapter<TTx, TTx>;
 
 /**
  * Standard tenants table schema matching the CLI-generated shape.
  * Columns: id (UUID), name, slug, created_at.
  * Use this table or provide your own with the same column contract for createGetTenantRepository.
  */
-declare const tenantsTable: drizzle_orm_pg_core.PgTableWithColumns<{
+declare const tenantsTable: Omit<drizzle_orm_pg_core.PgTableWithColumns<{
     name: "tenants";
     schema: undefined;
     columns: {
@@ -109,15 +97,40 @@ declare const tenantsTable: drizzle_orm_pg_core.PgTableWithColumns<{
         }, {}, {}>;
     };
     dialect: "pg";
-}>;
+}>, "enableRLS">;
+/**
+ * Pre-configured tenant_id column for use in tenant-scoped tables.
+ * References tenants.id and auto-populates from the current session variable.
+ *
+ * Usage:
+ * ```ts
+ * import { tenantId } from "@usebetterdev/tenant/drizzle";
+ *
+ * export const projectsTable = pgTable("projects", {
+ *   id: serial("id").primaryKey(),
+ *   name: text("name").notNull(),
+ *   ...tenantId,
+ * }).enableRLS();
+ * ```
+ */
+declare const tenantId: {
+    readonly tenantId: drizzle_orm.HasDefault<drizzle_orm.NotNull<drizzle_orm_pg_core.PgUUIDBuilderInitial<"tenant_id">>>;
+};
 
 /** Table shape expected by createGetTenantRepository: id, name, slug, createdAt (or created_at). */
 type TenantsTableLike = typeof tenantsTable;
+
 /**
- * Creates getTenantRepository for use with betterTenant({ getTenantRepository }).
- * Pass the tenants table (e.g. tenantsTable from this package or your own with id, name, slug, created_at).
- * The returned function is called by core with the system database handle (from adapter.runAsSystem).
+ * Creates a DatabaseProvider for Drizzle (PostgreSQL).
+ *
+ * Bundles drizzleAdapter + createGetTenantRepository into a single config value
+ * for use with `betterTenant({ database: drizzleDatabase(db) })`.
+ *
+ * @param db - Drizzle pg database (from drizzle(pool) or similar)
+ * @param options - Optional: custom tenants table
  */
-declare function createGetTenantRepository(table: TenantsTableLike): (database: unknown) => TenantRepository;
+declare function drizzleDatabase<TTx extends DrizzlePgTransaction>(db: DrizzlePgDatabase<TTx>, options?: {
+    table?: TenantsTableLike;
+}): DatabaseProvider<TTx, TTx>;
 
-export { type DrizzlePgDatabase, type DrizzlePgTransaction, type TenantsTableLike, createGetTenantRepository, drizzleAdapter, tenantsTable };
+export { drizzleDatabase, tenantId, tenantsTable };

package/dist/index.js

@@ -2,10 +2,10 @@
 import { sql } from "drizzle-orm";
 function drizzleAdapter(database) {
   return {
-    async runWithTenant(tenantId, fn) {
+    async runWithTenant(tenantId2, fn) {
       return database.transaction(async (tx) => {
         await tx.execute(
-          sql`SELECT set_config('app.current_tenant', ${tenantId}, true)`
+          sql`SELECT set_config('app.current_tenant', ${tenantId2}, true)`
         );
         return fn(tx);
       });
@@ -21,27 +21,37 @@ function drizzleAdapter(database) {
   };
 }
 
+// src/repository.ts
+import { eq, count } from "drizzle-orm";
+
 // src/schema.ts
+import { sql as sql2 } from "drizzle-orm";
 import { pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
 var tenantsTable = pgTable("tenants", {
   id: uuid("id").primaryKey().defaultRandom(),
   name: text("name").notNull(),
   slug: text("slug").notNull().unique(),
   createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull()
-});
+}).enableRLS();
+var tenantId = {
+  tenantId: uuid("tenant_id").notNull().references(() => tenantsTable.id).default(sql2`(current_setting('app.current_tenant', true))::uuid`)
+};
 
 // src/repository.ts
-import { eq } from "drizzle-orm";
 function rowToTenant(row) {
+  const createdAt = row.createdAt ?? row.created_at;
+  if (createdAt === void 0 || createdAt === null) {
+    throw new Error("better-tenant: row missing created_at / createdAt");
+  }
   return {
     id: String(row.id),
     name: String(row.name),
     slug: String(row.slug),
-    createdAt: row.createdAt ?? row.created_at,
+    createdAt,
     ...row
   };
 }
-function createGetTenantRepository(table) {
+function createGetTenantRepository(table = tenantsTable) {
   return (database) => {
     const db = database;
     return {
@@ -56,27 +66,35 @@ function createGetTenantRepository(table) {
         }
         return rowToTenant(row);
       },
-      async update(tenantId, data) {
+      async update(tenantId2, data) {
         const set = {};
         if (data.name !== void 0) set.name = data.name;
         if (data.slug !== void 0) set.slug = data.slug;
         if (Object.keys(set).length === 0) {
-          const rows2 = await db.select().from(table).where(eq(table.id, tenantId)).limit(1);
+          const rows2 = await db.select().from(table).where(eq(table.id, tenantId2)).limit(1);
           const row2 = Array.isArray(rows2) ? rows2[0] : void 0;
           if (!row2 || typeof row2 !== "object") {
             throw new Error("better-tenant: tenant not found");
           }
           return rowToTenant(row2);
         }
-        const rows = await db.update(table).set(set).where(eq(table.id, tenantId)).returning();
+        const rows = await db.update(table).set(set).where(eq(table.id, tenantId2)).returning();
         const row = rows[0];
         if (!row || typeof row !== "object") {
           throw new Error("better-tenant: tenant not found");
         }
         return rowToTenant(row);
       },
-      async getById(tenantId) {
-        const rows = await db.select().from(table).where(eq(table.id, tenantId)).limit(1);
+      async getById(tenantId2) {
+        const rows = await db.select().from(table).where(eq(table.id, tenantId2)).limit(1);
+        const row = Array.isArray(rows) ? rows[0] : void 0;
+        if (!row || typeof row !== "object") {
+          return null;
+        }
+        return rowToTenant(row);
+      },
+      async getBySlug(slug) {
+        const rows = await db.select().from(table).where(eq(table.slug, slug)).limit(1);
         const row = Array.isArray(rows) ? rows[0] : void 0;
         if (!row || typeof row !== "object") {
           return null;
@@ -84,22 +102,35 @@ function createGetTenantRepository(table) {
         return rowToTenant(row);
       },
       async list(options = {}) {
-        const limit = Math.min(options.limit ?? 50, 50);
+        const limit = options.limit ?? 50;
         const offset = Math.max(0, options.offset ?? 0);
         const rows = await db.select().from(table).limit(limit).offset(offset);
         return (Array.isArray(rows) ? rows : []).map(
           (r) => rowToTenant(r)
         );
       },
-      async delete(tenantId) {
-        await db.delete(table).where(eq(table.id, tenantId));
+      async count() {
+        const result = await db.select({ value: count() }).from(table);
+        const row = result[0];
+        return Number(row?.value ?? 0);
+      },
+      async delete(tenantId2) {
+        await db.delete(table).where(eq(table.id, tenantId2));
       }
     };
   };
 }
+
+// src/database.ts
+function drizzleDatabase(db, options) {
+  return {
+    adapter: drizzleAdapter(db),
+    getTenantRepository: createGetTenantRepository(options?.table)
+  };
+}
 export {
-  createGetTenantRepository,
-  drizzleAdapter,
+  drizzleDatabase,
+  tenantId,
   tenantsTable
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter.ts","../src/schema.ts","../src/repository.ts"],"sourcesContent":["import { sql } from \"drizzle-orm\";\nimport type { TenantAdapter } from \"@usebetterdev/tenant-core\";\n\n/**\n * Minimal shape for a Drizzle pg transaction: must support execute(sql).\n * The actual Drizzle transaction extends this with insert, select, etc.\n */\nexport interface DrizzlePgTransaction {\n  execute(query: ReturnType<typeof sql> | unknown): Promise<unknown>;\n}\n\n/**\n * Minimal shape for a Drizzle pg database: must support transaction().\n * Generic over TTx so the full transaction type (with insert, select, etc.) is preserved.\n */\nexport interface DrizzlePgDatabase<TTx extends DrizzlePgTransaction = DrizzlePgTransaction> {\n  transaction<T>(\n    callback: (tx: TTx) => Promise<T>,\n  ): Promise<T>;\n}\n\n/**\n * Creates a TenantAdapter for Drizzle (PostgreSQL).\n *\n * Uses a transaction per runWithTenant: BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n * The handle passed to fn is the transaction runner; use only this handle for tenant-scoped queries so RLS applies.\n *\n * runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = true so RLS policies that allow\n * when current_setting('app.bypass_rls', true) = 'true' permit access (CLI generates this bypass policy).\n *\n * @param database - Drizzle pg database (from drizzle(pool) or similar)\n * @returns TenantAdapter implementation\n */\nexport function drizzleAdapter<TTx extends DrizzlePgTransaction>(\n  database: DrizzlePgDatabase<TTx>,\n): TenantAdapter<TTx, TTx> {\n  return {\n    async runWithTenant<T>(\n      tenantId: string,\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.current_tenant', ${tenantId}, true)`,\n        );\n        return fn(tx);\n      });\n    },\n\n    async runAsSystem<T>(\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.bypass_rls', 'true', true)`,\n        );\n        return fn(tx);\n      });\n    },\n  };\n}\n","import { pgTable, text, timestamp, uuid } from \"drizzle-orm/pg-core\";\n\n/**\n * Standard tenants table schema matching the CLI-generated shape.\n * Columns: id (UUID), name, slug, created_at.\n * Use this table or provide your own with the same column contract for createGetTenantRepository.\n */\nexport const tenantsTable = pgTable(\"tenants\", {\n  id: uuid(\"id\").primaryKey().defaultRandom(),\n  name: text(\"name\").notNull(),\n  slug: text(\"slug\").notNull().unique(),\n  createdAt: timestamp(\"created_at\", { withTimezone: true }).defaultNow().notNull(),\n});\n","import { eq } from \"drizzle-orm\";\nimport type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport type { tenantsTable } from \"./schema.js\";\n\n/** Table shape expected by createGetTenantRepository: id, name, slug, createdAt (or created_at). */\nexport type TenantsTableLike = typeof tenantsTable;\n\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n  return {\n    id: String(row.id),\n    name: String(row.name),\n    slug: String(row.slug),\n    createdAt: (row.createdAt ?? row.created_at) as Date | string,\n    ...row,\n  };\n}\n\n/**\n * Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n * Pass the tenants table (e.g. tenantsTable from this package or your own with id, name, slug, created_at).\n * The returned function is called by core with the system database handle (from adapter.runAsSystem).\n */\nexport function createGetTenantRepository(\n  table: TenantsTableLike,\n): (database: unknown) => TenantRepository {\n  return (database: unknown) => {\n    const db = database as {\n      insert: (t: TenantsTableLike) => {\n        values: (v: { name: string; slug: string }) => {\n          returning: () => Promise<unknown[]>;\n        };\n      };\n      update: (t: TenantsTableLike) => {\n        set: (v: Partial<{ name: string; slug: string }>) => {\n          where: (c: unknown) => { returning: () => Promise<unknown[]> };\n        };\n      };\n      select: () => {\n        from: (t: TenantsTableLike) => {\n          where: (c: unknown) => { limit: (n: number) => Promise<unknown[]> };\n          limit: (n: number) => { offset: (n: number) => Promise<unknown[]> };\n        };\n      };\n      delete: (t: TenantsTableLike) => {\n        where: (c: unknown) => Promise<unknown>;\n      };\n    };\n\n    return {\n      async create(data) {\n        const rows = await db\n          .insert(table)\n          .values({\n            name: data.name,\n            slug: data.slug,\n          })\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: createTenant failed to return row\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async update(tenantId, data) {\n        const set: Partial<{ name: string; slug: string }> = {};\n        if (data.name !== undefined) set.name = data.name;\n        if (data.slug !== undefined) set.slug = data.slug;\n        if (Object.keys(set).length === 0) {\n          const rows = await db\n            .select()\n            .from(table)\n            .where(eq(table.id, tenantId))\n            .limit(1);\n          const row = Array.isArray(rows) ? rows[0] : undefined;\n          if (!row || typeof row !== \"object\") {\n            throw new Error(\"better-tenant: tenant not found\");\n          }\n          return rowToTenant(row as Record<string, unknown>);\n        }\n        const rows = await db\n          .update(table)\n          .set(set)\n          .where(eq(table.id, tenantId))\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: tenant not found\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async getById(tenantId: string) {\n        const rows = await db\n          .select()\n          .from(table)\n          .where(eq(table.id, tenantId))\n          .limit(1);\n        const row = Array.isArray(rows) ? rows[0] : undefined;\n        if (!row || typeof row !== \"object\") {\n          return null;\n        }\n\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async list(options = {}) {\n        const limit = Math.min(options.limit ?? 50, 50);\n        const offset = Math.max(0, options.offset ?? 0);\n        const rows = await db.select().from(table).limit(limit).offset(offset);\n        return (Array.isArray(rows) ? rows : []).map((r) =>\n          rowToTenant(r as Record<string, unknown>),\n        );\n      },\n\n      async delete(tenantId) {\n        await db.delete(table).where(eq(table.id, tenantId));\n      },\n    };\n  };\n}\n"],"mappings":"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","names":["rows","row"]}
+{"version":3,"sources":["../src/adapter.ts","../src/repository.ts","../src/schema.ts","../src/database.ts"],"sourcesContent":["import { sql } from \"drizzle-orm\";\nimport type { TenantAdapter } from \"@usebetterdev/tenant-core\";\n\n/**\n * Minimal shape for a Drizzle pg transaction: must support execute(sql).\n * The actual Drizzle transaction extends this with insert, select, etc.\n */\nexport interface DrizzlePgTransaction {\n  execute(query: ReturnType<typeof sql> | unknown): Promise<unknown>;\n}\n\n/**\n * Minimal shape for a Drizzle pg database: must support transaction().\n * Generic over TTx so the full transaction type (with insert, select, etc.) is preserved.\n */\nexport interface DrizzlePgDatabase<TTx extends DrizzlePgTransaction = DrizzlePgTransaction> {\n  transaction<T>(\n    callback: (tx: TTx) => Promise<T>,\n  ): Promise<T>;\n}\n\n/**\n * Creates a TenantAdapter for Drizzle (PostgreSQL).\n *\n * Uses a transaction per runWithTenant: BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n * The handle passed to fn is the transaction runner; use only this handle for tenant-scoped queries so RLS applies.\n *\n * runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = true so RLS policies that allow\n * when current_setting('app.bypass_rls', true) = 'true' permit access (CLI generates this bypass policy).\n *\n * @param database - Drizzle pg database (from drizzle(pool) or similar)\n * @returns TenantAdapter implementation\n */\nexport function drizzleAdapter<TTx extends DrizzlePgTransaction>(\n  database: DrizzlePgDatabase<TTx>,\n): TenantAdapter<TTx, TTx> {\n  return {\n    async runWithTenant<T>(\n      tenantId: string,\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.current_tenant', ${tenantId}, true)`,\n        );\n        return fn(tx);\n      });\n    },\n\n    async runAsSystem<T>(\n      fn: (database: TTx) => Promise<T>,\n    ): Promise<T> {\n      return database.transaction(async (tx) => {\n        await tx.execute(\n          sql`SELECT set_config('app.bypass_rls', 'true', true)`,\n        );\n        return fn(tx);\n      });\n    },\n  };\n}\n","import { eq, count } from \"drizzle-orm\";\nimport type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport { tenantsTable } from \"./schema.js\";\n\n/** Table shape expected by createGetTenantRepository: id, name, slug, createdAt (or created_at). */\nexport type TenantsTableLike = typeof tenantsTable;\n\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n  const createdAt = row.createdAt ?? row.created_at;\n  if (createdAt === undefined || createdAt === null) {\n    throw new Error(\"better-tenant: row missing created_at / createdAt\");\n  }\n  return {\n    id: String(row.id),\n    name: String(row.name),\n    slug: String(row.slug),\n    createdAt: createdAt as Date | string,\n    ...row,\n  };\n}\n\n/**\n * Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n * Pass the tenants table (e.g. tenantsTable from this package or your own with id, name, slug, created_at).\n * The returned function is called by core with the system database handle (from adapter.runAsSystem).\n */\nexport function createGetTenantRepository(\n  table: TenantsTableLike = tenantsTable,\n): (database: unknown) => TenantRepository {\n  return (database: unknown) => {\n    const db = database as {\n      insert: (t: TenantsTableLike) => {\n        values: (v: { name: string; slug: string }) => {\n          returning: () => Promise<unknown[]>;\n        };\n      };\n      update: (t: TenantsTableLike) => {\n        set: (v: Partial<{ name: string; slug: string }>) => {\n          where: (c: unknown) => { returning: () => Promise<unknown[]> };\n        };\n      };\n      select: {\n        (): {\n          from: (t: TenantsTableLike) => {\n            where: (c: unknown) => { limit: (n: number) => Promise<unknown[]> };\n            limit: (n: number) => { offset: (n: number) => Promise<unknown[]> };\n          };\n        };\n        (fields: Record<string, unknown>): {\n          from: (t: TenantsTableLike) => Promise<unknown[]>;\n        };\n      };\n      delete: (t: TenantsTableLike) => {\n        where: (c: unknown) => Promise<unknown>;\n      };\n    };\n\n    return {\n      async create(data) {\n        const rows = await db\n          .insert(table)\n          .values({\n            name: data.name,\n            slug: data.slug,\n          })\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: createTenant failed to return row\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async update(tenantId, data) {\n        const set: Partial<{ name: string; slug: string }> = {};\n        if (data.name !== undefined) set.name = data.name;\n        if (data.slug !== undefined) set.slug = data.slug;\n        if (Object.keys(set).length === 0) {\n          const rows = await db\n            .select()\n            .from(table)\n            .where(eq(table.id, tenantId))\n            .limit(1);\n          const row = Array.isArray(rows) ? rows[0] : undefined;\n          if (!row || typeof row !== \"object\") {\n            throw new Error(\"better-tenant: tenant not found\");\n          }\n          return rowToTenant(row as Record<string, unknown>);\n        }\n        const rows = await db\n          .update(table)\n          .set(set)\n          .where(eq(table.id, tenantId))\n          .returning();\n        const row = rows[0];\n        if (!row || typeof row !== \"object\") {\n          throw new Error(\"better-tenant: tenant not found\");\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async getById(tenantId: string) {\n        const rows = await db\n          .select()\n          .from(table)\n          .where(eq(table.id, tenantId))\n          .limit(1);\n        const row = Array.isArray(rows) ? rows[0] : undefined;\n        if (!row || typeof row !== \"object\") {\n          return null;\n        }\n\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async getBySlug(slug: string) {\n        const rows = await db\n          .select()\n          .from(table)\n          .where(eq(table.slug, slug))\n          .limit(1);\n        const row = Array.isArray(rows) ? rows[0] : undefined;\n        if (!row || typeof row !== \"object\") {\n          return null;\n        }\n        return rowToTenant(row as Record<string, unknown>);\n      },\n\n      async list(options = {}) {\n        const limit = options.limit ?? 50;\n        const offset = Math.max(0, options.offset ?? 0);\n        const rows = await db.select().from(table).limit(limit).offset(offset);\n        return (Array.isArray(rows) ? rows : []).map((r) =>\n          rowToTenant(r as Record<string, unknown>),\n        );\n      },\n\n      async count() {\n        const result = await db.select({ value: count() }).from(table);\n        const row = result[0] as { value: number | string } | undefined;\n        return Number(row?.value ?? 0);\n      },\n\n      async delete(tenantId) {\n        await db.delete(table).where(eq(table.id, tenantId));\n      },\n    };\n  };\n}\n","import { sql } from \"drizzle-orm\";\nimport { pgTable, text, timestamp, uuid } from \"drizzle-orm/pg-core\";\n\n/**\n * Standard tenants table schema matching the CLI-generated shape.\n * Columns: id (UUID), name, slug, created_at.\n * Use this table or provide your own with the same column contract for createGetTenantRepository.\n */\nexport const tenantsTable = pgTable(\"tenants\", {\n  id: uuid(\"id\").primaryKey().defaultRandom(),\n  name: text(\"name\").notNull(),\n  slug: text(\"slug\").notNull().unique(),\n  createdAt: timestamp(\"created_at\", { withTimezone: true }).defaultNow().notNull(),\n}).enableRLS();\n\n/**\n * Pre-configured tenant_id column for use in tenant-scoped tables.\n * References tenants.id and auto-populates from the current session variable.\n *\n * Usage:\n * ```ts\n * import { tenantId } from \"@usebetterdev/tenant/drizzle\";\n *\n * export const projectsTable = pgTable(\"projects\", {\n *   id: serial(\"id\").primaryKey(),\n *   name: text(\"name\").notNull(),\n *   ...tenantId,\n * }).enableRLS();\n * ```\n */\nexport const tenantId = {\n  tenantId: uuid(\"tenant_id\")\n    .notNull()\n    .references(() => tenantsTable.id)\n    .default(sql`(current_setting('app.current_tenant', true))::uuid`),\n} as const;\n","import type { DatabaseProvider } from \"@usebetterdev/tenant-core\";\nimport { drizzleAdapter } from \"./adapter.js\";\nimport type { DrizzlePgDatabase, DrizzlePgTransaction } from \"./adapter.js\";\nimport { createGetTenantRepository, type TenantsTableLike } from \"./repository.js\";\n\n/**\n * Creates a DatabaseProvider for Drizzle (PostgreSQL).\n *\n * Bundles drizzleAdapter + createGetTenantRepository into a single config value\n * for use with `betterTenant({ database: drizzleDatabase(db) })`.\n *\n * @param db - Drizzle pg database (from drizzle(pool) or similar)\n * @param options - Optional: custom tenants table\n */\nexport function drizzleDatabase<TTx extends DrizzlePgTransaction>(\n  db: DrizzlePgDatabase<TTx>,\n  options?: { table?: TenantsTableLike },\n): DatabaseProvider<TTx, TTx> {\n  return {\n    adapter: drizzleAdapter(db),\n    getTenantRepository: createGetTenantRepository(options?.table),\n  };\n}\n"],"mappings":"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","names":["tenantId","sql","tenantId","rows","row"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usebetterdev/tenant-drizzle",
-  "version": "0.2.0-beta.9",
+  "version": "0.3.0-beta.3",
   "repository": "github:usebetter-dev/usebetter",
   "bugs": "https://github.com/usebetter-dev/usebetter/issues",
   "homepage": "https://github.com/usebetter-dev/usebetter#readme",
@@ -25,14 +25,18 @@
   ],
   "dependencies": {
     "drizzle-orm": "^0.36.0",
-    "@usebetterdev/tenant-core": "0.2.0-beta.9"
+    "@usebetterdev/tenant-core": "0.3.0-beta.3"
   },
   "peerDependencies": {
-    "pg": ">=8.0.0"
+    "pg": ">=8.0.0",
+    "postgres": ">=3.0.0"
   },
   "peerDependenciesMeta": {
     "pg": {
-      "optional": false
+      "optional": true
+    },
+    "postgres": {
+      "optional": true
     }
   },
   "devDependencies": {
@@ -43,7 +47,7 @@
     "tsup": "^8.3.5",
     "typescript": "~5.7.2",
     "vitest": "^2.1.6",
-    "@usebetterdev/test-utils": "0.1.0"
+    "@usebetterdev/test-utils": "0.3.0-beta.3"
   },
   "engines": {
     "node": ">=22"