kitcn 0.16.1 → 0.17.0

package/dist/aggregate/index.d.ts

@@ -1,4 +1,4 @@
-import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial, dn as ConvexTableWithColumns, tr as ConvexTextBuilderInitial } from "../where-clause-compiler-C8UKgzTO.js";
+import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial, dn as ConvexTableWithColumns, tr as ConvexTextBuilderInitial } from "../where-clause-compiler-BRhLW1dp.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/auth/client/index.js

@@ -1,5 +1,5 @@
 'use client';
-import { A as defaultIsUnauthorized, D as writeAuthSessionFallbackData, E as readAuthSessionFallbackToken, T as readAuthSessionFallbackData, _ as useAuthValue, d as decodeJwtExp, f as isSessionSyncGraceActive, g as useAuthStore, k as CRPCClientError, n as AuthProvider, o as ConvexProviderWithAuth$1, s as FetchAccessTokenContext, t as AUTH_SESSION_SYNC_GRACE_MS, w as clearAuthSessionFallback } from "../../auth-store-ssZDPa37.js";
+import { A as defaultIsUnauthorized, D as writeAuthSessionFallbackData, E as readAuthSessionFallbackToken, T as readAuthSessionFallbackData, _ as useAuthValue, d as decodeJwtExp, f as isSessionSyncGraceActive, g as useAuthStore, k as CRPCClientError, n as AuthProvider, o as ConvexProviderWithAuth$1, s as FetchAccessTokenContext, t as AUTH_SESSION_SYNC_GRACE_MS, w as clearAuthSessionFallback } from "../../auth-store-BnGZxmnY.js";
 import { useConvexAuth } from "convex/react";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import { jsx } from "react/jsx-runtime";

package/dist/auth/index.js

@@ -3,7 +3,7 @@ import { r as partial } from "../validators-C7LelqTN.js";
 import { i as defineAuth, n as createDisabledAuthRuntime, r as getGeneratedAuthDisabledReason, t as DEFAULT_AUTH_DEFINITION_PATH } from "../generated-contract-disabled-BXaz7JCE.js";
 import { n as createGeneratedFunctionReference, o as isQueryCtx, s as isRunMutationCtx } from "../api-entry-N3nBOlI2.js";
 import { n as customCtx, r as customMutation } from "../customFunctions-DxEEO4Dq.js";
-import { a as mergedStream, l as unsetToken, o as stream, t as getByIdWithOrmQueryFallback, v as eq } from "../query-context-B47_3n97.js";
+import { o as mergedStream, s as stream, t as getByIdWithOrmQueryFallback, u as unsetToken, y as eq } from "../query-context-C90vNlc9.js";
 import { n as convex } from "../convex-plugin-BHVCqWTH.js";
 import { v } from "convex/values";
 import { internalActionGeneric, internalMutationGeneric, internalQueryGeneric, paginationOptsValidator } from "convex/server";
@@ -160,6 +160,11 @@ const filterByWhere = (doc, where, filterWhere) => {
 	}
 	return true;
 };
+const getByIdInTable = async (ctx, model, value) => {
+	if (typeof value !== "string") return null;
+	const normalizedId = ctx.db.normalizeId(model, value);
+	return normalizedId === null ? null : await ctx.db.get(normalizedId);
+};
 const generateQuery = (ctx, schema, args) => {
 	const { boundField, index, indexFields, values } = findIndex(schema, args) ?? {};
 	const usableIndex = index?.indexDescriptor === "by_creation_time" ? void 0 : index;
@@ -207,7 +212,7 @@ const paginate = async (ctx, schema, betterAuthSchema, args) => {
 			model: args.model,
 			where: [uniqueWhere]
 		}) || {};
