better-convex 0.8.4 → 0.9.1

package/dist/aggregate/index.d.ts

@@ -1,5 +1,4 @@
-import { jt as ConvexCustomBuilderInitial, sn as ConvexTableWithColumns, vt as ConvexTextBuilderInitial, wt as ConvexIdBuilderInitial, xt as ConvexNumberBuilderInitial } from "../where-clause-compiler-_b1UHbYW.js";
-import "../orm/index.js";
+import { Dt as ConvexCustomBuilderInitial, _t as ConvexNumberBuilderInitial, bt as ConvexIdBuilderInitial, qn as ConvexTextBuilderInitial, rn as ConvexTableWithColumns } from "../where-clause-compiler-UavDdMUX.js";
 import * as convex_values0 from "convex/values";
 import { GenericId, Infer, Value } from "convex/values";
 import { DocumentByName, GenericDataModel, GenericDatabaseReader, GenericDatabaseWriter, TableNamesInDataModel } from "convex/server";

package/dist/aggregate/index.js

@@ -1,4 +1,4 @@
-import { n as TableAggregate$1, r as aggregateStorageTables, t as DirectAggregate$1 } from "../runtime-oWZgeWOJ.js";
+import { n as TableAggregate$1, r as aggregateStorageTables, t as DirectAggregate$1 } from "../runtime-B20PP4Qr.js";
 
 //#region src/aggregate/index.ts
 const wrapTriggerFactory = (methodName, factory) => ((...args) => {

package/dist/auth/client/index.js

@@ -107,48 +107,69 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 		authStore
 	]);
 	const fetchAccessToken = useCallback(async ({ forceRefreshToken = false } = {}) => {
+		const fetchFreshToken = () => {
+			if (pendingTokenRef.current) return pendingTokenRef.current;
+			pendingTokenRef.current = authClient.convex.token({ fetchOptions: { throw: false } }).then((result) => {
+				const jwt = result.data?.token || null;
+				if (jwt) {
+					const exp = decodeJwtExp(jwt);
+					authStore.set("token", jwt);
+					authStore.set("expiresAt", exp);
+					return jwt;
+				}
+				authStore.set("token", null);
+				authStore.set("expiresAt", null);
+				return null;
+			}).catch((error) => {
+				authStore.set("token", null);
+				authStore.set("expiresAt", null);
+				console.error("[fetchAccessToken] error", error);
+				return null;
+			}).finally(() => {
+				pendingTokenRef.current = null;
+			});
+			return pendingTokenRef.current;
+		};
+		const fetchFreshTokenForced = async () => {
+			if (pendingTokenRef.current) {
+				const token = await pendingTokenRef.current;
+				if (token) return token;
+			}
+			return fetchFreshToken();
+		};
 		const currentSession = sessionRef.current;
 		const currentIsPending = isPendingRef.current;
 		if (!hasActiveSessionData(currentSession)) {
-			if (!currentIsPending) {
-				authStore.set("token", null);
-				authStore.set("expiresAt", null);
+			if (currentIsPending) {
+				if (!forceRefreshToken) return authStore.get("token");
+				const cachedToken = authStore.get("token");
+				const freshToken = await fetchFreshTokenForced();
+				if (!freshToken && cachedToken) {
+					authStore.set("token", cachedToken);
+					authStore.set("expiresAt", decodeJwtExp(cachedToken));
+					return cachedToken;
+				}
+				return freshToken;
 			}
-			return authStore.get("token");
+			authStore.set("token", null);
+			authStore.set("expiresAt", null);
+			return null;
 		}
-		const cachedToken = authStore.get("token");
+		const cachedToken_0 = authStore.get("token");
 		const expiresAt = authStore.get("expiresAt");
 		const timeRemaining = expiresAt ? expiresAt - Date.now() : 0;
-		if (!forceRefreshToken && cachedToken && expiresAt && timeRemaining >= 6e4) return cachedToken;
+		if (!forceRefreshToken && cachedToken_0 && expiresAt && timeRemaining >= 6e4) return cachedToken_0;
 		if (!forceRefreshToken && pendingTokenRef.current) return pendingTokenRef.current;
-		pendingTokenRef.current = authClient.convex.token({ fetchOptions: { throw: false } }).then((result) => {
-			const jwt = result.data?.token || null;
-			if (jwt) {
-				const exp = decodeJwtExp(jwt);
-				authStore.set("token", jwt);
-				authStore.set("expiresAt", exp);
-				return jwt;
-			}
-			authStore.set("token", null);
-			authStore.set("expiresAt", null);
-			return null;
-		}).catch((error) => {
-			authStore.set("token", null);
-			authStore.set("expiresAt", null);
-			console.error("[fetchAccessToken] error", error);
-			return null;
-		}).finally(() => {
-			pendingTokenRef.current = null;
-		});
-		return pendingTokenRef.current;
+		if (forceRefreshToken) return fetchFreshTokenForced();
+		return fetchFreshToken();
 	}, [authStore, authClient]);
 	const useAuth = useCallback(function useConvexAuthHook() {
-		const token = authStore.get("token");
+		const token_0 = authStore.get("token");
 		const hasSession_0 = hasActiveSessionData(sessionRef.current);
 		const sessionMissing = !hasSession_0 && !isPendingRef.current;
 		return {
-			isLoading: isPendingRef.current && !token,
-			isAuthenticated: sessionMissing ? false : hasSession_0 || token !== null,
+			isLoading: isPendingRef.current && !token_0,
+			isAuthenticated: sessionMissing ? false : hasSession_0 || token_0 !== null,
 			fetchAccessToken
 		};
 	}, [fetchAccessToken, authStore]);

package/dist/auth/index.d.ts

@@ -182,28 +182,28 @@ type AdapterPaginationOptions = PaginationOptions & {
 };
 declare const adapterWhereValidator: convex_values0.VObject<{
   connector?: "AND" | "OR" | undefined;
-  operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-  field: string;
+  operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
   value: string | number | boolean | string[] | number[] | null;
+  field: string;
 }, {
   connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
   field: convex_values0.VString<string, "required">;
-  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>;
+  operator: convex_values0.VUnion<"in" | "lt" | "lte" | "gt" | "gte" | "eq" | "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">;
+}, "required", "value" | "connector" | "field" | "operator">;
 declare const adapterArgsValidator: convex_values0.VObject<{
   limit?: number | undefined;
   select?: string[] | undefined;
   offset?: number | undefined;
   sortBy?: {
-    field: string;
     direction: "asc" | "desc";
+    field: string;
   } | undefined;
   where?: {
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
+    operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }[] | undefined;
   model: string;
 }, {
@@ -212,29 +212,29 @@ declare const adapterArgsValidator: convex_values0.VObject<{
   offset: convex_values0.VFloat64<number | undefined, "optional">;
   select: convex_values0.VArray<string[] | undefined, convex_values0.VString<string, "required">, "optional">;
   sortBy: convex_values0.VObject<{
-    field: string;
     direction: "asc" | "desc";
+    field: string;
   } | undefined, {
     direction: convex_values0.VUnion<"asc" | "desc", [convex_values0.VLiteral<"asc", "required">, convex_values0.VLiteral<"desc", "required">], "required", never>;
     field: convex_values0.VString<string, "required">;
-  }, "optional", "field" | "direction">;
+  }, "optional", "direction" | "field">;
   where: convex_values0.VArray<{
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
+    operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }[] | undefined, convex_values0.VObject<{
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
+    operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }, {
     connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
     field: convex_values0.VString<string, "required">;
-    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>;
+    operator: convex_values0.VUnion<"in" | "lt" | "lte" | "gt" | "gte" | "eq" | "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" | "select" | "offset" | "sortBy" | "where" | "sortBy.field" | "sortBy.direction">;
+  }, "required", "value" | "connector" | "field" | "operator">, "optional">;
+}, "required", "limit" | "model" | "select" | "offset" | "sortBy" | "where" | "sortBy.direction" | "sortBy.field">;
 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>;
@@ -359,26 +359,26 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     };
   }, Promise<any>>;
   deleteMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
       where?: any[] | undefined;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -391,9 +391,9 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
