@tanstack/svelte-query 5.0.0-alpha.75 → 5.0.0-alpha.77

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"createBaseQuery.d.ts","sourceRoot":"","sources":["../../src/createBaseQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI5E,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,CAsCtC"}
1
+ {"version":3,"file":"createBaseQuery.d.ts","sourceRoot":"","sources":["../../src/createBaseQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI5E,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"}
@@ -1,15 +1,19 @@
1
- import { derived, get, readable, writable } from 'svelte/store';
1
+ import { derived, get, readable } from 'svelte/store';
2
2
  import { notifyManager } from '@tanstack/query-core';
3
3
  import { useQueryClient } from './useQueryClient';
4
- import { isWritable } from './utils';
4
+ import { isSvelteStore } from './utils';
5
5
  export function createBaseQuery(options, Observer, queryClient) {
6
+ /** Load query client */
6
7
  const client = useQueryClient(queryClient);
7
- const optionsStore = isWritable(options) ? options : writable(options);
8
- const defaultedOptionsStore = derived(optionsStore, ($options) => {
9
- const defaultedOptions = client.defaultQueryOptions($options);
8
+ /** Converts options to a svelte store if not already a store object */
9
+ const optionsStore = isSvelteStore(options) ? options : readable(options);
10
+ /** Creates a store that has the default options applied */
11
+ const defaultedOptionsStore = derived(optionsStore, ($optionsStore) => {
12
+ const defaultedOptions = client.defaultQueryOptions($optionsStore);
10
13
  defaultedOptions._optimisticResults = 'optimistic';
11
14
  return defaultedOptions;
12
15
  });
16
+ /** Creates the observer */
13
17
  const observer = new Observer(client, get(defaultedOptionsStore));
14
18
  defaultedOptionsStore.subscribe(($defaultedOptions) => {
15
19
  // Do not notify on updates because of changes in the options because
@@ -19,9 +23,10 @@ export function createBaseQuery(options, Observer, queryClient) {
19
23
  const result = readable(observer.getCurrentResult(), (set) => {
20
24
  return observer.subscribe(notifyManager.batchCalls(set));
21
25
  });
22
- const { subscribe } = derived(result, ($result) => {
23
- $result = observer.getOptimisticResult(get(defaultedOptionsStore));
24
- return !get(defaultedOptionsStore).notifyOnChangeProps
26
+ /** Subscribe to changes in result and defaultedOptionsStore */
27
+ const { subscribe } = derived([result, defaultedOptionsStore], ([$result, $defaultedOptionsStore]) => {
28
+ $result = observer.getOptimisticResult($defaultedOptionsStore);
29
+ return !$defaultedOptionsStore.notifyOnChangeProps
25
30
  ? observer.trackResult($result)
26
31
  : $result;
27
32
  });
@@ -1,10 +1,10 @@
1
- import { readable, derived, writable, get } from 'svelte/store';
1
+ import { readable, derived, get } from 'svelte/store';
2
2
  import { MutationObserver, notifyManager } from '@tanstack/query-core';
3
3
  import { useQueryClient } from './useQueryClient';
4
- import { isWritable } from './utils';
4
+ import { isSvelteStore } from './utils';
5
5
  export function createMutation(options, queryClient) {
6
6
  const client = useQueryClient(queryClient);
7
- const optionsStore = isWritable(options) ? options : writable(options);
7
+ const optionsStore = isSvelteStore(options) ? options : readable(options);
8
8
  const observer = new MutationObserver(client, get(optionsStore));
9
9
  let mutate;
10
10
  optionsStore.subscribe(($options) => {
@@ -1,6 +1,6 @@
1
1
  import type { QueryKey, QueryFunction, QueryClient, QueriesPlaceholderDataFunction, QueryObserverResult, DefaultError, QueryObserverOptions } from '@tanstack/query-core';
2
- import { type Readable } from 'svelte/store';
3
- import type { WritableOrVal } from './types';
2
+ import type { Readable } from 'svelte/store';
3
+ import type { StoreOrVal } from './types';
4
4
  type QueryObserverOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Omit<QueryObserverOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>, 'placeholderData'> & {
5
5
  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
6
6
  };
@@ -46,7 +46,7 @@ export type QueriesOptions<T extends any[], Result extends any[] = [], Depth ext
46
46
  */
47
47
  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[];
48
48
  export declare function createQueries<T extends any[], TCombinedResult = QueriesResults<T>>({ queries, ...options }: {
49
- queries: WritableOrVal<[...QueriesOptions<T>]>;
49
+ queries: StoreOrVal<[...QueriesOptions<T>]>;
50
50
  combine?: (result: QueriesResults<T>) => TCombinedResult;
51
51
  }, queryClient?: QueryClient): Readable<TCombinedResult>;
52
52
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"createQueries.d.ts","sourceRoot":"","sources":["../../src/createQueries.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createQueries.d.ts","sourceRoot":"","sources":["../../src/createQueries.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
1
  import { notifyManager, QueriesObserver } from '@tanstack/query-core';
2
- import { derived, get, readable, writable } from 'svelte/store';
2
+ import { derived, get, readable } from 'svelte/store';
3
3
  import { useQueryClient } from './useQueryClient';
4
- import { isWritable } from './utils';
4
+ import { isSvelteStore } from './utils';
5
5
  export function createQueries({ queries, ...options }, queryClient) {
6
6
  const client = useQueryClient(queryClient);
7
7
  // const isRestoring = useIsRestoring()
8
- const queriesStore = isWritable(queries) ? queries : writable(queries);
8
+ const queriesStore = isSvelteStore(queries) ? queries : readable(queries);
9
9
  const defaultedQueriesStore = derived(queriesStore, ($queries) => {
10
10
  return $queries.map((opts) => {
11
11
  const defaultedOptions = client.defaultQueryOptions(opts);
package/dist/types.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  import type { InfiniteQueryObserverOptions, InfiniteQueryObserverResult, MutationObserverResult, QueryObserverOptions, QueryObserverResult, QueryKey, MutationObserverOptions, MutateFunction, DefinedQueryObserverResult, DefaultError } from '@tanstack/query-core';
2
2
  import type { Readable, Writable } from 'svelte/store';
3
3
  /** Allows a type to be either the base object or a store of that object */
4
- export type WritableOrVal<T> = T | Writable<T>;
4
+ export type StoreOrVal<T> = T | Readable<T> | Writable<T>;
5
5
  /** Options for createBaseQuery */
6
- export type CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = WritableOrVal<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>>;
6
+ export type CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = StoreOrVal<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>>;
7
7
  /** Result from createBaseQuery */
8
8
  export type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = Readable<QueryObserverResult<TData, TError>>;
9
9
  /** Options for createQuery */
@@ -11,7 +11,7 @@ export type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TD
11
11
  /** Result from createQuery */
12
12
  export type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
13
13
  /** Options for createInfiniteQuery */
14
- export type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = WritableOrVal<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>>;
14
+ export type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = StoreOrVal<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>>;
15
15
  /** Result from createInfiniteQuery */
16
16
  export type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = Readable<InfiniteQueryObserverResult<TData, TError>>;
17
17
  /** Options for createBaseQuery with initialData */
@@ -19,7 +19,7 @@ export type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError>
19
19
  /** Options for createQuery with initialData */
20
20
  export type DefinedCreateQueryResult<TData = unknown, TError = DefaultError> = DefinedCreateBaseQueryResult<TData, TError>;
21
21
  /** Options for createMutation */
22
- export type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = WritableOrVal<Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted' | 'variables'>>;
22
+ export type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = StoreOrVal<Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted' | 'variables'>>;
23
23
  export type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
24
24
  export type CreateMutateAsyncFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = MutateFunction<TData, TError, TVariables, TContext>;
25
25
  export type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown> = Override<MutationObserverResult<TData, TError, TVariables, TContext>, {
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
1
  import { type QueryFilters, type QueryClient } from '@tanstack/query-core';
2
- import { type Readable } from 'svelte/store';
2
+ import type { Readable } from 'svelte/store';
3
3
  export declare function useIsFetching(filters?: QueryFilters, queryClient?: QueryClient): Readable<number>;
4
4
  //# sourceMappingURL=useIsFetching.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useIsFetching.d.ts","sourceRoot":"","sources":["../../src/useIsFetching.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,cAAc,CAAA;AAGtD,wBAAgB,aAAa,CAC3B,OAAO,CAAC,EAAE,YAAY,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,QAAQ,CAAC,MAAM,CAAC,CAoBlB"}
1
+ {"version":3,"file":"useIsFetching.d.ts","sourceRoot":"","sources":["../../src/useIsFetching.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAG5C,wBAAgB,aAAa,CAC3B,OAAO,CAAC,EAAE,YAAY,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,QAAQ,CAAC,MAAM,CAAC,CAoBlB"}
@@ -1,4 +1,4 @@
1
1
  import { type MutationFilters, type QueryClient } from '@tanstack/query-core';
2
- import { type Readable } from 'svelte/store';
2
+ import type { Readable } from 'svelte/store';
3
3
  export declare function useIsMutating(filters?: MutationFilters, queryClient?: QueryClient): Readable<number>;
4
4
  //# sourceMappingURL=useIsMutating.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useIsMutating.d.ts","sourceRoot":"","sources":["../../src/useIsMutating.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,cAAc,CAAA;AAGtD,wBAAgB,aAAa,CAC3B,OAAO,CAAC,EAAE,eAAe,EACzB,WAAW,CAAC,EAAE,WAAW,GACxB,QAAQ,CAAC,MAAM,CAAC,CAoBlB"}
1
+ {"version":3,"file":"useIsMutating.d.ts","sourceRoot":"","sources":["../../src/useIsMutating.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAG5C,wBAAgB,aAAa,CAC3B,OAAO,CAAC,EAAE,eAAe,EACzB,WAAW,CAAC,EAAE,WAAW,GACxB,QAAQ,CAAC,MAAM,CAAC,CAoBlB"}
package/dist/utils.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Writable } from 'svelte/store';
2
- import type { WritableOrVal } from './types';
3
- export declare function isWritable<T extends object>(obj: WritableOrVal<T>): obj is Writable<T>;
1
+ import type { Readable } from 'svelte/store';
2
+ import type { StoreOrVal } from './types';
3
+ export declare function isSvelteStore<T extends object>(obj: StoreOrVal<T>): obj is Readable<T>;
4
4
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,GACpB,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,CAEpB"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEzC,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAC5C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GACjB,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,CAEpB"}
package/dist/utils.js CHANGED
@@ -1,3 +1,3 @@
1
- export function isWritable(obj) {
2
- return 'subscribe' in obj && 'set' in obj && 'update' in obj;
1
+ export function isSvelteStore(obj) {
2
+ return 'subscribe' in obj && typeof obj.subscribe === 'function';
3
3
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/svelte-query",
3
- "version": "5.0.0-alpha.75",
3
+ "version": "5.0.0-alpha.77",
4
4
  "description": "Primitives for managing, caching and syncing asynchronous and remote data in Svelte",
5
5
  "author": "Lachlan Collins",
6
6
  "license": "MIT",
@@ -1,9 +1,9 @@
1
- import { derived, get, readable, writable } from 'svelte/store'
1
+ import { derived, get, readable } from 'svelte/store'
2
2
  import { notifyManager } from '@tanstack/query-core'
3
3
  import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
4
4
  import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'
5
5
  import { useQueryClient } from './useQueryClient'
6
- import { isWritable } from './utils'
6
+ import { isSvelteStore } from './utils'
7
7
 
8
8
  export function createBaseQuery<
9
9
  TQueryFnData,
@@ -22,17 +22,20 @@ export function createBaseQuery<
22
22
  Observer: typeof QueryObserver,
23
23
  queryClient?: QueryClient,
24
24
  ): CreateBaseQueryResult<TData, TError> {
25
+ /** Load query client */
25
26
  const client = useQueryClient(queryClient)
26
27
 
27
- const optionsStore = isWritable(options) ? options : writable(options)
28
+ /** Converts options to a svelte store if not already a store object */
29
+ const optionsStore = isSvelteStore(options) ? options : readable(options)
28
30
 
29
- const defaultedOptionsStore = derived(optionsStore, ($options) => {
30
- const defaultedOptions = client.defaultQueryOptions($options)
31
+ /** Creates a store that has the default options applied */
32
+ const defaultedOptionsStore = derived(optionsStore, ($optionsStore) => {
33
+ const defaultedOptions = client.defaultQueryOptions($optionsStore)
31
34
  defaultedOptions._optimisticResults = 'optimistic'
32
-
33
35
  return defaultedOptions
34
36
  })
35
37
 
38
+ /** Creates the observer */
36
39
  const observer = new Observer<
37
40
  TQueryFnData,
38
41
  TError,
@@ -51,12 +54,16 @@ export function createBaseQuery<
51
54
  return observer.subscribe(notifyManager.batchCalls(set))
52
55
  })
53
56
 
54
- const { subscribe } = derived(result, ($result) => {
55
- $result = observer.getOptimisticResult(get(defaultedOptionsStore))
56
- return !get(defaultedOptionsStore).notifyOnChangeProps
57
- ? observer.trackResult($result)
58
- : $result
59
- })
57
+ /** Subscribe to changes in result and defaultedOptionsStore */
58
+ const { subscribe } = derived(
59
+ [result, defaultedOptionsStore],
60
+ ([$result, $defaultedOptionsStore]) => {
61
+ $result = observer.getOptimisticResult($defaultedOptionsStore)
62
+ return !$defaultedOptionsStore.notifyOnChangeProps
63
+ ? observer.trackResult($result)
64
+ : $result
65
+ },
66
+ )
60
67
 
61
68
  return { subscribe }
62
69
  }
@@ -1,4 +1,4 @@
1
- import { readable, derived, writable, get } from 'svelte/store'
1
+ import { readable, derived, get } from 'svelte/store'
2
2
  import type { QueryClient, DefaultError } from '@tanstack/query-core'
3
3
  import { MutationObserver, notifyManager } from '@tanstack/query-core'
4
4
  import type {
@@ -7,7 +7,7 @@ import type {
7
7
  CreateMutationResult,
8
8
  } from './types'
9
9
  import { useQueryClient } from './useQueryClient'
10
- import { isWritable } from './utils'
10
+ import { isSvelteStore } from './utils'
11
11
 
12
12
  export function createMutation<
13
13
  TData = unknown,
@@ -20,7 +20,7 @@ export function createMutation<
20
20
  ): CreateMutationResult<TData, TError, TVariables, TContext> {
21
21
  const client = useQueryClient(queryClient)
22
22
 
23
- const optionsStore = isWritable(options) ? options : writable(options)
23
+ const optionsStore = isSvelteStore(options) ? options : readable(options)
24
24
 
25
25
  const observer = new MutationObserver<TData, TError, TVariables, TContext>(
26
26
  client,
@@ -9,10 +9,11 @@ import type {
9
9
  QueryObserverOptions,
10
10
  } from '@tanstack/query-core'
11
11
  import { notifyManager, QueriesObserver } from '@tanstack/query-core'
12
- import { derived, get, readable, writable, type Readable } from 'svelte/store'
13
- import type { WritableOrVal } from './types'
12
+ import { derived, get, readable } from 'svelte/store'
13
+ import type { Readable } from 'svelte/store'
14
+ import type { StoreOrVal } from './types'
14
15
  import { useQueryClient } from './useQueryClient'
15
- import { isWritable } from './utils'
16
+ import { isSvelteStore } from './utils'
16
17
 
17
18
  // This defines the `CreateQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
18
19
  // `placeholderData` function does not have a parameter
@@ -168,7 +169,7 @@ export function createQueries<
168
169
  queries,
169
170
  ...options
170
171
  }: {
171
- queries: WritableOrVal<[...QueriesOptions<T>]>
172
+ queries: StoreOrVal<[...QueriesOptions<T>]>
172
173
  combine?: (result: QueriesResults<T>) => TCombinedResult
173
174
  },
174
175
  queryClient?: QueryClient,
@@ -176,7 +177,7 @@ export function createQueries<
176
177
  const client = useQueryClient(queryClient)
177
178
  // const isRestoring = useIsRestoring()
178
179
 
179
- const queriesStore = isWritable(queries) ? queries : writable(queries)
180
+ const queriesStore = isSvelteStore(queries) ? queries : readable(queries)
180
181
 
181
182
  const defaultedQueriesStore = derived(queriesStore, ($queries) => {
182
183
  return $queries.map((opts) => {
package/src/types.ts CHANGED
@@ -13,7 +13,7 @@ import type {
13
13
  import type { Readable, Writable } from 'svelte/store'
14
14
 
15
15
  /** Allows a type to be either the base object or a store of that object */
16
- export type WritableOrVal<T> = T | Writable<T>
16
+ export type StoreOrVal<T> = T | Readable<T> | Writable<T>
17
17
 
18
18
  /** Options for createBaseQuery */
19
19
  export type CreateBaseQueryOptions<
@@ -22,7 +22,7 @@ export type CreateBaseQueryOptions<
22
22
  TData = TQueryFnData,
23
23
  TQueryData = TQueryFnData,
24
24
  TQueryKey extends QueryKey = QueryKey,
25
- > = WritableOrVal<
25
+ > = StoreOrVal<
26
26
  QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>
27
27
  >
28
28
 
@@ -54,7 +54,7 @@ export type CreateInfiniteQueryOptions<
54
54
  TQueryData = TQueryFnData,
55
55
  TQueryKey extends QueryKey = QueryKey,
56
56
  TPageParam = unknown,
57
- > = WritableOrVal<
57
+ > = StoreOrVal<
58
58
  InfiniteQueryObserverOptions<
59
59
  TQueryFnData,
60
60
  TError,
@@ -89,7 +89,7 @@ export type CreateMutationOptions<
89
89
  TError = DefaultError,
90
90
  TVariables = void,
91
91
  TContext = unknown,
92
- > = WritableOrVal<
92
+ > = StoreOrVal<
93
93
  Omit<
94
94
  MutationObserverOptions<TData, TError, TVariables, TContext>,
95
95
  '_defaulted' | 'variables'
@@ -3,7 +3,8 @@ import {
3
3
  type QueryClient,
4
4
  notifyManager,
5
5
  } from '@tanstack/query-core'
6
- import { type Readable, readable } from 'svelte/store'
6
+ import { readable } from 'svelte/store'
7
+ import type { Readable } from 'svelte/store'
7
8
  import { useQueryClient } from './useQueryClient'
8
9
 
9
10
  export function useIsFetching(
@@ -3,7 +3,8 @@ import {
3
3
  type QueryClient,
4
4
  notifyManager,
5
5
  } from '@tanstack/query-core'
6
- import { type Readable, readable } from 'svelte/store'
6
+ import { readable } from 'svelte/store'
7
+ import type { Readable } from 'svelte/store'
7
8
  import { useQueryClient } from './useQueryClient'
8
9
 
9
10
  export function useIsMutating(
package/src/utils.ts CHANGED
@@ -1,8 +1,8 @@
1
- import type { Writable } from 'svelte/store'
2
- import type { WritableOrVal } from './types'
1
+ import type { Readable } from 'svelte/store'
2
+ import type { StoreOrVal } from './types'
3
3
 
4
- export function isWritable<T extends object>(
5
- obj: WritableOrVal<T>,
6
- ): obj is Writable<T> {
7
- return 'subscribe' in obj && 'set' in obj && 'update' in obj
4
+ export function isSvelteStore<T extends object>(
5
+ obj: StoreOrVal<T>,
6
+ ): obj is Readable<T> {
7
+ return 'subscribe' in obj && typeof obj.subscribe === 'function'
8
8
  }