@better-auth/drizzle-adapter 1.7.3 → 1.7.5

package/dist/index.mjs

@@ -1,38 +1,9 @@
-import { a as insensitiveNe, c as getOneToOneRelationKey, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, r as insensitiveIlike, s as buildRelationKeysByModel } from "./query-builders-CBLMSM7v.mjs";
+import { a as insensitiveInArray, c as buildRelationKeysByModel, i as insensitiveIlike, l as getOneToOneRelationKey, o as insensitiveNe, r as insensitiveEq, s as insensitiveNotInArray, t as findDrizzleSchemaProblems } from "./schema-check-_Aj1MGau.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
-import { checksSchema, createSchemaCheck, diffSchema, getExpectedSchema, registerSchemaCheck } from "@better-auth/core/db/internal";
+import { checksSchema, createSchemaCheck, registerSchemaCheck } from "@better-auth/core/db/internal";
 import { logger } from "@better-auth/core/env";
 import { BetterAuthError } from "@better-auth/core/error";
-import { Column, Table, and, asc, count, desc, eq, getTableColumns, gt, gte, inArray, is, isNotNull, isNull, like, lt, lte, ne, notInArray, or, sql } from "drizzle-orm";
-//#region src/schema-check.ts
-/**
-* Reads a Drizzle schema object the way the adapter addresses it: each table
-* by the key it is exported under, each column by its property name. Values
-* that are not tables, such as relations, are skipped.
-*/
-function introspectDrizzleSchema(schema) {
-	const tables = [];
-	for (const [name, table] of Object.entries(schema)) {
-		if (!is(table, Table)) continue;
-		const columns = Object.entries(getTableColumns(table)).map(([key, column]) => ({
-			name: key,
-			nullable: !column.notNull,
-			hasDefault: column.hasDefault || column.generated !== void 0 || column.generatedIdentity !== void 0
-		}));
-		tables.push({
-			name,
-			columns
-		});
-	}
-	return tables;
-}
-/**
-* Compares a Drizzle schema object with the tables this configuration writes.
-*/
-function findDrizzleSchemaProblems(schema, options, usePlural) {
-	return diffSchema(getExpectedSchema(options, { usePlural }), introspectDrizzleSchema(schema));
-}
-//#endregion
+import { Column, and, asc, count, desc, eq, gt, gte, inArray, is, isNotNull, isNull, like, lt, lte, ne, notInArray, or, sql } from "drizzle-orm";
 //#region src/drizzle-adapter.ts
 /**
 * Derive the number of affected rows from a Drizzle write result.
@@ -78,7 +49,8 @@ function hasDriverRowCount(result) {
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
 	let mysqlNoIdWarned = false;
-	const relationKeysByModel = buildRelationKeysByModel(db._?.schema);
+	let relationKeysByModel;
+	const getRelationKeysByModel = () => relationKeysByModel ??= buildRelationKeysByModel(db._?.schema);
 	const createCustomAdapter = (db, inTransaction = false) => ({ getFieldName, getDefaultFieldName, getDefaultModelName, options, schema: baSchema }) => {
 		if (config.provider === "mysql" && options.advanced?.database?.generateId === false && !mysqlNoIdWarned) {
 			mysqlNoIdWarned = true;
@@ -350,7 +322,7 @@ const drizzleAdapter = (db, config) => {
 					} else {
 						let includes;
 						const renamedJoinResults = [];
-						const relationKeys = relationKeysByModel.get(queryModel);
+						const relationKeys = getRelationKeysByModel().get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
 						for (const [joinModel, joinAttr] of joinEntries) {
@@ -406,7 +378,7 @@ const drizzleAdapter = (db, config) => {
 					} else {
 						let includes;
 						const renamedJoinResults = [];
-						const relationKeys = relationKeysByModel.get(queryModel);
+						const relationKeys = getRelationKeysByModel().get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
 						for (const [joinModel, joinAttr] of joinEntries) {

package/dist/relations-v2/index.mjs

@@ -1,5 +1,6 @@
-import { a as insensitiveNe, c as getOneToOneRelationKey, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, s as buildRelationKeysByModel, t as escapedLike } from "../query-builders-CBLMSM7v.mjs";
+import { a as insensitiveInArray, c as buildRelationKeysByModel, l as getOneToOneRelationKey, n as escapedLike, o as insensitiveNe, r as insensitiveEq, s as insensitiveNotInArray, t as findDrizzleSchemaProblems } from "../schema-check-_Aj1MGau.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
+import { checksSchema, createSchemaCheck, registerSchemaCheck } from "@better-auth/core/db/internal";
 import { logger } from "@better-auth/core/env";
 import { BetterAuthError } from "@better-auth/core/error";
 import { and, asc, count, desc, eq, gt, gte, inArray, isNotNull, isNull, lt, lte, ne, notInArray, or, sql } from "drizzle-orm";
@@ -72,7 +73,8 @@ function applyWhereOperator(column, w, fieldLabel, provider) {
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
 	let mysqlNoIdWarned = false;
-	const relationKeysByModel = buildRelationKeysByModel(db._?.relations);
+	let relationKeysByModel;
+	const getRelationKeysByModel = () => relationKeysByModel ??= buildRelationKeysByModel(db._?.relations);
 	const createCustomAdapter = (db, inTransaction = false) => ({ getFieldName, getDefaultModelName, options, schema: baSchema }) => {
 		if (config.provider === "mysql" && options.advanced?.database?.generateId === false && !mysqlNoIdWarned) {
 			mysqlNoIdWarned = true;
@@ -273,7 +275,7 @@ const drizzleAdapter = (db, config) => {
 		}
 		function checkMissingFields(schema, model, values) {
 			if (!schema) throw new BetterAuthError("Drizzle adapter failed to initialize. Drizzle Schema not found. Please provide a schema object in the adapter options object.");
-			for (const key in values) if (!schema[key]) throw new BetterAuthError(`The field "${key}" does not exist in the "${model}" Drizzle schema. Please update your drizzle schema or re-generate using "npx @better-auth/cli@latest generate".`);
+			for (const key in values) if (!schema[key]) throw new BetterAuthError(`The field "${key}" does not exist in the "${model}" Drizzle schema. Please update your drizzle schema or re-generate using "npx auth@latest generate".`);
 		}
 		return {
 			async create({ model, data: values }) {
@@ -287,12 +289,12 @@ const drizzleAdapter = (db, config) => {
 				if (join) {
 					const queryModel = getQueryModel(model);
 					if (!db.query || !queryModel) {
-						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx @better-auth/cli@latest generate".`);
+						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx auth@latest generate".`);
 						logger.info("Falling back to regular query");
 					} else {
 						let includes;
 						const renamedJoinResults = [];
-						const relationKeys = relationKeysByModel.get(queryModel);
+						const relationKeys = getRelationKeysByModel().get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
 						for (const [joinModel, joinAttr] of joinEntries) {
@@ -344,12 +346,12 @@ const drizzleAdapter = (db, config) => {
 				if (join) {
 					const queryModel = getQueryModel(model);
 					if (!db.query || !queryModel) {
-						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx @better-auth/cli@latest generate".`);
+						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx auth@latest generate".`);
 						logger.info("Falling back to regular query");
 					} else {
 						let includes;
 						const renamedJoinResults = [];
-						const relationKeys = relationKeysByModel.get(queryModel);
+						const relationKeys = getRelationKeysByModel().get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
 						for (const [joinModel, joinAttr] of joinEntries) {
@@ -544,7 +546,16 @@ const drizzleAdapter = (db, config) => {
 	const adapter = createAdapterFactory(adapterOptions);
 	return (options) => {
 		lazyOptions = options;
-		return adapter(options);
+		const instance = adapter(options);
+		if (checksSchema(options)) registerSchemaCheck(instance, createSchemaCheck(async () => {
+			const relations = db._?.relations ?? {};
+			return findDrizzleSchemaProblems({
+				...db._?.fullSchema,
+				...Object.fromEntries(Object.entries(relations).map(([name, relation]) => [name, relation.table])),
+				...config.schema
+			}, options, config.usePlural);
+		}, "drizzle"));
+		return instance;
 	};
 };
 //#endregion

package/dist/{query-builders-CBLMSM7v.mjs → schema-check-_Aj1MGau.mjs}

@@ -1,4 +1,5 @@
-import { ilike, sql } from "drizzle-orm";
+import { diffSchema, getExpectedSchema } from "@better-auth/core/db/internal";
+import { Table, getTableColumns, ilike, is, sql } from "drizzle-orm";
 //#region src/join-relation-key.ts
 /**
 * Reads the relation registry used to build Drizzle relational queries.
@@ -75,4 +76,33 @@ function insensitiveNe(column, value) {
 	return sql`LOWER(${column}) <> LOWER(${value})`;
 }
 //#endregion
-export { insensitiveNe as a, getOneToOneRelationKey as c, insensitiveInArray as i, insensitiveEq as n, insensitiveNotInArray as o, insensitiveIlike as r, buildRelationKeysByModel as s, escapedLike as t };
+//#region src/schema-check.ts
+/**
+* Reads a Drizzle schema object the way the adapter addresses it: each table
+* by the key it is exported under, each column by its property name. Values
+* that are not tables, such as relations, are skipped.
+*/
+function introspectDrizzleSchema(schema) {
+	const tables = [];
+	for (const [name, table] of Object.entries(schema)) {
+		if (!is(table, Table)) continue;
+		const columns = Object.entries(getTableColumns(table)).map(([key, column]) => ({
+			name: key,
+			nullable: !column.notNull,
+			hasDefault: column.hasDefault || column.generated !== void 0 || column.generatedIdentity !== void 0
+		}));
+		tables.push({
+			name,
+			columns
+		});
+	}
+	return tables;
+}
+/**
+* Compares a Drizzle schema object with the tables this configuration writes.
+*/
+function findDrizzleSchemaProblems(schema, options, usePlural) {
+	return diffSchema(getExpectedSchema(options, { usePlural }), introspectDrizzleSchema(schema));
+}
+//#endregion
+export { insensitiveInArray as a, buildRelationKeysByModel as c, insensitiveIlike as i, getOneToOneRelationKey as l, escapedLike as n, insensitiveNe as o, insensitiveEq as r, insensitiveNotInArray as s, findDrizzleSchemaProblems as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/drizzle-adapter",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "bugs": {
     "url": "https://github.com/better-auth/better-auth/issues"
   },
@@ -45,7 +45,7 @@
   "peerDependencies": {
     "@better-auth/utils": "0.4.2",
     "drizzle-orm": "^0.45.2 || >=1.0.0-rc.1 <2.0.0",
-    "@better-auth/core": "^1.7.3"
+    "@better-auth/core": "^1.7.5"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {
@@ -57,7 +57,7 @@
     "drizzle-orm": "^0.45.2",
     "tsdown": "0.21.10",
     "typescript": "^6.0.3",
-    "@better-auth/core": "1.7.3"
+    "@better-auth/core": "1.7.5"
   },
   "scripts": {
     "build": "tsdown",