@convex-dev/better-auth 0.9.7 → 0.9.8

package/package.json

@@ -6,7 +6,7 @@
   "bugs": {
     "url": "https://github.com/get-convex/better-auth/issues"
   },
-  "version": "0.9.7",
+  "version": "0.9.8",
   "license": "Apache-2.0",
   "keywords": [
     "convex",
@@ -18,171 +18,121 @@
   ],
   "type": "module",
   "scripts": {
-    "build": "npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc --project ./esm.json && tsc-alias -p ./esm.json && npm run build:esm:generatePackageJson",
-    "build:cjs": "tsc --project ./commonjs.json && npm run build:cjs:generatePackageJson",
-    "build:esm:generatePackageJson": "echo '{\\n  \"type\": \"module\"\\n}' > dist/esm/package.json",
-    "build:cjs:generatePackageJson": "echo '{\\n  \"type\": \"commonjs\"\\n}' > dist/commonjs/package.json",
-    "build:watch": "chokidar 'tsconfig*.json' 'src/**/*.{ts,tsx}' -c 'npm run build' --initial",
-    "typecheck": "tsc --noEmit",
-    "prepack": "node node10stubs.mjs",
-    "prepublishOnly": "npm run build",
-    "postpack": "node node10stubs.mjs --cleanup",
-    "generate": "concurrently \"cd examples/next && npm run generate\" \"cd examples/react && npm run generate\" \"cd examples/tanstack && npm run generate\"",
-    "test": "vitest run",
+    "dev": "cd examples/react && npm run dev",
+    "clean": "rm -rf dist *.tsbuildinfo",
+    "build": "tsc --project ./tsconfig.build.json",
+    "typecheck": "tsc --noEmit && tsc -p examples/next && tsc -p examples/next/convex && tsc -p examples/react && tsc -p examples/react/convex && tsc -p examples/tanstack && tsc -p examples/tanstack/convex",
+    "lint": "eslint .",
+    "all": "run-p -r 'dev' 'test:watch'",
+    "test": "vitest run --typecheck",
+    "test:watch": "vitest --typecheck --clearScreen false",
     "test:debug": "vitest --inspect-brk --no-file-parallelism",
-    "test:coverage": "vitest run --coverage --coverage.reporter=text"
+    "test:coverage": "vitest run --coverage --coverage.reporter=text",
+    "prepublishOnly": "npm run build",
+    "preversion": "npm run clean && npm ci && npm run build && run-p test lint typecheck",
+    "alpha": "npm version prerelease --preid alpha && npm publish --tag alpha && git push --tags",
+    "release": "npm version patch && npm publish && git push --tags && git push",
+    "version": "vim -c 'normal o' -c 'normal o## '$npm_package_version CHANGELOG.md && prettier -w CHANGELOG.md && git add CHANGELOG.md"
   },
   "files": [
     "dist",
-    "src",
-    "react",
-    "plugins"
+    "src"
   ],
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": {
-        "@convex-dev/component-source": "./src/client/index.ts",
-        "types": "./dist/esm/client/index.d.ts",
-        "default": "./dist/esm/client/index.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/client/index.ts",
-        "types": "./dist/commonjs/client/index.d.ts",
-        "default": "./dist/commonjs/client/index.js"
-      }
+      "types": "./dist/client/index.d.ts",
+      "default": "./dist/client/index.js"
+    },
+    "./_generated/component.js": {
+      "types": "./dist/component/_generated/component.d.ts"
+    },
+    "./convex.config": {
+      "types": "./dist/component/convex.config.d.ts",
+      "default": "./dist/component/convex.config.js"
+    },
+    "./convex.config.js": {
+      "types": "./dist/component/convex.config.d.ts",
+      "default": "./dist/component/convex.config.js"
     },
     "./adapter": {
-      "import": {
-        "@convex-dev/component-source": "./src/component/adapter.ts",
-        "types": "./dist/esm/component/adapter.d.ts",
-        "default": "./dist/esm/component/adapter.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/component/adapter.ts",
-        "types": "./dist/commonjs/component/adapter.d.ts",
-        "default": "./dist/commonjs/component/adapter.js"
-      }
+      "types": "./dist/component/adapter.d.ts",
+      "default": "./dist/component/adapter.js"
     },
     "./client/plugins": {
-      "import": {
-        "@convex-dev/component-source": "./src/client/plugins/index.ts",
-        "types": "./dist/esm/client/plugins/index.d.ts",
-        "default": "./dist/esm/client/plugins/index.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/client/plugins/index.ts",
-        "types": "./dist/commonjs/client/plugins/index.d.ts",
-        "default": "./dist/commonjs/client/plugins/index.js"
-      }
+      "types": "./dist/client/plugins/index.d.ts",
+      "default": "./dist/client/plugins/index.js"
     },
     "./nextjs": {
-      "import": {
-        "@convex-dev/component-source": "./src/nextjs/index.ts",
-        "types": "./dist/esm/nextjs/index.d.ts",
-        "default": "./dist/esm/nextjs/index.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/nextjs/index.ts",
-        "types": "./dist/commonjs/nextjs/index.d.ts",
-        "default": "./dist/commonjs/nextjs/index.js"
-      }
+      "types": "./dist/nextjs/index.d.ts",
+      "default": "./dist/nextjs/index.js"
     },
     "./plugins": {
-      "import": {
-        "@convex-dev/component-source": "./src/plugins/index.ts",
-        "types": "./dist/esm/plugins/index.d.ts",
-        "default": "./dist/esm/plugins/index.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/plugins/index.ts",
-        "types": "./dist/commonjs/plugins/index.d.ts",
-        "default": "./dist/commonjs/plugins/index.js"
-      }
+      "types": "./dist/plugins/index.d.ts",
+      "default": "./dist/plugins/index.js"
     },
     "./react": {
-      "import": {
-        "@convex-dev/component-source": "./src/react/index.tsx",
-        "types": "./dist/esm/react/index.d.ts",
-        "default": "./dist/esm/react/index.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/react/index.tsx",
-        "types": "./dist/commonjs/react/index.d.ts",
-        "default": "./dist/commonjs/react/index.js"
-      }
+      "types": "./dist/react/index.d.ts",
+      "default": "./dist/react/index.js"
     },
     "./react-start": {
-      "import": {
-        "@convex-dev/component-source": "./src/react-start/index.ts",
-        "types": "./dist/esm/react-start/index.d.ts",
-        "default": "./dist/esm/react-start/index.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/react-start/index.ts",
-        "types": "./dist/commonjs/react-start/index.d.ts",
-        "default": "./dist/commonjs/react-start/index.js"
-      }
+      "types": "./dist/react-start/index.d.ts",
+      "default": "./dist/react-start/index.js"
     },
