@tanstack/solid-query 5.28.6 → 5.28.9

package/build/dev.cjs

@@ -99,6 +99,7 @@ function createBaseQuery(options, Observer, queryClient) {
     }
     return defaultOptions;
   });
+  const initialOptions = defaultedOptions();
   const [observer, setObserver] = solidJs.createSignal(
     new Observer(client(), defaultedOptions())
   );
@@ -188,13 +189,12 @@ function createBaseQuery(options, Observer, queryClient) {
        * Note that this is only invoked on the client, for queries that were originally run on the server.
        */
       onHydrated(_k, info) {
-        const defaultOptions = defaultedOptions();
         if (info.value) {
           queryCore.hydrate(client(), {
             queries: [
               {
-                queryKey: defaultOptions.queryKey,
-                queryHash: defaultOptions.queryHash,
+                queryKey: initialOptions.queryKey,
+                queryHash: initialOptions.queryHash,
                 state: info.value
               }
             ]
@@ -202,8 +202,8 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (unsubscribe)
           return;
-        const newOptions = { ...defaultOptions };
-        if (defaultOptions.staleTime || !defaultOptions.initialData) {
+        const newOptions = { ...initialOptions };
+        if (initialOptions.staleTime || !initialOptions.initialData) {
           newOptions.refetchOnMount = false;
         }
         observer().setOptions(newOptions);

package/build/dev.js

@@ -98,6 +98,7 @@ function createBaseQuery(options, Observer, queryClient) {
     }
     return defaultOptions;
   });
+  const initialOptions = defaultedOptions();
   const [observer, setObserver] = createSignal(
     new Observer(client(), defaultedOptions())
   );
@@ -187,13 +188,12 @@ function createBaseQuery(options, Observer, queryClient) {
        * Note that this is only invoked on the client, for queries that were originally run on the server.
        */
       onHydrated(_k, info) {
-        const defaultOptions = defaultedOptions();
         if (info.value) {
           hydrate(client(), {
             queries: [
               {
-                queryKey: defaultOptions.queryKey,
-                queryHash: defaultOptions.queryHash,
+                queryKey: initialOptions.queryKey,
+                queryHash: initialOptions.queryHash,
                 state: info.value
               }
             ]
@@ -201,8 +201,8 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (unsubscribe)
           return;
-        const newOptions = { ...defaultOptions };
-        if (defaultOptions.staleTime || !defaultOptions.initialData) {
+        const newOptions = { ...initialOptions };
+        if (initialOptions.staleTime || !initialOptions.initialData) {
           newOptions.refetchOnMount = false;
         }
         observer().setOptions(newOptions);

package/build/index.cjs

@@ -99,6 +99,7 @@ function createBaseQuery(options, Observer, queryClient) {
     }
     return defaultOptions;
   });
+  const initialOptions = defaultedOptions();
   const [observer, setObserver] = solidJs.createSignal(
     new Observer(client(), defaultedOptions())
   );
@@ -188,13 +189,12 @@ function createBaseQuery(options, Observer, queryClient) {
        * Note that this is only invoked on the client, for queries that were originally run on the server.
        */
       onHydrated(_k, info) {
-        const defaultOptions = defaultedOptions();
         if (info.value) {
           queryCore.hydrate(client(), {
             queries: [
               {
-                queryKey: defaultOptions.queryKey,
-                queryHash: defaultOptions.queryHash,
+                queryKey: initialOptions.queryKey,
+                queryHash: initialOptions.queryHash,
                 state: info.value
               }
             ]
@@ -202,8 +202,8 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (unsubscribe)
           return;
-        const newOptions = { ...defaultOptions };
-        if (defaultOptions.staleTime || !defaultOptions.initialData) {
+        const newOptions = { ...initialOptions };
+        if (initialOptions.staleTime || !initialOptions.initialData) {
           newOptions.refetchOnMount = false;
         }
         observer().setOptions(newOptions);

package/build/index.d.cts

@@ -1,9 +1,9 @@
-import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
+import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
 
-interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
+interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends OmitKeyof<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
     /**
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
@@ -12,7 +12,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
-interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
+interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
     /**
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
@@ -22,7 +22,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
 interface DefaultOptions<TError = DefaultError> extends DefaultOptions$1<TError> {
-    queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>;
+    queries?: OmitKeyof<QueryObserverOptions<unknown, TError>, 'queryKey'>;
 }
 interface QueryClientConfig extends QueryClientConfig$1 {
     defaultOptions?: DefaultOptions;
@@ -42,13 +42,13 @@ type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserv
 type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
 type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError> = DefinedQueryObserverResult<TData, TError>;
 type DefinedCreateQueryResult<TData = unknown, TError = DefaultError> = DefinedCreateBaseQueryResult<TData, TError>;
-interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
+interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
     queryKey: TQueryKey;
     deferStream?: boolean;
 }
 type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
 type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = InfiniteQueryObserverResult<TData, TError>;
-interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
+interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
 }
 type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>;
 type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
@@ -96,7 +96,7 @@ type MutationStateOptions<TResult = MutationState> = {
 };
 declare function useMutationState<TResult = MutationState>(options?: Accessor<MutationStateOptions<TResult>>, queryClient?: Accessor<QueryClient>): Accessor<Array<TResult>>;
 
-type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Omit<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
+type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
     placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
 };
 type MAXIMUM_DEPTH = 20;
@@ -147,7 +147,7 @@ type QueriesOptions<T extends Array<any>, TResult extends Array<any> = [], TDept
 ], [
     ...TDepth,
     1
-]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
+]> : ReadonlyArray<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
 /**
  * QueriesResults reducer recursively maps type param to results
  */

package/build/index.d.ts

@@ -1,9 +1,9 @@
-import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
+import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
 
-interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
+interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends OmitKeyof<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
     /**
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
@@ -12,7 +12,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
-interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
+interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
     /**
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
@@ -22,7 +22,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
 interface DefaultOptions<TError = DefaultError> extends DefaultOptions$1<TError> {
-    queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>;
+    queries?: OmitKeyof<QueryObserverOptions<unknown, TError>, 'queryKey'>;
 }
 interface QueryClientConfig extends QueryClientConfig$1 {
     defaultOptions?: DefaultOptions;
@@ -42,13 +42,13 @@ type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserv
 type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
 type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError> = DefinedQueryObserverResult<TData, TError>;
 type DefinedCreateQueryResult<TData = unknown, TError = DefaultError> = DefinedCreateBaseQueryResult<TData, TError>;
-interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
+interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
     queryKey: TQueryKey;
     deferStream?: boolean;
 }
 type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
 type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = InfiniteQueryObserverResult<TData, TError>;
-interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
+interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
 }
 type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>;
 type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
@@ -96,7 +96,7 @@ type MutationStateOptions<TResult = MutationState> = {
 };
 declare function useMutationState<TResult = MutationState>(options?: Accessor<MutationStateOptions<TResult>>, queryClient?: Accessor<QueryClient>): Accessor<Array<TResult>>;
 
-type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Omit<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
+type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
     placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
 };
 type MAXIMUM_DEPTH = 20;
@@ -147,7 +147,7 @@ type QueriesOptions<T extends Array<any>, TResult extends Array<any> = [], TDept
 ], [
     ...TDepth,
     1
-]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
+]> : ReadonlyArray<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
 /**
  * QueriesResults reducer recursively maps type param to results
  */

package/build/index.js

@@ -98,6 +98,7 @@ function createBaseQuery(options, Observer, queryClient) {
     }
     return defaultOptions;
   });
+  const initialOptions = defaultedOptions();
   const [observer, setObserver] = createSignal(
     new Observer(client(), defaultedOptions())
   );
@@ -187,13 +188,12 @@ function createBaseQuery(options, Observer, queryClient) {
        * Note that this is only invoked on the client, for queries that were originally run on the server.
        */
       onHydrated(_k, info) {
-        const defaultOptions = defaultedOptions();
         if (info.value) {
           hydrate(client(), {
             queries: [
               {
-                queryKey: defaultOptions.queryKey,
-                queryHash: defaultOptions.queryHash,
+                queryKey: initialOptions.queryKey,
+                queryHash: initialOptions.queryHash,
                 state: info.value
               }
             ]
@@ -201,8 +201,8 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (unsubscribe)
           return;
-        const newOptions = { ...defaultOptions };
-        if (defaultOptions.staleTime || !defaultOptions.initialData) {
+        const newOptions = { ...initialOptions };
+        if (initialOptions.staleTime || !initialOptions.initialData) {
           newOptions.refetchOnMount = false;
         }
         observer().setOptions(newOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.28.6",
+  "version": "5.28.9",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -48,7 +48,7 @@
   ],
   "dependencies": {
     "solid-js": "^1.8.14",
-    "@tanstack/query-core": "5.28.6"
+    "@tanstack/query-core": "5.28.9"
   },
   "devDependencies": {
     "tsup-preset-solid": "^2.2.0",

package/src/QueryClient.ts

@@ -2,6 +2,7 @@ import { QueryClient as QueryCoreClient } from '@tanstack/query-core'
 import type {
   DefaultOptions as CoreDefaultOptions,
   DefaultError,
+  OmitKeyof,
   QueryClientConfig as QueryCoreClientConfig,
   InfiniteQueryObserverOptions as QueryCoreInfiniteQueryObserverOptions,
   QueryObserverOptions as QueryCoreObserverOptions,
@@ -15,7 +16,7 @@ export interface QueryObserverOptions<
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = never,
-> extends Omit<
+> extends OmitKeyof<
     QueryCoreObserverOptions<
       TQueryFnData,
       TError,
@@ -45,7 +46,7 @@ export interface InfiniteQueryObserverOptions<
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
-> extends Omit<
+> extends OmitKeyof<
     QueryCoreInfiniteQueryObserverOptions<
       TQueryFnData,
       TError,
@@ -70,7 +71,7 @@ export interface InfiniteQueryObserverOptions<
 
 export interface DefaultOptions<TError = DefaultError>
   extends CoreDefaultOptions<TError> {
-  queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>
+  queries?: OmitKeyof<QueryObserverOptions<unknown, TError>, 'queryKey'>
 }
 
 export interface QueryClientConfig extends QueryCoreClientConfig {

package/src/__tests__/createQuery.test.tsx

@@ -30,6 +30,7 @@ import type {
   CreateQueryOptions,
   CreateQueryResult,
   DefinedCreateQueryResult,
+  OmitKeyof,
   QueryFunction,
 } from '..'
 import type { Mock } from 'vitest'
@@ -163,9 +164,10 @@ describe('createQuery', () => {
           token: string,
           // return type must be wrapped with TQueryFnReturn
         ) => Promise<TQueryFnData>,
-        options?: Omit<
+        options?: OmitKeyof<
           CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-          'queryKey' | 'queryFn' | 'initialData'
+          'queryKey' | 'queryFn' | 'initialData',
+          'safely'
         >,
       ) =>
         createQuery(() => ({
@@ -185,9 +187,10 @@ describe('createQuery', () => {
       >(
         qk: TQueryKey,
         fetcher: () => Promise<TQueryFnData>,
-        options?: Omit<
+        options?: OmitKeyof<
           CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-          'queryKey' | 'queryFn' | 'initialData'
+          'queryKey' | 'queryFn' | 'initialData',
+          'safely'
         >,
       ) => createQuery(() => ({ queryKey: qk, queryFn: fetcher, ...options }))
       const testFuncStyle = useWrappedFuncStyleQuery([''], async () => true)

package/src/createBaseQuery.ts

@@ -138,6 +138,7 @@ export function createBaseQuery<
     }
     return defaultOptions
   })
+  const initialOptions = defaultedOptions()
 
   const [observer, setObserver] = createSignal(
     new Observer(client(), defaultedOptions()),
@@ -254,13 +255,12 @@ export function createBaseQuery<
        * Note that this is only invoked on the client, for queries that were originally run on the server.
        */
       onHydrated(_k, info) {
-        const defaultOptions = defaultedOptions()
         if (info.value) {
           hydrate(client(), {
             queries: [
               {
-                queryKey: defaultOptions.queryKey,
-                queryHash: defaultOptions.queryHash,
+                queryKey: initialOptions.queryKey,
+                queryHash: initialOptions.queryHash,
                 state: info.value,
               },
             ],
@@ -272,8 +272,8 @@ export function createBaseQuery<
          * Do not refetch query on mount if query was fetched on server,
          * even if `staleTime` is not set.
          */
-        const newOptions = { ...defaultOptions }
-        if (defaultOptions.staleTime || !defaultOptions.initialData) {
+        const newOptions = { ...initialOptions }
+        if (initialOptions.staleTime || !initialOptions.initialData) {
           newOptions.refetchOnMount = false
         }
         // Setting the options as an immutable object to prevent

package/src/createQueries.ts

@@ -18,6 +18,7 @@ import type { Accessor } from 'solid-js'
 import type { QueryClient } from './QueryClient'
 import type {
   DefaultError,
+  OmitKeyof,
   QueriesObserverOptions,
   QueriesPlaceholderDataFunction,
   QueryFunction,
@@ -34,7 +35,7 @@ type CreateQueryOptionsForCreateQueries<
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-> = Omit<
+> = OmitKeyof<
   SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
   'placeholderData'
 > & {
@@ -147,7 +148,7 @@ type QueriesOptions<
             [...TResult, GetOptions<Head>],
             [...TDepth, 1]
           >
-        : Array<unknown> extends T
+        : ReadonlyArray<unknown> extends T
           ? T
           : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
             // use this to infer the param types in the case of Array.map() argument
@@ -220,7 +221,7 @@ export function createQueries<
   const client = createMemo(() => useQueryClient(queryClient?.()))
   const isRestoring = useIsRestoring()
 
-  const defaultedQueries = createMemo(() =>
+  const defaultedQueries: QueriesOptions<any> = createMemo(() =>
     queriesOptions().queries.map((options) =>
       mergeProps(client().defaultQueryOptions(options), {
         get _optimisticResults() {
@@ -293,7 +294,7 @@ export function createQueries<
           const dataResources_ = dataResources()
           for (let index = 0; index < dataResources_.length; index++) {
             const dataResource = dataResources_[index]!
-            const unwrappedResult = { ...unwrap(result[index]!) }
+            const unwrappedResult = { ...unwrap(result[index]) }
             // @ts-expect-error typescript pedantry regarding the possible range of index
             setState(index, unwrap(unwrappedResult))
             dataResource[1].mutate(() => unwrap(state[index]!.data))

package/src/types.ts

@@ -7,6 +7,7 @@ import type {
   MutateFunction,
   MutationObserverOptions,
   MutationObserverResult,
+  OmitKeyof,
   QueryKey,
   QueryObserverResult,
 } from '@tanstack/query-core'
@@ -83,7 +84,7 @@ export interface SolidInfiniteQueryOptions<
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
-> extends Omit<
+> extends OmitKeyof<
     InfiniteQueryObserverOptions<
       TQueryFnData,
       TError,
@@ -126,7 +127,7 @@ export interface SolidMutationOptions<
   TError = DefaultError,
   TVariables = void,
   TContext = unknown,
-> extends Omit<
+> extends OmitKeyof<
     MutationObserverOptions<TData, TError, TVariables, TContext>,
     '_defaulted'
   > {}