kitcn 0.17.1 → 0.17.3

package/dist/orm/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as GenericOrmCtx$1, $n as unique, $r as endsWith, $t as ManyConfig, A as ConvexDateMode, An as ConvexRankIndexBuilder, Ar as ReturningResult, At as MigrationManifestEntry, B as ConvexBytesBuilderInitial, Bn as rankIndex, Br as OrmSchemaRelations, Bt as defineMigration, C as ConvexNumberBuilderInitial, Ci as ColumnBuilderWithTableName, Cn as RlsRole, Cr as MutationReturning, Ct as MigrationStatusArgs, D as id, Di as IsPrimaryKey, Dn as ConvexAggregateIndexBuilderOn, Dr as PaginatedResult, Dt as MigrationDoc, E as ConvexIdBuilderInitial, Ei as HasDefault, En as ConvexAggregateIndexBuilder, Er as OrderDirection, Et as MigrationDirection, F as custom, Fn as ConvexVectorIndexBuilder, Fr as unsetToken, Ft as MigrationStateMap, G as ConvexBigIntBuilder, Gn as ConvexCheckConfig, Gr as ExpressionVisitor, Gt as OrmReader$1, H as ConvexBooleanBuilder, Hn as uniqueIndex, Hr as TableName, Ht as detectMigrationDrift, I as json, In as ConvexVectorIndexBuilderOn, Ir as Brand, It as MigrationStep, J as CountBackfillChunkArgs, Jn as ConvexUniqueConstraintBuilder, Jr as LogicalExpression, Jt as RlsMode, K as ConvexBigIntBuilderInitial, Kn as ConvexForeignKeyBuilder, Kr as FieldReference, Kt as OrmWriter$1, L as objectOf, Ln as ConvexVectorIndexConfig, Lr as Columns, Lt as MigrationTableName, M as ConvexCustomBuilder, Mn as ConvexSearchIndexBuilder, Mr as UpdateSet, Mt as MigrationPlan, N as ConvexCustomBuilderInitial, Nn as ConvexSearchIndexBuilderOn, Nr as VectorQueryConfig, Nt as MigrationRunStatus, O as ConvexDateBuilder, Oi as IsUnique, On as ConvexIndexBuilder, Or as PredicateWhereIndexConfig, Ot as MigrationDocContext, P as arrayOf, Pn as ConvexSearchIndexConfig, Pr as VectorSearchProvider, Pt as MigrationSet, Q as GenericOrm$1, Qn as foreignKey, Qr as contains, Qt as ExtractTablesWithRelations, R as unionOf, Rn as aggregateIndex, Rr as OrmSchemaExtensionTables, Rt as MigrationWriteMode, S as ConvexNumberBuilder, Si as ColumnBuilderTypeConfig, Sn as rlsPolicy, Sr as MutationResult, St as MigrationRunChunkArgs, T as ConvexIdBuilder, Ti as DrizzleEntity, Tn as rlsRole, Tr as OrderByClause, Tt as MigrationDefinition, U as ConvexBooleanBuilderInitial, Un as vectorIndex, Ur as SystemFields, Ut as DatabaseWithMutations, V as bytes, Vn as searchIndex, Vr as OrmSchemaTriggers, Vt as defineMigrationSet, W as boolean, Wn as ConvexCheckBuilder, Wr as BinaryExpression, Wt as DatabaseWithQuery, X as CountBackfillStatusArgs, Xn as ConvexUniqueConstraintConfig, Xr as and, Xt as extractRelationsConfig, Y as CountBackfillKickoffArgs, Yn as ConvexUniqueConstraintBuilderOn, Yr as UnaryExpression, Yt as EdgeMetadata, Z as CreateOrmOptions, Zn as check, Zr as between, Zt as ExtractTablesFromSchema, _ as ConvexTimestampMode, _i as startsWith, _n as deletion, _r as MutationExecuteConfig, _t as OrmTriggerContext, a as requireSchemaRelations, ai as inArray, an as TablesRelationalConfig, ar as AggregateResult, at as OrmWriterCtx, b as ConvexTextEnumBuilderInitial, bi as ColumnBuilderBaseConfig, bn as RlsPolicyConfig, br as MutationPaginateConfig, bt as MigrationCancelArgs, c as TableConfigResult, ci as isNull, cn as ConvexDeletionBuilder, cr as CountConfig, ct as ScheduledMutationBatchArgs, d as OrmNotFoundError, di as lte, dn as ConvexTableWithColumns, dr as FilterOperators, dt as scheduledDeleteFactory, ei as eq, en as OneConfig, er as ConvexTextBuilder, et as OrmApiResult, f as ConvexVectorBuilder, fi as ne, fn as DiscriminatorBuilderConfig, fr as GetColumnData, ft as SchemaExtension, g as ConvexTimestampBuilderInitial, gi as or, gn as convexTable, gr as InsertValue, gt as OrmTriggerChange, h as ConvexTimestampBuilder, hi as notInArray, hn as TableConfig, hr as InferSelectModel, ht as OrmTableTriggers, i as getSchemaTriggers, ii as ilike, in as TableRelationalConfig, ir as AggregateFieldValue, it as OrmReaderCtx, j as date, jn as ConvexRankIndexBuilderOn, jr as ReturningSelection, jt as MigrationMigrateOne, k as ConvexDateBuilderInitial, ki as NotNull, kn as ConvexIndexBuilderOn, kr as ReturningAll, kt as MigrationDriftIssue, l as getTableColumns, li as like, ln as ConvexDeletionConfig, lr as CountResult, lt as scheduledMutationBatchFactory, m as vector, mi as notBetween, mn as OrmLifecycleOperation, mr as InferModelFromColumns, mt as OrmBeforeResult, n as defineSchema, ni as gt, nn as RelationsBuilderColumnBase, nr as text, nt as OrmClientWithApi$1, o as asc, oi as isFieldReference, on as defineRelations, or as BuildQueryResult, ot as ResolveOrmSchema, p as ConvexVectorBuilderInitial, pi as not, pn as OrmLifecycleChange, pr as InferInsertModel, pt as defineSchemaExtension, q as bigint, qn as ConvexForeignKeyConfig, qr as FilterExpression, qt as RlsContext, r as getSchemaRelations, ri as gte, rn as RelationsBuilderColumnConfig, rr as AggregateConfig, rt as OrmFunctions, s as desc, si as isNotNull, sn as defineRelationsPart, sr as BuildRelationResult, st as createOrm, t as WhereClauseResult, ti as fieldRef, tn as RelationsBuilder, tr as ConvexTextBuilderInitial, tt as OrmClientBase$1, u as getTableConfig, ui as lt, un as ConvexTable, ur as DBQueryConfig, ut as ScheduledDeleteArgs, v as timestamp, vi as AnyColumn, vn as discriminator, vr as MutationExecuteResult, vt as OrmTriggers, w as integer, wi as ColumnDataType, wn as RlsRoleConfig, wr as MutationRunMode, wt as MigrationAppliedState, x as textEnum, xi as ColumnBuilderRuntimeConfig, xn as RlsPolicyToOption, xr as MutationPaginatedResult, xt as MigrationRunArgs, y as ConvexTextEnumBuilder, yi as ColumnBuilder, yn as RlsPolicy, yr as MutationExecutionMode, yt as defineTriggers, z as ConvexBytesBuilder, zn as index, zr as OrmSchemaExtensions, zt as buildMigrationPlan } from "../where-clause-compiler-BRhLW1dp.js";
+import { $ as GenericOrmCtx$1, $n as unique, $r as endsWith, $t as ManyConfig, A as ConvexDateMode, An as ConvexRankIndexBuilder, Ar as ReturningResult, At as MigrationManifestEntry, B as ConvexBytesBuilderInitial, Bn as rankIndex, Br as OrmSchemaRelations, Bt as defineMigration, C as ConvexNumberBuilderInitial, Ci as ColumnBuilderWithTableName, Cn as RlsRole, Cr as MutationReturning, Ct as MigrationStatusArgs, D as id, Di as IsPrimaryKey, Dn as ConvexAggregateIndexBuilderOn, Dr as PaginatedResult, Dt as MigrationDoc, E as ConvexIdBuilderInitial, Ei as HasDefault, En as ConvexAggregateIndexBuilder, Er as OrderDirection, Et as MigrationDirection, F as custom, Fn as ConvexVectorIndexBuilder, Fr as unsetToken, Ft as MigrationStateMap, G as ConvexBigIntBuilder, Gn as ConvexCheckConfig, Gr as ExpressionVisitor, Gt as OrmReader$1, H as ConvexBooleanBuilder, Hn as uniqueIndex, Hr as TableName, Ht as detectMigrationDrift, I as json, In as ConvexVectorIndexBuilderOn, Ir as Brand, It as MigrationStep, J as CountBackfillChunkArgs, Jn as ConvexUniqueConstraintBuilder, Jr as LogicalExpression, Jt as RlsMode, K as ConvexBigIntBuilderInitial, Kn as ConvexForeignKeyBuilder, Kr as FieldReference, Kt as OrmWriter$1, L as objectOf, Ln as ConvexVectorIndexConfig, Lr as Columns, Lt as MigrationTableName, M as ConvexCustomBuilder, Mn as ConvexSearchIndexBuilder, Mr as UpdateSet, Mt as MigrationPlan, N as ConvexCustomBuilderInitial, Nn as ConvexSearchIndexBuilderOn, Nr as VectorQueryConfig, Nt as MigrationRunStatus, O as ConvexDateBuilder, Oi as IsUnique, On as ConvexIndexBuilder, Or as PredicateWhereIndexConfig, Ot as MigrationDocContext, P as arrayOf, Pn as ConvexSearchIndexConfig, Pr as VectorSearchProvider, Pt as MigrationSet, Q as GenericOrm$1, Qn as foreignKey, Qr as contains, Qt as ExtractTablesWithRelations, R as unionOf, Rn as aggregateIndex, Rr as OrmSchemaExtensionTables, Rt as MigrationWriteMode, S as ConvexNumberBuilder, Si as ColumnBuilderTypeConfig, Sn as rlsPolicy, Sr as MutationResult, St as MigrationRunChunkArgs, T as ConvexIdBuilder, Ti as DrizzleEntity, Tn as rlsRole, Tr as OrderByClause, Tt as MigrationDefinition, U as ConvexBooleanBuilderInitial, Un as vectorIndex, Ur as SystemFields, Ut as DatabaseWithMutations, V as bytes, Vn as searchIndex, Vr as OrmSchemaTriggers, Vt as defineMigrationSet, W as boolean, Wn as ConvexCheckBuilder, Wr as BinaryExpression, Wt as DatabaseWithQuery, X as CountBackfillStatusArgs, Xn as ConvexUniqueConstraintConfig, Xr as and, Xt as extractRelationsConfig, Y as CountBackfillKickoffArgs, Yn as ConvexUniqueConstraintBuilderOn, Yr as UnaryExpression, Yt as EdgeMetadata, Z as CreateOrmOptions, Zn as check, Zr as between, Zt as ExtractTablesFromSchema, _ as ConvexTimestampMode, _i as startsWith, _n as deletion, _r as MutationExecuteConfig, _t as OrmTriggerContext, a as requireSchemaRelations, ai as inArray, an as TablesRelationalConfig, ar as AggregateResult, at as OrmWriterCtx, b as ConvexTextEnumBuilderInitial, bi as ColumnBuilderBaseConfig, bn as RlsPolicyConfig, br as MutationPaginateConfig, bt as MigrationCancelArgs, c as TableConfigResult, ci as isNull, cn as ConvexDeletionBuilder, cr as CountConfig, ct as ScheduledMutationBatchArgs, d as OrmNotFoundError, di as lte, dn as ConvexTableWithColumns, dr as FilterOperators, dt as scheduledDeleteFactory, ei as eq, en as OneConfig, er as ConvexTextBuilder, et as OrmApiResult, f as ConvexVectorBuilder, fi as ne, fn as DiscriminatorBuilderConfig, fr as GetColumnData, ft as SchemaExtension, g as ConvexTimestampBuilderInitial, gi as or, gn as convexTable, gr as InsertValue, gt as OrmTriggerChange, h as ConvexTimestampBuilder, hi as notInArray, hn as TableConfig, hr as InferSelectModel, ht as OrmTableTriggers, i as getSchemaTriggers, ii as ilike, in as TableRelationalConfig, ir as AggregateFieldValue, it as OrmReaderCtx, j as date, jn as ConvexRankIndexBuilderOn, jr as ReturningSelection, jt as MigrationMigrateOne, k as ConvexDateBuilderInitial, ki as NotNull, kn as ConvexIndexBuilderOn, kr as ReturningAll, kt as MigrationDriftIssue, l as getTableColumns, li as like, ln as ConvexDeletionConfig, lr as CountResult, lt as scheduledMutationBatchFactory, m as vector, mi as notBetween, mn as OrmLifecycleOperation, mr as InferModelFromColumns, mt as OrmBeforeResult, n as defineSchema, ni as gt, nn as RelationsBuilderColumnBase, nr as text, nt as OrmClientWithApi$1, o as asc, oi as isFieldReference, on as defineRelations, or as BuildQueryResult, ot as ResolveOrmSchema, p as ConvexVectorBuilderInitial, pi as not, pn as OrmLifecycleChange, pr as InferInsertModel, pt as defineSchemaExtension, q as bigint, qn as ConvexForeignKeyConfig, qr as FilterExpression, qt as RlsContext, r as getSchemaRelations, ri as gte, rn as RelationsBuilderColumnConfig, rr as AggregateConfig, rt as OrmFunctions, s as desc, si as isNotNull, sn as defineRelationsPart, sr as BuildRelationResult, st as createOrm, t as WhereClauseResult, ti as fieldRef, tn as RelationsBuilder, tr as ConvexTextBuilderInitial, tt as OrmClientBase$1, u as getTableConfig, ui as lt, un as ConvexTable, ur as DBQueryConfig, ut as ScheduledDeleteArgs, v as timestamp, vi as AnyColumn, vn as discriminator, vr as MutationExecuteResult, vt as OrmTriggers, w as integer, wi as ColumnDataType, wn as RlsRoleConfig, wr as MutationRunMode, wt as MigrationAppliedState, x as textEnum, xi as ColumnBuilderRuntimeConfig, xn as RlsPolicyToOption, xr as MutationPaginatedResult, xt as MigrationRunArgs, y as ConvexTextEnumBuilder, yi as ColumnBuilder, yn as RlsPolicy, yr as MutationExecutionMode, yt as defineTriggers, z as ConvexBytesBuilder, zn as index, zr as OrmSchemaExtensions, zt as buildMigrationPlan } from "../where-clause-compiler-BgEc0GdS.js";
 import { i as pretendRequired, n as deprecated, r as pretend } from "../validators-BhsByJeg.js";
 import { a as QueryCtxWithPreferredOrmQueryTable, i as QueryCtxWithOrmQueryTable, n as LookupByIdResultByCtx, o as getByIdWithOrmQueryFallback, r as QueryCtxWithOptionalOrmQueryTable, t as DocByCtx } from "../query-context-CNo9ffvI.js";
 import { DefineSchemaOptions, GenericDatabaseReader, GenericDatabaseWriter, GenericSchema, SchemaDefinition } from "convex/server";