+    "./test": "./src/test.ts",
     "./utils": {
-      "import": {
-        "@convex-dev/component-source": "./src/utils/index.ts",
-        "types": "./dist/esm/utils/index.d.ts",
-        "default": "./dist/esm/utils/index.js"
-      },
-      "require": {
-        "@convex-dev/component-source": "./src/utils/index.ts",
-        "types": "./dist/commonjs/utils/index.d.ts",
-        "default": "./dist/commonjs/utils/index.js"
-      }
-    },
-    "./convex.config": {
-      "import": {
-        "@convex-dev/component-source": "./src/component/convex.config.ts",
-        "types": "./dist/esm/component/convex.config.d.ts",
-        "default": "./dist/esm/component/convex.config.js"
-      }
+      "types": "./dist/utils/index.d.ts",
+      "default": "./dist/utils/index.js"
     }
   },
   "typesVersions": {
     "*": {
       "next-js": [
-        "./dist/esm/nextjs/index.d.ts"
+        "./dist/nextjs/index.d.ts"
       ]
     }
   },
   "peerDependencies": {
-    "better-auth": "1.3.27",
-    "convex": ">=1.28.2 <1.35.0",
+    "better-auth": "1.3.34",
+    "convex": "^1.25.0",
     "react": "^18.3.1 || ^19.0.0",
     "react-dom": "^18.3.1 || ^19.0.0"
   },
   "devDependencies": {
     "@better-fetch/fetch": "^1.1.18",
-    "@edge-runtime/vm": "^5.0.0",
-    "@eslint/js": "^9.9.1",
+    "@edge-runtime/vm": "5.0.0",
+    "@eslint/eslintrc": "3.3.1",
+    "@eslint/js": "9.39.1",
     "@tanstack/react-start": "^1.132.37",
     "@types/common-tags": "^1.8.4",
-    "@types/node": "^20",
-    "@types/react": "19.1.6",
-    "@types/react-dom": "19.1.6",
+    "@types/node": "20.19.24",
+    "@types/react": "18.3.26",
+    "@types/react-dom": "18.3.7",
     "@types/semver": "^7.7.0",
-    "chokidar-cli": "^3.0.0",
+    "@vitejs/plugin-react": "5.0.4",
     "concurrently": "^9.2.0",
-    "convex-test": "^0.0.33",
-    "eslint": "^9.9.1",
-    "globals": "^15.9.0",
+    "chokidar-cli": "3.0.0",
+    "convex": "^1.29.0",
+    "convex-test": "0.0.41",
+    "cpy-cli": "6.0.0",
+    "eslint": "9.39.1",
+    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react-hooks": "5.2.0",
+    "eslint-plugin-react-refresh": "0.4.24",
+    "globals": "15.14.0",
     "next": "^15.1.8",
-    "prettier": "3.2.5",
-    "tsc-alias": "^1.8.16",
-    "typescript": "5.8.3",
-    "typescript-eslint": "^8.4.0",
-    "vitest": "^3.2.2"
+    "npm-run-all2": "7.0.2",
+    "pkg-pr-new": "0.0.60",
+    "prettier": "3.6.2",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.46.4",
+    "vite": "^7.1.5",
+    "vitest": "3.2.4"
   },
