npm - @usebetterdev/tenant-prisma - Versions diffs - 0.2.1-beta.1 → 0.3.0-beta.3 - Mend

@usebetterdev/tenant-prisma 0.2.1-beta.1 → 0.3.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/README.md CHANGED Viewed

@@ -5,17 +5,19 @@ Prisma adapter for [@usebetterdev/tenant](https://github.com/usebetter-dev/usebe
 ## Install
 ```bash
-pnpm add @usebetterdev/tenant @prisma/client
+pnpm add @usebetterdev/tenant @prisma/client @prisma/adapter-pg
 ```
 ## Usage
 ```ts
-import { PrismaClient } from "@prisma/client";
+import { PrismaClient } from "./generated/prisma/client.js";
+import { PrismaPg } from "@prisma/adapter-pg";
 import { betterTenant } from "@usebetterdev/tenant";
 import { prismaDatabase } from "@usebetterdev/tenant/prisma";
-const prisma = new PrismaClient();
+const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL });
+const prisma = new PrismaClient({ adapter });
 const tenant = betterTenant({
   database: prismaDatabase(prisma),
@@ -52,6 +54,11 @@ Integration tests use [@testcontainers/postgresql](https://www.npmjs.com/package
 **Run integration tests:** From the repo root, run `pnpm run test:integration` or `pnpm run test --filter @usebetterdev/tenant-prisma`.
-## Peer dependency
+## Peer dependencies
-Requires `@prisma/client` (>= 5.0.0). Install it in your app when using this adapter.
+Requires Prisma 7+:
+- `@prisma/client` (>= 7.0.0)
+- `@prisma/adapter-pg` (>= 7.0.0)
+Prisma 7 uses the `prisma-client` generator with a required `output` path. Adjust the `PrismaClient` import to match your `output` configuration in `schema.prisma`.

package/dist/index.cjs CHANGED Viewed

@@ -52,8 +52,7 @@ function rowToTenant(row) {
     id: String(row.id),
     name: String(row.name),
     slug: String(row.slug),
-    createdAt,
-    ...row
+    createdAt
   };
 }
 function assertSafeIdentifier(name) {
@@ -69,8 +68,10 @@ function createGetTenantRepository(tableName = "tenants") {
     const tx = database;
     return {
       async create(data) {
+        const id = crypto.randomUUID();
         const rows = await tx.$queryRawUnsafe(
-          `INSERT INTO ${tableName} (name, slug) VALUES ($1, $2) RETURNING *`,
+          `INSERT INTO ${tableName} (id, name, slug) VALUES ($1::uuid, $2, $3) RETURNING *`,
+          id,
           data.name,
           data.slug
         );
@@ -151,6 +152,13 @@ function createGetTenantRepository(tableName = "tenants") {
           `DELETE FROM ${tableName} WHERE id = $1::uuid`,
           tenantId
         );
+      },
+      async count() {
+        const rows = await tx.$queryRawUnsafe(
+          `SELECT count(*)::int AS count FROM ${tableName}`
+        );
+        const row = rows[0];
+        return Number(row?.count ?? 0);
       }
     };
   };

package/dist/index.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/index.ts","../src/adapter.ts","../src/repository.ts","../src/database.ts"],"sourcesContent":["export { prismaDatabase } from \"./database.js\";\nexport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\n","import type { TenantAdapter } from \"@usebetterdev/tenant-core\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\n\n/*\n Creates a TenantAdapter for Prisma (PostgreSQL).\n \n Uses an interactive transaction per runWithTenant:\n * BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n \n The handle passed to fn is the Prisma transaction client; use only this\n * handle for tenant-scoped queries so RLS applies.\n \n runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = 'true'\n * so RLS policies that allow when current_setting('app.bypass_rls', true) = 'true'\n * permit access (CLI generates this bypass policy).\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @returns TenantAdapter implementation\n /\nexport function prismaAdapter(\n prisma: PrismaClientLike,\n): TenantAdapter<PrismaTransactionClient, PrismaTransactionClient> {\n return {\n async runWithTenant<T>(\n tenantId: string,\n fn: (database: PrismaTransactionClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx: PrismaTransactionClient) => {\n await tx.$executeRaw`SELECT set_config('app.current_tenant', ${tenantId}, true)`;\n return fn(tx);\n });\n },\n\n async runAsSystem<T>(\n fn: (database: PrismaTransactionClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx: PrismaTransactionClient) => {\n await tx.$executeRaw`SELECT set_config('app.bypass_rls', 'true', true)`;\n return fn(tx);\n });\n },\n };\n}\n","import type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport type { PrismaTransactionClient } from \"./types.js\";\n\n/\n Converts a raw DB row to the Tenant shape expected by core.\n /\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n const createdAt = row.created_at ?? row.createdAt;\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 Validate table name to prevent SQL injection. Only allows [a-zA-Z_][a-zA-Z0-9_].\n /\nfunction assertSafeIdentifier(name: string): void {\n if (!/^[a-zA-Z_][a-zA-Z0-9_]$/.test(name)) {\n throw new Error(\n `better-tenant: invalid table name \"${name}\" — must be [a-zA-Z_][a-zA-Z0-9_]`,\n );\n }\n}\n\n/*\n Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n \n Uses raw SQL ($queryRawUnsafe / $executeRawUnsafe) on the Prisma transaction\n * client so the adapter works without requiring a generated `Tenant` model in\n * the user's Prisma schema. The tenants table must match the CLI-generated shape\n * (id UUID, name TEXT, slug TEXT, created_at TIMESTAMPTZ).\n \n Table name is validated at creation time to prevent injection — only\n * alphanumeric + underscore identifiers are accepted.\n \n @param tableName - SQL table name (default: \"tenants\")\n /\nexport function createGetTenantRepository(\n tableName = \"tenants\",\n): (database: PrismaTransactionClient) => TenantRepository {\n assertSafeIdentifier(tableName);\n\n return (database: PrismaTransactionClient) => {\n const tx = database;\n\n return {\n async create(data) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `INSERT INTO ${tableName} (name, slug) VALUES ($1, $2) RETURNING `,\n data.name,\n data.slug,\n );\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);\n },\n\n async getById(tenantId: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async getBySlug(slug: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE slug = $1 LIMIT 1`,\n slug,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async update(tenantId, data) {\n const setClauses: string[] = [];\n const values: unknown[] = [];\n\n if (data.name !== undefined) {\n values.push(data.name);\n setClauses.push(`name = $${String(values.length)}`);\n }\n if (data.slug !== undefined) {\n values.push(data.slug);\n setClauses.push(`slug = $${String(values.length)}`);\n }\n\n if (setClauses.length === 0) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\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);\n }\n\n values.push(tenantId);\n const query = `UPDATE ${tableName} SET ${setClauses.join(\", \")} WHERE id = $${String(values.length)}::uuid RETURNING `;\n\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n query,\n ...values,\n );\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);\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 tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT FROM ${tableName} ORDER BY created_at ASC LIMIT $1 OFFSET $2`,\n limit,\n offset,\n );\n return rows.map(rowToTenant);\n },\n\n async delete(tenantId) {\n await tx.$executeRawUnsafe(\n `DELETE FROM ${tableName} WHERE id = $1::uuid`,\n tenantId,\n );\n },\n };\n };\n}\n","import type { DatabaseProvider } from \"@usebetterdev/tenant-core\";\nimport { prismaAdapter } from \"./adapter.js\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\nimport { createGetTenantRepository } from \"./repository.js\";\n\n/*\n Creates a DatabaseProvider for Prisma (PostgreSQL).\n \n Bundles prismaAdapter + createGetTenantRepository into a single config value\n * for use with `betterTenant({ database: prismaDatabase(prisma) })`.\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @param options - Optional: custom table name (default: \"tenants\")\n */\nexport function prismaDatabase(\n prisma: PrismaClientLike,\n options?: { tableName?: string },\n): DatabaseProvider<PrismaTransactionClient, PrismaTransactionClient> {\n return {\n adapter: prismaAdapter(prisma),\n getTenantRepository: createGetTenantRepository(options?.tableName),\n };\n}\n"],"mappings":"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","names":["rows","row"]}
1	+ {"version":3,"sources":["../src/index.ts","../src/adapter.ts","../src/repository.ts","../src/database.ts"],"sourcesContent":["export { prismaDatabase } from \"./database.js\";\nexport type {\n PrismaClientLike,\n PrismaTransactionClient,\n WithOptionalTenant,\n} from \"./types.js\";\n","import type { TenantAdapter } from \"@usebetterdev/tenant-core\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\n\n/*\n Creates a TenantAdapter for Prisma (PostgreSQL).\n \n Uses an interactive transaction per runWithTenant:\n * BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n \n The handle passed to fn is the Prisma transaction client; use only this\n * handle for tenant-scoped queries so RLS applies.\n \n runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = 'true'\n * so RLS policies that allow when current_setting('app.bypass_rls', true) = 'true'\n * permit access (CLI generates this bypass policy).\n \n Generic `TxClient` flows from `PrismaClientLike<TxClient>` so\n * `getDatabase()` returns the user's full transaction client type.\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @returns TenantAdapter implementation\n /\nexport function prismaAdapter<\n TxClient extends PrismaTransactionClient = PrismaTransactionClient,\n>(\n prisma: PrismaClientLike<TxClient>,\n): TenantAdapter<TxClient, TxClient> {\n return {\n async runWithTenant<T>(\n tenantId: string,\n fn: (database: TxClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx) => {\n await tx.$executeRaw`SELECT set_config('app.current_tenant', ${tenantId}, true)`;\n return fn(tx);\n });\n },\n\n async runAsSystem<T>(\n fn: (database: TxClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx) => {\n await tx.$executeRaw`SELECT set_config('app.bypass_rls', 'true', true)`;\n return fn(tx);\n });\n },\n };\n}\n","import type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport type { PrismaTransactionClient } from \"./types.js\";\n\n/\n Converts a raw DB row to the Tenant shape expected by core.\n /\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n const createdAt = row.created_at ?? row.createdAt;\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 };\n}\n\n/\n Validate table name to prevent SQL injection. Only allows [a-zA-Z_][a-zA-Z0-9_].\n /\nfunction assertSafeIdentifier(name: string): void {\n if (!/^[a-zA-Z_][a-zA-Z0-9_]$/.test(name)) {\n throw new Error(\n `better-tenant: invalid table name \"${name}\" — must be [a-zA-Z_][a-zA-Z0-9_]`,\n );\n }\n}\n\n/*\n Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n \n Uses raw SQL ($queryRawUnsafe / $executeRawUnsafe) on the Prisma transaction\n * client so the adapter works without requiring a generated `Tenant` model in\n * the user's Prisma schema. The tenants table must match the CLI-generated shape\n * (id UUID, name TEXT, slug TEXT, created_at TIMESTAMPTZ).\n \n Table name is validated at creation time to prevent injection — only\n * alphanumeric + underscore identifiers are accepted.\n \n @param tableName - SQL table name (default: \"tenants\")\n /\nexport function createGetTenantRepository(\n tableName = \"tenants\",\n): (database: PrismaTransactionClient) => TenantRepository {\n assertSafeIdentifier(tableName);\n\n return (database: PrismaTransactionClient) => {\n const tx = database;\n\n return {\n async create(data) {\n const id = crypto.randomUUID();\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `INSERT INTO ${tableName} (id, name, slug) VALUES ($1::uuid, $2, $3) RETURNING `,\n id,\n data.name,\n data.slug,\n );\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);\n },\n\n async getById(tenantId: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async getBySlug(slug: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE slug = $1 LIMIT 1`,\n slug,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async update(tenantId, data) {\n const setClauses: string[] = [];\n const values: unknown[] = [];\n\n if (data.name !== undefined) {\n values.push(data.name);\n setClauses.push(`name = $${String(values.length)}`);\n }\n if (data.slug !== undefined) {\n values.push(data.slug);\n setClauses.push(`slug = $${String(values.length)}`);\n }\n\n if (setClauses.length === 0) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\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);\n }\n\n values.push(tenantId);\n const query = `UPDATE ${tableName} SET ${setClauses.join(\", \")} WHERE id = $${String(values.length)}::uuid RETURNING `;\n\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n query,\n ...values,\n );\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);\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 tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT FROM ${tableName} ORDER BY created_at ASC LIMIT $1 OFFSET $2`,\n limit,\n offset,\n );\n return rows.map(rowToTenant);\n },\n\n async delete(tenantId) {\n await tx.$executeRawUnsafe(\n `DELETE FROM ${tableName} WHERE id = $1::uuid`,\n tenantId,\n );\n },\n\n async count() {\n const rows = await tx.$queryRawUnsafe<{ count: bigint \| number \| string }[]>(\n `SELECT count()::int AS count FROM ${tableName}`,\n );\n const row = rows[0];\n return Number(row?.count ?? 0);\n },\n };\n };\n}\n","import type { DatabaseProvider } from \"@usebetterdev/tenant-core\";\nimport { prismaAdapter } from \"./adapter.js\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\nimport { createGetTenantRepository } from \"./repository.js\";\n\n/\n Creates a DatabaseProvider for Prisma (PostgreSQL).\n \n Bundles prismaAdapter + createGetTenantRepository into a single config value\n * for use with `betterTenant({ database: prismaDatabase(prisma) })`.\n \n Generic `TxClient` is inferred from the PrismaClient's `$transaction` callback,\n * so `getDatabase()` returns the user's full transaction client type with model\n * methods (e.g. `db.project.findMany()`) instead of just raw query methods.\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @param options - Optional: custom table name (default: \"tenants\")\n */\nexport function prismaDatabase<\n TxClient extends PrismaTransactionClient = PrismaTransactionClient,\n>(\n prisma: PrismaClientLike<TxClient>,\n options?: { tableName?: string },\n): DatabaseProvider<TxClient, TxClient> {\n return {\n adapter: prismaAdapter(prisma),\n getTenantRepository: createGetTenantRepository(options?.tableName),\n };\n}\n"],"mappings":"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","names":["rows","row"]}

