better-convex 0.6.1 → 0.6.2

package/dist/auth/index.d.ts

@@ -1,6 +1,6 @@
 import { t as GenericCtx } from "../context-utils-DSuX99Da.js";
 import { convex } from "@convex-dev/better-auth/plugins";
-import * as better_auth_adapters0 from "better-auth/adapters";
+import * as better_auth_adapters1 from "better-auth/adapters";
 import { DBAdapterDebugLogOption } from "better-auth/adapters";
 import { BetterAuthDBSchema } from "better-auth/db";
 import * as convex_server24 from "convex/server";
@@ -45,19 +45,19 @@ declare const createClient: <DataModel extends GenericDataModel, Schema extends
 }) => {
   authFunctions: AuthFunctions;
   triggers: Triggers<DataModel, Schema, TriggerCtx> | undefined;
-  adapter: (ctx: GenericCtx<DataModel>, getAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters0.AdapterFactory;
+  adapter: (ctx: GenericCtx<DataModel>, getAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters1.AdapterFactory;
   triggersApi: () => {
     beforeCreate: convex_server24.RegisteredMutation<"internal", {
-      model: string;
       data: any;
+      model: string;
     }, Promise<any>>;
     beforeDelete: convex_server24.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<any>>;
     beforeUpdate: convex_server24.RegisteredMutation<"internal", {
-      model: string;
       update: any;
+      model: string;
       doc: any;
     }, Promise<any>>;
     onCreate: convex_server24.RegisteredMutation<"internal", {
@@ -150,7 +150,7 @@ declare const httpAdapter: <DataModel extends GenericDataModel, Schema extends S
   debugLogs?: DBAdapterDebugLogOption;
   schema?: Schema;
   triggers?: Triggers<DataModel, Schema>;
-}) => better_auth_adapters0.AdapterFactory;
+}) => better_auth_adapters1.AdapterFactory;
 declare const dbAdapter: <DataModel extends GenericDataModel, Schema extends SchemaDefinition<any, any>>(ctx: GenericCtx<DataModel>, getAuthOptions: (ctx: any) => BetterAuthOptions, {
   authFunctions,
   debugLogs,
@@ -161,7 +161,7 @@ declare const dbAdapter: <DataModel extends GenericDataModel, Schema extends Sch
   schema: Schema;
   debugLogs?: DBAdapterDebugLogOption;
   triggers?: Triggers<DataModel, Schema>;
-}) => better_auth_adapters0.AdapterFactory;
+}) => better_auth_adapters1.AdapterFactory;
 //#endregion
 //#region src/auth/adapter-utils.d.ts
 type AdapterPaginationOptions = PaginationOptions & {
@@ -181,8 +181,8 @@ declare const adapterWhereValidator: convex_values0.VObject<{
 }, "required", "connector" | "field" | "operator" | "value">;
 declare const adapterArgsValidator: convex_values0.VObject<{
   limit?: number | undefined;
-  offset?: number | undefined;
   select?: string[] | undefined;
+  offset?: number | undefined;
   sortBy?: {
     field: string;
     direction: "asc" | "desc";
@@ -222,7 +222,7 @@ declare const adapterArgsValidator: convex_values0.VObject<{
     operator: convex_values0.VUnion<"lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
     value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
   }, "required", "connector" | "field" | "operator" | "value">, "optional">;
-}, "required", "limit" | "model" | "offset" | "select" | "sortBy" | "where" | "sortBy.field" | "sortBy.direction">;
+}, "required", "limit" | "model" | "select" | "offset" | "sortBy" | "where" | "sortBy.field" | "sortBy.direction">;
 declare const hasUniqueFields: (betterAuthSchema: BetterAuthDBSchema, model: string, input: Record<string, any>) => boolean;
 declare const checkUniqueFields: <Schema extends SchemaDefinition<any, any>>(ctx: GenericQueryCtx<GenericDataModel>, schema: Schema, betterAuthSchema: BetterAuthDBSchema, table: string, input: Record<string, any>, doc?: Record<string, any>) => Promise<void>;
 declare const selectFields: <T extends TableNamesInDataModel<GenericDataModel>, D extends DocumentByName<GenericDataModel, T>>(doc: D | null, select?: string[]) => Promise<D | null>;
@@ -324,15 +324,15 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
     beforeCreateHandle?: string | undefined;
     onCreateHandle?: string | undefined;
     input: {
-      model: string;
       data: any;
-    } | {
       model: string;
+    } | {
       data: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     };
   }, Promise<any>>;
   deleteMany: convex_server24.RegisteredMutation<"internal", {
@@ -383,8 +383,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
     };
   }, Promise<convex_server24.GenericDocument | undefined>>;
   findMany: convex_server24.RegisteredQuery<"internal", {
-    join?: any;
     limit?: number | undefined;
+    join?: any;
     offset?: number | undefined;
     sortBy?: {
       field: string;
@@ -396,7 +396,6 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
       field: string;
       value: string | number | boolean | string[] | number[] | null;
     }[] | undefined;
-    model: string;
     paginationOpts: {
       id?: number;
       endCursor?: string | null;
@@ -405,6 +404,7 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
       numItems: number;
       cursor: string | null;
     };
+    model: string;
   }, Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>>;
   findOne: convex_server24.RegisteredQuery<"internal", {
     join?: any;
@@ -430,8 +430,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
     };
     input: {
       where?: any[] | undefined;
-      model: string;
       update: any;
+      model: string;
     } | {
       where?: {
         connector?: "AND" | "OR" | undefined;
@@ -439,12 +439,12 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
         field: string;
         value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
-      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     };
   }, Promise<{
     count: number;
@@ -459,8 +459,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
     onUpdateHandle?: string | undefined;
     input: {
       where?: any[] | undefined;
-      model: string;
       update: any;
+      model: string;
     } | {
       where?: {
         connector?: "AND" | "OR" | undefined;
@@ -468,12 +468,12 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>>(schema: Sch
         field: string;
         value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
-      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     };
   }, Promise<any>>;
   getLatestJwks: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;

package/dist/auth/index.js

@@ -1098,6 +1098,29 @@ const getHeaders = async (ctx, session) => {
 	});
 };
 
