@convex-dev/better-auth 0.10.6 → 0.10.7

package/src/client/adapter.ts

@@ -84,15 +84,21 @@ type ConvexCleanedWhere<TableName extends TableNames = TableNames> = Where & {
   field: keyof WithoutSystemFields<Doc<TableName>> & string;
 };
 
-const parseWhere = (where?: Where[]): ConvexCleanedWhere[] => {
-  return where?.map((where) => {
-    if (where.value instanceof Date) {
+const parseWhere = (
+  where?: (Where & { join?: undefined }) | (Where & { join?: undefined })[]
+): ConvexCleanedWhere[] => {
+  if (!where) {
+    return [];
+  }
+  const whereArray = Array.isArray(where) ? where : [where];
+  return whereArray.map((w) => {
+    if (w.value instanceof Date) {
       return {
-        ...where,
-        value: where.value.getTime(),
+        ...w,
+        value: w.value.getTime(),
       };
     }
-    return where;
+    return w;
   }) as ConvexCleanedWhere[];
 };
 
@@ -121,6 +127,7 @@ export const convexAdapter = <
       transaction: false,
       supportsNumericIds: false,
       supportsJSON: false,
+      supportsDates: false,
       supportsArrays: true,
       usePlural: false,
       mapKeysTransformInput: {
@@ -129,8 +136,6 @@ export const convexAdapter = <
       mapKeysTransformOutput: {
         _id: "id",
       },
-      // Dates provided as strings
-      supportsDates: false,
       // Convert dates to numbers. This aligns with how
       // Convex stores _creationTime and avoids a breaking change.
       customTransformInput: ({ data, fieldAttributes }) => {
@@ -180,7 +185,7 @@ export const convexAdapter = <
               const result = await ctx.runQuery(api.adapter.findOne, {
                 ...data,
                 model: data.model as TableNames,
-                where: parseWhere([w]),
+                where: parseWhere(w),
               });
               if (result) {
                 return result;
@@ -197,6 +202,7 @@ export const convexAdapter = <
           if (data.offset) {
             throw new Error("offset not supported");
           }
+
           if (data.where?.some((w) => w.connector === "OR")) {
             const results = await asyncMap(data.where, async (w) =>
               handlePagination(
@@ -204,7 +210,7 @@ export const convexAdapter = <
                   return await ctx.runQuery(api.adapter.findMany, {
                     ...data,
                     model: data.model as TableNames,
-                    where: parseWhere([w]),
+                    where: parseWhere(w),
                     paginationOpts,
                   });
                 },
@@ -213,12 +219,10 @@ export const convexAdapter = <
             );
             const docs = unique(results.flatMap((r) => r.docs));
             if (data.sortBy) {
-              const result = sortBy(docs, [
+              return sortBy(docs, [
                 prop(data.sortBy.field),
                 data.sortBy.direction,
               ]);
-              console.log(result);
-              return result;
             }
             return docs;
           }
@@ -244,7 +248,7 @@ export const convexAdapter = <
                 return await ctx.runQuery(api.adapter.findMany, {
                   ...data,
                   model: data.model as TableNames,
-                  where: parseWhere([w]),
+                  where: parseWhere(w),
                   paginationOpts,
                 });
               })

package/src/client/create-api.ts

@@ -18,7 +18,7 @@ import {
 } from "./adapter-utils.js";
 import { getAuthTables } from "better-auth/db";
 import type { TableNames } from "../component/_generated/dataModel.js";
-import type { BetterAuthOptions } from "better-auth";
+import type { BetterAuthOptions } from "better-auth/minimal";
 
 const whereValidator = (
   schema: SchemaDefinition<any, any>,
@@ -112,6 +112,7 @@ export const createApi = <Schema extends SchemaDefinition<any, any>>(
         ),
         where: v.optional(v.array(adapterWhereValidator)),
         select: v.optional(v.array(v.string())),
+        join: v.optional(v.any()),
       },
       handler: async (ctx, args) => {
         return await listOne(ctx, schema, betterAuthSchema, args);
@@ -131,6 +132,7 @@ export const createApi = <Schema extends SchemaDefinition<any, any>>(
           })
         ),
         offset: v.optional(v.number()),
+        join: v.optional(v.any()),
         paginationOpts: paginationOptsValidator,
       },
       handler: async (ctx, args) => {

package/src/client/create-client.ts

@@ -354,12 +354,15 @@ export const createClient = <
       const path = staticAuth.options.basePath ?? "/api/auth";
       const authRequestHandler = httpActionGeneric(async (ctx, request) => {
         if (config?.verbose) {
+          // eslint-disable-next-line no-console
           console.log("options.baseURL", staticAuth.options.baseURL);
+          // eslint-disable-next-line no-console
           console.log("request headers", request.headers);
         }
         const auth = createAuth(ctx as any);
         const response = await auth.handler(request);
         if (config?.verbose) {
+          // eslint-disable-next-line no-console
           console.log("response headers", response.headers);
         }
         return response;

package/src/component/_generated/component.ts

@@ -934,6 +934,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         "query",
         "internal",
         {
+          join?: any;
           limit?: number;
           model:
             | "user"
@@ -988,6 +989,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         "query",
         "internal",
         {
+          join?: any;
           model:
             | "user"
             | "session"
@@ -2000,13 +2002,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
       >;
     };
     adapterTest: {
-      count: FunctionReference<"query", "internal", any, any, Name>;
-      create: FunctionReference<"mutation", "internal", any, any, Name>;
-      delete: FunctionReference<"mutation", "internal", any, any, Name>;
-      deleteMany: FunctionReference<"mutation", "internal", any, any, Name>;
-      findMany: FunctionReference<"query", "internal", any, any, Name>;
-      findOne: FunctionReference<"query", "internal", any, any, Name>;
-      update: FunctionReference<"mutation", "internal", any, any, Name>;
-      updateMany: FunctionReference<"mutation", "internal", any, any, Name>;
+      runCustomTests: FunctionReference<"action", "internal", any, any, Name>;
+      runTests: FunctionReference<"action", "internal", any, any, Name>;
     };
   };