@tanstack/solid-query 6.0.0-beta.4 → 6.0.0-beta.5

package/build/_tsup-dts-rollup.d.cts

@@ -19,7 +19,6 @@ import { dehydrate } from '@tanstack/query-core';
 import { DehydratedState } from '@tanstack/query-core';
 import { DehydrateOptions } from '@tanstack/query-core';
 import { DistributiveOmit } from '@tanstack/query-core';
-import { Enabled } from '@tanstack/query-core';
 import { EnsureInfiniteQueryDataOptions } from '@tanstack/query-core';
 import { EnsureQueryDataOptions } from '@tanstack/query-core';
 import { environmentManager } from '@tanstack/query-core';
@@ -55,12 +54,11 @@ import { InvalidateOptions } from '@tanstack/query-core';
 import { InvalidateQueryFilters } from '@tanstack/query-core';
 import { isCancelledError } from '@tanstack/query-core';
 import { isServer } from '@tanstack/query-core';
-import { JSX } from 'solid-js';
+import type { JSX } from '@solidjs/web';
 import { keepPreviousData } from '@tanstack/query-core';
 import { ManagedTimerId } from '@tanstack/query-core';
 import { matchMutation } from '@tanstack/query-core';
 import { matchQuery } from '@tanstack/query-core';
-import type { MockInstance } from 'vitest';
 import { MutateFunction } from '@tanstack/query-core';
 import { MutateOptions } from '@tanstack/query-core';
 import { Mutation } from '@tanstack/query-core';
@@ -79,12 +77,10 @@ import { MutationObserverLoadingResult } from '@tanstack/query-core';
 import { MutationObserverOptions } from '@tanstack/query-core';
 import { MutationObserverResult } from '@tanstack/query-core';
 import { MutationObserverSuccessResult } from '@tanstack/query-core';
-import { MutationOptions } from '@tanstack/query-core';
 import { MutationScope } from '@tanstack/query-core';
 import { MutationState } from '@tanstack/query-core';
 import { MutationStatus } from '@tanstack/query-core';
 import { NetworkMode } from '@tanstack/query-core';
-import { NoInfer as NoInfer_2 } from '@tanstack/query-core';
 import { NonUndefinedGuard } from '@tanstack/query-core';
 import { noop } from '@tanstack/query-core';
 import { NotifyEvent } from '@tanstack/query-core';
@@ -93,15 +89,14 @@ import { notifyManager } from '@tanstack/query-core';
 import { NotifyOnChangeProps } from '@tanstack/query-core';
 import { OmitKeyof } from '@tanstack/query-core';
 import { onlineManager } from '@tanstack/query-core';
-import { Options } from 'tsup';
 import { Override } from '@tanstack/query-core';
-import type { ParentProps } from 'solid-js';
 import { partialMatchKey } from '@tanstack/query-core';
 import { PlaceholderDataFunction } from '@tanstack/query-core';
 import { QueriesObserver } from '@tanstack/query-core';
 import { QueriesObserverOptions } from '@tanstack/query-core';
 import { QueriesPlaceholderDataFunction } from '@tanstack/query-core';
 import { Query } from '@tanstack/query-core';
+import { QueryBooleanOption } from '@tanstack/query-core';
 import { QueryCache } from '@tanstack/query-core';
 import { QueryCacheNotifyEvent } from '@tanstack/query-core';
 import { QueryClient as QueryClient_2 } from '@tanstack/query-core';
@@ -122,7 +117,6 @@ import { QueryObserverPlaceholderResult } from '@tanstack/query-core';
 import { QueryObserverRefetchErrorResult } from '@tanstack/query-core';
 import { QueryObserverResult } from '@tanstack/query-core';
 import { QueryObserverSuccessResult } from '@tanstack/query-core';
-import { QueryOptions } from '@tanstack/query-core';
 import { QueryPersister } from '@tanstack/query-core';
 import { QueryState } from '@tanstack/query-core';
 import { QueryStatus } from '@tanstack/query-core';
@@ -145,15 +139,10 @@ import { TimeoutProvider } from '@tanstack/query-core';
 import { UnsetMarker } from '@tanstack/query-core';
 import { unsetMarker } from '@tanstack/query-core';
 import { Updater } from '@tanstack/query-core';
-import { UserConfig } from 'vite';
 import { WithRequired } from '@tanstack/query-core';
 
 export { AnyDataTag }
 
-export declare function Blink(props: {
-    duration: number;
-} & ParentProps): JSX;
-
 export { CancelledError }
 
 export { CancelOptions }
@@ -172,14 +161,6 @@ export { dataTagErrorSymbol }
 
 export { dataTagSymbol }
 
-export declare const default_alias: any[];
-
-export declare const default_alias_1: any[];
-
-export declare const default_alias_2: Options | Options[] | ((overrideOptions: Options) => Options | Options[] | Promise<Options | Options[]>);
-
-export declare const default_alias_3: UserConfig;
-
 export { DefaultedInfiniteQueryObserverOptions }
 
 export { DefaultedQueryObserverOptions }
@@ -200,13 +181,13 @@ export { defaultShouldDehydrateQuery }
 
 export { DefinedInfiniteQueryObserverResult }
 
-declare type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
+declare type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
     initialData: NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>> | (() => NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>>);
 }>;
 export { DefinedInitialDataInfiniteOptions }
 export { DefinedInitialDataInfiniteOptions as DefinedInitialDataInfiniteOptions_alias_1 }
 
-declare type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+declare type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData: TQueryFnData | (() => TQueryFnData);
 }>;
 export { DefinedInitialDataOptions }
@@ -237,8 +218,6 @@ export { DehydrateOptions }
 
 export { DistributiveOmit }
 
-export { Enabled }
-
 export { EnsureInfiniteQueryDataOptions }
 
 export { EnsureQueryDataOptions }
@@ -337,6 +316,25 @@ export { InfiniteQueryObserverResult }
 
 export { InfiniteQueryObserverSuccessResult }
 
+declare interface InfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, 'queryKey' | 'suspense'> {
+    queryKey: TQueryKey;
+    /**
+     * Only applicable while rendering queries on the server with streaming.
+     * Set `deferStream` to `true` to wait for the query to resolve on the server before flushing the stream.
+     * This can be useful to avoid sending a loading state to the client before the query has resolved.
+     * Defaults to `false`.
+     */
+    deferStream?: boolean;
+    /**
+     * @deprecated The `suspense` option has been deprecated in v5 and will be removed in the next major version.
+     * The `data` property on useInfiniteQuery is a SolidJS resource and will automatically suspend when the data is loading.
+     * Setting `suspense` to `false` will be a no-op.
+     */
+    suspense?: boolean;
+}
+export { InfiniteQueryOptions }
+export { InfiniteQueryOptions as InfiniteQueryOptions_alias_1 }
+
 declare function infiniteQueryOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>): ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>> & {
     queryKey: DataTag<TQueryKey, InfiniteData<TQueryFnData>>;
 };
