@tanstack/svelte-query 5.0.0-beta.6 → 5.0.0-rc.0

package/dist/context.d.ts

@@ -1,6 +1,11 @@
 import type { QueryClient } from '@tanstack/query-core';
+import type { Readable } from 'svelte/store';
 /** Retrieves a Client from Svelte's context */
 export declare const getQueryClientContext: () => QueryClient;
 /** Sets a QueryClient on Svelte's context */
 export declare const setQueryClientContext: (client: QueryClient) => void;
+/** Retrieves a `isRestoring` from Svelte's context */
+export declare const getIsRestoringContext: () => Readable<boolean>;
+/** Sets a `isRestoring` on Svelte's context */
+export declare const setIsRestoringContext: (isRestoring: Readable<boolean>) => void;
 //# sourceMappingURL=context.d.ts.map

package/dist/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAIvD,+CAA+C;AAC/C,eAAO,MAAM,qBAAqB,QAAO,WASxC,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,qBAAqB,WAAY,WAAW,KAAG,IAE3D,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAI5C,+CAA+C;AAC/C,eAAO,MAAM,qBAAqB,QAAO,WASxC,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,qBAAqB,WAAY,WAAW,KAAG,IAE3D,CAAA;AAID,sDAAsD;AACtD,eAAO,MAAM,qBAAqB,QAAO,SAAS,OAAO,CAIxD,CAAA;AAED,+CAA+C;AAC/C,eAAO,MAAM,qBAAqB,gBAAiB,SAAS,OAAO,CAAC,KAAG,IAEtE,CAAA"}

package/dist/context.js

@@ -1,4 +1,5 @@
 import { getContext, setContext } from 'svelte';