@@ -406,14 +406,14 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     join?: any;
     offset?: number | undefined;
     sortBy?: {
-      field: string;
       direction: "asc" | "desc";
+      field: string;
     } | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     paginationOpts: {
       id?: number;
@@ -430,27 +430,19 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     select?: string[] | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     model: string;
   }, Promise<convex_server0.GenericDocument | null>>;
   updateMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;
@@ -463,6 +455,14 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       update: any;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -475,9 +475,9 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;
@@ -19155,26 +19155,26 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     };
   }, Promise<any>>;
   deleteMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
       where?: any[] | undefined;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -19187,9 +19187,9 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
@@ -19202,14 +19202,14 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     join?: any;
     offset?: number | undefined;
     sortBy?: {
-      field: string;
       direction: "asc" | "desc";
+      field: string;
     } | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     paginationOpts: {
       id?: number;
@@ -19226,27 +19226,19 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     select?: string[] | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     model: string;
   }, Promise<convex_server0.GenericDocument | null>>;
   updateMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;
@@ -19259,6 +19251,14 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
       update: any;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -19271,9 +19271,9 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as getConvexConfig, t as generateMeta } from "./codegen-BS36cYTH.mjs";
+import { n as getConvexConfig, t as generateMeta } from "./codegen-CMQIKrqh.mjs";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import fs from "node:fs";
@@ -230,6 +230,7 @@ const OrmContext = Symbol.for("better-convex:OrmContext");
 const RlsPolicies = Symbol.for("better-convex:RlsPolicies");
 const EnableRLS = Symbol.for("better-convex:EnableRLS");
 const TableDeleteConfig = Symbol.for("better-convex:TableDeleteConfig");