@@ -375,8 +373,6 @@ export { matchQuery }
 
 declare type MAXIMUM_DEPTH = 20;
 
-export declare function mockOnlineManagerIsOnline(value: boolean): MockInstance<() => boolean>;
-
 export { MutateFunction }
 
 export { MutateOptions }
@@ -413,11 +409,14 @@ export { MutationObserverResult }
 
 export { MutationObserverSuccessResult }
 
+declare interface MutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TOnMutateResult>, '_defaulted'> {
+}
 export { MutationOptions }
+export { MutationOptions as MutationOptions_alias_1 }
 
-declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: WithRequired<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): WithRequired<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
+declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: WithRequired<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): WithRequired<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
 
-declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: Omit<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): Omit<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
+declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: Omit<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): Omit<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
 export { mutationOptions }
 export { mutationOptions as mutationOptions_alias_1 }
 
@@ -434,8 +433,6 @@ export { MutationStatus }
 
 export { NetworkMode }
 
-export { NoInfer_2 as NoInfer }
-
 export { NonUndefinedGuard }
 
 export { noop }
@@ -494,6 +491,8 @@ GetResults<Head>
 
 export { Query }
 
+export { QueryBooleanOption }
+
 export { QueryCache }
 
 export { QueryCacheNotifyEvent }
@@ -567,7 +566,10 @@ export { QueryObserverResult }
 
 export { QueryObserverSuccessResult }
 
+declare interface QueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
+}
 export { QueryOptions }
+export { QueryOptions as QueryOptions_alias_1 }
 
 declare function queryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>>): ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>> & {
     queryKey: DataTag<TQueryKey, TQueryFnData, TError>;
@@ -597,8 +599,6 @@ export { ResetOptions }
 
 export { ResultOptions }
 
-export declare function setActTimeout(fn: () => void, ms?: number): NodeJS.Timeout;
-
 export { SetDataOptions }
 
 export { shouldThrowError }
@@ -609,35 +609,6 @@ export { skipToken }
 
 declare type SkipTokenForUseQueries = symbol;
 
-declare interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, 'queryKey' | 'suspense'> {
-    queryKey: TQueryKey;
-    /**
-     * Only applicable while rendering queries on the server with streaming.
-     * Set `deferStream` to `true` to wait for the query to resolve on the server before flushing the stream.
-     * This can be useful to avoid sending a loading state to the client before the query has resolved.
-     * Defaults to `false`.
-     */
-    deferStream?: boolean;
-    /**
-     * @deprecated The `suspense` option has been deprecated in v5 and will be removed in the next major version.
-     * The `data` property on useInfiniteQuery is a SolidJS resource and will automatically suspend when the data is loading.
-     * Setting `suspense` to `false` will be a no-op.
-     */
-    suspense?: boolean;
-}
-export { SolidInfiniteQueryOptions }
-export { SolidInfiniteQueryOptions as SolidInfiniteQueryOptions_alias_1 }
-
-declare interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TOnMutateResult>, '_defaulted'> {
-}
-export { SolidMutationOptions }
-export { SolidMutationOptions as SolidMutationOptions_alias_1 }
-
-declare interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
-}
-export { SolidQueryOptions }
-export { SolidQueryOptions as SolidQueryOptions_alias_1 }
-
 export { StaleTime }
 
 export { StaleTimeFunction }
@@ -650,13 +621,13 @@ export { timeoutManager }
 
 export { TimeoutProvider }
 
-declare type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
+declare type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
     initialData?: undefined;
 }>;
 export { UndefinedInitialDataInfiniteOptions }
 export { UndefinedInitialDataInfiniteOptions as UndefinedInitialDataInfiniteOptions_alias_1 }
 
-declare type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+declare type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData?: undefined;
 }>;
 export { UndefinedInitialDataOptions }
@@ -709,7 +680,7 @@ declare function useInfiniteQuery<TQueryFnData, TError = DefaultError, TData = I
 export { useInfiniteQuery }
 export { useInfiniteQuery as useInfiniteQuery_alias_1 }
 
-declare type UseInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>;
+declare type UseInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>;
 export { UseInfiniteQueryOptions as CreateInfiniteQueryOptions }
 export { UseInfiniteQueryOptions }
 export { UseInfiniteQueryOptions as UseInfiniteQueryOptions_alias_1 }
@@ -747,7 +718,7 @@ declare function useMutation<TData = unknown, TError = DefaultError, TVariables
 export { useMutation }
 export { useMutation as useMutation_alias_1 }
 
-declare type UseMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> = Accessor<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>>;
+declare type UseMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> = Accessor<MutationOptions<TData, TError, TVariables, TOnMutateResult>>;
 export { UseMutationOptions as CreateMutationOptions }
 export { UseMutationOptions }
 export { UseMutationOptions as UseMutationOptions_alias_1 }
@@ -781,12 +752,12 @@ declare const useQueryClient: (queryClient?: QueryClient) => QueryClient;
 export { useQueryClient }
 export { useQueryClient as useQueryClient_alias_1 }
 
-declare type UseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
+declare type UseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<QueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
 export { UseQueryOptions as CreateQueryOptions }
 export { UseQueryOptions }
 export { UseQueryOptions as UseQueryOptions_alias_1 }
 
-declare type UseQueryOptionsForUseQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData' | 'suspense'> & {
+declare type UseQueryOptionsForUseQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<QueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData' | 'suspense'> & {
     placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
     /**
      * @deprecated The `suspense` option has been deprecated in v5 and will be removed in the next major version.

package/build/_tsup-dts-rollup.d.ts

@@ -19,7 +19,6 @@ import { dehydrate } from '@tanstack/query-core';
 import { DehydratedState } from '@tanstack/query-core';
 import { DehydrateOptions } from '@tanstack/query-core';
 import { DistributiveOmit } from '@tanstack/query-core';
-import { Enabled } from '@tanstack/query-core';
 import { EnsureInfiniteQueryDataOptions } from '@tanstack/query-core';
 import { EnsureQueryDataOptions } from '@tanstack/query-core';
 import { environmentManager } from '@tanstack/query-core';
@@ -55,12 +54,11 @@ import { InvalidateOptions } from '@tanstack/query-core';
 import { InvalidateQueryFilters } from '@tanstack/query-core';
 import { isCancelledError } from '@tanstack/query-core';
 import { isServer } from '@tanstack/query-core';
-import { JSX } from 'solid-js';
+import type { JSX } from '@solidjs/web';
 import { keepPreviousData } from '@tanstack/query-core';
 import { ManagedTimerId } from '@tanstack/query-core';
 import { matchMutation } from '@tanstack/query-core';
 import { matchQuery } from '@tanstack/query-core';
-import type { MockInstance } from 'vitest';
 import { MutateFunction } from '@tanstack/query-core';
 import { MutateOptions } from '@tanstack/query-core';
 import { Mutation } from '@tanstack/query-core';
@@ -79,12 +77,10 @@ import { MutationObserverLoadingResult } from '@tanstack/query-core';
 import { MutationObserverOptions } from '@tanstack/query-core';
 import { MutationObserverResult } from '@tanstack/query-core';
 import { MutationObserverSuccessResult } from '@tanstack/query-core';
-import { MutationOptions } from '@tanstack/query-core';
 import { MutationScope } from '@tanstack/query-core';
 import { MutationState } from '@tanstack/query-core';
 import { MutationStatus } from '@tanstack/query-core';
 import { NetworkMode } from '@tanstack/query-core';
-import { NoInfer as NoInfer_2 } from '@tanstack/query-core';
 import { NonUndefinedGuard } from '@tanstack/query-core';
 import { noop } from '@tanstack/query-core';
 import { NotifyEvent } from '@tanstack/query-core';
@@ -93,15 +89,14 @@ import { notifyManager } from '@tanstack/query-core';
 import { NotifyOnChangeProps } from '@tanstack/query-core';
 import { OmitKeyof } from '@tanstack/query-core';
 import { onlineManager } from '@tanstack/query-core';
-import { Options } from 'tsup';
 import { Override } from '@tanstack/query-core';
-import type { ParentProps } from 'solid-js';
 import { partialMatchKey } from '@tanstack/query-core';
 import { PlaceholderDataFunction } from '@tanstack/query-core';
 import { QueriesObserver } from '@tanstack/query-core';
 import { QueriesObserverOptions } from '@tanstack/query-core';
 import { QueriesPlaceholderDataFunction } from '@tanstack/query-core';
 import { Query } from '@tanstack/query-core';
+import { QueryBooleanOption } from '@tanstack/query-core';
 import { QueryCache } from '@tanstack/query-core';
 import { QueryCacheNotifyEvent } from '@tanstack/query-core';
 import { QueryClient as QueryClient_2 } from '@tanstack/query-core';
@@ -122,7 +117,6 @@ import { QueryObserverPlaceholderResult } from '@tanstack/query-core';
 import { QueryObserverRefetchErrorResult } from '@tanstack/query-core';
 import { QueryObserverResult } from '@tanstack/query-core';
 import { QueryObserverSuccessResult } from '@tanstack/query-core';
-import { QueryOptions } from '@tanstack/query-core';
 import { QueryPersister } from '@tanstack/query-core';
 import { QueryState } from '@tanstack/query-core';
 import { QueryStatus } from '@tanstack/query-core';
@@ -145,15 +139,10 @@ import { TimeoutProvider } from '@tanstack/query-core';
 import { UnsetMarker } from '@tanstack/query-core';
 import { unsetMarker } from '@tanstack/query-core';
 import { Updater } from '@tanstack/query-core';
-import { UserConfig } from 'vite';
 import { WithRequired } from '@tanstack/query-core';
 
 export { AnyDataTag }
 
-export declare function Blink(props: {
-    duration: number;
-} & ParentProps): JSX;
-
 export { CancelledError }
 
 export { CancelOptions }
@@ -172,14 +161,6 @@ export { dataTagErrorSymbol }
 
 export { dataTagSymbol }
 
-export declare const default_alias: any[];
-
-export declare const default_alias_1: any[];
-
-export declare const default_alias_2: Options | Options[] | ((overrideOptions: Options) => Options | Options[] | Promise<Options | Options[]>);
-
-export declare const default_alias_3: UserConfig;
-
 export { DefaultedInfiniteQueryObserverOptions }
 
 export { DefaultedQueryObserverOptions }
@@ -200,13 +181,13 @@ export { defaultShouldDehydrateQuery }
 
 export { DefinedInfiniteQueryObserverResult }
 
-declare type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
+declare type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
     initialData: NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>> | (() => NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>>);
 }>;
 export { DefinedInitialDataInfiniteOptions }
 export { DefinedInitialDataInfiniteOptions as DefinedInitialDataInfiniteOptions_alias_1 }
 
-declare type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+declare type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData: TQueryFnData | (() => TQueryFnData);
 }>;
 export { DefinedInitialDataOptions }
@@ -237,8 +218,6 @@ export { DehydrateOptions }
 
 export { DistributiveOmit }
 
-export { Enabled }
-
 export { EnsureInfiniteQueryDataOptions }
 
 export { EnsureQueryDataOptions }
@@ -337,6 +316,25 @@ export { InfiniteQueryObserverResult }
 
 export { InfiniteQueryObserverSuccessResult }
 
+declare interface InfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, 'queryKey' | 'suspense'> {
+    queryKey: TQueryKey;
+    /**
+     * Only applicable while rendering queries on the server with streaming.
+     * Set `deferStream` to `true` to wait for the query to resolve on the server before flushing the stream.
+     * This can be useful to avoid sending a loading state to the client before the query has resolved.
+     * Defaults to `false`.
+     */
+    deferStream?: boolean;
+    /**
+     * @deprecated The `suspense` option has been deprecated in v5 and will be removed in the next major version.
+     * The `data` property on useInfiniteQuery is a SolidJS resource and will automatically suspend when the data is loading.
+     * Setting `suspense` to `false` will be a no-op.
+     */
+    suspense?: boolean;
+}
+export { InfiniteQueryOptions }
+export { InfiniteQueryOptions as InfiniteQueryOptions_alias_1 }
+
 declare function infiniteQueryOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>): ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>> & {
     queryKey: DataTag<TQueryKey, InfiniteData<TQueryFnData>>;
 };
@@ -375,8 +373,6 @@ export { matchQuery }
 
 declare type MAXIMUM_DEPTH = 20;
 
-export declare function mockOnlineManagerIsOnline(value: boolean): MockInstance<() => boolean>;
-
 export { MutateFunction }
 
 export { MutateOptions }
@@ -413,11 +409,14 @@ export { MutationObserverResult }
 
 export { MutationObserverSuccessResult }
 
+declare interface MutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TOnMutateResult>, '_defaulted'> {
+}
 export { MutationOptions }
+export { MutationOptions as MutationOptions_alias_1 }
 
-declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: WithRequired<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): WithRequired<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
+declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: WithRequired<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): WithRequired<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
 
-declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: Omit<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): Omit<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
+declare function mutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown>(options: Omit<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>): Omit<MutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey'>;
 export { mutationOptions }
 export { mutationOptions as mutationOptions_alias_1 }
 
