@better-auth/prisma-adapter 1.7.0-beta.1 → 1.7.0-beta.10

package/dist/index.mjs

@@ -1,9 +1,12 @@
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
 import { BetterAuthError } from "@better-auth/core/error";
 //#region src/prisma-adapter.ts
+function isPrismaNotFoundError(e) {
+	return e?.code === "P2025";
+}
 const prismaAdapter = (prisma, config) => {
 	let lazyOptions = null;
-	const createCustomAdapter = (prisma) => ({ getFieldName, getModelName, getFieldAttributes, getDefaultModelName, schema }) => {
+	const createCustomAdapter = (prisma, inTransaction = false) => ({ getFieldName, getModelName, getFieldAttributes, getDefaultModelName, schema }) => {
 		const db = prisma;
 		const convertSelect = (select, model, join) => {
 			if (!select && !join) return void 0;
@@ -258,10 +261,15 @@ const prismaAdapter = (prisma, config) => {
 					where,
 					action: "update"
 				});
-				return await db[model].update({
-					where: whereClause,
-					data: update
-				});
+				try {
+					return await db[model].update({
+						where: whereClause,
+						data: update
+					});
+				} catch (e) {
+					if (isPrismaNotFoundError(e)) return null;
+					throw e;
+				}
 			},
 			async updateMany({ model, where, update }) {
 				if (!db[model]) throw new BetterAuthError(`Model ${model} does not exist in the database. If you haven't generated the Prisma client, you need to run 'npx prisma generate'`);
@@ -295,9 +303,8 @@ const prismaAdapter = (prisma, config) => {
 				try {
 					await db[model].delete({ where: whereClause });
 				} catch (e) {
-					if (e?.meta?.cause === "Record to delete does not exist.") return;
-					if (e?.code === "P2025") return;
-					console.log(e);
+					if (isPrismaNotFoundError(e)) return;
+					throw e;
 				}
 			},
 			async deleteMany({ model, where }) {
@@ -309,6 +316,98 @@ const prismaAdapter = (prisma, config) => {
 				const result = await db[model].deleteMany({ where: whereClause });
 				return result ? result.count : 0;
 			},
+			async consumeOne({ model, where }) {
+				if (!db[model]) throw new BetterAuthError(`Model ${model} does not exist in the database. If you haven't generated the Prisma client, you need to run 'npx prisma generate'`);
+				if (where?.some((w) => w.field === "id")) {
+					const whereClause = convertWhereClause({
+						model,
+						where,
+						action: "delete"
+					});
+					try {
+						return await db[model].delete({ where: whereClause }) ?? null;
+					} catch (e) {
+						if (isPrismaNotFoundError(e)) return null;
+						throw e;
+					}
+				}
+				const findWhere = convertWhereClause({
+					model,
+					where,
+					action: "findOne"
+				});
+				const claimFromTransaction = async (tx) => {
+					const target = await tx[model].findFirst({ where: findWhere });
+					if (!target) return null;
+					try {
+						return (await tx[model].deleteMany({ where: convertWhereClause({
+							model,
+							where: [...where ?? [], {
+								field: "id",
+								value: target.id,
+								operator: "eq",
+								connector: "AND",
+								mode: "sensitive"
+							}],
+							action: "deleteMany"
+						}) }))?.count > 0 ? target : null;
+					} catch (e) {
+						if (isPrismaNotFoundError(e)) return null;
+						throw e;
+					}
+				};
+				return inTransaction || typeof db.$transaction !== "function" ? claimFromTransaction(db) : db.$transaction(claimFromTransaction);
+			},
+			async incrementOne({ model, where, increment, set }) {
+				if (!db[model]) throw new BetterAuthError(`Model ${model} does not exist in the database. If you haven't generated the Prisma client, you need to run 'npx prisma generate'`);
+				const data = { ...set ?? {} };
+				for (const [field, delta] of Object.entries(increment)) data[field] = { increment: delta };
+				if (where?.some((w) => w.field === "id")) {
+					const whereClause = convertWhereClause({
+						model,
+						where,
+						action: "update"
+					});
+					try {
+						return await db[model].update({
+							where: whereClause,
+							data
+						}) ?? null;
+					} catch (e) {
+						if (isPrismaNotFoundError(e)) return null;
+						throw e;
+					}
+				}
+				const findWhere = convertWhereClause({
+					model,
+					where,
+					action: "findOne"
+				});
+				const mutateInTransaction = async (tx) => {
+					const target = await tx[model].findFirst({ where: findWhere });
+					if (!target) return null;
+					try {
+						return await tx[model].update({
+							where: convertWhereClause({
+								model,
+								where: [...where, {
+									field: "id",
+									value: target.id,
+									operator: "eq",
+									connector: "AND",
+									mode: "sensitive"
+								}],
+								action: "update"
+							}),
+							data
+						}) ?? null;
+					} catch (e) {
+						if (isPrismaNotFoundError(e)) return null;
+						throw e;
+					}
+				};
+				return inTransaction || typeof db.$transaction !== "function" ? mutateInTransaction(db) : db.$transaction(mutateInTransaction);
+			},
 			options: config
 		};
 	};
@@ -323,8 +422,11 @@ const prismaAdapter = (prisma, config) => {
 			supportsArrays: config.provider === "postgresql" || config.provider === "mongodb" ? true : false,
 			transaction: config.transaction ?? false ? (cb) => prisma.$transaction((tx) => {
 				return cb(createAdapterFactory({
-					config: adapterOptions.config,
-					adapter: createCustomAdapter(tx)
+					config: {
+						...adapterOptions.config,
+						transaction: false
+					},
+					adapter: createCustomAdapter(tx, true)
 				})(lazyOptions));
 			}) : false
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/prisma-adapter",
-  "version": "1.7.0-beta.1",
+  "version": "1.7.0-beta.10",
   "description": "Prisma adapter for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -35,10 +35,10 @@
     }
   },
   "peerDependencies": {
-    "@better-auth/utils": "0.4.0",
+    "@better-auth/utils": "0.4.2",
     "@prisma/client": "^5.0.0 || ^6.0.0 || ^7.0.0",
     "prisma": "^5.0.0 || ^6.0.0 || ^7.0.0",
-    "@better-auth/core": "^1.7.0-beta.1"
+    "@better-auth/core": "^1.7.0-beta.10"
   },
   "peerDependenciesMeta": {
     "@prisma/client": {
@@ -49,10 +49,10 @@
     }
   },
   "devDependencies": {
-    "@better-auth/utils": "0.4.0",
+    "@better-auth/utils": "0.4.2",
     "tsdown": "0.21.1",
     "typescript": "^5.9.3",
-    "@better-auth/core": "1.7.0-beta.1"
+    "@better-auth/core": "1.7.0-beta.10"
   },
   "scripts": {
     "build": "tsdown",