package/dist/solid/index.js

@@ -1,10 +1,10 @@
 import { getFunctionName } from "convex/server";
-import { Show, createContext, createEffect, createMemo, createSignal, on, onCleanup, onMount, useContext } from "solid-js";
+import { Show, createComputed, createContext, createEffect, createMemo, createRenderEffect, createSignal, on, onCleanup, onMount, useContext } from "solid-js";
 import { createComponent, memo } from "solid-js/web";
 import { createStore } from "solid-js/store";
-import { notifyManager, skipToken, useQueries, useQueryClient } from "@tanstack/solid-query";
+import { notifyManager, skipToken, useQueryClient } from "@tanstack/solid-query";
 import { ConvexClient, ConvexHttpClient } from "convex/browser";
-import { hashKey } from "@tanstack/query-core";
+import { QueriesObserver, hashKey } from "@tanstack/query-core";
 import { convexToJson } from "convex/values";
 
 //#region src/crpc/error.ts
@@ -2504,6 +2504,42 @@ const getConvexQueryClientSingleton = ({ authStore, convex, queryClient, symbolK
 //#region src/internal/pagination.ts
 const shouldSplitPaginationPage = (page, initialNumItems) => Boolean(page.splitCursor) && (page.pageStatus === "SplitRecommended" || page.pageStatus === "SplitRequired" || initialNumItems !== void 0 && page.page.length > initialNumItems * 2);
 
+//#endregion
+//#region src/solid/create-queries-results.ts
+/**
+* Subscribe a reactive list of queries and expose the raw observer results.
+*
+* Solid Query's `useQueries` cannot back an aggregate result: it feeds the
+* `combine` output straight into `createStore` and then calls `.map()` on it,
+* so any non-array aggregate throws `state.map is not a function` while the
+* component is still setting up. It also routes `.data` through
+* `createResource`, which suspends the nearest boundary for as long as a query
+* is in flight.
+*
+* Driving `QueriesObserver` directly keeps every entry a plain
+* `QueryObserverResult` - the same value the React port aggregates - and leaves
+* aggregation to the caller.
+*
+* @param queries Reactive list of query options.
+* @returns Accessor for the raw observer results, in query order.
+*/
+function createQueriesResults(queries) {
+	const queryClient = useQueryClient();
+	const defaulted = () => queries().map((options) => ({
+		...queryClient.defaultQueryOptions(options),
+		_optimisticResults: "optimistic"
+	}));
+	const observer = new QueriesObserver(queryClient, defaulted());
+	const [results, setResults] = createSignal(observer.getCurrentResult(), { equals: false });
+	createComputed(() => {
+		const next = defaulted();
+		observer.setQueries(next);
+		setResults(observer.getOptimisticResult(next, void 0)[0]);
+	});
+	onCleanup(observer.subscribe((next) => setResults(next)));
+	return results;
+}
+
 //#endregion
 //#region src/solid/use-infinite-query.ts
 const PAGINATION_KEY_PREFIX = "__pagination__";
@@ -2516,6 +2552,59 @@ const getOrCreatePaginationId = (storeKey) => {
 	paginationIdStore.set(storeKey, newId);
 	return newId;
 };
+/** Read the identity of a Convex document, tolerating `id` and `_id` shapes */
+const getItemId = (item) => {
+	const doc = item;
+	return doc?._id || doc?.id;
+};
+/**
+* Fold the per-page observer results into one pagination-shaped aggregate.
+* Pure: same inputs always produce the same output, so it is safe to re-run
+* inside a reactive derivation.
+*/
+const aggregatePages = (results, hasPlaceholderData) => {
+	const allItems = [];
+	const pages = [];
+	const seenIds = /* @__PURE__ */ new Set();
+	let lastPage;
+	let status = "LoadingFirstPage";
+	for (let i = 0; i < results.length; i++) {
+		const pageQuery = results[i];
+		if (pageQuery.isLoading || pageQuery.data === void 0) {
+			status = i === 0 ? "LoadingFirstPage" : "LoadingMore";
+			break;
+		}
+		const page = pageQuery.data;
+		lastPage = page;
+		pages.push(page.page);
+		for (const item of page.page) {
+			const id = getItemId(item);
+			if (id && seenIds.has(id)) continue;
+			if (id) seenIds.add(id);
+			allItems.push(item);
+		}
+		status = page.isDone ? "Exhausted" : "CanLoadMore";
+	}
+	const firstPage = results.length > 0 ? results[0] : void 0;
+	const isPlaceholderData = firstPage ? firstPage.isPlaceholderData : hasPlaceholderData;
+	const isFetching = results.some((r) => r.isFetching);
+	const error = results.find((r) => r.isError)?.error ?? null;
+	return {
+		data: allItems,
+		dataUpdatedAt: Math.max(...results.map((r) => r.dataUpdatedAt)),
+		error,
+		failureReason: error,
+		isError: results.some((r) => r.isError),
+		isFetchNextPageError: results.length > 1 && (results.at(-1)?.isError ?? false),
+		isFetching,
+		isLoading: status === "LoadingFirstPage",
+		isPlaceholderData,
+		isRefetching: isFetching && allItems.length > 0 && !isPlaceholderData,
+		lastPage,
+		pages,
+		status
+	};
+};
 /** Build a unique key for recovery attempt detection */
 const buildRecoveryKey = (pageKeys, page0Cursor, page0UpdatedAt) => JSON.stringify({
 	pageKeys,
@@ -2531,26 +2620,27 @@ const buildRecoveryKey = (pageKeys, page0Cursor, page0UpdatedAt) => JSON.stringi
 * This hook detects this pattern and creates a recovery page that fetches
 * enough items to cover the lost pages, preserving the user's scroll position.
 */
-const useStaleCursorRecovery = ({ argsObject, combined, limit, setState, state }) => {
+const useStaleCursorRecovery = ({ argsObject, combined, limit, pageResults, setState, state }) => {
 	createEffect(on([
 		() => combined.isFetchNextPageError,
-		() => combined._rawResults,
+		pageResults,
 		() => state().pageKeys,
 		() => state().queries,
 		() => state().autoRecoveryAttempted,
 		argsObject
 	], () => {
 		if (!combined.isFetchNextPageError) return;
-		const page0Result = combined._rawResults[0];
+		const results = pageResults();
+		const page0Result = results[0];
 		const page0Data = page0Result?.data;
 		const page0UpdatedAt = page0Result?.dataUpdatedAt ?? 0;
 		const hasPage0Data = page0Data !== void 0 && !page0Result?.isError;
-		const hasSubsequentErrors = combined._rawResults.slice(1).some((q) => q?.isError && !q?.isFetching);
+		const hasSubsequentErrors = results.slice(1).some((q) => q?.isError && !q?.isFetching);
 		if (!hasPage0Data || !hasSubsequentErrors || !page0Data?.continueCursor) return;
 		const currentState = state();
 		const recoveryKey = buildRecoveryKey(currentState.pageKeys, page0Data.continueCursor, page0UpdatedAt);
 		if (currentState.autoRecoveryAttempted === recoveryKey) return;
-		const erroredPageKeys = currentState.pageKeys.filter((_, i) => i > 0 && combined._rawResults[i]?.isError);
+		const erroredPageKeys = currentState.pageKeys.filter((_, i) => i > 0 && results[i]?.isError);
 		const itemsToRecover = erroredPageKeys.reduce((sum, key) => {
 			return sum + (currentState.queries[key]?.args?.limit ?? limit ?? 20);
 		}, 0);
@@ -2711,66 +2801,27 @@ const useInfiniteQueryInternal = (query, args, options) => {
 			} } : {}
 		};
 	}));
-	const combined = useQueries(() => ({
-		queries: tanstackQueries(),
-		combine: (results) => {
-			const allItems = [];
-			const pages = [];
-			const seenIds = /* @__PURE__ */ new Set();
-			let lastPage;
-			let paginationStatus = "LoadingFirstPage";
-			for (let i = 0; i < results.length; i++) {
-				const pageQuery = results[i];
-				if (pageQuery.isLoading || pageQuery.data === void 0) {
-					paginationStatus = i === 0 ? "LoadingFirstPage" : "LoadingMore";
-					break;
-				}
-				const page = pageQuery.data;
-				lastPage = page;
-				pages.push(page.page);
-				for (const item of page.page) {
-					const id = item._id || item.id;
-					if (id && seenIds.has(id)) continue;
-					if (id) seenIds.add(id);
-					allItems.push(item);
-				}
-				paginationStatus = page.isDone ? "Exhausted" : "CanLoadMore";
-			}
-			const isPlaceholderData = results[0]?.isPlaceholderData ?? !!placeholderData;
-			const isFetching = results.some((r) => r.isFetching);
-			return {
-				data: allItems,
-				dataUpdatedAt: Math.max(...results.map((r) => r.dataUpdatedAt ?? 0)),
-				lastPage,
-				pages,
-				status: paginationStatus,
-				error: results.find((r) => r.isError)?.error ?? null,
-				isError: results.some((r) => r.isError),
-				isFetching,
-				isFetchNextPageError: results.length > 1 && (results.at(-1)?.isError ?? false),
-				isPlaceholderData,
-				isRefetching: isFetching && allItems.length > 0 && !isPlaceholderData,
-				isLoading: paginationStatus === "LoadingFirstPage",
-				failureReason: results.find((r) => r.isError)?.error ?? null,
-				_rawResults: results
-			};
-		}
-	}));
+	const pageResults = createQueriesResults(() => tanstackQueries());
+	const derive = () => aggregatePages(pageResults(), !!placeholderData);
+	const [combined, setCombined] = createStore(derive());
+	createRenderEffect(() => setCombined(derive()));
 	useStaleCursorRecovery({
 		argsObject,
 		combined,
 		limit,
+		pageResults,
 		setState,
 		state
 	});
 	createEffect(on([
-		() => combined._rawResults,
+		pageResults,
 		() => state().pageKeys,
 		() => state().queries,
 		argsObject
 	], () => {
-		for (let i = 0; i < combined._rawResults.length; i++) {
-			const pageQuery = combined._rawResults[i];
+		const results = pageResults();
+		for (let i = 0; i < results.length; i++) {
+			const pageQuery = results[i];
 			if (pageQuery.data) {
 				const page = pageQuery.data;
 				const pageKey = state().pageKeys[i];

package/dist/watcher.mjs

@@ -1,12 +1,24 @@
 #!/usr/bin/env node
-import { At as PARSE_SNAPSHOT_SUFFIX, Dt as generateMeta, F as resolveRunDeps, Ot as getConvexConfig, j as resolveConfiguredBackend, kt as logger, q as withLocalCodegenEnv } from "./backend-core-KwJ5FZgj.mjs";
+import { a as generateMeta, c as PARSE_SNAPSHOT_SUFFIX, i as resolveConfiguredBackend, n as withLocalCodegenEnv, o as getConvexConfig, r as loadCliConfig, s as logger } from "./local-env-fAYvoOfl.mjs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 //#region src/cli/watcher.ts
+function getConvexRoot(functionsDir) {
+	const projectDir = path.resolve(process.cwd());
+	const relativeFunctionsDir = path.relative(projectDir, functionsDir);
+	return relativeFunctionsDir.includes(path.sep) && relativeFunctionsDir !== ".." && !relativeFunctionsDir.startsWith(`..${path.sep}`) && !path.isAbsolute(relativeFunctionsDir) ? path.dirname(functionsDir) : functionsDir;
+}
 function getWatchRoots(functionsDir) {
-	const convexDir = path.dirname(functionsDir);
-	return [functionsDir, path.join(convexDir, "routers")];
+	const functions = path.resolve(functionsDir);
+	const convexRoot = getConvexRoot(functions);
+	const roots = [
+		functions,
+		path.join(convexRoot, "routers"),
+		path.join(convexRoot, "lib"),
+		path.join(convexRoot, "shared")
+	];
+	return roots.filter((root, index) => roots.indexOf(root) === index && !roots.some((other) => root.startsWith(`${other}${path.sep}`)));
 }
 function parseWatcherBackendEnv(value) {
 	if (value === "convex" || value === "concave") return value;
@@ -47,10 +59,9 @@ function shouldIgnoreWatchPath(watchedPath, functionsDir, outputFile) {
 	return normalizedPath.endsWith(".runtime.ts") || normalizedPath.endsWith(PARSE_SNAPSHOT_SUFFIX);
 }
 async function runWatcherCodegen(params, deps = {}) {
-	const resolveRunDepsFn = deps.resolveRunDeps ?? resolveRunDeps;
 	const resolveConfiguredBackendFn = deps.resolveConfiguredBackendFn ?? resolveConfiguredBackend;
-	const { execa: execaFn, generateMeta: generateMetaFn, loadCliConfig: loadCliConfigFn } = resolveRunDepsFn();
-	const config = loadCliConfigFn(params.configPath);
+	const generateMetaFn = deps.generateMeta ?? generateMeta;
+	const config = (deps.loadCliConfig ?? loadCliConfig)(params.configPath);
 	const backend = resolveConfiguredBackendFn({
 		backendArg: params.backendArg,
 		config
@@ -78,7 +89,7 @@ async function runWatcherCodegen(params, deps = {}) {
 	if (params.sharedDir) args.push("--api", params.sharedDir);
 	if (params.configPath) args.push("--config", params.configPath);
 	if (params.debug) args.push("--debug");
-	const result = await execaFn(runtime, args, {
+	const result = await (deps.execa ?? (await import("execa")).execa)(runtime, args, {
 		cwd: process.cwd(),
 		reject: false,
 		stdio: "pipe"

package/dist/{where-clause-compiler-BRhLW1dp.d.ts → where-clause-compiler-BgEc0GdS.d.ts}

@@ -4292,19 +4292,6 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly aggregate_state: ConvexTableWithColumns<{
     name: "aggregate_state";
     columns: {
-      status: ConvexTextBuilderInitial<""> & {
-        _: {
-          notNull: true;
-        };
-      } & {
-        _: {
-          tableName: "aggregate_state";
-        };
-      } & {
-        _: {
-          fieldName: "status";
-        };
-      };
       kind: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
@@ -4392,6 +4379,19 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "metricDefinitionHash";
         };
       };
+      status: ConvexTextBuilderInitial<""> & {
+        _: {
+          notNull: true;
+        };
+      } & {
+        _: {
+          tableName: "aggregate_state";
+        };
+      } & {
+        _: {
+          fieldName: "status";
+        };
+      };
       processed: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
@@ -4446,38 +4446,38 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly migration_state: ConvexTableWithColumns<{
     name: "migration_state";
     columns: {
-      status: ConvexTextBuilderInitial<""> & {
-        _: {
-          notNull: true;
-        };
-      } & {
+      cursor: ConvexTextBuilderInitial<""> & {
         _: {
           tableName: "migration_state";
         };
       } & {
         _: {
-          fieldName: "status";
+          fieldName: "cursor";
         };
       };
-      cursor: ConvexTextBuilderInitial<""> & {
+      direction: ConvexTextBuilderInitial<""> & {
         _: {
           tableName: "migration_state";
         };
       } & {
         _: {
-          fieldName: "cursor";
+          fieldName: "direction";
         };
       };
-      direction: ConvexTextBuilderInitial<""> & {
+      updatedAt: ConvexNumberBuilderInitial<""> & {
+        _: {
+          notNull: true;
+        };
+      } & {
         _: {
           tableName: "migration_state";
         };
       } & {
         _: {
-          fieldName: "direction";
+          fieldName: "updatedAt";
         };
       };
-      updatedAt: ConvexNumberBuilderInitial<""> & {
+      status: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4487,7 +4487,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "updatedAt";
+          fieldName: "status";
         };
       };
       processed: ConvexNumberBuilderInitial<""> & {
@@ -4600,7 +4600,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly migration_run: ConvexTableWithColumns<{
     name: "migration_run";
     columns: {
-      status: ConvexTextBuilderInitial<""> & {
+      direction: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4610,10 +4610,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "status";
+          fieldName: "direction";
         };
       };
-      direction: ConvexTextBuilderInitial<""> & {
+      updatedAt: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4623,10 +4623,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "direction";
+          fieldName: "updatedAt";
         };
       };
-      updatedAt: ConvexNumberBuilderInitial<""> & {
+      status: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4636,7 +4636,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "updatedAt";
+          fieldName: "status";
         };
       };
       startedAt: ConvexNumberBuilderInitial<""> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitcn",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "description": "kitcn - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",