@@ -434,8 +433,6 @@ export { MutationStatus }
 
 export { NetworkMode }
 
-export { NoInfer_2 as NoInfer }
-
 export { NonUndefinedGuard }
 
 export { noop }
@@ -494,6 +491,8 @@ GetResults<Head>
 
 export { Query }
 
+export { QueryBooleanOption }
+
 export { QueryCache }
 
 export { QueryCacheNotifyEvent }
@@ -567,7 +566,10 @@ export { QueryObserverResult }
 
 export { QueryObserverSuccessResult }
 
+declare interface QueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
+}
 export { QueryOptions }
+export { QueryOptions as QueryOptions_alias_1 }
 
 declare function queryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>>): ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>> & {
     queryKey: DataTag<TQueryKey, TQueryFnData, TError>;
@@ -597,8 +599,6 @@ export { ResetOptions }
 
 export { ResultOptions }
 
-export declare function setActTimeout(fn: () => void, ms?: number): NodeJS.Timeout;
-
 export { SetDataOptions }
 
 export { shouldThrowError }
@@ -609,35 +609,6 @@ export { skipToken }
 
 declare type SkipTokenForUseQueries = symbol;
 
-declare interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, 'queryKey' | 'suspense'> {
-    queryKey: TQueryKey;
-    /**
-     * Only applicable while rendering queries on the server with streaming.
-     * Set `deferStream` to `true` to wait for the query to resolve on the server before flushing the stream.
-     * This can be useful to avoid sending a loading state to the client before the query has resolved.
-     * Defaults to `false`.
-     */
-    deferStream?: boolean;
-    /**
-     * @deprecated The `suspense` option has been deprecated in v5 and will be removed in the next major version.
-     * The `data` property on useInfiniteQuery is a SolidJS resource and will automatically suspend when the data is loading.
-     * Setting `suspense` to `false` will be a no-op.
-     */
-    suspense?: boolean;
-}
-export { SolidInfiniteQueryOptions }
-export { SolidInfiniteQueryOptions as SolidInfiniteQueryOptions_alias_1 }
-
-declare interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TOnMutateResult>, '_defaulted'> {
-}
-export { SolidMutationOptions }
-export { SolidMutationOptions as SolidMutationOptions_alias_1 }
-
-declare interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
-}
-export { SolidQueryOptions }
-export { SolidQueryOptions as SolidQueryOptions_alias_1 }
-
 export { StaleTime }
 
 export { StaleTimeFunction }
@@ -650,13 +621,13 @@ export { timeoutManager }
 
 export { TimeoutProvider }
 
-declare type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
+declare type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
     initialData?: undefined;
 }>;
 export { UndefinedInitialDataInfiniteOptions }
 export { UndefinedInitialDataInfiniteOptions as UndefinedInitialDataInfiniteOptions_alias_1 }
 
-declare type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+declare type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData?: undefined;
 }>;
 export { UndefinedInitialDataOptions }
@@ -709,7 +680,7 @@ declare function useInfiniteQuery<TQueryFnData, TError = DefaultError, TData = I
 export { useInfiniteQuery }
 export { useInfiniteQuery as useInfiniteQuery_alias_1 }
 
-declare type UseInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>;
+declare type UseInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>;
 export { UseInfiniteQueryOptions as CreateInfiniteQueryOptions }
 export { UseInfiniteQueryOptions }
 export { UseInfiniteQueryOptions as UseInfiniteQueryOptions_alias_1 }
@@ -747,7 +718,7 @@ declare function useMutation<TData = unknown, TError = DefaultError, TVariables
 export { useMutation }
 export { useMutation as useMutation_alias_1 }
 
-declare type UseMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> = Accessor<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>>;
+declare type UseMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown> = Accessor<MutationOptions<TData, TError, TVariables, TOnMutateResult>>;
 export { UseMutationOptions as CreateMutationOptions }
 export { UseMutationOptions }
 export { UseMutationOptions as UseMutationOptions_alias_1 }
@@ -781,12 +752,12 @@ declare const useQueryClient: (queryClient?: QueryClient) => QueryClient;
 export { useQueryClient }
 export { useQueryClient as useQueryClient_alias_1 }
 
-declare type UseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
+declare type UseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<QueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
 export { UseQueryOptions as CreateQueryOptions }
 export { UseQueryOptions }
 export { UseQueryOptions as UseQueryOptions_alias_1 }
 
-declare type UseQueryOptionsForUseQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData' | 'suspense'> & {
+declare type UseQueryOptionsForUseQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<QueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData' | 'suspense'> & {
     placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
     /**
      * @deprecated The `suspense` option has been deprecated in v5 and will be removed in the next major version.

package/build/dev.cjs

@@ -254,7 +254,10 @@ function useBaseQuery(options, Observer, queryClient) {
         return Reflect.get(target, prop, receiver);
       }
       if (isServer) {
-        queryResource();
+        const resolved = queryResource();
+        if (prop in resolved) {
+          return Reflect.get(resolved, prop);
+        }
       }
       if (errorPassthroughProps.has(prop)) {
         return Reflect.get(target, prop, receiver);
@@ -309,11 +312,13 @@ function useMutation(options, queryClient) {
     mutateAsync: initialResult.mutate
   });
   const unsubscribe = observer.subscribe((result) => {
-    setState(() => ({
-      ...result,
-      mutate,
-      mutateAsync: result.mutate
-    }));
+    solidJs.runWithOwner(null, () => {
+      setState(() => ({
+        ...result,
+        mutate,
+        mutateAsync: result.mutate
+      }));
+    });
   });
   solidJs.onCleanup(unsubscribe);
   solidJs.createRenderEffect(

package/build/dev.d.cts

@@ -1,9 +1,9 @@
 export { DefinedUseBaseQueryResult } from './_tsup-dts-rollup.cjs';
 export { DefinedUseInfiniteQueryResult } from './_tsup-dts-rollup.cjs';
 export { DefinedUseQueryResult } from './_tsup-dts-rollup.cjs';
-export { SolidInfiniteQueryOptions } from './_tsup-dts-rollup.cjs';
-export { SolidMutationOptions } from './_tsup-dts-rollup.cjs';
-export { SolidQueryOptions } from './_tsup-dts-rollup.cjs';
+export { InfiniteQueryOptions } from './_tsup-dts-rollup.cjs';
+export { MutationOptions } from './_tsup-dts-rollup.cjs';
+export { QueryOptions } from './_tsup-dts-rollup.cjs';
 export { UseBaseMutationResult } from './_tsup-dts-rollup.cjs';
 export { UseBaseQueryOptions } from './_tsup-dts-rollup.cjs';
 export { UseBaseQueryResult } from './_tsup-dts-rollup.cjs';
@@ -111,7 +111,6 @@ export { NonUndefinedGuard } from './_tsup-dts-rollup.cjs';
 export { DistributiveOmit } from './_tsup-dts-rollup.cjs';
 export { OmitKeyof } from './_tsup-dts-rollup.cjs';
 export { Override } from './_tsup-dts-rollup.cjs';
-export { NoInfer } from './_tsup-dts-rollup.cjs';
 export { Register } from './_tsup-dts-rollup.cjs';
 export { DefaultError } from './_tsup-dts-rollup.cjs';
 export { QueryKey } from './_tsup-dts-rollup.cjs';
@@ -126,7 +125,7 @@ export { InferErrorFromTag } from './_tsup-dts-rollup.cjs';
 export { QueryFunction } from './_tsup-dts-rollup.cjs';
 export { StaleTime } from './_tsup-dts-rollup.cjs';
 export { StaleTimeFunction } from './_tsup-dts-rollup.cjs';
-export { Enabled } from './_tsup-dts-rollup.cjs';
+export { QueryBooleanOption } from './_tsup-dts-rollup.cjs';
 export { QueryPersister } from './_tsup-dts-rollup.cjs';
 export { QueryFunctionContext } from './_tsup-dts-rollup.cjs';
 export { InitialDataFunction } from './_tsup-dts-rollup.cjs';
@@ -139,7 +138,6 @@ export { InfiniteData } from './_tsup-dts-rollup.cjs';
 export { QueryMeta } from './_tsup-dts-rollup.cjs';
 export { NetworkMode } from './_tsup-dts-rollup.cjs';
 export { NotifyOnChangeProps } from './_tsup-dts-rollup.cjs';
-export { QueryOptions } from './_tsup-dts-rollup.cjs';
 export { InitialPageParam } from './_tsup-dts-rollup.cjs';
 export { InfiniteQueryPageParamsOptions } from './_tsup-dts-rollup.cjs';
 export { ThrowOnError } from './_tsup-dts-rollup.cjs';
@@ -184,7 +182,6 @@ export { MutationScope } from './_tsup-dts-rollup.cjs';
 export { MutationMeta } from './_tsup-dts-rollup.cjs';
 export { MutationFunctionContext } from './_tsup-dts-rollup.cjs';
 export { MutationFunction } from './_tsup-dts-rollup.cjs';
-export { MutationOptions } from './_tsup-dts-rollup.cjs';
 export { MutationObserverOptions } from './_tsup-dts-rollup.cjs';
 export { MutateOptions } from './_tsup-dts-rollup.cjs';
 export { MutateFunction } from './_tsup-dts-rollup.cjs';

package/build/dev.d.ts

@@ -1,9 +1,9 @@
 export { DefinedUseBaseQueryResult } from './_tsup-dts-rollup.js';
 export { DefinedUseInfiniteQueryResult } from './_tsup-dts-rollup.js';
 export { DefinedUseQueryResult } from './_tsup-dts-rollup.js';
-export { SolidInfiniteQueryOptions } from './_tsup-dts-rollup.js';
-export { SolidMutationOptions } from './_tsup-dts-rollup.js';
-export { SolidQueryOptions } from './_tsup-dts-rollup.js';
+export { InfiniteQueryOptions } from './_tsup-dts-rollup.js';
+export { MutationOptions } from './_tsup-dts-rollup.js';
+export { QueryOptions } from './_tsup-dts-rollup.js';
 export { UseBaseMutationResult } from './_tsup-dts-rollup.js';
 export { UseBaseQueryOptions } from './_tsup-dts-rollup.js';
 export { UseBaseQueryResult } from './_tsup-dts-rollup.js';
@@ -111,7 +111,6 @@ export { NonUndefinedGuard } from './_tsup-dts-rollup.js';
 export { DistributiveOmit } from './_tsup-dts-rollup.js';
 export { OmitKeyof } from './_tsup-dts-rollup.js';
 export { Override } from './_tsup-dts-rollup.js';
-export { NoInfer } from './_tsup-dts-rollup.js';
 export { Register } from './_tsup-dts-rollup.js';
 export { DefaultError } from './_tsup-dts-rollup.js';
 export { QueryKey } from './_tsup-dts-rollup.js';
@@ -126,7 +125,7 @@ export { InferErrorFromTag } from './_tsup-dts-rollup.js';
 export { QueryFunction } from './_tsup-dts-rollup.js';
 export { StaleTime } from './_tsup-dts-rollup.js';
 export { StaleTimeFunction } from './_tsup-dts-rollup.js';
-export { Enabled } from './_tsup-dts-rollup.js';
+export { QueryBooleanOption } from './_tsup-dts-rollup.js';
 export { QueryPersister } from './_tsup-dts-rollup.js';
 export { QueryFunctionContext } from './_tsup-dts-rollup.js';
 export { InitialDataFunction } from './_tsup-dts-rollup.js';
@@ -139,7 +138,6 @@ export { InfiniteData } from './_tsup-dts-rollup.js';
 export { QueryMeta } from './_tsup-dts-rollup.js';
 export { NetworkMode } from './_tsup-dts-rollup.js';
 export { NotifyOnChangeProps } from './_tsup-dts-rollup.js';
-export { QueryOptions } from './_tsup-dts-rollup.js';
 export { InitialPageParam } from './_tsup-dts-rollup.js';
 export { InfiniteQueryPageParamsOptions } from './_tsup-dts-rollup.js';
 export { ThrowOnError } from './_tsup-dts-rollup.js';
@@ -184,7 +182,6 @@ export { MutationScope } from './_tsup-dts-rollup.js';
 export { MutationMeta } from './_tsup-dts-rollup.js';
 export { MutationFunctionContext } from './_tsup-dts-rollup.js';
 export { MutationFunction } from './_tsup-dts-rollup.js';
-export { MutationOptions } from './_tsup-dts-rollup.js';
 export { MutationObserverOptions } from './_tsup-dts-rollup.js';
 export { MutateOptions } from './_tsup-dts-rollup.js';
 export { MutateFunction } from './_tsup-dts-rollup.js';

package/build/dev.js

@@ -1,6 +1,6 @@
 import { MutationObserver, shouldThrowError, QueriesObserver, QueryClient as QueryClient$1, replaceEqualDeep, noop, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
-import { createContext, useContext, onCleanup, createMemo, untrack, createRenderEffect, createStore, merge, createEffect, runWithOwner, reconcile, createSignal, isPending, refresh, snapshot } from 'solid-js';
+import { createContext, useContext, onCleanup, createMemo, untrack, createRenderEffect, createStore, runWithOwner, merge, createEffect, reconcile, createSignal, isPending, refresh, snapshot } from 'solid-js';
 import { createComponent } from '@solidjs/web';
 
 // src/useQuery.ts
@@ -253,7 +253,10 @@ function useBaseQuery(options, Observer, queryClient) {
         return Reflect.get(target, prop, receiver);
       }
       if (isServer) {
-        queryResource();
+        const resolved = queryResource();
+        if (prop in resolved) {
+          return Reflect.get(resolved, prop);
+        }
       }
       if (errorPassthroughProps.has(prop)) {
         return Reflect.get(target, prop, receiver);
@@ -308,11 +311,13 @@ function useMutation(options, queryClient) {
     mutateAsync: initialResult.mutate
   });
   const unsubscribe = observer.subscribe((result) => {
-    setState(() => ({
-      ...result,
-      mutate,
-      mutateAsync: result.mutate
-    }));
+    runWithOwner(null, () => {
+      setState(() => ({
+        ...result,
+        mutate,
+        mutateAsync: result.mutate
+      }));
+    });
   });
   onCleanup(unsubscribe);
   createRenderEffect(

package/build/index.cjs

@@ -245,7 +245,10 @@ function useBaseQuery(options, Observer, queryClient) {
         return Reflect.get(target, prop, receiver);
       }
       if (isServer) {
-        queryResource();
+        const resolved = queryResource();
+        if (prop in resolved) {
+          return Reflect.get(resolved, prop);
+        }
       }
       if (errorPassthroughProps.has(prop)) {
         return Reflect.get(target, prop, receiver);
@@ -300,11 +303,13 @@ function useMutation(options, queryClient) {
     mutateAsync: initialResult.mutate
   });
   const unsubscribe = observer.subscribe((result) => {
-    setState(() => ({
-      ...result,
-      mutate,
-      mutateAsync: result.mutate
-    }));
+    solidJs.runWithOwner(null, () => {
+      setState(() => ({
+        ...result,
+        mutate,
+        mutateAsync: result.mutate
+      }));
+    });
   });
   solidJs.onCleanup(unsubscribe);
   solidJs.createRenderEffect(

package/build/index.d.cts

@@ -1,9 +1,9 @@
 export { DefinedUseBaseQueryResult } from './_tsup-dts-rollup.cjs';
 export { DefinedUseInfiniteQueryResult } from './_tsup-dts-rollup.cjs';
 export { DefinedUseQueryResult } from './_tsup-dts-rollup.cjs';
-export { SolidInfiniteQueryOptions } from './_tsup-dts-rollup.cjs';
-export { SolidMutationOptions } from './_tsup-dts-rollup.cjs';
-export { SolidQueryOptions } from './_tsup-dts-rollup.cjs';
+export { InfiniteQueryOptions } from './_tsup-dts-rollup.cjs';
+export { MutationOptions } from './_tsup-dts-rollup.cjs';
+export { QueryOptions } from './_tsup-dts-rollup.cjs';
 export { UseBaseMutationResult } from './_tsup-dts-rollup.cjs';
 export { UseBaseQueryOptions } from './_tsup-dts-rollup.cjs';
 export { UseBaseQueryResult } from './_tsup-dts-rollup.cjs';
@@ -111,7 +111,6 @@ export { NonUndefinedGuard } from './_tsup-dts-rollup.cjs';
 export { DistributiveOmit } from './_tsup-dts-rollup.cjs';
 export { OmitKeyof } from './_tsup-dts-rollup.cjs';
 export { Override } from './_tsup-dts-rollup.cjs';
-export { NoInfer } from './_tsup-dts-rollup.cjs';
 export { Register } from './_tsup-dts-rollup.cjs';
 export { DefaultError } from './_tsup-dts-rollup.cjs';
 export { QueryKey } from './_tsup-dts-rollup.cjs';
@@ -126,7 +125,7 @@ export { InferErrorFromTag } from './_tsup-dts-rollup.cjs';
 export { QueryFunction } from './_tsup-dts-rollup.cjs';
 export { StaleTime } from './_tsup-dts-rollup.cjs';
 export { StaleTimeFunction } from './_tsup-dts-rollup.cjs';
-export { Enabled } from './_tsup-dts-rollup.cjs';
+export { QueryBooleanOption } from './_tsup-dts-rollup.cjs';
 export { QueryPersister } from './_tsup-dts-rollup.cjs';
 export { QueryFunctionContext } from './_tsup-dts-rollup.cjs';
 export { InitialDataFunction } from './_tsup-dts-rollup.cjs';
@@ -139,7 +138,6 @@ export { InfiniteData } from './_tsup-dts-rollup.cjs';
 export { QueryMeta } from './_tsup-dts-rollup.cjs';
 export { NetworkMode } from './_tsup-dts-rollup.cjs';
 export { NotifyOnChangeProps } from './_tsup-dts-rollup.cjs';
-export { QueryOptions } from './_tsup-dts-rollup.cjs';
 export { InitialPageParam } from './_tsup-dts-rollup.cjs';
 export { InfiniteQueryPageParamsOptions } from './_tsup-dts-rollup.cjs';
 export { ThrowOnError } from './_tsup-dts-rollup.cjs';
@@ -184,7 +182,6 @@ export { MutationScope } from './_tsup-dts-rollup.cjs';
 export { MutationMeta } from './_tsup-dts-rollup.cjs';
 export { MutationFunctionContext } from './_tsup-dts-rollup.cjs';
 export { MutationFunction } from './_tsup-dts-rollup.cjs';
-export { MutationOptions } from './_tsup-dts-rollup.cjs';
 export { MutationObserverOptions } from './_tsup-dts-rollup.cjs';
 export { MutateOptions } from './_tsup-dts-rollup.cjs';
 export { MutateFunction } from './_tsup-dts-rollup.cjs';

package/build/index.d.ts

@@ -1,9 +1,9 @@
 export { DefinedUseBaseQueryResult } from './_tsup-dts-rollup.js';
 export { DefinedUseInfiniteQueryResult } from './_tsup-dts-rollup.js';
 export { DefinedUseQueryResult } from './_tsup-dts-rollup.js';
-export { SolidInfiniteQueryOptions } from './_tsup-dts-rollup.js';
-export { SolidMutationOptions } from './_tsup-dts-rollup.js';
-export { SolidQueryOptions } from './_tsup-dts-rollup.js';
+export { InfiniteQueryOptions } from './_tsup-dts-rollup.js';
+export { MutationOptions } from './_tsup-dts-rollup.js';
+export { QueryOptions } from './_tsup-dts-rollup.js';
 export { UseBaseMutationResult } from './_tsup-dts-rollup.js';
 export { UseBaseQueryOptions } from './_tsup-dts-rollup.js';
 export { UseBaseQueryResult } from './_tsup-dts-rollup.js';
@@ -111,7 +111,6 @@ export { NonUndefinedGuard } from './_tsup-dts-rollup.js';
 export { DistributiveOmit } from './_tsup-dts-rollup.js';
 export { OmitKeyof } from './_tsup-dts-rollup.js';
 export { Override } from './_tsup-dts-rollup.js';
-export { NoInfer } from './_tsup-dts-rollup.js';
 export { Register } from './_tsup-dts-rollup.js';
 export { DefaultError } from './_tsup-dts-rollup.js';
 export { QueryKey } from './_tsup-dts-rollup.js';
@@ -126,7 +125,7 @@ export { InferErrorFromTag } from './_tsup-dts-rollup.js';
 export { QueryFunction } from './_tsup-dts-rollup.js';
 export { StaleTime } from './_tsup-dts-rollup.js';
 export { StaleTimeFunction } from './_tsup-dts-rollup.js';
-export { Enabled } from './_tsup-dts-rollup.js';
+export { QueryBooleanOption } from './_tsup-dts-rollup.js';
 export { QueryPersister } from './_tsup-dts-rollup.js';
 export { QueryFunctionContext } from './_tsup-dts-rollup.js';
 export { InitialDataFunction } from './_tsup-dts-rollup.js';
@@ -139,7 +138,6 @@ export { InfiniteData } from './_tsup-dts-rollup.js';
 export { QueryMeta } from './_tsup-dts-rollup.js';
 export { NetworkMode } from './_tsup-dts-rollup.js';
 export { NotifyOnChangeProps } from './_tsup-dts-rollup.js';
-export { QueryOptions } from './_tsup-dts-rollup.js';
 export { InitialPageParam } from './_tsup-dts-rollup.js';
 export { InfiniteQueryPageParamsOptions } from './_tsup-dts-rollup.js';
 export { ThrowOnError } from './_tsup-dts-rollup.js';
@@ -184,7 +182,6 @@ export { MutationScope } from './_tsup-dts-rollup.js';
 export { MutationMeta } from './_tsup-dts-rollup.js';
 export { MutationFunctionContext } from './_tsup-dts-rollup.js';
 export { MutationFunction } from './_tsup-dts-rollup.js';
-export { MutationOptions } from './_tsup-dts-rollup.js';
 export { MutationObserverOptions } from './_tsup-dts-rollup.js';
 export { MutateOptions } from './_tsup-dts-rollup.js';
 export { MutateFunction } from './_tsup-dts-rollup.js';

package/build/index.js

@@ -1,6 +1,6 @@
 import { MutationObserver, shouldThrowError, QueriesObserver, QueryClient as QueryClient$1, replaceEqualDeep, noop, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
-import { createContext, useContext, onCleanup, createMemo, untrack, createRenderEffect, createStore, merge, createEffect, runWithOwner, reconcile, createSignal, isPending, refresh, snapshot } from 'solid-js';
+import { createContext, useContext, onCleanup, createMemo, untrack, createRenderEffect, createStore, runWithOwner, merge, createEffect, reconcile, createSignal, isPending, refresh, snapshot } from 'solid-js';
 import { createComponent } from '@solidjs/web';
 
 // src/useQuery.ts
@@ -244,7 +244,10 @@ function useBaseQuery(options, Observer, queryClient) {
         return Reflect.get(target, prop, receiver);
       }
       if (isServer) {
-        queryResource();
+        const resolved = queryResource();
+        if (prop in resolved) {
+          return Reflect.get(resolved, prop);
+        }
       }
       if (errorPassthroughProps.has(prop)) {
         return Reflect.get(target, prop, receiver);
@@ -299,11 +302,13 @@ function useMutation(options, queryClient) {
     mutateAsync: initialResult.mutate
   });
   const unsubscribe = observer.subscribe((result) => {
-    setState(() => ({
-      ...result,
-      mutate,
-      mutateAsync: result.mutate
-    }));
+    runWithOwner(null, () => {
+      setState(() => ({
+        ...result,
+        mutate,
+        mutateAsync: result.mutate
+      }));
+    });
   });
   onCleanup(unsubscribe);
   createRenderEffect(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "6.0.0-beta.4",
+  "version": "6.0.0-beta.5",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -46,16 +46,16 @@
     "!src/__tests__"
   ],
   "dependencies": {
-    "@tanstack/query-core": "5.91.2"
+    "@tanstack/query-core": "5.101.0"
   },
   "devDependencies": {
     "@babel/core": "^7.28.0",
     "@babel/preset-typescript": "^7.18.6",
     "@solidjs/testing-library": "^0.8.10",
-    "@solidjs/web": "2.0.0-beta.7",
-    "babel-preset-solid": "2.0.0-beta.7",
+    "@solidjs/web": "2.0.0-beta.15",
+    "babel-preset-solid": "2.0.0-beta.15",
     "npm-run-all2": "^5.0.0",
-    "solid-js": "2.0.0-beta.7",
+    "solid-js": "2.0.0-beta.15",
     "tsup-preset-solid": "^2.2.0",
     "vite-plugin-solid": "3.0.0-next.5",
     "@tanstack/query-test-utils": "0.0.0"

package/src/QueryClientProvider.tsx

@@ -1,6 +1,6 @@
 import { createContext, onCleanup, useContext } from 'solid-js'
 import type { QueryClient } from './QueryClient'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
 
 export const QueryClientContext = createContext<(() => QueryClient) | null>(
   null,

package/src/index.ts

@@ -15,9 +15,9 @@ export type {
   DefinedUseBaseQueryResult,
   DefinedUseInfiniteQueryResult,
   DefinedUseQueryResult,
-  SolidInfiniteQueryOptions,
-  SolidMutationOptions,
-  SolidQueryOptions,
+  InfiniteQueryOptions,
+  MutationOptions,
+  QueryOptions,
   UseBaseMutationResult,
   UseBaseQueryOptions,
   UseBaseQueryResult,

package/src/infiniteQueryOptions.ts

@@ -5,7 +5,7 @@ import type {
   NonUndefinedGuard,
   QueryKey,
 } from '@tanstack/query-core'
-import type { SolidInfiniteQueryOptions } from './types'
+import type { InfiniteQueryOptions } from './types'
 import type { Accessor } from 'solid-js'
 
 export type UndefinedInitialDataInfiniteOptions<
@@ -15,13 +15,7 @@ export type UndefinedInitialDataInfiniteOptions<
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 > = Accessor<
-  SolidInfiniteQueryOptions<
-    TQueryFnData,
-    TError,
-    TData,
-    TQueryKey,
-    TPageParam
-  > & {
+  InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
     initialData?: undefined
   }
 >
@@ -34,13 +28,7 @@ export type DefinedInitialDataInfiniteOptions<
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 > = Accessor<
-  SolidInfiniteQueryOptions<
-    TQueryFnData,
-    TError,
-    TData,
-    TQueryKey,
-    TPageParam
-  > & {
+  InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam> & {
     initialData:
       | NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>>
       | (() => NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>>)

package/src/mutationOptions.ts

@@ -1,5 +1,5 @@
 import type { DefaultError, WithRequired } from '@tanstack/query-core'
-import type { SolidMutationOptions } from './types'
+import type { MutationOptions } from './types'
 
 export function mutationOptions<
   TData = unknown,
@@ -8,11 +8,11 @@ export function mutationOptions<
   TOnMutateResult = unknown,
 >(
   options: WithRequired<
-    SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>,
+    MutationOptions<TData, TError, TVariables, TOnMutateResult>,
     'mutationKey'
   >,
 ): WithRequired<
-  SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>,
+  MutationOptions<TData, TError, TVariables, TOnMutateResult>,
   'mutationKey'
 >
 export function mutationOptions<
@@ -22,11 +22,11 @@ export function mutationOptions<
   TOnMutateResult = unknown,
 >(
   options: Omit<
-    SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>,
+    MutationOptions<TData, TError, TVariables, TOnMutateResult>,
     'mutationKey'
   >,
 ): Omit<
-  SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>,
+  MutationOptions<TData, TError, TVariables, TOnMutateResult>,
   'mutationKey'
 >
 export function mutationOptions<
@@ -35,7 +35,7 @@ export function mutationOptions<
   TVariables = void,
   TOnMutateResult = unknown,
 >(
-  options: SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>,
-): SolidMutationOptions<TData, TError, TVariables, TOnMutateResult> {
+  options: MutationOptions<TData, TError, TVariables, TOnMutateResult>,
+): MutationOptions<TData, TError, TVariables, TOnMutateResult> {
   return options
 }

package/src/queryOptions.ts

@@ -1,5 +1,5 @@
 import type { DataTag, DefaultError, QueryKey } from '@tanstack/query-core'
-import type { SolidQueryOptions } from './types'
+import type { QueryOptions } from './types'
 import type { Accessor } from 'solid-js'
 
 export type UndefinedInitialDataOptions<
@@ -8,7 +8,7 @@ export type UndefinedInitialDataOptions<
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > = Accessor<
-  SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+  QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData?: undefined
   }
 >
@@ -19,7 +19,7 @@ export type DefinedInitialDataOptions<
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > = Accessor<
-  SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+  QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData: TQueryFnData | (() => TQueryFnData)
   }
 >

package/src/types.ts

@@ -44,7 +44,7 @@ export interface UseBaseQueryOptions<
   suspense?: boolean
 }
 
-export interface SolidQueryOptions<
+export interface QueryOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
@@ -62,7 +62,7 @@ export type UseQueryOptions<
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
+> = Accessor<QueryOptions<TQueryFnData, TError, TData, TQueryKey>>
 
 /* --- Create Query and Create Base Query  Types --- */
 
