@better-auth/drizzle-adapter 1.6.22 → 1.6.24

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 import { DBAdapter, DBAdapterDebugLogOption } from "@better-auth/core/db/adapter";
 import { BetterAuthOptions } from "@better-auth/core";
-
 //#region src/drizzle-adapter.d.ts
 interface DB {
   [key: string]: any;

package/dist/index.mjs

@@ -41,15 +41,19 @@ function insensitiveNe(column, value) {
 /**
 * Derive the number of affected rows from a Drizzle write result.
 *
-* Drizzle's drivers report affected rows under different shapes: postgres-js
-* exposes `rowCount`, mysql2 reports `affectedRows`/`rowsAffected` (sometimes as
-* the first element of a result-header array), and better-sqlite3 uses
-* `changes`. This normalizes those so write methods that depend on affected
-* rows honor the adapter contract instead of leaking the raw driver result.
+* Drizzle returns the raw per-driver result for a non-returning write, so the
+* count lives under a different field per driver: node-postgres / neon expose
+* `rowCount`, postgres-js / bun-sql carry `count` on an Array subclass, mysql2
+* reports `affectedRows` (in a result-header array), planetscale and other
+* serverless drivers use `rowsAffected`, better-sqlite3 uses `changes`, and
+* Cloudflare D1 nests the count under `meta.changes`. This normalizes them so
+* write methods that depend on affected rows honor the adapter contract instead
+* of leaking the raw driver result.
 */
 function getAffectedRowCount(result, operation, context) {
 	let count = 0;
 	if (result && typeof result === "object" && "rowCount" in result) count = result.rowCount;
+	else if (result && typeof result === "object" && typeof result.count === "number") count = result.count;
 	else if (Array.isArray(result)) count = result.length > 0 && hasDriverRowCount(result[0]) ? readDriverRowCount(result[0]) : result.length;
 	else if (hasDriverRowCount(result)) count = readDriverRowCount(result);
 	if (typeof count !== "number") {
@@ -61,12 +65,18 @@ function getAffectedRowCount(result, operation, context) {
 	}
 	return count;
 }
-function hasDriverRowCount(result) {
-	return !!result && typeof result === "object" && ("affectedRows" in result || "rowsAffected" in result || "changes" in result);
-}
 function readDriverRowCount(result) {
-	const r = result;
-	return r.affectedRows ?? r.rowsAffected ?? r.changes;
+	if (!result || typeof result !== "object") return void 0;
+	if ("affectedRows" in result) return result.affectedRows;
+	if ("rowsAffected" in result) return result.rowsAffected;
+	if ("changes" in result) return result.changes;
+	if ("meta" in result) {
+		const meta = result.meta;
+		if (meta && typeof meta === "object" && "changes" in meta) return meta.changes;
+	}
+}
+function hasDriverRowCount(result) {
+	return readDriverRowCount(result) !== void 0;
 }
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
@@ -321,7 +331,8 @@ const drizzleAdapter = (db, config) => {
 			async create({ model, data: values }) {
 				const schemaModel = getSchema(model);
 				checkMissingFields(schemaModel, model, values);
-				return await withReturning(model, db.insert(schemaModel).values(values), values);
+				const builder = db.insert(schemaModel).values(values);
+				return await withReturning(model, builder, values);
 			},
 			async findOne({ model, where, select, join }) {
 				const schemaModel = getSchema(model);
@@ -456,7 +467,8 @@ const drizzleAdapter = (db, config) => {
 			async update({ model, where, update: values }) {
 				const schemaModel = getSchema(model);
 				const clause = convertWhereClause(where, model);
-				return await withReturning(model, db.update(schemaModel).set(values).where(...clause), values, where);
+				const builder = db.update(schemaModel).set(values).where(...clause);
+				return await withReturning(model, builder, values, where);
 			},
 			async updateMany({ model, where, update: values }) {
 				const schemaModel = getSchema(model);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/drizzle-adapter",
-  "version": "1.6.22",
+  "version": "1.6.24",
   "bugs": {
     "url": "https://github.com/better-auth/better-auth/issues"
   },
@@ -40,7 +40,7 @@
   "peerDependencies": {
     "@better-auth/utils": "0.4.2",
     "drizzle-orm": "^0.45.2",
-    "@better-auth/core": "^1.6.22"
+    "@better-auth/core": "^1.6.24"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {
@@ -50,9 +50,9 @@
   "devDependencies": {
     "@better-auth/utils": "0.4.2",
     "drizzle-orm": "^0.45.2",
-    "tsdown": "0.21.1",
-    "typescript": "^5.9.3",
-    "@better-auth/core": "1.6.22"
+    "tsdown": "0.22.7",
+    "typescript": "^6.0.3",
+    "@better-auth/core": "1.6.24"
   },
   "scripts": {
     "build": "tsdown",