package/dist/index.d.cts CHANGED Viewed

@@ -16,13 +16,38 @@ type PrismaTransactionClient = {
  * Minimal PrismaClient shape: must support interactive `$transaction`.
  *
  * Matches `new PrismaClient()` — no generated model types required at build time.
+ *
+ * Generic `TxClient` allows the transaction client type to flow through
+ * so `getDatabase()` returns the user's full Prisma transaction client
+ * (with model methods like `db.project.findMany()`) instead of `unknown`.
  */
-type PrismaClientLike = PrismaTransactionClient & {
-    $transaction<T>(fn: (tx: PrismaTransactionClient) => Promise<T>, options?: {
+type PrismaClientLike<TxClient extends PrismaTransactionClient = PrismaTransactionClient> = PrismaTransactionClient & {
+    $transaction<T>(fn: (tx: TxClient) => Promise<T>, options?: {
         maxWait?: number;
         timeout?: number;
+        isolationLevel?: string;
     }): Promise<T>;
 };
+/**
+ * Makes `tenantId` optional in a Prisma create/update input type.
+ *
+ * When a model has a `@relation` to a Tenant model, Prisma generates `tenantId`
+ * as required in `UncheckedCreateInput` regardless of `@default(dbgenerated(...))`.
+ * Wrap your data type with this utility to safely omit `tenantId` — the
+ * `set_tenant_id()` trigger fills it from the session variable at INSERT time.
+ *
+ * @example
+ * ```ts
+ * import type { WithOptionalTenant } from "@usebetterdev/tenant/prisma";
+ * import type { ProjectUncheckedCreateInput } from "./generated/prisma/models/Project.js";
+ *
+ * const data: WithOptionalTenant<ProjectUncheckedCreateInput> = { name: "Alpha" };
+ * await db.project.create({ data: data as ProjectUncheckedCreateInput });
+ * ```
+ */
+type WithOptionalTenant<T> = Omit<T, "tenantId" | "tenant"> & {
+    tenantId?: string;
+};
 /**
  * Creates a DatabaseProvider for Prisma (PostgreSQL).
@@ -30,11 +55,15 @@ type PrismaClientLike = PrismaTransactionClient & {
  * Bundles prismaAdapter + createGetTenantRepository into a single config value
  * for use with `betterTenant({ database: prismaDatabase(prisma) })`.
  *
+ * Generic `TxClient` is inferred from the PrismaClient's `$transaction` callback,
+ * so `getDatabase()` returns the user's full transaction client type with model
+ * methods (e.g. `db.project.findMany()`) instead of just raw query methods.
+ *
  * @param prisma - PrismaClient instance (or anything matching PrismaClientLike)
  * @param options - Optional: custom table name (default: "tenants")
  */
-declare function prismaDatabase(prisma: PrismaClientLike, options?: {
+declare function prismaDatabase<TxClient extends PrismaTransactionClient = PrismaTransactionClient>(prisma: PrismaClientLike<TxClient>, options?: {
     tableName?: string;
-}): DatabaseProvider<PrismaTransactionClient, PrismaTransactionClient>;
+}): DatabaseProvider<TxClient, TxClient>;
-export { type PrismaClientLike, type PrismaTransactionClient, prismaDatabase };
+export { type PrismaClientLike, type PrismaTransactionClient, type WithOptionalTenant, prismaDatabase };

package/dist/index.d.ts CHANGED Viewed

@@ -16,13 +16,38 @@ type PrismaTransactionClient = {
  * Minimal PrismaClient shape: must support interactive `$transaction`.
  *
  * Matches `new PrismaClient()` — no generated model types required at build time.
+ *
+ * Generic `TxClient` allows the transaction client type to flow through
+ * so `getDatabase()` returns the user's full Prisma transaction client
+ * (with model methods like `db.project.findMany()`) instead of `unknown`.
  */
-type PrismaClientLike = PrismaTransactionClient & {
-    $transaction<T>(fn: (tx: PrismaTransactionClient) => Promise<T>, options?: {
+type PrismaClientLike<TxClient extends PrismaTransactionClient = PrismaTransactionClient> = PrismaTransactionClient & {
+    $transaction<T>(fn: (tx: TxClient) => Promise<T>, options?: {
         maxWait?: number;
         timeout?: number;
+        isolationLevel?: string;
     }): Promise<T>;
 };
+/**
+ * Makes `tenantId` optional in a Prisma create/update input type.
+ *
+ * When a model has a `@relation` to a Tenant model, Prisma generates `tenantId`
+ * as required in `UncheckedCreateInput` regardless of `@default(dbgenerated(...))`.
+ * Wrap your data type with this utility to safely omit `tenantId` — the
+ * `set_tenant_id()` trigger fills it from the session variable at INSERT time.
+ *
+ * @example
+ * ```ts
+ * import type { WithOptionalTenant } from "@usebetterdev/tenant/prisma";
+ * import type { ProjectUncheckedCreateInput } from "./generated/prisma/models/Project.js";
+ *
+ * const data: WithOptionalTenant<ProjectUncheckedCreateInput> = { name: "Alpha" };
+ * await db.project.create({ data: data as ProjectUncheckedCreateInput });
+ * ```
+ */
+type WithOptionalTenant<T> = Omit<T, "tenantId" | "tenant"> & {
+    tenantId?: string;
+};
 /**
  * Creates a DatabaseProvider for Prisma (PostgreSQL).
@@ -30,11 +55,15 @@ type PrismaClientLike = PrismaTransactionClient & {
  * Bundles prismaAdapter + createGetTenantRepository into a single config value
  * for use with `betterTenant({ database: prismaDatabase(prisma) })`.
  *
+ * Generic `TxClient` is inferred from the PrismaClient's `$transaction` callback,
+ * so `getDatabase()` returns the user's full transaction client type with model
+ * methods (e.g. `db.project.findMany()`) instead of just raw query methods.
+ *
  * @param prisma - PrismaClient instance (or anything matching PrismaClientLike)
  * @param options - Optional: custom table name (default: "tenants")
  */
-declare function prismaDatabase(prisma: PrismaClientLike, options?: {
+declare function prismaDatabase<TxClient extends PrismaTransactionClient = PrismaTransactionClient>(prisma: PrismaClientLike<TxClient>, options?: {
     tableName?: string;
-}): DatabaseProvider<PrismaTransactionClient, PrismaTransactionClient>;
+}): DatabaseProvider<TxClient, TxClient>;
-export { type PrismaClientLike, type PrismaTransactionClient, prismaDatabase };
+export { type PrismaClientLike, type PrismaTransactionClient, type WithOptionalTenant, prismaDatabase };

package/dist/index.js CHANGED Viewed

@@ -26,8 +26,7 @@ function rowToTenant(row) {
     id: String(row.id),
     name: String(row.name),
     slug: String(row.slug),
-    createdAt,
-    ...row
+    createdAt
   };
 }
 function assertSafeIdentifier(name) {
@@ -43,8 +42,10 @@ function createGetTenantRepository(tableName = "tenants") {
     const tx = database;
     return {
       async create(data) {
+        const id = crypto.randomUUID();
         const rows = await tx.$queryRawUnsafe(
-          `INSERT INTO ${tableName} (name, slug) VALUES ($1, $2) RETURNING *`,
+          `INSERT INTO ${tableName} (id, name, slug) VALUES ($1::uuid, $2, $3) RETURNING *`,
+          id,
           data.name,
           data.slug
         );
@@ -125,6 +126,13 @@ function createGetTenantRepository(tableName = "tenants") {
           `DELETE FROM ${tableName} WHERE id = $1::uuid`,
           tenantId
         );
+      },
+      async count() {
+        const rows = await tx.$queryRawUnsafe(
+          `SELECT count(*)::int AS count FROM ${tableName}`
+        );
+        const row = rows[0];
+        return Number(row?.count ?? 0);
       }
     };
   };

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/adapter.ts","../src/repository.ts","../src/database.ts"],"sourcesContent":["import type { TenantAdapter } from \"@usebetterdev/tenant-core\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\n\n/*\n Creates a TenantAdapter for Prisma (PostgreSQL).\n \n Uses an interactive transaction per runWithTenant:\n * BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n \n The handle passed to fn is the Prisma transaction client; use only this\n * handle for tenant-scoped queries so RLS applies.\n \n runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = 'true'\n * so RLS policies that allow when current_setting('app.bypass_rls', true) = 'true'\n * permit access (CLI generates this bypass policy).\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @returns TenantAdapter implementation\n /\nexport function prismaAdapter(\n prisma: PrismaClientLike,\n): TenantAdapter<PrismaTransactionClient, PrismaTransactionClient> {\n return {\n async runWithTenant<T>(\n tenantId: string,\n fn: (database: PrismaTransactionClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx: PrismaTransactionClient) => {\n await tx.$executeRaw`SELECT set_config('app.current_tenant', ${tenantId}, true)`;\n return fn(tx);\n });\n },\n\n async runAsSystem<T>(\n fn: (database: PrismaTransactionClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx: PrismaTransactionClient) => {\n await tx.$executeRaw`SELECT set_config('app.bypass_rls', 'true', true)`;\n return fn(tx);\n });\n },\n };\n}\n","import type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport type { PrismaTransactionClient } from \"./types.js\";\n\n/\n Converts a raw DB row to the Tenant shape expected by core.\n /\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n const createdAt = row.created_at ?? row.createdAt;\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 Validate table name to prevent SQL injection. Only allows [a-zA-Z_][a-zA-Z0-9_].\n /\nfunction assertSafeIdentifier(name: string): void {\n if (!/^[a-zA-Z_][a-zA-Z0-9_]$/.test(name)) {\n throw new Error(\n `better-tenant: invalid table name \"${name}\" — must be [a-zA-Z_][a-zA-Z0-9_]`,\n );\n }\n}\n\n/*\n Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n \n Uses raw SQL ($queryRawUnsafe / $executeRawUnsafe) on the Prisma transaction\n * client so the adapter works without requiring a generated `Tenant` model in\n * the user's Prisma schema. The tenants table must match the CLI-generated shape\n * (id UUID, name TEXT, slug TEXT, created_at TIMESTAMPTZ).\n \n Table name is validated at creation time to prevent injection — only\n * alphanumeric + underscore identifiers are accepted.\n \n @param tableName - SQL table name (default: \"tenants\")\n /\nexport function createGetTenantRepository(\n tableName = \"tenants\",\n): (database: PrismaTransactionClient) => TenantRepository {\n assertSafeIdentifier(tableName);\n\n return (database: PrismaTransactionClient) => {\n const tx = database;\n\n return {\n async create(data) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `INSERT INTO ${tableName} (name, slug) VALUES ($1, $2) RETURNING `,\n data.name,\n data.slug,\n );\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);\n },\n\n async getById(tenantId: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async getBySlug(slug: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE slug = $1 LIMIT 1`,\n slug,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async update(tenantId, data) {\n const setClauses: string[] = [];\n const values: unknown[] = [];\n\n if (data.name !== undefined) {\n values.push(data.name);\n setClauses.push(`name = $${String(values.length)}`);\n }\n if (data.slug !== undefined) {\n values.push(data.slug);\n setClauses.push(`slug = $${String(values.length)}`);\n }\n\n if (setClauses.length === 0) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\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);\n }\n\n values.push(tenantId);\n const query = `UPDATE ${tableName} SET ${setClauses.join(\", \")} WHERE id = $${String(values.length)}::uuid RETURNING `;\n\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n query,\n ...values,\n );\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);\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 tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT FROM ${tableName} ORDER BY created_at ASC LIMIT $1 OFFSET $2`,\n limit,\n offset,\n );\n return rows.map(rowToTenant);\n },\n\n async delete(tenantId) {\n await tx.$executeRawUnsafe(\n `DELETE FROM ${tableName} WHERE id = $1::uuid`,\n tenantId,\n );\n },\n };\n };\n}\n","import type { DatabaseProvider } from \"@usebetterdev/tenant-core\";\nimport { prismaAdapter } from \"./adapter.js\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\nimport { createGetTenantRepository } from \"./repository.js\";\n\n/*\n Creates a DatabaseProvider for Prisma (PostgreSQL).\n \n Bundles prismaAdapter + createGetTenantRepository into a single config value\n * for use with `betterTenant({ database: prismaDatabase(prisma) })`.\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @param options - Optional: custom table name (default: \"tenants\")\n */\nexport function prismaDatabase(\n prisma: PrismaClientLike,\n options?: { tableName?: string },\n): DatabaseProvider<PrismaTransactionClient, PrismaTransactionClient> {\n return {\n adapter: prismaAdapter(prisma),\n getTenantRepository: createGetTenantRepository(options?.tableName),\n };\n}\n"],"mappings":"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","names":["rows","row"]}
1	+ {"version":3,"sources":["../src/adapter.ts","../src/repository.ts","../src/database.ts"],"sourcesContent":["import type { TenantAdapter } from \"@usebetterdev/tenant-core\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\n\n/*\n Creates a TenantAdapter for Prisma (PostgreSQL).\n \n Uses an interactive transaction per runWithTenant:\n * BEGIN → SET LOCAL app.current_tenant = tenantId → fn(tx) → COMMIT.\n \n The handle passed to fn is the Prisma transaction client; use only this\n * handle for tenant-scoped queries so RLS applies.\n \n runAsSystem runs in a transaction with SET LOCAL app.bypass_rls = 'true'\n * so RLS policies that allow when current_setting('app.bypass_rls', true) = 'true'\n * permit access (CLI generates this bypass policy).\n \n Generic `TxClient` flows from `PrismaClientLike<TxClient>` so\n * `getDatabase()` returns the user's full transaction client type.\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @returns TenantAdapter implementation\n /\nexport function prismaAdapter<\n TxClient extends PrismaTransactionClient = PrismaTransactionClient,\n>(\n prisma: PrismaClientLike<TxClient>,\n): TenantAdapter<TxClient, TxClient> {\n return {\n async runWithTenant<T>(\n tenantId: string,\n fn: (database: TxClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx) => {\n await tx.$executeRaw`SELECT set_config('app.current_tenant', ${tenantId}, true)`;\n return fn(tx);\n });\n },\n\n async runAsSystem<T>(\n fn: (database: TxClient) => Promise<T>,\n ): Promise<T> {\n return prisma.$transaction(async (tx) => {\n await tx.$executeRaw`SELECT set_config('app.bypass_rls', 'true', true)`;\n return fn(tx);\n });\n },\n };\n}\n","import type { Tenant, TenantRepository } from \"@usebetterdev/tenant-core\";\nimport type { PrismaTransactionClient } from \"./types.js\";\n\n/\n Converts a raw DB row to the Tenant shape expected by core.\n /\nfunction rowToTenant(row: Record<string, unknown>): Tenant {\n const createdAt = row.created_at ?? row.createdAt;\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 };\n}\n\n/\n Validate table name to prevent SQL injection. Only allows [a-zA-Z_][a-zA-Z0-9_].\n /\nfunction assertSafeIdentifier(name: string): void {\n if (!/^[a-zA-Z_][a-zA-Z0-9_]$/.test(name)) {\n throw new Error(\n `better-tenant: invalid table name \"${name}\" — must be [a-zA-Z_][a-zA-Z0-9_]`,\n );\n }\n}\n\n/*\n Creates getTenantRepository for use with betterTenant({ getTenantRepository }).\n \n Uses raw SQL ($queryRawUnsafe / $executeRawUnsafe) on the Prisma transaction\n * client so the adapter works without requiring a generated `Tenant` model in\n * the user's Prisma schema. The tenants table must match the CLI-generated shape\n * (id UUID, name TEXT, slug TEXT, created_at TIMESTAMPTZ).\n \n Table name is validated at creation time to prevent injection — only\n * alphanumeric + underscore identifiers are accepted.\n \n @param tableName - SQL table name (default: \"tenants\")\n /\nexport function createGetTenantRepository(\n tableName = \"tenants\",\n): (database: PrismaTransactionClient) => TenantRepository {\n assertSafeIdentifier(tableName);\n\n return (database: PrismaTransactionClient) => {\n const tx = database;\n\n return {\n async create(data) {\n const id = crypto.randomUUID();\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `INSERT INTO ${tableName} (id, name, slug) VALUES ($1::uuid, $2, $3) RETURNING `,\n id,\n data.name,\n data.slug,\n );\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);\n },\n\n async getById(tenantId: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async getBySlug(slug: string) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE slug = $1 LIMIT 1`,\n slug,\n );\n const row = rows[0];\n if (!row \|\| typeof row !== \"object\") {\n return null;\n }\n return rowToTenant(row);\n },\n\n async update(tenantId, data) {\n const setClauses: string[] = [];\n const values: unknown[] = [];\n\n if (data.name !== undefined) {\n values.push(data.name);\n setClauses.push(`name = $${String(values.length)}`);\n }\n if (data.slug !== undefined) {\n values.push(data.slug);\n setClauses.push(`slug = $${String(values.length)}`);\n }\n\n if (setClauses.length === 0) {\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT * FROM ${tableName} WHERE id = $1::uuid LIMIT 1`,\n tenantId,\n );\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);\n }\n\n values.push(tenantId);\n const query = `UPDATE ${tableName} SET ${setClauses.join(\", \")} WHERE id = $${String(values.length)}::uuid RETURNING `;\n\n const rows = await tx.$queryRawUnsafe<Record<string, unknown>[]>(\n query,\n ...values,\n );\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);\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 tx.$queryRawUnsafe<Record<string, unknown>[]>(\n `SELECT FROM ${tableName} ORDER BY created_at ASC LIMIT $1 OFFSET $2`,\n limit,\n offset,\n );\n return rows.map(rowToTenant);\n },\n\n async delete(tenantId) {\n await tx.$executeRawUnsafe(\n `DELETE FROM ${tableName} WHERE id = $1::uuid`,\n tenantId,\n );\n },\n\n async count() {\n const rows = await tx.$queryRawUnsafe<{ count: bigint \| number \| string }[]>(\n `SELECT count()::int AS count FROM ${tableName}`,\n );\n const row = rows[0];\n return Number(row?.count ?? 0);\n },\n };\n };\n}\n","import type { DatabaseProvider } from \"@usebetterdev/tenant-core\";\nimport { prismaAdapter } from \"./adapter.js\";\nimport type { PrismaClientLike, PrismaTransactionClient } from \"./types.js\";\nimport { createGetTenantRepository } from \"./repository.js\";\n\n/\n Creates a DatabaseProvider for Prisma (PostgreSQL).\n \n Bundles prismaAdapter + createGetTenantRepository into a single config value\n * for use with `betterTenant({ database: prismaDatabase(prisma) })`.\n \n Generic `TxClient` is inferred from the PrismaClient's `$transaction` callback,\n * so `getDatabase()` returns the user's full transaction client type with model\n * methods (e.g. `db.project.findMany()`) instead of just raw query methods.\n \n @param prisma - PrismaClient instance (or anything matching PrismaClientLike)\n * @param options - Optional: custom table name (default: \"tenants\")\n */\nexport function prismaDatabase<\n TxClient extends PrismaTransactionClient = PrismaTransactionClient,\n>(\n prisma: PrismaClientLike<TxClient>,\n options?: { tableName?: string },\n): DatabaseProvider<TxClient, TxClient> {\n return {\n adapter: prismaAdapter(prisma),\n getTenantRepository: createGetTenantRepository(options?.tableName),\n };\n}\n"],"mappings":"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","names":["rows","row"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@usebetterdev/tenant-prisma",
-  "version": "0.2.1-beta.1",
+  "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",
@@ -24,14 +24,18 @@
     "README.md"
   ],
   "dependencies": {
-    "@usebetterdev/tenant-core": "0.2.1-beta.1"
+    "@usebetterdev/tenant-core": "0.3.0-beta.3"
   },
   "peerDependencies": {
-    "@prisma/client": ">=5.0.0"
+    "@prisma/client": ">=7.0.0",
+    "@prisma/adapter-pg": ">=7.0.0"
   },
   "peerDependenciesMeta": {
     "@prisma/client": {
       "optional": false
+    },
+    "@prisma/adapter-pg": {
+      "optional": false
     }
   },
   "devDependencies": {
@@ -42,7 +46,7 @@
     "tsup": "^8.3.5",
     "typescript": "~5.7.2",
     "vitest": "^2.1.6",
-    "@usebetterdev/test-utils": "0.2.1-beta.1"
+    "@usebetterdev/test-utils": "0.3.0-beta.3"
   },
   "engines": {
     "node": ">=22"