@better-auth/kysely-adapter 1.6.9 → 1.6.11

package/dist/index.mjs

@@ -124,7 +124,7 @@ function insensitiveNe(columnRef, value) {
 //#region src/kysely-adapter.ts
 const kyselyAdapter = (db, config) => {
 	let lazyOptions = null;
-	const createCustomAdapter = (db) => {
+	const createCustomAdapter = (db, inTransaction = false) => {
 		return ({ getFieldName, schema, getDefaultFieldName, getDefaultModelName, getFieldAttributes, getModelName }) => {
 			const selectAllJoins = (join) => {
 				const allSelects = [];
@@ -425,6 +425,43 @@ const kyselyAdapter = (db, config) => {
 					const res = (await query.executeTakeFirst()).numDeletedRows;
 					return res > Number.MAX_SAFE_INTEGER ? Number.MAX_SAFE_INTEGER : Number(res);
 				},
+				async consumeOne({ model, where }) {
+					const { and, or } = convertWhereClause(model, where);
+					const applyWhere = (query) => {
+						if (and) query = query.where((eb) => eb.and(and.map((expr) => expr(eb))));
+						if (or) query = query.where((eb) => eb.or(or.map((expr) => expr(eb))));
+						return query;
+					};
+					const idField = getFieldName({
+						model,
+						field: "id"
+					});
+					const deleteSelectedRow = async (db, row) => {
+						const targetId = row[idField] ?? row.id;
+						if (targetId === void 0 || targetId === null) return null;
+						const query = db.deleteFrom(model).where(`${model}.${idField}`, "=", targetId);
+						if (config?.type === "mysql") {
+							const result = await query.executeTakeFirst();
+							return Number(result.numDeletedRows) > 0 ? row : null;
+						}
+						if (config?.type === "mssql") return await query.outputAll("deleted").executeTakeFirst() ?? null;
+						return await query.returningAll().executeTakeFirst() ?? null;
+					};
+					const deleteWithReturning = async (query) => {
+						if (config?.type === "mssql") return await query.outputAll("deleted").executeTakeFirst() ?? null;
+						return await query.returningAll().executeTakeFirst() ?? null;
+					};
+					if (config?.type === "mysql") {
+						const claimFromTransaction = async (trx) => {
+							const row = await applyWhere(trx.selectFrom(model).selectAll().forUpdate()).limit(1).executeTakeFirst();
+							if (!row) return null;
+							return deleteSelectedRow(trx, row);
+						};
+						return inTransaction ? claimFromTransaction(db) : db.transaction().execute(claimFromTransaction);
+					}
+					const targetIds = applyWhere(db.selectFrom(model).select(`${model}.${idField}`)).limit(1);
+					return deleteWithReturning(db.deleteFrom(model).where(`${model}.${idField}`, "in", targetIds));
+				},
 				options: config
 			};
 		};
@@ -443,8 +480,11 @@ const kyselyAdapter = (db, config) => {
 			supportsUUIDs: config?.type === "postgres" ? true : false,
 			transaction: config?.transaction ? (cb) => db.transaction().execute((trx) => {
 				return cb(createAdapterFactory({
-					config: adapterOptions.config,
-					adapter: createCustomAdapter(trx)
+					config: {
+						...adapterOptions.config,
+						transaction: false
+					},
+					adapter: createCustomAdapter(trx, true)
 				})(lazyOptions));
 			}) : false
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/kysely-adapter",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "description": "Kysely adapter for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -41,8 +41,8 @@
   },
   "peerDependencies": {
     "@better-auth/utils": "0.4.0",
-    "kysely": "^0.28.14",
-    "@better-auth/core": "^1.6.9"
+    "kysely": "^0.28.17",
+    "@better-auth/core": "^1.6.11"
   },
   "peerDependenciesMeta": {
     "kysely": {
@@ -52,10 +52,10 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250121.0",
     "@better-auth/utils": "0.4.0",
-    "kysely": "^0.28.14",
+    "kysely": "^0.28.17",
     "tsdown": "0.21.1",
     "typescript": "^5.9.3",
-    "@better-auth/core": "1.6.9"
+    "@better-auth/core": "1.6.11"
   },
   "scripts": {
     "build": "tsdown",