-		const doc = uniqueWhere.field === "_id" ? await ctx.db.get(uniqueWhere.value) : await ctx.db.query(args.model).withIndex(index?.indexDescriptor, (q) => q.eq(index?.fields[0], uniqueWhere.value)).unique();
+		const doc = uniqueWhere.field === "_id" ? await getByIdInTable(ctx, args.model, uniqueWhere.value) : await ctx.db.query(args.model).withIndex(index?.indexDescriptor, (q) => q.eq(index?.fields[0], uniqueWhere.value)).unique();
 		if (filterByWhere(doc, args.where, (w) => w !== uniqueWhere)) return {
 			continueCursor: "",
 			isDone: true,
@@ -233,7 +238,7 @@ const paginate = async (ctx, schema, betterAuthSchema, args) => {
 		if (inWhere.field === "_id") return {
 			continueCursor: "",
 			isDone: true,
-			page: (await asyncMap(inWhere.value, async (value) => ctx.db.get(value))).flatMap((doc) => doc ? [doc] : []).filter((doc) => filterByWhere(doc, args.where, (w) => w !== inWhere)).sort((a, b) => {
+			page: (await asyncMap(inWhere.value, async (value) => getByIdInTable(ctx, args.model, value))).flatMap((doc) => doc ? [doc] : []).filter((doc) => filterByWhere(doc, args.where, (w) => w !== inWhere)).sort((a, b) => {
 				if (args.sortBy?.field === "createdAt") return args.sortBy.direction === "asc" ? a._creationTime - b._creationTime : b._creationTime - a._creationTime;
 				if (args.sortBy) {
 					const aValue = a[args.sortBy.field];
@@ -261,18 +266,7 @@ const paginate = async (ctx, schema, betterAuthSchema, args) => {
 		};
 	}
 	const notInWhere = args.where?.find((w) => w.operator === "not_in");
-	if (notInWhere) {
-		if (!Array.isArray(notInWhere.value)) throw new TypeError("not_in clause value must be an array");
-		const result = await generateQuery(ctx, schema, {
-			...args,
-			where: args.where?.filter((w) => w !== notInWhere)
-		}).paginate(paginationOpts);
-		const filteredPage = result.page.filter((doc) => filterByWhere(doc, [notInWhere]));
-		return {
-			...result,
-			page: filteredPage.map((doc) => selectFields(doc, args.select))
-		};
-	}
+	if (notInWhere && !Array.isArray(notInWhere.value)) throw new TypeError("not_in clause value must be an array");
 	const result = await generateQuery(ctx, schema, args).paginate(paginationOpts);
 	return {
 		...result,
@@ -763,7 +757,7 @@ const handlePagination = async (next, { limit, numItems } = {}) => {
 		isDone: false
 	};
 	const onResult = (result) => {
-		state.cursor = result.pageStatus === "SplitRecommended" || result.pageStatus === "SplitRequired" ? result.splitCursor ?? result.continueCursor : result.continueCursor;
+		state.cursor = result.continueCursor;
 		if (result.page) {
 			state.docs.push(...result.page);
 			state.isDone = limit && state.docs.length >= limit || result.isDone;
@@ -790,7 +784,7 @@ const handlePagination = async (next, { limit, numItems } = {}) => {
 	return state;
 };
 const hasOrWhere = (where) => where?.some((clause) => clause.connector === "OR") ?? false;
-const assertSupportedBulkOrWhere = (where, operation) => {
+const assertSupportedOrWhere = (where, operation) => {
 	if (hasOrWhere(where) && !where?.every((clause) => clause.connector === "OR")) throw new Error(`Mixed OR/AND where clauses are not supported for ${operation}`);
 };
 const parseWhere = (where) => {
@@ -897,6 +891,7 @@ const httpAdapter = (ctx, { authFunctions, debugLogs, schema }) => {
 				id: "convex",
 				options: { isRunMutationCtx: isRunMutationCtx(ctx) },
 				count: async (data) => {
+					assertSupportedOrWhere(data.where, "count");
 					if (hasOrWhere(data.where)) return dedupeDocsById((await asyncMap(data.where, async (w) => handlePagination(async ({ paginationOpts }) => await ctx.runQuery(authFunctions.findMany, {
 						...data,
 						paginationOpts,
@@ -932,7 +927,7 @@ const httpAdapter = (ctx, { authFunctions, debugLogs, schema }) => {
 				},
 				deleteMany: async (data) => {
 					if (!("runMutation" in ctx)) throw new Error("ctx is not a mutation ctx");
-					assertSupportedBulkOrWhere(data.where, "deleteMany");
+					assertSupportedOrWhere(data.where, "deleteMany");
 					if (hasOrWhere(data.where)) {
 						const ids = await collectIdsForOrWhere({
 							model: data.model,
@@ -960,6 +955,7 @@ const httpAdapter = (ctx, { authFunctions, debugLogs, schema }) => {
 				},
 				findMany: async (data) => {
 					if (data.offset) throw new Error("offset not supported");
+					assertSupportedOrWhere(data.where, "findMany");
 					if (hasOrWhere(data.where)) {
 						const { select: _ignoredSelect, ...queryData } = data;
 						let docs = dedupeDocsById((await asyncMap(data.where, async (w) => handlePagination(async ({ paginationOpts }) => await ctx.runQuery(authFunctions.findMany, {
@@ -1012,7 +1008,7 @@ const httpAdapter = (ctx, { authFunctions, debugLogs, schema }) => {
 				},
 				updateMany: async (data) => {
 					if (!("runMutation" in ctx)) throw new Error("ctx is not a mutation ctx");
-					assertSupportedBulkOrWhere(data.where, "updateMany");
+					assertSupportedOrWhere(data.where, "updateMany");
 					if (hasOrWhere(data.where)) {
 						const ids = await collectIdsForOrWhere({
 							model: data.model,
@@ -1073,6 +1069,7 @@ const dbAdapter = (ctx, getAuthOptions, { authFunctions, debugLogs, schema }) =>
 				id: "convex",
 				options: { isRunMutationCtx: isRunMutationCtx(ctx) },
 				count: async (data) => {
+					assertSupportedOrWhere(data.where, "count");
 					if (hasOrWhere(data.where)) return dedupeDocsById((await asyncMap(data.where, async (w) => handlePagination(async ({ paginationOpts }) => await findManyHandler(ctx, {
 						...data,
 						paginationOpts,
@@ -1108,7 +1105,7 @@ const dbAdapter = (ctx, getAuthOptions, { authFunctions, debugLogs, schema }) =>
 				},
 				deleteMany: async (data) => {
 					if (!("runMutation" in ctx)) throw new Error("ctx is not a mutation ctx");
-					assertSupportedBulkOrWhere(data.where, "deleteMany");
+					assertSupportedOrWhere(data.where, "deleteMany");
 					if (hasOrWhere(data.where)) {
 						const ids = await collectIdsForOrWhere({
 							model: data.model,
@@ -1136,6 +1133,7 @@ const dbAdapter = (ctx, getAuthOptions, { authFunctions, debugLogs, schema }) =>
 				},
 				findMany: async (data) => {
 					if (data.offset) throw new Error("offset not supported");
+					assertSupportedOrWhere(data.where, "findMany");
 					if (hasOrWhere(data.where)) {
 						const { select: _ignoredSelect, ...queryData } = data;
 						let docs = dedupeDocsById((await asyncMap(data.where, async (w) => handlePagination(async ({ paginationOpts }) => await findManyHandler(ctx, {
@@ -1187,7 +1185,7 @@ const dbAdapter = (ctx, getAuthOptions, { authFunctions, debugLogs, schema }) =>
 				},
 				updateMany: async (data) => {
 					if (!("runMutation" in ctx)) throw new Error("ctx is not a mutation ctx");
-					assertSupportedBulkOrWhere(data.where, "updateMany");
+					assertSupportedOrWhere(data.where, "updateMany");
 					if (hasOrWhere(data.where)) {
 						const ids = await collectIdsForOrWhere({
 							model: data.model,

package/dist/auth/nextjs/index.d.ts

@@ -1,4 +1,4 @@
-import { H as ConvexContext, W as LazyCaller } from "../../procedure-name-Cy1AxayA.js";
+import { H as ConvexContext, W as LazyCaller } from "../../procedure-name-Bo5KMcqc.js";
 import { t as GetTokenOptions } from "../../token-B9Bjcqug.js";
 
 //#region src/auth-nextjs/index.d.ts

package/dist/auth/nextjs/index.js

@@ -1,6 +1,6 @@
 import { t as getToken } from "../../token-oA2EMtPA.js";
 import { n as defaultIsUnauthorized } from "../../error-Bvo7YEhk.js";
-import { t as createCallerFactory } from "../../caller-factory-NEfgD5E0.js";
+import { t as createCallerFactory } from "../../caller-factory-DHywSoGZ.js";
 
 //#region src/auth-nextjs/index.ts
 /** biome-ignore-all lint/suspicious/noExplicitAny: lib */
@@ -69,7 +69,7 @@ function convexBetterAuth(opts) {
 	const jwtCacheEnabled = auth.jwtCache !== false;
 	const { createContext, createCaller } = createCallerFactory({
 		api: opts.api,
-		auth: jwtCacheEnabled ? {
+		auth: {
 			getToken: (siteUrl, headers, getTokenOpts) => {
 				const mutableHeaders = new Headers(headers);
 				stripHopByHopHeaders(mutableHeaders);
@@ -78,14 +78,14 @@ function convexBetterAuth(opts) {
 					basePath: auth.basePath,
 					...getTokenOpts,
 					jwtCache: {
-						enabled: true,
+						enabled: jwtCacheEnabled,
 						expirationToleranceSeconds: auth.expirationToleranceSeconds,
 						isAuthError: auth.isUnauthorized ?? defaultIsUnauthorized
 					}
 				});
 			},
 			isUnauthorized: auth.isUnauthorized ?? defaultIsUnauthorized
-		} : void 0,
+		},
 		convexSiteUrl: opts.convexSiteUrl,
 		convexUrl: opts.convexUrl
 	});

package/dist/{auth-store-ssZDPa37.js → auth-store-BnGZxmnY.js}

@@ -170,7 +170,10 @@ const isSessionSyncGraceActive = (sessionSyncGraceUntil) => typeof sessionSyncGr
 /** Decode JWT expiration (ms timestamp) from token */
 function decodeJwtExp(token) {
 	try {
-		const payload = JSON.parse(atob(token.split(".")[1]));
+		const segment = token.split(".")[1];
+		if (!segment) return null;
+		const binary = atob(segment.replaceAll("-", "+").replaceAll("_", "/"));
+		const payload = JSON.parse(new TextDecoder().decode(Uint8Array.from(binary, (char) => char.charCodeAt(0))));
 		return payload.exp ? payload.exp * 1e3 : null;
 	} catch {
 		return null;