@@ -87,7 +87,7 @@ export type DefinedUseQueryResult<
 > = DefinedUseBaseQueryResult<TData, TError>
 
 /* --- Create Infinite Queries Types --- */
-export interface SolidInfiniteQueryOptions<
+export interface InfiniteQueryOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
@@ -126,7 +126,7 @@ export type UseInfiniteQueryOptions<
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 > = Accessor<
-  SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
+  InfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
 >
 
 export type UseInfiniteQueryResult<
@@ -140,7 +140,7 @@ export type DefinedUseInfiniteQueryResult<
 > = DefinedInfiniteQueryObserverResult<TData, TError>
 
 /* --- Create Mutation Types --- */
-export interface SolidMutationOptions<
+export interface MutationOptions<
   TData = unknown,
   TError = DefaultError,
   TVariables = void,
@@ -155,7 +155,7 @@ export type UseMutationOptions<
   TError = DefaultError,
   TVariables = void,
   TOnMutateResult = unknown,
-> = Accessor<SolidMutationOptions<TData, TError, TVariables, TOnMutateResult>>
+> = Accessor<MutationOptions<TData, TError, TVariables, TOnMutateResult>>
 
 export type UseMutateFunction<
   TData = unknown,

package/src/useBaseQuery.ts

@@ -418,8 +418,19 @@ export function useBaseQuery<
       // pending Promise, and re-renders with the resolved state. Without
       // this, JSX reads through the Proxy never subscribe to queryResource
       // and SSR HTML reflects the initial loading state.