+import { readable } from 'svelte/store';
 const _contextKey = '$$_queryClient';
 /** Retrieves a Client from Svelte's context */
 export const getQueryClientContext = () => {
@@ -12,3 +13,15 @@ export const getQueryClientContext = () => {
 export const setQueryClientContext = (client) => {
     setContext(_contextKey, client);
 };
+const _isRestoringContextKey = '$$_isRestoring';
+/** Retrieves a `isRestoring` from Svelte's context */
+export const getIsRestoringContext = () => {
+    const isRestoring = getContext(_isRestoringContextKey);
+    if (!isRestoring)
+        return readable(false);
+    return isRestoring;
+};
+/** Sets a `isRestoring` on Svelte's context */
+export const setIsRestoringContext = (isRestoring) => {
+    setContext(_isRestoringContextKey, isRestoring);
+};

package/dist/createBaseQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBaseQuery.d.ts","sourceRoot":"","sources":["../../src/createBaseQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE5E,wBAAgB,eAAe,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,SAAS,QAAQ,EAE1B,OAAO,EAAE,sBAAsB,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,CACV,EACD,QAAQ,EAAE,OAAO,aAAa,EAC9B,WAAW,CAAC,EAAE,WAAW,GACxB,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,CA6CtC"}
+{"version":3,"file":"createBaseQuery.d.ts","sourceRoot":"","sources":["../../src/createBaseQuery.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,aAAa,EAEd,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE5E,wBAAgB,eAAe,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,SAAS,QAAQ,EAE1B,OAAO,EAAE,sBAAsB,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,CACV,EACD,QAAQ,EAAE,OAAO,aAAa,EAC9B,WAAW,CAAC,EAAE,WAAW,GACxB,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,CAyDtC"}

package/dist/createBaseQuery.js

@@ -1,16 +1,20 @@
 import { derived, get, readable } from 'svelte/store';
 import { notifyManager } from '@tanstack/query-core';
+import { useIsRestoring } from './useIsRestoring';
 import { useQueryClient } from './useQueryClient';
 import { isSvelteStore } from './utils';
 export function createBaseQuery(options, Observer, queryClient) {
     /** Load query client */
     const client = useQueryClient(queryClient);
+    const isRestoring = useIsRestoring();
     /** Converts options to a svelte store if not already a store object */
     const optionsStore = isSvelteStore(options) ? options : readable(options);
     /** Creates a store that has the default options applied */
-    const defaultedOptionsStore = derived(optionsStore, ($optionsStore) => {
+    const defaultedOptionsStore = derived([optionsStore, isRestoring], ([$optionsStore, $isRestoring]) => {
         const defaultedOptions = client.defaultQueryOptions($optionsStore);
-        defaultedOptions._optimisticResults = 'optimistic';
+        defaultedOptions._optimisticResults = $isRestoring
+            ? 'isRestoring'
+            : 'optimistic';
         return defaultedOptions;
     });
     /** Creates the observer */
@@ -20,8 +24,12 @@ export function createBaseQuery(options, Observer, queryClient) {
         // these changes should already be reflected in the optimistic result.
         observer.setOptions($defaultedOptions, { listeners: false });
     });
-    const result = readable(observer.getCurrentResult(), (set) => {
-        return observer.subscribe(notifyManager.batchCalls(set));
+    const result = derived(isRestoring, ($isRestoring, set) => {
+        const unsubscribe = $isRestoring
+            ? () => undefined
+            : observer.subscribe(notifyManager.batchCalls(set));
+        observer.updateResult();
+        return unsubscribe;
     });
     /** Subscribe to changes in result and defaultedOptionsStore */
     const { subscribe } = derived([result, defaultedOptionsStore], ([$result, $defaultedOptionsStore]) => {

package/dist/createQueries.d.ts

@@ -40,12 +40,12 @@ type GetResults<T> = T extends {
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */
-export type QueriesOptions<T extends any[], Result extends any[] = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? QueryObserverOptionsForCreateQueries[] : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]> : unknown[] extends T ? T : T extends QueryObserverOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>[] ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>[] : QueryObserverOptionsForCreateQueries[];
+export type QueriesOptions<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<QueryObserverOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]> : Array<unknown> extends T ? T : T extends Array<QueryObserverOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<QueryObserverOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<QueryObserverOptionsForCreateQueries>;
 /**
  * QueriesResults reducer recursively maps type param to results
  */
-export type QueriesResults<T extends any[], Result extends any[] = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? QueryObserverResult[] : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]> : T extends QueryObserverOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>[] ? QueryObserverResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>[] : QueryObserverResult[];
-export declare function createQueries<T extends any[], TCombinedResult = QueriesResults<T>>({ queries, ...options }: {
+export type QueriesResults<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<QueryObserverResult> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]> : T extends Array<QueryObserverOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<QueryObserverResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<QueryObserverResult>;
+export declare function createQueries<T extends Array<any>, TCombinedResult = QueriesResults<T>>({ queries, ...options }: {
     queries: StoreOrVal<[...QueriesOptions<T>]>;
     combine?: (result: QueriesResults<T>) => TCombinedResult;
 }, queryClient?: QueryClient): Readable<TCombinedResult>;

package/dist/createQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createQueries.d.ts","sourceRoot":"","sources":["../../src/createQueries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createQueries.d.ts","sourceRoot":"","sources":["../../src/createQueries.ts"],"names":[],"mappings":"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"}

package/dist/createQueries.js

@@ -1,16 +1,19 @@
 import { QueriesObserver, notifyManager } from '@tanstack/query-core';
 import { derived, get, readable } from 'svelte/store';
+import { useIsRestoring } from './useIsRestoring';
 import { useQueryClient } from './useQueryClient';
 import { isSvelteStore } from './utils';
 export function createQueries({ queries, ...options }, queryClient) {
     const client = useQueryClient(queryClient);
-    // const isRestoring = useIsRestoring()
+    const isRestoring = useIsRestoring();
     const queriesStore = isSvelteStore(queries) ? queries : readable(queries);
-    const defaultedQueriesStore = derived(queriesStore, ($queries) => {
+    const defaultedQueriesStore = derived([queriesStore, isRestoring], ([$queries, $isRestoring]) => {
         return $queries.map((opts) => {
             const defaultedOptions = client.defaultQueryOptions(opts);
             // Make sure the results are already in fetching state before subscribing or updating options
-            defaultedOptions._optimisticResults = 'optimistic';
+            defaultedOptions._optimisticResults = $isRestoring
+                ? 'isRestoring'
+                : 'optimistic';
             return defaultedOptions;
         });
     });
@@ -20,9 +23,22 @@ export function createQueries({ queries, ...options }, queryClient) {
         // these changes should already be reflected in the optimistic result.
         observer.setQueries($defaultedQueries, options, { listeners: false });
     });
-    const [, getCombinedResult] = observer.getOptimisticResult(get(defaultedQueriesStore));
-    const { subscribe } = readable(getCombinedResult(), (set) => {
-        return observer.subscribe(notifyManager.batchCalls(set));
+    const [, getCombinedResult, trackResult] = observer.getOptimisticResult(get(defaultedQueriesStore));
+    const result = derived(isRestoring, ($isRestoring, set) => {
+        const unsubscribe = $isRestoring
+            ? () => undefined
+            : observer.subscribe(notifyManager.batchCalls(set));
+        return () => unsubscribe();
+    }, getCombinedResult(trackResult()));
+    const { subscribe } = derived([result, defaultedQueriesStore], ([$result, $defaultedQueries]) => {
+        $result = observer.getOptimisticResult($defaultedQueries)[0];
+        const observers = observer.getObservers();
+        return $defaultedQueries.map((query, index) => query.notifyOnChangeProps
+            ? // @ts-expect-error TCombinedResult should be an array
+                $result[index]
+            : // @ts-expect-error TCombinedResult should be an array
+                observers[index].trackResult($result[index]));
     });
+    // @ts-expect-error TCombinedResult should be an array
     return { subscribe };
 }

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { createMutation } from './createMutation';
 export { useQueryClient } from './useQueryClient';
 export { useIsFetching } from './useIsFetching';
 export { useIsMutating } from './useIsMutating';
+export { useIsRestoring } from './useIsRestoring';
 export { useHydrate } from './useHydrate';
 export { default as HydrationBoundary } from './HydrationBoundary.svelte';
 export { default as QueryClientProvider } from './QueryClientProvider.svelte';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,sBAAsB,CAAA;AAGpC,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AACzE,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,sBAAsB,CAAA;AAGpC,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AACzE,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,8BAA8B,CAAA"}

package/dist/index.js

@@ -11,6 +11,7 @@ export { createMutation } from './createMutation';
 export { useQueryClient } from './useQueryClient';
 export { useIsFetching } from './useIsFetching';
 export { useIsMutating } from './useIsMutating';
+export { useIsRestoring } from './useIsRestoring';
 export { useHydrate } from './useHydrate';
 export { default as HydrationBoundary } from './HydrationBoundary.svelte';
 export { default as QueryClientProvider } from './QueryClientProvider.svelte';

package/dist/useIsRestoring.d.ts

@@ -0,0 +1,3 @@
+import type { Readable } from 'svelte/store';
+export declare function useIsRestoring(): Readable<boolean>;
+//# sourceMappingURL=useIsRestoring.d.ts.map

package/dist/useIsRestoring.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useIsRestoring.d.ts","sourceRoot":"","sources":["../../src/useIsRestoring.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,wBAAgB,cAAc,IAAI,QAAQ,CAAC,OAAO,CAAC,CAElD"}

package/dist/useIsRestoring.js

@@ -0,0 +1,4 @@
+import { getIsRestoringContext } from './context';
+export function useIsRestoring() {
+    return getIsRestoringContext();
+}

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@tanstack/svelte-query",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-rc.0",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Svelte",
   "author": "Lachlan Collins",
   "license": "MIT",
-  "repository": "tanstack/query",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/TanStack/query.git",
+    "directory": "packages/svelte-query"
+  },
   "homepage": "https://tanstack.com/query",
   "funding": {
     "type": "github",
@@ -30,7 +34,7 @@
     "!src/__tests__"
   ],
   "dependencies": {
-    "@tanstack/query-core": "5.0.0-beta.6"
+    "@tanstack/query-core": "5.0.0-rc.0"
   },
   "devDependencies": {
     "@sveltejs/package": "^2.2.0",

package/src/context.ts

@@ -1,5 +1,7 @@
 import { getContext, setContext } from 'svelte'
+import { readable } from 'svelte/store'
 import type { QueryClient } from '@tanstack/query-core'
+import type { Readable } from 'svelte/store'
 
 const _contextKey = '$$_queryClient'
 
@@ -19,3 +21,17 @@ export const getQueryClientContext = (): QueryClient => {
 export const setQueryClientContext = (client: QueryClient): void => {
   setContext(_contextKey, client)
 }
+
+const _isRestoringContextKey = '$$_isRestoring'
+
+/** Retrieves a `isRestoring` from Svelte's context */
+export const getIsRestoringContext = (): Readable<boolean> => {
+  const isRestoring = getContext(_isRestoringContextKey)
+  if (!isRestoring) return readable(false)
+  return isRestoring as Readable<boolean>
+}
+
+/** Sets a `isRestoring` on Svelte's context */
+export const setIsRestoringContext = (isRestoring: Readable<boolean>): void => {
+  setContext(_isRestoringContextKey, isRestoring)
+}

package/src/createBaseQuery.ts

@@ -1,8 +1,14 @@
 import { derived, get, readable } from 'svelte/store'
 import { notifyManager } from '@tanstack/query-core'
+import { useIsRestoring } from './useIsRestoring'
 import { useQueryClient } from './useQueryClient'
 import { isSvelteStore } from './utils'
-import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
+import type {
+  QueryClient,
+  QueryKey,
+  QueryObserver,
+  QueryObserverResult,
+} from '@tanstack/query-core'
 import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'
 
 export function createBaseQuery<
@@ -24,16 +30,21 @@ export function createBaseQuery<
 ): CreateBaseQueryResult<TData, TError> {
   /** Load query client */
   const client = useQueryClient(queryClient)
-
+  const isRestoring = useIsRestoring()
   /** Converts options to a svelte store if not already a store object */
   const optionsStore = isSvelteStore(options) ? options : readable(options)
 
   /** Creates a store that has the default options applied */
-  const defaultedOptionsStore = derived(optionsStore, ($optionsStore) => {
-    const defaultedOptions = client.defaultQueryOptions($optionsStore)
-    defaultedOptions._optimisticResults = 'optimistic'
-    return defaultedOptions
-  })
+  const defaultedOptionsStore = derived(
+    [optionsStore, isRestoring],
+    ([$optionsStore, $isRestoring]) => {
+      const defaultedOptions = client.defaultQueryOptions($optionsStore)
+      defaultedOptions._optimisticResults = $isRestoring
+        ? 'isRestoring'
+        : 'optimistic'
+      return defaultedOptions
+    },
+  )
 
   /** Creates the observer */
   const observer = new Observer<
@@ -50,8 +61,15 @@ export function createBaseQuery<
     observer.setOptions($defaultedOptions, { listeners: false })
   })
 
-  const result = readable(observer.getCurrentResult(), (set) => {
-    return observer.subscribe(notifyManager.batchCalls(set))
+  const result = derived<
+    typeof isRestoring,
+    QueryObserverResult<TData, TError>
+  >(isRestoring, ($isRestoring, set) => {
+    const unsubscribe = $isRestoring
+      ? () => undefined
+      : observer.subscribe(notifyManager.batchCalls(set))
+    observer.updateResult()
+    return unsubscribe
   })
 
   /** Subscribe to changes in result and defaultedOptionsStore */

package/src/createQueries.ts

@@ -1,5 +1,6 @@
 import { QueriesObserver, notifyManager } from '@tanstack/query-core'
 import { derived, get, readable } from 'svelte/store'
+import { useIsRestoring } from './useIsRestoring'
 import { useQueryClient } from './useQueryClient'
 import { isSvelteStore } from './utils'
 import type { Readable } from 'svelte/store'
@@ -102,67 +103,75 @@ type GetResults<T> =
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */
 export type QueriesOptions<
-  T extends any[],
-  Result extends any[] = [],
+  T extends Array<any>,
+  Result extends Array<any> = [],
   Depth extends ReadonlyArray<number> = [],
 > = Depth['length'] extends MAXIMUM_DEPTH
-  ? QueryObserverOptionsForCreateQueries[]
+  ? Array<QueryObserverOptionsForCreateQueries>
   : T extends []
   ? []
   : T extends [infer Head]
   ? [...Result, GetOptions<Head>]
   : T extends [infer Head, ...infer Tail]
   ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>
-  : unknown[] extends T
+  : Array<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
-  T extends QueryObserverOptionsForCreateQueries<
-      infer TQueryFnData,
-      infer TError,
-      infer TData,
-      infer TQueryKey
-    >[]
-  ? QueryObserverOptionsForCreateQueries<
-      TQueryFnData,
-      TError,
-      TData,
-      TQueryKey
-    >[]
+  T extends Array<
+      QueryObserverOptionsForCreateQueries<
+        infer TQueryFnData,
+        infer TError,
+        infer TData,
+        infer TQueryKey
+      >
+    >
+  ? Array<
+      QueryObserverOptionsForCreateQueries<
+        TQueryFnData,
+        TError,
+        TData,
+        TQueryKey
+      >
+    >
   : // Fallback
-    QueryObserverOptionsForCreateQueries[]
+    Array<QueryObserverOptionsForCreateQueries>
 
 /**
  * QueriesResults reducer recursively maps type param to results
  */
 export type QueriesResults<
-  T extends any[],
-  Result extends any[] = [],
+  T extends Array<any>,
+  Result extends Array<any> = [],
   Depth extends ReadonlyArray<number> = [],
 > = Depth['length'] extends MAXIMUM_DEPTH
-  ? QueryObserverResult[]
+  ? Array<QueryObserverResult>
   : T extends []
   ? []
   : T extends [infer Head]
   ? [...Result, GetResults<Head>]
   : T extends [infer Head, ...infer Tail]
   ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>
-  : T extends QueryObserverOptionsForCreateQueries<
-      infer TQueryFnData,
-      infer TError,
-      infer TData,
-      any
-    >[]
+  : T extends Array<
+      QueryObserverOptionsForCreateQueries<
+        infer TQueryFnData,
+        infer TError,
+        infer TData,
+        any
+      >
+    >
   ? // Dynamic-size (homogenous) CreateQueryOptions array: map directly to array of results
-    QueryObserverResult<
-      unknown extends TData ? TQueryFnData : TData,
-      unknown extends TError ? DefaultError : TError
-    >[]
+    Array<
+      QueryObserverResult<
+        unknown extends TData ? TQueryFnData : TData,
+        unknown extends TError ? DefaultError : TError
+      >
+    >
   : // Fallback
-    QueryObserverResult[]
+    Array<QueryObserverResult>
 
 export function createQueries<
-  T extends any[],
+  T extends Array<any>,
   TCombinedResult = QueriesResults<T>,
 >(
   {
@@ -175,19 +184,23 @@ export function createQueries<
   queryClient?: QueryClient,
 ): Readable<TCombinedResult> {
   const client = useQueryClient(queryClient)
-  // const isRestoring = useIsRestoring()
+  const isRestoring = useIsRestoring()
 
   const queriesStore = isSvelteStore(queries) ? queries : readable(queries)
 
-  const defaultedQueriesStore = derived(queriesStore, ($queries) => {
-    return $queries.map((opts) => {
-      const defaultedOptions = client.defaultQueryOptions(opts)
-      // Make sure the results are already in fetching state before subscribing or updating options
-      defaultedOptions._optimisticResults = 'optimistic'
-
-      return defaultedOptions
-    })
-  })
+  const defaultedQueriesStore = derived(
+    [queriesStore, isRestoring],
+    ([$queries, $isRestoring]) => {
+      return $queries.map((opts) => {
+        const defaultedOptions = client.defaultQueryOptions(opts)
+        // Make sure the results are already in fetching state before subscribing or updating options
+        defaultedOptions._optimisticResults = $isRestoring
+          ? 'isRestoring'
+          : 'optimistic'
+        return defaultedOptions
+      })
+    },
+  )
   const observer = new QueriesObserver<TCombinedResult>(
     client,
     get(defaultedQueriesStore),
@@ -204,13 +217,40 @@ export function createQueries<
     )
   })
 
-  const [, getCombinedResult] = observer.getOptimisticResult(
+  const [, getCombinedResult, trackResult] = observer.getOptimisticResult(
     get(defaultedQueriesStore),
   )
 
-  const { subscribe } = readable(getCombinedResult() as any, (set) => {
-    return observer.subscribe(notifyManager.batchCalls(set))
-  })
+  const result = derived<
+    typeof isRestoring,
+    | Parameters<Parameters<typeof observer.subscribe>[0]>[0]
+    | ReturnType<typeof getCombinedResult>
+  >(
+    isRestoring,
+    ($isRestoring, set) => {
+      const unsubscribe = $isRestoring
+        ? () => undefined
+        : observer.subscribe(notifyManager.batchCalls(set))
 
+      return () => unsubscribe()
+    },
+    getCombinedResult(trackResult()),
+  )
+
+  const { subscribe } = derived(
+    [result, defaultedQueriesStore],
+    ([$result, $defaultedQueries]) => {
+      $result = observer.getOptimisticResult($defaultedQueries)[0]
+      const observers = observer.getObservers()
+      return $defaultedQueries.map((query, index) =>
+        query.notifyOnChangeProps
+          ? // @ts-expect-error TCombinedResult should be an array
+            $result[index]
+          : // @ts-expect-error TCombinedResult should be an array
+            observers[index]!.trackResult($result[index]),
+      )
+    },
+  )
+  // @ts-expect-error TCombinedResult should be an array
   return { subscribe }
 }

package/src/index.ts

@@ -13,6 +13,7 @@ export { createMutation } from './createMutation'
 export { useQueryClient } from './useQueryClient'
 export { useIsFetching } from './useIsFetching'
 export { useIsMutating } from './useIsMutating'
+export { useIsRestoring } from './useIsRestoring'
 export { useHydrate } from './useHydrate'
 export { default as HydrationBoundary } from './HydrationBoundary.svelte'
 export { default as QueryClientProvider } from './QueryClientProvider.svelte'

package/src/useIsRestoring.ts

@@ -0,0 +1,6 @@
+import { getIsRestoringContext } from './context'
+import type { Readable } from 'svelte/store'
+
+export function useIsRestoring(): Readable<boolean> {
+  return getIsRestoringContext()
+}