better-convex 0.2.0 → 0.2.1

package/dist/auth/index.d.ts

@@ -1,7 +1,7 @@
-import * as better_auth_adapters1 from "better-auth/adapters";
+import * as better_auth_adapters0 from "better-auth/adapters";
 import { DBAdapterDebugLogOption } from "better-auth/adapters";
 import { BetterAuthDBSchema } from "better-auth/db";
-import * as convex_server24 from "convex/server";
+import * as convex_server0 from "convex/server";
 import { DocumentByName, FunctionReference, GenericDataModel, GenericMutationCtx, GenericQueryCtx, GenericSchema, HttpRouter, IdField, PaginationOptions, PaginationResult, SchemaDefinition, SystemFields, TableNamesInDataModel, internalMutationGeneric } from "convex/server";
 import * as convex_values0 from "convex/values";
 import { Infer } from "convex/values";
@@ -44,31 +44,31 @@ declare const createClient: <DataModel extends GenericDataModel, Schema$1 extend
 }) => {
   authFunctions: AuthFunctions;
   triggers: Triggers<DataModel, Schema$1> | undefined;
-  adapter: (ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters1.AdapterFactory;
-  httpAdapter: (ctx: GenericCtx<DataModel>) => better_auth_adapters1.AdapterFactory;
+  adapter: (ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters0.AdapterFactory;
+  httpAdapter: (ctx: GenericCtx<DataModel>) => better_auth_adapters0.AdapterFactory;
   triggersApi: () => {
-    beforeCreate: convex_server24.RegisteredMutation<"internal", {
+    beforeCreate: convex_server0.RegisteredMutation<"internal", {
       data: any;
       model: string;
     }, Promise<any>>;
-    beforeDelete: convex_server24.RegisteredMutation<"internal", {
+    beforeDelete: convex_server0.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<any>>;
-    beforeUpdate: convex_server24.RegisteredMutation<"internal", {
+    beforeUpdate: convex_server0.RegisteredMutation<"internal", {
       update: any;
       model: string;
       doc: any;
     }, Promise<any>>;
-    onCreate: convex_server24.RegisteredMutation<"internal", {
+    onCreate: convex_server0.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<void>>;
-    onDelete: convex_server24.RegisteredMutation<"internal", {
+    onDelete: convex_server0.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<void>>;
-    onUpdate: convex_server24.RegisteredMutation<"internal", {
+    onUpdate: convex_server0.RegisteredMutation<"internal", {
       model: string;
       newDoc: any;
       oldDoc: any;
@@ -148,7 +148,7 @@ declare const httpAdapter: <DataModel extends GenericDataModel, Schema$1 extends
   authFunctions: AuthFunctions;
   debugLogs?: DBAdapterDebugLogOption;
   triggers?: Triggers<DataModel, Schema$1>;
-}) => better_auth_adapters1.AdapterFactory;
+}) => better_auth_adapters0.AdapterFactory;
 declare const dbAdapter: <DataModel extends GenericDataModel, Schema$1 extends SchemaDefinition<any, any>>(ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions, {
   authFunctions,
   debugLogs,
@@ -159,7 +159,7 @@ declare const dbAdapter: <DataModel extends GenericDataModel, Schema$1 extends S
   schema: Schema$1;
   debugLogs?: DBAdapterDebugLogOption;
   triggers?: Triggers<DataModel, Schema$1>;
-}) => better_auth_adapters1.AdapterFactory;
+}) => better_auth_adapters0.AdapterFactory;
 //#endregion
 //#region src/auth/adapter-utils.d.ts
 declare const adapterWhereValidator: convex_values0.VObject<{
@@ -175,18 +175,18 @@ declare const adapterWhereValidator: convex_values0.VObject<{
 }, "required", "operator" | "value" | "field" | "connector">;
 declare const adapterArgsValidator: convex_values0.VObject<{
   limit?: number | undefined;
+  offset?: number | undefined;
+  select?: string[] | undefined;
+  sortBy?: {
+    field: string;
+    direction: "asc" | "desc";
+  } | undefined;
   where?: {
     operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
     value: string | number | boolean | string[] | number[] | null;
     field: string;
   }[] | undefined;
-  select?: string[] | undefined;
-  offset?: number | undefined;
-  sortBy?: {
-    field: string;
-    direction: "asc" | "desc";
-  } | undefined;
   model: string;
 }, {
   limit: convex_values0.VFloat64<number | undefined, "optional">;
@@ -216,7 +216,7 @@ declare const adapterArgsValidator: convex_values0.VObject<{
     operator: convex_values0.VUnion<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "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", "operator" | "value" | "field" | "connector">, "optional">;
-}, "required", "limit" | "where" | "model" | "select" | "offset" | "sortBy" | "sortBy.field" | "sortBy.direction">;
+}, "required", "limit" | "model" | "offset" | "select" | "sortBy" | "where" | "sortBy.field" | "sortBy.direction">;
 declare const hasUniqueFields: (betterAuthSchema: BetterAuthDBSchema, model: string, input: Record<string, any>) => boolean;
 declare const checkUniqueFields: <Schema$1 extends SchemaDefinition<any, any>>(ctx: GenericQueryCtx<GenericDataModel>, schema: Schema$1, 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>;
@@ -244,7 +244,7 @@ declare const findOneHandler: (ctx: any, args: {
   model: string;
   select?: string[];
   where?: any[];
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.GenericDocument | null>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server0.GenericDocument | null>;
 declare const findManyHandler: (ctx: any, args: {
   model: string;
   paginationOpts: any;
@@ -255,7 +255,7 @@ declare const findManyHandler: (ctx: any, args: {
     field: string;
   };
   where?: any[];
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server0.PaginationResult<convex_server0.GenericDocument>>;
 declare const updateOneHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -278,8 +278,8 @@ declare const updateManyHandler: (ctx: any, args: {
   count: number;
   ids: any[];
   isDone: boolean;
-  continueCursor: convex_server24.Cursor;
-  splitCursor?: convex_server24.Cursor | null;
+  continueCursor: convex_server0.Cursor;
+  splitCursor?: convex_server0.Cursor | null;
   pageStatus?: "SplitRecommended" | "SplitRequired" | null;
 }>;
 declare const deleteOneHandler: (ctx: any, args: {
@@ -290,7 +290,7 @@ declare const deleteOneHandler: (ctx: any, args: {
   beforeDeleteHandle?: string;
   skipBeforeHooks?: boolean;
   onDeleteHandle?: string;
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.GenericDocument | undefined>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server0.GenericDocument | undefined>;
 declare const deleteManyHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -304,8 +304,8 @@ declare const deleteManyHandler: (ctx: any, args: {
   count: number;
   ids: any[];
   isDone: boolean;
-  continueCursor: convex_server24.Cursor;
-  splitCursor?: convex_server24.Cursor | null;
+  continueCursor: convex_server0.Cursor;
+  splitCursor?: convex_server0.Cursor | null;
   pageStatus?: "SplitRecommended" | "SplitRequired" | null;
 }>;
 declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: Schema$1, createAuth: CreateAuth, options?: {
@@ -313,7 +313,7 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
   /** Skip input validation for smaller generated types. Since these are internal functions, validation is optional. */
   skipValidation?: boolean;
 }) => {
-  create: convex_server24.RegisteredMutation<"internal", {
+  create: convex_server0.RegisteredMutation<"internal", {
     select?: string[] | undefined;
     beforeCreateHandle?: string | undefined;
     onCreateHandle?: string | undefined;
@@ -329,7 +329,7 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     };
   }, Promise<any>>;
-  deleteMany: convex_server24.RegisteredMutation<"internal", {
+  deleteMany: convex_server0.RegisteredMutation<"internal", {
     beforeDeleteHandle?: string | undefined;
     onDeleteHandle?: string | undefined;
     paginationOpts: {
@@ -356,11 +356,11 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
     count: number;
     ids: any[];
     isDone: boolean;
-    continueCursor: convex_server24.Cursor;
-    splitCursor?: convex_server24.Cursor | null;
+    continueCursor: convex_server0.Cursor;
+    splitCursor?: convex_server0.Cursor | null;
     pageStatus?: "SplitRecommended" | "SplitRequired" | null;
   }>>;
-  deleteOne: convex_server24.RegisteredMutation<"internal", {
+  deleteOne: convex_server0.RegisteredMutation<"internal", {
     beforeDeleteHandle?: string | undefined;
     onDeleteHandle?: string | undefined;
     input: {
@@ -375,21 +375,21 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       }[] | undefined;
       model: string;
     };
-  }, Promise<convex_server24.GenericDocument | undefined>>;
-  findMany: convex_server24.RegisteredQuery<"internal", {
-    limit?: number | undefined;
+  }, Promise<convex_server0.GenericDocument | undefined>>;
+  findMany: convex_server0.RegisteredQuery<"internal", {
     join?: any;
+    limit?: number | undefined;
+    offset?: number | undefined;
+    sortBy?: {
+      field: string;
+      direction: "asc" | "desc";
+    } | undefined;
     where?: {
       operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
       value: string | number | boolean | string[] | number[] | null;
       field: string;
     }[] | undefined;
-    offset?: number | undefined;
-    sortBy?: {
-      field: string;
-      direction: "asc" | "desc";
-    } | undefined;
     paginationOpts: {
       id?: number;
       endCursor?: string | null;
@@ -399,19 +399,19 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       cursor: string | null;
     };
     model: string;
-  }, Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>>;
-  findOne: convex_server24.RegisteredQuery<"internal", {
+  }, Promise<convex_server0.PaginationResult<convex_server0.GenericDocument>>>;
+  findOne: convex_server0.RegisteredQuery<"internal", {
     join?: any;
+    select?: string[] | undefined;
     where?: {
       operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
       value: string | number | boolean | string[] | number[] | null;
       field: string;
     }[] | undefined;
-    select?: string[] | undefined;
     model: string;
-  }, Promise<convex_server24.GenericDocument | null>>;
-  updateMany: convex_server24.RegisteredMutation<"internal", {
+  }, Promise<convex_server0.GenericDocument | null>>;
+  updateMany: convex_server0.RegisteredMutation<"internal", {
     beforeUpdateHandle?: string | undefined;
     onUpdateHandle?: string | undefined;
     paginationOpts: {
@@ -444,11 +444,11 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
     count: number;
     ids: any[];
     isDone: boolean;
-    continueCursor: convex_server24.Cursor;
-    splitCursor?: convex_server24.Cursor | null;
+    continueCursor: convex_server0.Cursor;
+    splitCursor?: convex_server0.Cursor | null;
     pageStatus?: "SplitRecommended" | "SplitRequired" | null;
   }>>;
-  updateOne: convex_server24.RegisteredMutation<"internal", {
+  updateOne: convex_server0.RegisteredMutation<"internal", {
     beforeUpdateHandle?: string | undefined;
     onUpdateHandle?: string | undefined;
     input: {
@@ -470,8 +470,8 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     };
   }, Promise<any>>;
-  getLatestJwks: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;
-  rotateKeys: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;
+  getLatestJwks: convex_server0.RegisteredAction<"internal", {}, Promise<any>>;
+  rotateKeys: convex_server0.RegisteredAction<"internal", {}, Promise<any>>;
 };
 //#endregion
 //#region src/auth/helpers.d.ts

package/dist/auth-client/index.js

@@ -2,7 +2,7 @@
 import { _ as defaultIsUnauthorized, d as useAuthStore, f as useAuthValue, g as CRPCClientError, r as FetchAccessTokenContext, s as decodeJwtExp, t as AuthProvider } from "../auth-store-BMSJFMtR.js";
 import { c } from "react/compiler-runtime";
 import { ConvexProviderWithAuth, useConvexAuth } from "convex/react";
-import { useCallback, useEffect, useMemo } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/auth-client/convex-auth-provider.tsx
@@ -85,9 +85,26 @@ function _temp() {}
 function ConvexAuthProviderInner({ children, client, authClient }) {
 	const authStore = useAuthStore();
 	const { data: session, isPending } = authClient.useSession();
+	const sessionRef = useRef(session);
+	const isPendingRef = useRef(isPending);
+	sessionRef.current = session;
+	isPendingRef.current = isPending;
+	useEffect(() => {
+		if (!session && !isPending) {
+			authStore.set("token", null);
+			authStore.set("expiresAt", null);
+			authStore.set("isAuthenticated", false);
+		}
+	}, [
+		session,
+		isPending,
+		authStore
+	]);
 	const fetchAccessToken = useCallback(async ({ forceRefreshToken = false } = {}) => {
-		if (!session) {
-			if (!isPending) {
+		const currentSession = sessionRef.current;
+		const currentIsPending = isPendingRef.current;
+		if (!currentSession) {
+			if (!currentIsPending) {
 				authStore.set("token", null);
 				authStore.set("expiresAt", null);
 			}
@@ -106,30 +123,18 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 				authStore.set("expiresAt", exp);
 			}
 			return jwt;
-		} catch {
+		} catch (e) {
+			console.error("[fetchAccessToken] error", e);
 			return null;
 		}
-	}, [
-		session,
-		isPending,
-		authStore,
-		authClient
-	]);
-	const useAuth = useMemo(() => function useConvexAuthHook() {
-		return useMemo(() => ({
-			isLoading: isPending,
-			isAuthenticated: session !== null,
-			fetchAccessToken
-		}), [
-			isPending,
-			session,
+	}, [authStore, authClient]);
+	const useAuth = useCallback(function useConvexAuthHook() {
+		return {
+			isLoading: isPendingRef.current,
+			isAuthenticated: sessionRef.current !== null,
 			fetchAccessToken
-		]);
-	}, [
-		isPending,
-		session,
-		fetchAccessToken
-	]);
+		};
+	}, [fetchAccessToken]);
 	return /* @__PURE__ */ jsx(FetchAccessTokenContext.Provider, {
 		value: fetchAccessToken,
 		children: /* @__PURE__ */ jsx(ConvexProviderWithAuth, {

package/dist/react/index.d.ts

@@ -256,6 +256,12 @@ declare class ConvexQueryClient {
   updateAuthStore(authStore?: AuthStore): void;
   /** Get current auth state from store */
   private getAuthState;
+  /**
+   * Check if subscription should be skipped due to auth state.
+   * Needed for useSuspenseQuery which ignores enabled: false.
+   * Regular useQuery already handles this via enabled: false in hooks.
+   */
+  private shouldSkipSubscription;
   /** Get QueryClient, throwing if not connected */
   get queryClient(): QueryClient;
   /**

package/dist/react/index.js

@@ -1203,6 +1203,7 @@ function createAuthMutations(authClient) {
 		return {
 			...options,
 			mutationFn: async (args) => {
+				authStoreApi.set("isAuthenticated", false);
 				convexQueryClient?.unsubscribeAuthQueries();
 				const res = await authClient.signOut(args);
 				await waitForTokenClear(authStoreApi);
@@ -1451,6 +1452,18 @@ var ConvexQueryClient = class {
 			isUnauthorized: this.authStore.get("isUnauthorized")
 		};
 	}
+	/**
+	* Check if subscription should be skipped due to auth state.
+	* Needed for useSuspenseQuery which ignores enabled: false.
+	* Regular useQuery already handles this via enabled: false in hooks.
+	*/
+	shouldSkipSubscription(authType) {
+		if (!authType || !this.authStore) return false;
+		const authState = this.getAuthState();
+		if (authState?.isLoading) return true;
+		if (authType === "required" && !authState?.isAuthenticated) return true;
+		return false;
+	}
 	/** Get QueryClient, throwing if not connected */
 	get queryClient() {
 		if (!this._queryClient) throw new Error("ConvexQueryClient not connected to TanStack QueryClient.");
@@ -1587,9 +1600,11 @@ var ConvexQueryClient = class {
 					break;
 				}
 				case "added": {
-					if (event.query.meta?.subscribe === false) break;
+					const meta = event.query.meta;
+					if (meta?.subscribe === false) break;
 					const [, funcName, args] = event.query.queryKey;
 					if (event.query.getObserversCount() === 0) break;
+					if (this.shouldSkipSubscription(meta?.authType)) break;
 					const watch = this.convexClient.watchQuery(funcName, args);
 					const unsubscribe = watch.onUpdate(() => {
 						this.onUpdateQueryKeyHash(event.query.queryHash);
@@ -1609,8 +1624,10 @@ var ConvexQueryClient = class {
 					}
 					if (this.subscriptions[event.query.queryHash]) break;
 					if (event.query.options.enabled === false) break;
-					if (event.query.meta?.subscribe === false) break;
+					const meta = event.query.meta;
+					if (meta?.subscribe === false) break;
 					const [, funcName, args] = event.query.queryKey;
+					if (this.shouldSkipSubscription(meta?.authType)) break;
 					const watch = this.convexClient.watchQuery(funcName, args);
 					const unsubscribe = watch.onUpdate(() => {
 						this.onUpdateQueryKeyHash(event.query.queryHash);
@@ -1650,8 +1667,10 @@ var ConvexQueryClient = class {
 						break;
 					}
 					if (isSubscribed || isDisabled) break;
-					if (event.query.meta?.subscribe === false) break;
+					const meta = event.query.meta;
+					if (meta?.subscribe === false) break;
 					const [, funcName, args] = event.query.queryKey;
+					if (this.shouldSkipSubscription(meta?.authType)) break;
 					const watch = this.convexClient.watchQuery(funcName, args);
 					const unsubscribe = watch.onUpdate(() => {
 						this.onUpdateQueryKeyHash(event.query.queryHash);

package/dist/rsc/index.js

@@ -216,7 +216,7 @@ function getServerQueryClientOptions({ getToken, convexSiteUrl } = {}) {
 				const routeMeta = meta;
 				if (!convexSiteUrl) throw new Error("convexSiteUrl required for HTTP queries. Pass it to getServerQueryClientOptions().");
 				if (!routeMeta?.path) throw new Error(`HTTP route metadata missing for: ${routeKey}`);
-				return fetchHttpRoute(convexSiteUrl, routeMeta, args$1, token);
+				return await fetchHttpRoute(convexSiteUrl, routeMeta, args$1, token);
 			}
 			const [funcRef, args] = rest;
 			const queryMeta = meta;
@@ -224,7 +224,7 @@ function getServerQueryClientOptions({ getToken, convexSiteUrl } = {}) {
 			const authRequired = queryMeta?.authType === "required";
 			if (!token && (skipUnauth || authRequired)) return null;
 			const opts = token ? { token } : void 0;
-			return type === "convexQuery" ? fetchQuery(funcRef, args, opts) : fetchAction(funcRef, args, opts);
+			return type === "convexQuery" ? await fetchQuery(funcRef, args, opts) : await fetchAction(funcRef, args, opts);
 		},
 		queryKeyHashFn: createHashFn()
 	} };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-convex",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Better Convex - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",
@@ -37,6 +37,7 @@
   "dependencies": {
     "chokidar": "^5.0.0",
     "common-tags": "^1.8.2",
+    "dotenv": "^17.2.3",
     "execa": "^9.6.1",
     "jiti": "^2.6.1",
     "jotai-x": "^2.3.3",