-  "main": "./dist/commonjs/client/index.js",
-  "types": "./dist/commonjs/client/index.d.ts",
-  "module": "./dist/esm/client/index.js",
+  "types": "./dist/client/index.d.ts",
+  "module": "./dist/client/index.js",
   "dependencies": {
     "common-tags": "^1.8.2",
     "convex-helpers": "^0.1.95",

package/src/auth.ts

@@ -1,4 +1,4 @@
-import { betterAuth, BetterAuthOptions } from "better-auth";
+import { betterAuth, type BetterAuthOptions } from "better-auth";
 import {
   anonymous,
   bearer,
@@ -13,9 +13,9 @@ import {
   twoFactor,
   username,
 } from "better-auth/plugins";
-import { convex } from "./plugins";
+import { convex } from "./plugins/convex";
 import { passkey } from "better-auth/plugins/passkey";
-import { convexAdapter } from "./client";
+import { convexAdapter } from "./client/adapter";
 
 // This is the config used to generate the schema
 const options = {

package/src/client/adapter.test.ts

@@ -6,7 +6,7 @@ import { convexTest } from "convex-test";
 import { api } from "../component/_generated/api";
 import schema from "../component/schema";
 import { serialize } from "../component/adapterTest";
-import { Adapter } from "better-auth";
+import type { DBAdapter } from "better-auth/adapters";
 
 export const getAdapter = (t: ReturnType<typeof convexTest>) => async () => {
   return {
@@ -43,7 +43,7 @@ export const getAdapter = (t: ReturnType<typeof convexTest>) => async () => {
       return t.mutation(api.adapterTest.deleteMany, data);
     },
     transaction: false as any,
-  } satisfies Adapter;
+  } satisfies DBAdapter;
 };
 
 describe("Better Auth Adapter Tests", async () => {

package/src/client/adapter.ts

@@ -1,24 +1,26 @@
 import {
   createAdapterFactory,
-  DBAdapterDebugLogOption,
+  type DBAdapterDebugLogOption,
 } from "better-auth/adapters";
 import {
   createFunctionHandle,
-  FunctionHandle,
-  GenericActionCtx,
-  GenericDataModel,
-  PaginationOptions,
-  PaginationResult,
-  SchemaDefinition,
+  type FunctionHandle,
+  type GenericActionCtx,
+  type GenericDataModel,
+  type PaginationOptions,
+  type PaginationResult,
+  type SchemaDefinition,
+  type WithoutSystemFields,
 } from "convex/server";
-import { SetOptional } from "type-fest";
-import { AuthFunctions, GenericCtx, Triggers, UseApi } from ".";
+import type { SetOptional } from "type-fest";
 import defaultSchema from "../component/schema";
-import { api as componentApi } from "../component/_generated/api";
-import { Where } from "better-auth/types";
+import type { Where } from "better-auth/types";
 import { asyncMap } from "convex-helpers";
 import { prop, sortBy, unique } from "remeda";
 import { isRunMutationCtx } from "../utils";
+import type { Doc, TableNames } from "../component/_generated/dataModel";
+import type { ComponentApi } from "../component/_generated/component";
+import type { AuthFunctions, GenericCtx, Triggers } from ".";
 
 const handlePagination = async (
   next: ({
@@ -47,7 +49,7 @@ const handlePagination = async (
     state.cursor =
       result.pageStatus === "SplitRecommended" ||
       result.pageStatus === "SplitRequired"
-        ? result.splitCursor ?? result.continueCursor
+        ? (result.splitCursor ?? result.continueCursor)
         : result.continueCursor;
     if (result.page) {
       state.docs.push(...result.page);
@@ -79,8 +81,9 @@ const handlePagination = async (
   return state;
 };
 
-type ConvexCleanedWhere = Where & {
+type ConvexCleanedWhere<TableName extends TableNames = TableNames> = Where & {
   value: string | number | boolean | string[] | number[] | null;
+  field: keyof WithoutSystemFields<Doc<TableName>> & string;
 };
 
 const parseWhere = (where?: Where[]): ConvexCleanedWhere[] => {
@@ -102,11 +105,8 @@ export const convexAdapter = <
 >(
   ctx: Ctx,
   api: {
-    adapter: SetOptional<
-      UseApi<typeof componentApi>["adapter"],
-      "migrationRemoveUserId"
-    >;
-    adapterTest?: UseApi<typeof componentApi>["adapterTest"];
+    adapter: SetOptional<ComponentApi["adapter"], "migrationRemoveUserId">;
+    adapterTest?: ComponentApi["adapterTest"];
   },
   config: {
     debugLogs?: DBAdapterDebugLogOption;
@@ -156,7 +156,7 @@ export const convexAdapter = <
           isRunMutationCtx: isRunMutationCtx(ctx),
         },
         createSchema: async ({ file, tables }) => {
-          const { createSchema } = await import("./createSchema");
+          const { createSchema } = await import("./createSchema.js");
           return createSchema({ file, tables });
         },
         create: async ({ model, data, select }): Promise<any> => {
@@ -170,7 +170,7 @@ export const convexAdapter = <
                 )) as FunctionHandle<"mutation">)
               : undefined;
           return ctx.runMutation(api.adapter.create, {
-            input: { model, data },
+            input: { model: model as any, data },
             select,
             onCreateHandle: onCreateHandle,
           });
@@ -180,6 +180,7 @@ export const convexAdapter = <
             for (const w of data.where) {
               const result = await ctx.runQuery(api.adapter.findOne, {
                 ...data,
+                model: data.model as TableNames,
                 where: parseWhere([w]),
               });
               if (result) {
@@ -189,6 +190,7 @@ export const convexAdapter = <
           }
           return await ctx.runQuery(api.adapter.findOne, {
             ...data,
+            model: data.model as TableNames,
             where: parseWhere(data.where),
           });
         },
@@ -202,6 +204,7 @@ export const convexAdapter = <
                 async ({ paginationOpts }) => {
                   return await ctx.runQuery(api.adapter.findMany, {
                     ...data,
+                    model: data.model as TableNames,
                     where: parseWhere([w]),
                     paginationOpts,
                   });
@@ -225,6 +228,7 @@ export const convexAdapter = <
             async ({ paginationOpts }) => {
               return await ctx.runQuery(api.adapter.findMany, {
                 ...data,
+                model: data.model as TableNames,
                 where: parseWhere(data.where),
                 paginationOpts,
               });
@@ -240,6 +244,7 @@ export const convexAdapter = <
               handlePagination(async ({ paginationOpts }) => {
                 return await ctx.runQuery(api.adapter.findMany, {
                   ...data,
+                  model: data.model as TableNames,
                   where: parseWhere([w]),
                   paginationOpts,
                 });
@@ -252,6 +257,7 @@ export const convexAdapter = <
           const result = await handlePagination(async ({ paginationOpts }) => {
             return await ctx.runQuery(api.adapter.findMany, {
               ...data,
+              model: data.model as TableNames,
               where: parseWhere(data.where),
               paginationOpts,
             });
@@ -272,7 +278,7 @@ export const convexAdapter = <
                 : undefined;
             return ctx.runMutation(api.adapter.updateOne, {
               input: {
-                model: data.model,
+                model: data.model as TableNames,
                 where: parseWhere(data.where),
                 update: data.update as any,
               },
@@ -294,7 +300,7 @@ export const convexAdapter = <
               : undefined;
           await ctx.runMutation(api.adapter.deleteOne, {
             input: {
-              model: data.model,
+              model: data.model as TableNames,
               where: parseWhere(data.where),
             },
             onDeleteHandle: onDeleteHandle,
@@ -306,7 +312,7 @@ export const convexAdapter = <
           }
           const onDeleteHandle =
             config.authFunctions?.onDelete &&
-            config.triggers?.[data.model]?.onDelete
+            config.triggers?.[data.model as TableNames]?.onDelete
               ? ((await createFunctionHandle(
                   config.authFunctions.onDelete
                 )) as FunctionHandle<"mutation">)
@@ -315,6 +321,7 @@ export const convexAdapter = <
             return await ctx.runMutation(api.adapter.deleteMany, {
               input: {
                 ...data,
+                model: data.model as TableNames,
                 where: parseWhere(data.where),
               },
               paginationOpts,
@@ -338,6 +345,7 @@ export const convexAdapter = <
             return await ctx.runMutation(api.adapter.updateMany, {
               input: {
                 ...data,
+                model: data.model as TableNames,
                 where: parseWhere(data.where),
               },
               paginationOpts,

package/src/client/adapterUtils.ts

@@ -1,18 +1,18 @@
 import { asyncMap } from "convex-helpers";
-import { GenericId, Infer, v } from "convex/values";
+import { type GenericId, type Infer, v } from "convex/values";
 import {
-  DocumentByName,
-  GenericDataModel,
-  GenericQueryCtx,
-  PaginationOptions,
-  PaginationResult,
-  SchemaDefinition,
-  TableNamesInDataModel,
+  type DocumentByName,
+  type GenericDataModel,
+  type GenericQueryCtx,
+  type PaginationOptions,
+  type PaginationResult,
+  type SchemaDefinition,
+  type TableNamesInDataModel,
 } from "convex/server";
 import { stream } from "convex-helpers/server/stream";
 import { mergedStream } from "convex-helpers/server/stream";
 import { stripIndent } from "common-tags";
-import { BetterAuthDbSchema } from "better-auth/db";
+import type { BetterAuthDBSchema } from "better-auth/db";
 
 export const adapterWhereValidator = v.object({
   field: v.string(),
@@ -57,7 +57,7 @@ export const adapterArgsValidator = v.object({
 });
 
 const isUniqueField = (
-  betterAuthSchema: BetterAuthDbSchema,
+  betterAuthSchema: BetterAuthDBSchema,
   model: string,
   field: string
 ) => {
@@ -72,7 +72,7 @@ const isUniqueField = (
     .includes(field);
 };
 export const hasUniqueFields = (
-  betterAuthSchema: BetterAuthDbSchema,
+  betterAuthSchema: BetterAuthDBSchema,
   model: string,
   input: Record<string, any>
 ) => {
@@ -241,7 +241,7 @@ export const checkUniqueFields = async <
 >(
   ctx: GenericQueryCtx<GenericDataModel>,
   schema: Schema,
-  betterAuthSchema: BetterAuthDbSchema,
+  betterAuthSchema: BetterAuthDBSchema,
   table: string,
   input: Record<string, any>,
   doc?: Record<string, any>
@@ -466,7 +466,7 @@ export const paginate = async <
 >(
   ctx: GenericQueryCtx<GenericDataModel>,
   schema: SchemaDefinition<any, any>,
-  betterAuthSchema: BetterAuthDbSchema,
+  betterAuthSchema: BetterAuthDBSchema,
   args: Infer<typeof adapterArgsValidator> & {
     paginationOpts: PaginationOptions;
   }
@@ -623,7 +623,7 @@ export const listOne = async <
 >(
   ctx: GenericQueryCtx<GenericDataModel>,
   schema: SchemaDefinition<any, any>,
-  betterAuthSchema: BetterAuthDbSchema,
+  betterAuthSchema: BetterAuthDBSchema,
   args: Infer<typeof adapterArgsValidator>
 ): Promise<Doc | null> => {
   return (