Skip to content

fix: fix useSpacetimeDBQuery returns untyped rows for TanStack Start #4488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cloutiertyler merged 2 commits into from
Mar 3, 2026
Merged

fix: fix useSpacetimeDBQuery returns untyped rows for TanStack Start #4488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c558fc
fix: useSpacetimeDBQuery returns untyped rows for TanStack Start
clockwork-tien Feb 27, 2026
49b403b
Merge branch 'master' into tien/fix/tanstack-start-types
clockwork-tien Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions crates/bindings-typescript/src/tanstack/SpacetimeDBQueryClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ import type {
QueryFunction,
} from '@tanstack/react-query';
import {
type Query,
toSql,
type BooleanExpr,
evaluateBooleanExpr,
getQueryAccessorName,
getQueryWhereClause,
} from '../lib/query';

type QueryInput = { toSql(): string } & Record<string, any>;
type QueryInput = Query<any>;

const queryRegistry = new Map<
string,
Expand Down Expand Up @@ -51,7 +53,7 @@ export function spacetimeDBQuery(
const query = queryOrSkip;
const accessorName = getQueryAccessorName(query);
const whereExpr = getQueryWhereClause(query);
const querySql = query.toSql();
const querySql = toSql(query);

queryRegistry.set(querySql, { accessorName, whereExpr });

Expand Down
5 changes: 3 additions & 2 deletions crates/bindings-typescript/src/tanstack/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
UseSuspenseQueryResult,
} from '@tanstack/react-query';
import type { UntypedTableDef, RowType } from '../lib/table';
import type { Query } from '../lib/query';
import { spacetimeDBQuery } from './SpacetimeDBQueryClient';

export type UseSpacetimeDBQueryResult<T> = [
Expand All @@ -29,7 +30,7 @@ export type UseSpacetimeDBSuspenseQueryResult<T> = [
// useSpacetimeDBQuery(tables.user.where(r => r.online.eq(true)))
// useSpacetimeDBQuery(condition ? tables.user : 'skip')
export function useSpacetimeDBQuery<TableDef extends UntypedTableDef>(
queryOrSkip: ({ toSql(): string } & Record<string, any>) | 'skip',
queryOrSkip: Query<TableDef> | 'skip',
// any useQuery option (e.g. enabled, refetchInterval, select, placeholderData),
// except queryKey, queryFn, and meta (managed internally)
options?: Omit<
Expand Down Expand Up @@ -60,7 +61,7 @@ export function useSpacetimeDBQuery<TableDef extends UntypedTableDef>(
// until data is ready, a parent <Suspense fallback={…}> handles the loading UI.
// does not support 'skip' because useSuspenseQuery must always resolve
export function useSpacetimeDBSuspenseQuery<TableDef extends UntypedTableDef>(
query: { toSql(): string } & Record<string, any>,
query: Query<TableDef>,
options?: Omit<
UseSuspenseQueryOptions<
RowType<TableDef>[],
Expand Down
Loading