+const TablePolymorphic = Symbol.for("better-convex:TablePolymorphic");
 const OrmSchemaOptions = Symbol.for("better-convex:OrmSchemaOptions");
 const OrmSchemaDefinition = Symbol.for("better-convex:OrmSchemaDefinition");
 const OrmSchemaPluginTables = Symbol.for("better-convex:OrmSchemaPluginTables");
@@ -449,8 +450,22 @@ const walkDeployEntryPoints = (dir, options) => {
 };
 const detectProjectRoots = () => {
 	const projectRoot = process.cwd();
+	const convexConfigPath = path.join(projectRoot, "convex.json");
+	const configuredFunctionsRoot = (() => {
+		if (!fs.existsSync(convexConfigPath)) return null;
+		try {
+			const parsed = JSON.parse(fs.readFileSync(convexConfigPath, "utf8"));
+			return typeof parsed.functions === "string" && parsed.functions.length > 0 ? path.join(projectRoot, parsed.functions) : null;
+		} catch {
+			return null;
+		}
+	})();
 	const preferredFunctionsRoot = path.join(projectRoot, "convex", "functions");
 	const fallbackFunctionsRoot = path.join(projectRoot, "convex");
+	if (configuredFunctionsRoot && fs.existsSync(configuredFunctionsRoot)) return {
+		projectRoot,
+		functionsRoot: configuredFunctionsRoot
+	};
 	if (fs.existsSync(preferredFunctionsRoot)) return {
 		projectRoot,
 		functionsRoot: preferredFunctionsRoot
@@ -459,7 +474,7 @@ const detectProjectRoots = () => {
 		projectRoot,
 		functionsRoot: fallbackFunctionsRoot
 	};
-	throw new Error(`Missing Convex functions directory. Expected one of:\n- ${preferredFunctionsRoot}\n- ${fallbackFunctionsRoot}`);
+	throw new Error(`Missing Convex functions directory. Expected one of:\n- ${configuredFunctionsRoot ?? "<convex.json functions>"}\n- ${preferredFunctionsRoot}\n- ${fallbackFunctionsRoot}`);
 };
 const hasUseNodeDirective = (source) => {
 	if (!source.includes("use node")) return false;
@@ -516,17 +531,22 @@ const listConvexHandlerExports = async (entryPoint, jitiInstance) => {
 	return Array.from(exportNames).sort((a, b) => a.localeCompare(b));
 };
 const scanHandlerExportsByEntry = async (entryPoints) => {
-	const jitiInstance = createJiti(process.cwd(), {
-		interopDefault: true,
-		moduleCache: false
-	});
-	const results = await Promise.all(entryPoints.map(async (entryPoint) => ({
-		entryPoint,
-		exportNames: await listConvexHandlerExports(entryPoint, jitiInstance)
-	})));
-	const byEntry = /* @__PURE__ */ new Map();
-	for (const result of results) if (result.exportNames.length > 0) byEntry.set(result.entryPoint, result.exportNames);
-	return byEntry;
+	globalThis.__BETTER_CONVEX_CODEGEN__ = true;
+	try {
+		const jitiInstance = createJiti(process.cwd(), {
+			interopDefault: true,
+			moduleCache: false
+		});
+		const results = await Promise.all(entryPoints.map(async (entryPoint) => ({
+			entryPoint,
+			exportNames: await listConvexHandlerExports(entryPoint, jitiInstance)
+		})));
+		const byEntry = /* @__PURE__ */ new Map();
+		for (const result of results) if (result.exportNames.length > 0) byEntry.set(result.entryPoint, result.exportNames);
+		return byEntry;
+	} finally {
+		delete globalThis.__BETTER_CONVEX_CODEGEN__;
+	}
 };
 const parseArgs$1 = (argv) => {
 	const options = {

package/dist/{codegen-BS36cYTH.mjs → codegen-CMQIKrqh.mjs}

@@ -888,40 +888,45 @@ async function generateMeta(outputDir, options) {
 	if (hasTriggersExport && !hasRelationsExport) throw new Error("Codegen error: schema.ts exports 'triggers' but is missing 'relations'. Export `relations` and define triggers via `defineTriggers(relations, { ... })`.");
 	ensureGeneratedSupportPlaceholders(functionsDir, { includeAuth: generateAuth });
 	if (generateApi) {
-		const jitiInstance = createJiti(process.cwd(), {
-			interopDefault: true,
-			moduleCache: false
-		});
-		const files = listFilesRecursive(functionsDir).filter((file) => file.endsWith(".ts") && isValidConvexFile(file));
-		createdRuntimePlaceholders = ensureGeneratedRuntimePlaceholders(functionsDir, [...new Set([
-			...files.map((file) => file.replace(TS_EXTENSION_RE, "")),
-			...hasRelationsExport ? ["generated/server"] : [],
-			...generateAuth ? [generatedAuthModuleName] : []
-		])]);
-		for (const file of files) {
-			const filePath = path.join(functionsDir, file);
-			const moduleName = file.replace(TS_EXTENSION_RE, "");
-			try {
-				const { meta: moduleMeta, httpRoutes, procedures } = await parseModuleRuntime(filePath, jitiInstance);
-				if (moduleMeta) {
-					meta[moduleName] = moduleMeta;
-					const fnCount = Object.keys(moduleMeta).length;
-					totalFunctions += fnCount;
-					if (debug) console.info(`  ✓ ${moduleName}: ${fnCount} functions`);
+		globalThis.__BETTER_CONVEX_CODEGEN__ = true;
+		try {
+			const jitiInstance = createJiti(process.cwd(), {
+				interopDefault: true,
+				moduleCache: false
+			});
+			const files = listFilesRecursive(functionsDir).filter((file) => file.endsWith(".ts") && isValidConvexFile(file));
+			createdRuntimePlaceholders = ensureGeneratedRuntimePlaceholders(functionsDir, [...new Set([
+				...files.map((file) => file.replace(TS_EXTENSION_RE, "")),
+				...hasRelationsExport ? ["generated/server"] : [],
+				...generateAuth ? [generatedAuthModuleName] : []
+			])]);
+			for (const file of files) {
+				const filePath = path.join(functionsDir, file);
+				const moduleName = file.replace(TS_EXTENSION_RE, "");
+				try {
+					const { meta: moduleMeta, httpRoutes, procedures } = await parseModuleRuntime(filePath, jitiInstance);
+					if (moduleMeta) {
+						meta[moduleName] = moduleMeta;
+						const fnCount = Object.keys(moduleMeta).length;
+						totalFunctions += fnCount;
+						if (debug) console.info(`  ✓ ${moduleName}: ${fnCount} functions`);
+					}
+					if (Object.keys(httpRoutes).length > 0 && debug) console.info(`  ✓ ${moduleName}: ${Object.keys(httpRoutes).length} HTTP routes`);
+					Object.assign(allHttpRoutes, httpRoutes);
+					for (const procedure of procedures) procedureEntries.push({
+						moduleName,
+						exportName: procedure.exportName,
+						internal: procedure.internal,
+						type: procedure.type,
+						kind: "crpc"
+					});
+				} catch (error) {
+					runtimeFilesPreservedFromParseFailures.add(getGeneratedRuntimeOutputFile(functionsDir, moduleName));
+					if (debug || file === "http.ts") console.error(`  ⚠ Failed to parse ${file}:`, error);
 				}
-				if (Object.keys(httpRoutes).length > 0 && debug) console.info(`  ✓ ${moduleName}: ${Object.keys(httpRoutes).length} HTTP routes`);
-				Object.assign(allHttpRoutes, httpRoutes);
-				for (const procedure of procedures) procedureEntries.push({
-					moduleName,
-					exportName: procedure.exportName,
-					internal: procedure.internal,
-					type: procedure.type,
-					kind: "crpc"
-				});
-			} catch (error) {
-				runtimeFilesPreservedFromParseFailures.add(getGeneratedRuntimeOutputFile(functionsDir, moduleName));
-				if (debug || file === "http.ts") console.error(`  ⚠ Failed to parse ${file}:`, error);
 			}
+		} finally {
+			delete globalThis.__BETTER_CONVEX_CODEGEN__;
 		}
 	}
 	if (generateApi) {

package/dist/{id-DdAxiGby.js → id-BF_SaWhQ.js}

@@ -1,4 +1,4 @@
-import { T as entityKind, w as ConvexColumnBuilder } from "./table-B7yzBihE.js";
+import { D as entityKind, E as ConvexColumnBuilder } from "./table-Bxqm450r.js";
 import { o as vRequired } from "./validators-D_i3BK7v.js";
 import { v } from "convex/values";