+      //
+      // Read the value from the *resolved resource* rather than `state`. When
+      // the boundary suspends and re-renders after the query settles, the
+      // `state` store is not synced (the server subscriber resolves the
+      // resource Promise but does not write the store), so reading `state`
+      // would render stale loading values. Reading the resolved resource keeps
+      // the streamed SSR HTML consistent with the serialized resource, which
+      // is what the client hydrates against.
       if (isServer) {
-        queryResource()
+        const resolved = queryResource()
+        if (prop in resolved) {
+          return Reflect.get(resolved, prop)
+        }
       }
 
       // Always pass through error-related props without throwing

package/src/useMutation.ts

@@ -4,6 +4,7 @@ import {
   createRenderEffect,
   createStore,
   onCleanup,
+  runWithOwner,
   untrack,
 } from 'solid-js'
 import { useQueryClient } from './QueryClientProvider'
@@ -63,11 +64,17 @@ export function useMutation<
   })
 
   const unsubscribe = observer.subscribe((result) => {
-    setState(() => ({
-      ...result,
-      mutate,
-      mutateAsync: result.mutate,
-    }))
+    // observer.mutate may be invoked synchronously from an owned scope (e.g.
+    // during render or inside an effect), which triggers this subscriber
+    // synchronously. Store writes inside an owned scope throw in Solid v2, so
+    // escape the owner to allow the setState write — matching useBaseQuery.
+    runWithOwner(null, () => {
+      setState(() => ({
+        ...result,
+        mutate,
+        mutateAsync: result.mutate,
+      }))
+    })
   })
 
   onCleanup(unsubscribe)

package/src/useQueries.ts

@@ -11,7 +11,7 @@ import {
 } from 'solid-js'
 import { useQueryClient } from './QueryClientProvider'
 import { useIsRestoring } from './isRestoring'
-import type { SolidQueryOptions, UseQueryResult } from './types'
+import type { QueryOptions, UseQueryResult } from './types'
 import type { Accessor } from 'solid-js'
 import type { QueryClient } from './QueryClient'
 import type {
@@ -34,7 +34,7 @@ type UseQueryOptionsForUseQueries<
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > = OmitKeyof<
-  SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+  QueryOptions<TQueryFnData, TError, TData, TQueryKey>,
   'placeholderData' | 'suspense'
 > & {
   placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>