+//#endregion
+//#region src/auth/error-response.ts
+const isApiErrorLike = (error) => !!error && typeof error === "object" && (error.name === "APIError" && "statusCode" in error || typeof error.statusCode === "number");
+const toResponseInit = (error) => {
+	const init = {
+		headers: new Headers(error.headers ?? {}),
+		status: typeof error.statusCode === "number" ? error.statusCode : 500
+	};
+	if (typeof error.status === "string") init.statusText = error.status;
+	return init;
+};
+const toAuthErrorResponse = (error) => {
+	if (!isApiErrorLike(error)) return null;
+	const init = toResponseInit(error);
+	const { body } = error;
+	if (body === void 0) return new Response(null, init);
+	if (typeof body === "string") {
+		if (init.headers instanceof Headers && !init.headers.has("content-type")) init.headers.set("content-type", "text/plain");
+		return new Response(body, init);
+	}
+	return Response.json(body, init);
+};
+
 //#endregion
 //#region src/auth/middleware.ts
 /**
@@ -1123,7 +1146,15 @@ function authMiddleware(getAuth, opts = {}) {
 		if (c.req.path === "/.well-known/openid-configuration") return c.redirect(`${process.env.CONVEX_SITE_URL}${basePath}/convex/.well-known/openid-configuration`);
 		if (c.req.path.startsWith(basePath)) {
 			if (opts.verbose) console.log("request headers", c.req.raw.headers);
-			const response = await getAuth(c.env).handler(c.req.raw);
+			const auth = getAuth(c.env);
+			let response;
+			try {
+				response = await auth.handler(c.req.raw);
+			} catch (error) {
+				const errorResponse = toAuthErrorResponse(error);
+				if (errorResponse) return errorResponse;
+				throw error;
+			}
 			if (opts.verbose) console.log("response headers", response.headers);
 			return response;
 		}
@@ -1395,7 +1426,15 @@ const registerRoutes = (http, getAuth, opts = {}) => {
 			console.log("options.baseURL", staticAuth.options.baseURL);
 			console.log("request headers", request.headers);
 		}
-		const response = await getAuth(ctx).handler(request);
+		const auth = getAuth(ctx);
+		let response;
+		try {
+			response = await auth.handler(request);
+		} catch (error) {
+			const errorResponse = toAuthErrorResponse(error);
+			if (errorResponse) return errorResponse;
+			throw error;
+		}
 		if (opts?.verbose) console.log("response headers", response.headers);
 		return response;
 	});

package/dist/orm/index.d.ts

@@ -1,6 +1,6 @@
 import { a as ReturnTypeOrValue, i as KnownKeysOnly, o as Simplify, t as Assume } from "../types-jftzhhuc.js";
 import { DefineSchemaOptions, DefineSchemaOptions as DefineSchemaOptions$1, FilterExpression as FilterExpression$1, GenericDatabaseReader, GenericDatabaseWriter, GenericIndexFields, GenericSchema, GenericSchema as GenericSchema$1, GenericTableIndexes, GenericTableSearchIndexes, GenericTableVectorIndexes, IndexRange, IndexRangeBuilder, SchedulableFunctionReference, Scheduler, SchemaDefinition, SchemaDefinition as SchemaDefinition$1, TableDefinition, VectorFilterBuilder, internalMutationGeneric } from "convex/server";
-import * as convex_values69 from "convex/values";
+import * as convex_values63 from "convex/values";
 import { GenericId, Validator, Value } from "convex/values";
 
 //#region src/orm/builders/column-builder.d.ts
@@ -390,7 +390,7 @@ declare function custom<TName extends string, TValidator extends AnyValidator>(n
  *
  * Note: This is Convex JSON (runtime `v.any()`), not SQL JSON/JSONB.
  */
-declare function json<T = Value>(): $Type<ConvexCustomBuilderInitial<"", convex_values69.VAny<any, "required", string>>, T>;
+declare function json<T = Value>(): $Type<ConvexCustomBuilderInitial<"", convex_values63.VAny<any, "required", string>>, T>;
 //#endregion
 //#region src/orm/builders/date.d.ts
 type ConvexDateMode = 'string' | 'date';
@@ -523,12 +523,12 @@ declare class ConvexSystemIdBuilder<_TTableName extends string> extends ColumnBu
   static readonly [entityKind]: string;
   readonly [entityKind]: string;
   constructor();
-  build(): convex_values69.VString<string, "required">;
+  build(): convex_values63.VString<string, "required">;
   /**
    * Convex validator - runtime access
    * System fields use v.string() for _id
    */
-  get convexValidator(): convex_values69.VString<string, "required">;
+  get convexValidator(): convex_values63.VString<string, "required">;
 }
 type ConvexSystemCreatedAtConfig = ColumnBuilderBaseConfig<'number', 'ConvexSystemCreatedAt'> & {
   data: number;
@@ -541,8 +541,8 @@ declare class ConvexSystemCreatedAtBuilder extends ColumnBuilder<ConvexSystemCre
   static readonly [entityKind]: string;
   readonly [entityKind]: string;
   constructor();
-  build(): convex_values69.VFloat64<number, "required">;
-  get convexValidator(): convex_values69.VFloat64<number, "required">;
+  build(): convex_values63.VFloat64<number, "required">;
+  get convexValidator(): convex_values63.VFloat64<number, "required">;
 }
 /**
  * Create system field builders for a table

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-convex",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Better Convex - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",