@tanstack/solid-query 5.0.0-alpha.32 → 5.0.0-alpha.34
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.
- package/build/cjs/index.js +11 -8
- package/build/cjs/index.js.map +1 -1
- package/build/esm/index.js +11 -8
- package/build/esm/index.js.map +1 -1
- package/build/types/createQueries.d.ts +3 -2
- package/build/umd/index.js +1 -1
- package/build/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/src/__tests__/createQueries.test.tsx +1 -1
- package/src/createQueries.ts +31 -13
- package/build/source/QueryClient.js +0 -6
- package/build/source/QueryClientProvider.jsx +0 -21
- package/build/source/__tests__/QueryClientProvider.test.jsx +0 -121
- package/build/source/__tests__/createInfiniteQuery.test.jsx +0 -1361
- package/build/source/__tests__/createMutation.test.jsx +0 -867
- package/build/source/__tests__/createQueries.test.jsx +0 -590
- package/build/source/__tests__/createQuery.test.jsx +0 -4398
- package/build/source/__tests__/createQuery.types.test.jsx +0 -153
- package/build/source/__tests__/suspense.test.jsx +0 -659
- package/build/source/__tests__/transition.test.jsx +0 -42
- package/build/source/__tests__/useIsFetching.test.jsx +0 -190
- package/build/source/__tests__/useIsMutating.test.jsx +0 -198
- package/build/source/__tests__/utils.jsx +0 -50
- package/build/source/createBaseQuery.js +0 -174
- package/build/source/createInfiniteQuery.js +0 -8
- package/build/source/createMutation.js +0 -38
- package/build/source/createQueries.js +0 -32
- package/build/source/createQuery.js +0 -9
- package/build/source/index.js +0 -15
- package/build/source/setBatchUpdatesFn.js +0 -3
- package/build/source/types.js +0 -2
- package/build/source/useIsFetching.js +0 -12
- package/build/source/useIsMutating.js +0 -12
- package/build/source/utils.js +0 -7
- package/build/types/QueryClient.d.ts.map +0 -1
- package/build/types/QueryClientProvider.d.ts.map +0 -1
- package/build/types/__tests__/QueryClientProvider.test.d.ts.map +0 -1
- package/build/types/__tests__/createInfiniteQuery.test.d.ts.map +0 -1
- package/build/types/__tests__/createMutation.test.d.ts.map +0 -1
- package/build/types/__tests__/createQueries.test.d.ts.map +0 -1
- package/build/types/__tests__/createQuery.test.d.ts.map +0 -1
- package/build/types/__tests__/createQuery.types.test.d.ts.map +0 -1
- package/build/types/__tests__/suspense.test.d.ts.map +0 -1
- package/build/types/__tests__/transition.test.d.ts.map +0 -1
- package/build/types/__tests__/useIsFetching.test.d.ts.map +0 -1
- package/build/types/__tests__/useIsMutating.test.d.ts.map +0 -1
- package/build/types/__tests__/utils.d.ts.map +0 -1
- package/build/types/createBaseQuery.d.ts.map +0 -1
- package/build/types/createInfiniteQuery.d.ts.map +0 -1
- package/build/types/createMutation.d.ts.map +0 -1
- package/build/types/createQueries.d.ts.map +0 -1
- package/build/types/createQuery.d.ts.map +0 -1
- package/build/types/index.d.ts.map +0 -1
- package/build/types/setBatchUpdatesFn.d.ts.map +0 -1
- package/build/types/types.d.ts.map +0 -1
- package/build/types/useIsFetching.d.ts.map +0 -1
- package/build/types/useIsMutating.d.ts.map +0 -1
- package/build/types/utils.d.ts.map +0 -1
package/build/umd/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../src/setBatchUpdatesFn.ts","../../src/QueryClient.ts","../../src/QueryClientProvider.tsx","../../src/utils.ts","../../src/createBaseQuery.ts","../../src/createMutation.ts","../../src/createInfiniteQuery.ts","../../src/createQueries.ts","../../src/createQuery.ts","../../src/useIsFetching.ts","../../src/useIsMutating.ts"],"sourcesContent":["import { notifyManager } from '@tanstack/query-core'\nimport { batch } from 'solid-js'\n\nnotifyManager.setBatchNotifyFunction(batch)\n","import type {\n QueryClientConfig as QueryCoreClientConfig,\n DefaultOptions as CoreDefaultOptions,\n QueryObserverOptions as QueryCoreObserverOptions,\n InfiniteQueryObserverOptions as QueryCoreInfiniteQueryObserverOptions,\n DefaultError,\n QueryKey,\n} from '@tanstack/query-core'\nimport { QueryClient as QueryCoreClient } from '@tanstack/query-core'\n\nexport interface QueryObserverOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n TPageParam = never,\n> extends Omit<\n QueryCoreObserverOptions<\n TQueryFnData,\n TError,\n TData,\n TQueryData,\n TQueryKey,\n TPageParam\n >,\n 'structuralSharing'\n > {\n /**\n * Set this to a reconciliation key to enable reconciliation between query results.\n * Set this to `false` to disable reconciliation between query results.\n * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.\n * Defaults reconciliation key to `id`.\n */\n reconcile?:\n | string\n | false\n | ((oldData: TData | undefined, newData: TData) => TData)\n}\n\nexport interface InfiniteQueryObserverOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n TPageParam = unknown,\n> extends Omit<\n QueryCoreInfiniteQueryObserverOptions<\n TQueryFnData,\n TError,\n TData,\n TQueryData,\n TQueryKey,\n TPageParam\n >,\n 'structuralSharing'\n > {\n /**\n * Set this to a reconciliation key to enable reconciliation between query results.\n * Set this to `false` to disable reconciliation between query results.\n * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.\n * Defaults reconciliation key to `id`.\n */\n reconcile?:\n | string\n | false\n | ((oldData: TData | undefined, newData: TData) => TData)\n}\n\nexport interface DefaultOptions<TError = DefaultError>\n extends CoreDefaultOptions<TError> {\n queries?: QueryObserverOptions<unknown, TError>\n}\n\nexport interface QueryClientConfig extends QueryCoreClientConfig {\n defaultOptions?: DefaultOptions\n}\n\nexport class QueryClient extends QueryCoreClient {\n constructor(config: QueryClientConfig = {}) {\n super(config)\n }\n}\n","import type { QueryClient } from './QueryClient'\nimport type { JSX } from 'solid-js'\nimport { createContext, useContext, onMount, onCleanup } from 'solid-js'\n\nexport const QueryClientContext = createContext<QueryClient | undefined>(\n undefined,\n)\n\nexport const useQueryClient = (queryClient?: QueryClient) => {\n const client = useContext(QueryClientContext)\n\n if (queryClient) {\n return queryClient\n }\n\n if (!client) {\n throw new Error('No QueryClient set, use QueryClientProvider to set one')\n }\n\n return client\n}\n\nexport type QueryClientProviderProps = {\n client: QueryClient\n children?: JSX.Element\n}\n\nexport const QueryClientProvider = (\n props: QueryClientProviderProps,\n): JSX.Element => {\n onMount(() => {\n props.client.mount()\n })\n onCleanup(() => props.client.unmount())\n\n return (\n <QueryClientContext.Provider value={props.client}>\n {props.children}\n </QueryClientContext.Provider>\n )\n}\n","export function shouldThrowError<T extends (...args: any[]) => boolean>(\n throwError: boolean | T | undefined,\n params: Parameters<T>,\n): boolean {\n // Allow throwError function to override throwing behavior on a per-error basis\n if (typeof throwError === 'function') {\n return throwError(...params)\n }\n\n return !!throwError\n}\n","/* eslint-disable @typescript-eslint/no-unnecessary-condition */\n// Had to disable the lint rule because isServer type is defined as false\n// in solid-js/web package. I'll create a GitHub issue with them to see\n// why that happens.\nimport type {\n QueryKey,\n QueryObserver,\n QueryObserverResult,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { hydrate } from '@tanstack/query-core'\nimport { notifyManager } from '@tanstack/query-core'\nimport type { Accessor } from 'solid-js'\nimport { isServer } from 'solid-js/web'\nimport {\n createComputed,\n createMemo,\n createResource,\n on,\n onCleanup,\n} from 'solid-js'\nimport { createStore, reconcile, unwrap } from 'solid-js/store'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { CreateBaseQueryOptions } from './types'\nimport { shouldThrowError } from './utils'\n\nfunction reconcileFn<TData, TError>(\n store: QueryObserverResult<TData, TError>,\n result: QueryObserverResult<TData, TError>,\n reconcileOption:\n | string\n | false\n | ((oldData: TData | undefined, newData: TData) => TData),\n): QueryObserverResult<TData, TError> {\n if (reconcileOption === false) return result\n if (typeof reconcileOption === 'function') {\n const newData = reconcileOption(store.data, result.data as TData)\n return { ...result, data: newData } as typeof result\n }\n const newData = reconcile(result.data, { key: reconcileOption })(store.data)\n return { ...result, data: newData } as typeof result\n}\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n TQueryFnData,\n TError,\n TData,\n TQueryData,\n TQueryKey extends QueryKey,\n>(\n options: Accessor<\n CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>\n >,\n Observer: typeof QueryObserver,\n queryClient?: Accessor<QueryClient>,\n) {\n const client = createMemo(() => useQueryClient(queryClient?.()))\n\n const defaultedOptions = client().defaultQueryOptions(options())\n defaultedOptions._optimisticResults = 'optimistic'\n defaultedOptions.structuralSharing = false\n if (isServer) {\n defaultedOptions.retry = false\n defaultedOptions.throwOnError = true\n }\n const observer = new Observer(client(), defaultedOptions)\n\n const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n observer.getOptimisticResult(defaultedOptions),\n )\n\n const createServerSubscriber = (\n resolve: (\n data:\n | QueryObserverResult<TData, TError>\n | PromiseLike<QueryObserverResult<TData, TError> | undefined>\n | undefined,\n ) => void,\n reject: (reason?: any) => void,\n ) => {\n return observer.subscribe((result) => {\n notifyManager.batchCalls(() => {\n const query = observer.getCurrentQuery()\n const { refetch, ...rest } = unwrap(result)\n const unwrappedResult = {\n ...rest,\n\n // hydrate() expects a QueryState object, which is similar but not\n // quite the same as a QueryObserverResult object. Thus, for now, we're\n // copying over the missing properties from state in order to support hydration\n dataUpdateCount: query.state.dataUpdateCount,\n fetchFailureCount: query.state.fetchFailureCount,\n // Removing these properties since they might not be serializable\n // fetchFailureReason: query.state.fetchFailureReason,\n // fetchMeta: query.state.fetchMeta,\n isInvalidated: query.state.isInvalidated,\n }\n\n if (unwrappedResult.isError) {\n if (process.env['NODE_ENV'] === 'development') {\n console.error(unwrappedResult.error)\n }\n reject(unwrappedResult.error)\n }\n if (unwrappedResult.isSuccess) {\n // Use of any here is fine\n // We cannot include refetch since it is not serializable\n resolve(unwrappedResult as any)\n }\n })()\n })\n }\n\n const createClientSubscriber = () => {\n return observer.subscribe((result) => {\n notifyManager.batchCalls(() => {\n // @ts-expect-error - This will error because the reconcile option does not\n // exist on the query-core QueryObserverResult type\n const reconcileOptions = observer.options.reconcile\n // If the query has data we dont suspend but instead mutate the resource\n // This could happen when placeholderData/initialData is defined\n if (queryResource()?.data && result.data && !queryResource.loading) {\n setState((store) => {\n return reconcileFn(\n store,\n result,\n reconcileOptions === undefined ? 'id' : reconcileOptions,\n )\n })\n mutate(state)\n } else {\n setState((store) => {\n return reconcileFn(\n store,\n result,\n reconcileOptions === undefined ? 'id' : reconcileOptions,\n )\n })\n refetch()\n }\n })()\n })\n }\n\n /**\n * Unsubscribe is set lazily, so that we can subscribe after hydration when needed.\n */\n let unsubscribe: (() => void) | null = null\n\n const [queryResource, { refetch, mutate }] = createResource<\n QueryObserverResult<TData, TError> | undefined\n >(\n () => {\n return new Promise((resolve, reject) => {\n if (isServer) {\n unsubscribe = createServerSubscriber(resolve, reject)\n } else {\n if (!unsubscribe) {\n unsubscribe = createClientSubscriber()\n }\n }\n if (!state.isLoading) {\n resolve(state)\n }\n })\n },\n {\n initialValue: state,\n\n // If initialData is provided, we resolve the resource immediately\n ssrLoadFrom: options().initialData ? 'initial' : 'server',\n\n get deferStream() {\n return options().deferStream\n },\n\n /**\n * If this resource was populated on the server (either sync render, or streamed in over time), onHydrated\n * will be called. This is the point at which we can hydrate the query cache state, and setup the query subscriber.\n *\n * Leveraging onHydrated allows us to plug into the async and streaming support that solidjs resources already support.\n *\n * Note that this is only invoked on the client, for queries that were originally run on the server.\n */\n onHydrated(_k, info) {\n if (info.value) {\n hydrate(client(), {\n queries: [\n {\n queryKey: defaultedOptions.queryKey,\n queryHash: defaultedOptions.queryHash,\n state: info.value,\n },\n ],\n })\n }\n\n if (!unsubscribe) {\n /**\n * Do not refetch query on mount if query was fetched on server,\n * even if `staleTime` is not set.\n */\n const newOptions = { ...defaultedOptions }\n if (defaultedOptions.staleTime || !defaultedOptions.initialData) {\n newOptions.refetchOnMount = false\n }\n // Setting the options as an immutable object to prevent\n // wonky behavior with observer subscriptions\n observer.setOptions(newOptions)\n setState(observer.getOptimisticResult(newOptions))\n unsubscribe = createClientSubscriber()\n }\n },\n },\n )\n\n onCleanup(() => {\n if (unsubscribe) {\n unsubscribe()\n unsubscribe = null\n }\n })\n\n createComputed(\n on(\n () => client().defaultQueryOptions(options()),\n () => observer.setOptions(client().defaultQueryOptions(options())),\n {\n // Defer because we don't need to trigger on first render\n // This only cares about changes to options after the observer is created\n defer: true,\n },\n ),\n )\n\n createComputed(\n on(\n () => state.status,\n () => {\n if (\n state.isError &&\n !state.isFetching &&\n shouldThrowError(observer.options.throwOnError, [\n state.error,\n observer.getCurrentQuery(),\n ])\n ) {\n throw state.error\n }\n },\n ),\n )\n\n const handler = {\n get(\n target: QueryObserverResult<TData, TError>,\n prop: keyof QueryObserverResult<TData, TError>,\n ): any {\n const val = queryResource()?.[prop]\n return val !== undefined ? val : Reflect.get(target, prop)\n },\n }\n\n return new Proxy(state, handler)\n}\n","import type { DefaultError } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { MutationObserver } from '@tanstack/query-core'\nimport { useQueryClient } from './QueryClientProvider'\nimport type {\n CreateMutateFunction,\n CreateMutationOptions,\n CreateMutationResult,\n} from './types'\nimport type { Accessor } from 'solid-js'\nimport { createComputed, onCleanup, on } from 'solid-js'\nimport { createStore } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// HOOK\nexport function createMutation<\n TData = unknown,\n TError = DefaultError,\n TVariables = void,\n TContext = unknown,\n>(\n options: CreateMutationOptions<TData, TError, TVariables, TContext>,\n queryClient?: Accessor<QueryClient>,\n): CreateMutationResult<TData, TError, TVariables, TContext> {\n const client = useQueryClient(queryClient?.())\n\n const observer = new MutationObserver<TData, TError, TVariables, TContext>(\n client,\n options(),\n )\n\n const mutate: CreateMutateFunction<TData, TError, TVariables, TContext> = (\n variables,\n mutateOptions,\n ) => {\n observer.mutate(variables, mutateOptions).catch(noop)\n }\n\n const [state, setState] = createStore<\n CreateMutationResult<TData, TError, TVariables, TContext>\n >({\n ...observer.getCurrentResult(),\n mutate,\n mutateAsync: observer.getCurrentResult().mutate,\n })\n\n createComputed(() => {\n observer.setOptions(options())\n })\n\n createComputed(\n on(\n () => state.status,\n () => {\n if (\n state.isError &&\n shouldThrowError(observer.options.throwOnError, [state.error])\n ) {\n throw state.error\n }\n },\n ),\n )\n\n const unsubscribe = observer.subscribe((result) => {\n setState({\n ...result,\n mutate,\n mutateAsync: result.mutate,\n })\n })\n\n onCleanup(unsubscribe)\n\n return state\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-function\nfunction noop() {}\n","import type {\n QueryObserver,\n QueryKey,\n DefaultError,\n InfiniteData,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { InfiniteQueryObserver } from '@tanstack/query-core'\nimport type {\n CreateInfiniteQueryOptions,\n CreateInfiniteQueryResult,\n} from './types'\nimport { createBaseQuery } from './createBaseQuery'\nimport { createMemo } from 'solid-js'\nimport type { Accessor } from 'solid-js'\n\nexport function createInfiniteQuery<\n TQueryFnData,\n TError = DefaultError,\n TData = InfiniteData<TQueryFnData>,\n TQueryKey extends QueryKey = QueryKey,\n TPageParam = unknown,\n>(\n options: CreateInfiniteQueryOptions<\n TQueryFnData,\n TError,\n TData,\n TQueryKey,\n TPageParam\n >,\n queryClient?: Accessor<QueryClient>,\n): CreateInfiniteQueryResult<TData, TError> {\n return createBaseQuery(\n createMemo(() => options()),\n // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n InfiniteQueryObserver as typeof QueryObserver,\n queryClient,\n ) as CreateInfiniteQueryResult<TData, TError>\n}\n","import type {\n QueriesPlaceholderDataFunction,\n QueryFunction,\n QueryKey,\n DefaultError,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport type { Accessor } from 'solid-js'\nimport { createComputed, onCleanup, onMount } from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { CreateQueryResult, SolidQueryOptions } from './types'\n\n// This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype CreateQueryOptionsForCreateQueries<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n 'placeholderData'\n> & {\n placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n T extends {\n queryFnData: infer TQueryFnData\n error?: infer TError\n data: infer TData\n }\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData>\n : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>\n : T extends { data: infer TData; error?: infer TError }\n ? CreateQueryOptionsForCreateQueries<unknown, TError, TData>\n : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n T extends [infer TQueryFnData, infer TError, infer TData]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData>\n : T extends [infer TQueryFnData, infer TError]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>\n : T extends [infer TQueryFnData]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData>\n : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n T extends {\n queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n select: (data: any) => infer TData\n }\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey>\n : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }\n ? CreateQueryOptionsForCreateQueries<\n TQueryFnData,\n Error,\n TQueryFnData,\n TQueryKey\n >\n : // Fallback\n CreateQueryOptionsForCreateQueries\n\ntype GetResults<T> =\n // Part 1: responsible for mapping explicit type parameter to function result, if object\n T extends { queryFnData: any; error?: infer TError; data: infer TData }\n ? CreateQueryResult<TData, TError>\n : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n ? CreateQueryResult<TQueryFnData, TError>\n : T extends { data: infer TData; error?: infer TError }\n ? CreateQueryResult<TData, TError>\n : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n T extends [any, infer TError, infer TData]\n ? CreateQueryResult<TData, TError>\n : T extends [infer TQueryFnData, infer TError]\n ? CreateQueryResult<TQueryFnData, TError>\n : T extends [infer TQueryFnData]\n ? CreateQueryResult<TQueryFnData>\n : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n T extends {\n queryFn?: QueryFunction<unknown, any>\n select: (data: any) => infer TData\n }\n ? CreateQueryResult<TData>\n : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }\n ? CreateQueryResult<TQueryFnData>\n : // Fallback\n CreateQueryResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n T extends any[],\n Result extends any[] = [],\n Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n ? CreateQueryOptionsForCreateQueries[]\n : T extends []\n ? []\n : T extends [infer Head]\n ? [...Result, GetOptions<Head>]\n : T extends [infer Head, ...infer Tail]\n ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>\n : unknown[] extends T\n ? T\n : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n // use this to infer the param types in the case of Array.map() argument\n T extends CreateQueryOptionsForCreateQueries<\n infer TQueryFnData,\n infer TError,\n infer TData,\n infer TQueryKey\n >[]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>[]\n : // Fallback\n CreateQueryOptionsForCreateQueries[]\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n T extends any[],\n Result extends any[] = [],\n Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n ? CreateQueryResult[]\n : T extends []\n ? []\n : T extends [infer Head]\n ? [...Result, GetResults<Head>]\n : T extends [infer Head, ...infer Tail]\n ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>\n : T extends CreateQueryOptionsForCreateQueries<\n infer TQueryFnData,\n infer TError,\n infer TData,\n any\n >[]\n ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results\n CreateQueryResult<\n unknown extends TData ? TQueryFnData : TData,\n unknown extends TError ? DefaultError : TError\n >[]\n : // Fallback\n CreateQueryResult[]\n\nexport function createQueries<T extends any[]>(\n queriesOptions: Accessor<{\n queries: readonly [...QueriesOptions<T>]\n }>,\n queryClient?: Accessor<QueryClient>,\n): QueriesResults<T> {\n const client = useQueryClient(queryClient?.())\n\n const defaultedQueries = queriesOptions().queries.map((options) => {\n const defaultedOptions = client.defaultQueryOptions(options)\n defaultedOptions._optimisticResults = 'optimistic'\n return defaultedOptions\n })\n\n const observer = new QueriesObserver(client, defaultedQueries)\n\n const [state, setState] = createStore(\n observer.getOptimisticResult(defaultedQueries),\n )\n\n const unsubscribe = observer.subscribe((result) => {\n notifyManager.batchCalls(() => {\n setState(unwrap(result))\n })()\n })\n\n onCleanup(unsubscribe)\n\n onMount(() => {\n observer.setQueries(defaultedQueries, { listeners: false })\n })\n\n createComputed(() => {\n const updatedQueries = queriesOptions().queries.map((options) => {\n const defaultedOptions = client.defaultQueryOptions(options)\n defaultedOptions._optimisticResults = 'optimistic'\n return defaultedOptions\n })\n observer.setQueries(updatedQueries)\n })\n\n return state as QueriesResults<T>\n}\n","import type { QueryKey, DefaultError } from '@tanstack/query-core'\nimport { QueryObserver } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport type { Accessor } from 'solid-js'\nimport { createMemo } from 'solid-js'\nimport { createBaseQuery } from './createBaseQuery'\nimport type {\n CreateQueryOptions,\n CreateQueryResult,\n DefinedCreateQueryResult,\n FunctionedParams,\n SolidQueryOptions,\n} from './types'\n\ntype UndefinedInitialDataOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n> = FunctionedParams<\n SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n initialData?: undefined\n }\n>\n\ntype DefinedInitialDataOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n> = FunctionedParams<\n SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n initialData: TQueryFnData | (() => TQueryFnData)\n }\n>\n\nexport function queryOptions<\n TQueryFnData = unknown,\n TError = unknown,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions<\n TQueryFnData = unknown,\n TError = unknown,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions(options: unknown) {\n return options\n}\n\nexport function createQuery<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n queryClient?: () => QueryClient,\n): CreateQueryResult<TData, TError>\n\nexport function createQuery<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n queryClient?: () => QueryClient,\n): DefinedCreateQueryResult<TData, TError>\nexport function createQuery<\n TQueryFnData,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n queryClient?: Accessor<QueryClient>,\n) {\n return createBaseQuery(\n createMemo(() => options()),\n QueryObserver,\n queryClient,\n )\n}\n","import type { QueryFilters } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport type { Accessor } from 'solid-js'\nimport { createMemo, createSignal, onCleanup } from 'solid-js'\nimport { useQueryClient } from './QueryClientProvider'\n\nexport function useIsFetching(\n filters?: Accessor<QueryFilters>,\n queryClient?: Accessor<QueryClient>,\n): Accessor<number> {\n const client = createMemo(() => useQueryClient(queryClient?.()))\n const queryCache = createMemo(() => client().getQueryCache())\n\n const [fetches, setFetches] = createSignal(client().isFetching(filters?.()))\n\n const unsubscribe = queryCache().subscribe(() => {\n setFetches(client().isFetching(filters?.()))\n })\n\n onCleanup(unsubscribe)\n\n return fetches\n}\n","import type { MutationFilters } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { Accessor } from 'solid-js'\nimport { createSignal, onCleanup, createMemo } from 'solid-js'\n\nexport function useIsMutating(\n filters?: Accessor<MutationFilters>,\n queryClient?: Accessor<QueryClient>,\n): Accessor<number> {\n const client = createMemo(() => useQueryClient(queryClient?.()))\n const mutationCache = createMemo(() => client().getMutationCache())\n\n const [mutations, setMutations] = createSignal(\n client().isMutating(filters?.()),\n )\n\n const unsubscribe = mutationCache().subscribe((_result) => {\n setMutations(client().isMutating(filters?.()))\n })\n\n onCleanup(unsubscribe)\n\n return mutations\n}\n"],"names":["notifyManager","setBatchNotifyFunction","batch","QueryClient","QueryCoreClient","constructor","config","super","QueryClientContext","createContext","undefined","useQueryClient","queryClient","client","useContext","Error","shouldThrowError","throwError","params","reconcileFn","store","result","reconcileOption","newData","data","reconcile","key","createBaseQuery","options","Observer","createMemo","defaultedOptions","defaultQueryOptions","_optimisticResults","structuralSharing","isServer","retry","throwOnError","observer","state","setState","createStore","getOptimisticResult","createClientSubscriber","subscribe","batchCalls","reconcileOptions","queryResource","loading","mutate","refetch","unsubscribe","createResource","Promise","resolve","reject","query","getCurrentQuery","rest","unwrap","unwrappedResult","dataUpdateCount","fetchFailureCount","isInvalidated","isError","process","env","console","error","isSuccess","createServerSubscriber","isLoading","initialValue","ssrLoadFrom","initialData","deferStream","onHydrated","_k","info","value","hydrate","queries","queryKey","queryHash","newOptions","staleTime","refetchOnMount","setOptions","onCleanup","createComputed","on","defer","status","isFetching","Proxy","get","target","prop","val","Reflect","noop","props","onMount","mount","unmount","_$createComponent","createComponent","Provider","children","InfiniteQueryObserver","MutationObserver","variables","mutateOptions","catch","getCurrentResult","mutateAsync","queriesOptions","defaultedQueries","map","QueriesObserver","setQueries","listeners","updatedQueries","QueryObserver","filters","queryCache","getQueryCache","fetches","setFetches","createSignal","mutationCache","getMutationCache","mutations","setMutations","isMutating","_result"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../src/setBatchUpdatesFn.ts","../../src/QueryClient.ts","../../src/QueryClientProvider.tsx","../../src/utils.ts","../../src/createBaseQuery.ts","../../src/createMutation.ts","../../src/createInfiniteQuery.ts","../../src/createQueries.ts","../../src/createQuery.ts","../../src/useIsFetching.ts","../../src/useIsMutating.ts"],"sourcesContent":["import { notifyManager } from '@tanstack/query-core'\nimport { batch } from 'solid-js'\n\nnotifyManager.setBatchNotifyFunction(batch)\n","import type {\n QueryClientConfig as QueryCoreClientConfig,\n DefaultOptions as CoreDefaultOptions,\n QueryObserverOptions as QueryCoreObserverOptions,\n InfiniteQueryObserverOptions as QueryCoreInfiniteQueryObserverOptions,\n DefaultError,\n QueryKey,\n} from '@tanstack/query-core'\nimport { QueryClient as QueryCoreClient } from '@tanstack/query-core'\n\nexport interface QueryObserverOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n TPageParam = never,\n> extends Omit<\n QueryCoreObserverOptions<\n TQueryFnData,\n TError,\n TData,\n TQueryData,\n TQueryKey,\n TPageParam\n >,\n 'structuralSharing'\n > {\n /**\n * Set this to a reconciliation key to enable reconciliation between query results.\n * Set this to `false` to disable reconciliation between query results.\n * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.\n * Defaults reconciliation key to `id`.\n */\n reconcile?:\n | string\n | false\n | ((oldData: TData | undefined, newData: TData) => TData)\n}\n\nexport interface InfiniteQueryObserverOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n TPageParam = unknown,\n> extends Omit<\n QueryCoreInfiniteQueryObserverOptions<\n TQueryFnData,\n TError,\n TData,\n TQueryData,\n TQueryKey,\n TPageParam\n >,\n 'structuralSharing'\n > {\n /**\n * Set this to a reconciliation key to enable reconciliation between query results.\n * Set this to `false` to disable reconciliation between query results.\n * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.\n * Defaults reconciliation key to `id`.\n */\n reconcile?:\n | string\n | false\n | ((oldData: TData | undefined, newData: TData) => TData)\n}\n\nexport interface DefaultOptions<TError = DefaultError>\n extends CoreDefaultOptions<TError> {\n queries?: QueryObserverOptions<unknown, TError>\n}\n\nexport interface QueryClientConfig extends QueryCoreClientConfig {\n defaultOptions?: DefaultOptions\n}\n\nexport class QueryClient extends QueryCoreClient {\n constructor(config: QueryClientConfig = {}) {\n super(config)\n }\n}\n","import type { QueryClient } from './QueryClient'\nimport type { JSX } from 'solid-js'\nimport { createContext, useContext, onMount, onCleanup } from 'solid-js'\n\nexport const QueryClientContext = createContext<QueryClient | undefined>(\n undefined,\n)\n\nexport const useQueryClient = (queryClient?: QueryClient) => {\n const client = useContext(QueryClientContext)\n\n if (queryClient) {\n return queryClient\n }\n\n if (!client) {\n throw new Error('No QueryClient set, use QueryClientProvider to set one')\n }\n\n return client\n}\n\nexport type QueryClientProviderProps = {\n client: QueryClient\n children?: JSX.Element\n}\n\nexport const QueryClientProvider = (\n props: QueryClientProviderProps,\n): JSX.Element => {\n onMount(() => {\n props.client.mount()\n })\n onCleanup(() => props.client.unmount())\n\n return (\n <QueryClientContext.Provider value={props.client}>\n {props.children}\n </QueryClientContext.Provider>\n )\n}\n","export function shouldThrowError<T extends (...args: any[]) => boolean>(\n throwError: boolean | T | undefined,\n params: Parameters<T>,\n): boolean {\n // Allow throwError function to override throwing behavior on a per-error basis\n if (typeof throwError === 'function') {\n return throwError(...params)\n }\n\n return !!throwError\n}\n","/* eslint-disable @typescript-eslint/no-unnecessary-condition */\n// Had to disable the lint rule because isServer type is defined as false\n// in solid-js/web package. I'll create a GitHub issue with them to see\n// why that happens.\nimport type {\n QueryKey,\n QueryObserver,\n QueryObserverResult,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { hydrate } from '@tanstack/query-core'\nimport { notifyManager } from '@tanstack/query-core'\nimport type { Accessor } from 'solid-js'\nimport { isServer } from 'solid-js/web'\nimport {\n createComputed,\n createMemo,\n createResource,\n on,\n onCleanup,\n} from 'solid-js'\nimport { createStore, reconcile, unwrap } from 'solid-js/store'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { CreateBaseQueryOptions } from './types'\nimport { shouldThrowError } from './utils'\n\nfunction reconcileFn<TData, TError>(\n store: QueryObserverResult<TData, TError>,\n result: QueryObserverResult<TData, TError>,\n reconcileOption:\n | string\n | false\n | ((oldData: TData | undefined, newData: TData) => TData),\n): QueryObserverResult<TData, TError> {\n if (reconcileOption === false) return result\n if (typeof reconcileOption === 'function') {\n const newData = reconcileOption(store.data, result.data as TData)\n return { ...result, data: newData } as typeof result\n }\n const newData = reconcile(result.data, { key: reconcileOption })(store.data)\n return { ...result, data: newData } as typeof result\n}\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n TQueryFnData,\n TError,\n TData,\n TQueryData,\n TQueryKey extends QueryKey,\n>(\n options: Accessor<\n CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>\n >,\n Observer: typeof QueryObserver,\n queryClient?: Accessor<QueryClient>,\n) {\n const client = createMemo(() => useQueryClient(queryClient?.()))\n\n const defaultedOptions = client().defaultQueryOptions(options())\n defaultedOptions._optimisticResults = 'optimistic'\n defaultedOptions.structuralSharing = false\n if (isServer) {\n defaultedOptions.retry = false\n defaultedOptions.throwOnError = true\n }\n const observer = new Observer(client(), defaultedOptions)\n\n const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n observer.getOptimisticResult(defaultedOptions),\n )\n\n const createServerSubscriber = (\n resolve: (\n data:\n | QueryObserverResult<TData, TError>\n | PromiseLike<QueryObserverResult<TData, TError> | undefined>\n | undefined,\n ) => void,\n reject: (reason?: any) => void,\n ) => {\n return observer.subscribe((result) => {\n notifyManager.batchCalls(() => {\n const query = observer.getCurrentQuery()\n const { refetch, ...rest } = unwrap(result)\n const unwrappedResult = {\n ...rest,\n\n // hydrate() expects a QueryState object, which is similar but not\n // quite the same as a QueryObserverResult object. Thus, for now, we're\n // copying over the missing properties from state in order to support hydration\n dataUpdateCount: query.state.dataUpdateCount,\n fetchFailureCount: query.state.fetchFailureCount,\n // Removing these properties since they might not be serializable\n // fetchFailureReason: query.state.fetchFailureReason,\n // fetchMeta: query.state.fetchMeta,\n isInvalidated: query.state.isInvalidated,\n }\n\n if (unwrappedResult.isError) {\n if (process.env['NODE_ENV'] === 'development') {\n console.error(unwrappedResult.error)\n }\n reject(unwrappedResult.error)\n }\n if (unwrappedResult.isSuccess) {\n // Use of any here is fine\n // We cannot include refetch since it is not serializable\n resolve(unwrappedResult as any)\n }\n })()\n })\n }\n\n const createClientSubscriber = () => {\n return observer.subscribe((result) => {\n notifyManager.batchCalls(() => {\n // @ts-expect-error - This will error because the reconcile option does not\n // exist on the query-core QueryObserverResult type\n const reconcileOptions = observer.options.reconcile\n // If the query has data we dont suspend but instead mutate the resource\n // This could happen when placeholderData/initialData is defined\n if (queryResource()?.data && result.data && !queryResource.loading) {\n setState((store) => {\n return reconcileFn(\n store,\n result,\n reconcileOptions === undefined ? 'id' : reconcileOptions,\n )\n })\n mutate(state)\n } else {\n setState((store) => {\n return reconcileFn(\n store,\n result,\n reconcileOptions === undefined ? 'id' : reconcileOptions,\n )\n })\n refetch()\n }\n })()\n })\n }\n\n /**\n * Unsubscribe is set lazily, so that we can subscribe after hydration when needed.\n */\n let unsubscribe: (() => void) | null = null\n\n const [queryResource, { refetch, mutate }] = createResource<\n QueryObserverResult<TData, TError> | undefined\n >(\n () => {\n return new Promise((resolve, reject) => {\n if (isServer) {\n unsubscribe = createServerSubscriber(resolve, reject)\n } else {\n if (!unsubscribe) {\n unsubscribe = createClientSubscriber()\n }\n }\n if (!state.isLoading) {\n resolve(state)\n }\n })\n },\n {\n initialValue: state,\n\n // If initialData is provided, we resolve the resource immediately\n ssrLoadFrom: options().initialData ? 'initial' : 'server',\n\n get deferStream() {\n return options().deferStream\n },\n\n /**\n * If this resource was populated on the server (either sync render, or streamed in over time), onHydrated\n * will be called. This is the point at which we can hydrate the query cache state, and setup the query subscriber.\n *\n * Leveraging onHydrated allows us to plug into the async and streaming support that solidjs resources already support.\n *\n * Note that this is only invoked on the client, for queries that were originally run on the server.\n */\n onHydrated(_k, info) {\n if (info.value) {\n hydrate(client(), {\n queries: [\n {\n queryKey: defaultedOptions.queryKey,\n queryHash: defaultedOptions.queryHash,\n state: info.value,\n },\n ],\n })\n }\n\n if (!unsubscribe) {\n /**\n * Do not refetch query on mount if query was fetched on server,\n * even if `staleTime` is not set.\n */\n const newOptions = { ...defaultedOptions }\n if (defaultedOptions.staleTime || !defaultedOptions.initialData) {\n newOptions.refetchOnMount = false\n }\n // Setting the options as an immutable object to prevent\n // wonky behavior with observer subscriptions\n observer.setOptions(newOptions)\n setState(observer.getOptimisticResult(newOptions))\n unsubscribe = createClientSubscriber()\n }\n },\n },\n )\n\n onCleanup(() => {\n if (unsubscribe) {\n unsubscribe()\n unsubscribe = null\n }\n })\n\n createComputed(\n on(\n () => client().defaultQueryOptions(options()),\n () => observer.setOptions(client().defaultQueryOptions(options())),\n {\n // Defer because we don't need to trigger on first render\n // This only cares about changes to options after the observer is created\n defer: true,\n },\n ),\n )\n\n createComputed(\n on(\n () => state.status,\n () => {\n if (\n state.isError &&\n !state.isFetching &&\n shouldThrowError(observer.options.throwOnError, [\n state.error,\n observer.getCurrentQuery(),\n ])\n ) {\n throw state.error\n }\n },\n ),\n )\n\n const handler = {\n get(\n target: QueryObserverResult<TData, TError>,\n prop: keyof QueryObserverResult<TData, TError>,\n ): any {\n const val = queryResource()?.[prop]\n return val !== undefined ? val : Reflect.get(target, prop)\n },\n }\n\n return new Proxy(state, handler)\n}\n","import type { DefaultError } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { MutationObserver } from '@tanstack/query-core'\nimport { useQueryClient } from './QueryClientProvider'\nimport type {\n CreateMutateFunction,\n CreateMutationOptions,\n CreateMutationResult,\n} from './types'\nimport type { Accessor } from 'solid-js'\nimport { createComputed, onCleanup, on } from 'solid-js'\nimport { createStore } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// HOOK\nexport function createMutation<\n TData = unknown,\n TError = DefaultError,\n TVariables = void,\n TContext = unknown,\n>(\n options: CreateMutationOptions<TData, TError, TVariables, TContext>,\n queryClient?: Accessor<QueryClient>,\n): CreateMutationResult<TData, TError, TVariables, TContext> {\n const client = useQueryClient(queryClient?.())\n\n const observer = new MutationObserver<TData, TError, TVariables, TContext>(\n client,\n options(),\n )\n\n const mutate: CreateMutateFunction<TData, TError, TVariables, TContext> = (\n variables,\n mutateOptions,\n ) => {\n observer.mutate(variables, mutateOptions).catch(noop)\n }\n\n const [state, setState] = createStore<\n CreateMutationResult<TData, TError, TVariables, TContext>\n >({\n ...observer.getCurrentResult(),\n mutate,\n mutateAsync: observer.getCurrentResult().mutate,\n })\n\n createComputed(() => {\n observer.setOptions(options())\n })\n\n createComputed(\n on(\n () => state.status,\n () => {\n if (\n state.isError &&\n shouldThrowError(observer.options.throwOnError, [state.error])\n ) {\n throw state.error\n }\n },\n ),\n )\n\n const unsubscribe = observer.subscribe((result) => {\n setState({\n ...result,\n mutate,\n mutateAsync: result.mutate,\n })\n })\n\n onCleanup(unsubscribe)\n\n return state\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-function\nfunction noop() {}\n","import type {\n QueryObserver,\n QueryKey,\n DefaultError,\n InfiniteData,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { InfiniteQueryObserver } from '@tanstack/query-core'\nimport type {\n CreateInfiniteQueryOptions,\n CreateInfiniteQueryResult,\n} from './types'\nimport { createBaseQuery } from './createBaseQuery'\nimport { createMemo } from 'solid-js'\nimport type { Accessor } from 'solid-js'\n\nexport function createInfiniteQuery<\n TQueryFnData,\n TError = DefaultError,\n TData = InfiniteData<TQueryFnData>,\n TQueryKey extends QueryKey = QueryKey,\n TPageParam = unknown,\n>(\n options: CreateInfiniteQueryOptions<\n TQueryFnData,\n TError,\n TData,\n TQueryKey,\n TPageParam\n >,\n queryClient?: Accessor<QueryClient>,\n): CreateInfiniteQueryResult<TData, TError> {\n return createBaseQuery(\n createMemo(() => options()),\n // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n InfiniteQueryObserver as typeof QueryObserver,\n queryClient,\n ) as CreateInfiniteQueryResult<TData, TError>\n}\n","import type {\n QueriesPlaceholderDataFunction,\n QueryFunction,\n QueryKey,\n DefaultError,\n QueriesObserverOptions,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport type { Accessor } from 'solid-js'\nimport { createComputed, onCleanup } from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { CreateQueryResult, SolidQueryOptions } from './types'\n\n// This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype CreateQueryOptionsForCreateQueries<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n 'placeholderData'\n> & {\n placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n T extends {\n queryFnData: infer TQueryFnData\n error?: infer TError\n data: infer TData\n }\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData>\n : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>\n : T extends { data: infer TData; error?: infer TError }\n ? CreateQueryOptionsForCreateQueries<unknown, TError, TData>\n : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n T extends [infer TQueryFnData, infer TError, infer TData]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData>\n : T extends [infer TQueryFnData, infer TError]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>\n : T extends [infer TQueryFnData]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData>\n : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n T extends {\n queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n select: (data: any) => infer TData\n }\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey>\n : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }\n ? CreateQueryOptionsForCreateQueries<\n TQueryFnData,\n Error,\n TQueryFnData,\n TQueryKey\n >\n : // Fallback\n CreateQueryOptionsForCreateQueries\n\ntype GetResults<T> =\n // Part 1: responsible for mapping explicit type parameter to function result, if object\n T extends { queryFnData: any; error?: infer TError; data: infer TData }\n ? CreateQueryResult<TData, TError>\n : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n ? CreateQueryResult<TQueryFnData, TError>\n : T extends { data: infer TData; error?: infer TError }\n ? CreateQueryResult<TData, TError>\n : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n T extends [any, infer TError, infer TData]\n ? CreateQueryResult<TData, TError>\n : T extends [infer TQueryFnData, infer TError]\n ? CreateQueryResult<TQueryFnData, TError>\n : T extends [infer TQueryFnData]\n ? CreateQueryResult<TQueryFnData>\n : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n T extends {\n queryFn?: QueryFunction<unknown, any>\n select: (data: any) => infer TData\n }\n ? CreateQueryResult<TData>\n : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }\n ? CreateQueryResult<TQueryFnData>\n : // Fallback\n CreateQueryResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n T extends any[],\n Result extends any[] = [],\n Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n ? CreateQueryOptionsForCreateQueries[]\n : T extends []\n ? []\n : T extends [infer Head]\n ? [...Result, GetOptions<Head>]\n : T extends [infer Head, ...infer Tail]\n ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>\n : unknown[] extends T\n ? T\n : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n // use this to infer the param types in the case of Array.map() argument\n T extends CreateQueryOptionsForCreateQueries<\n infer TQueryFnData,\n infer TError,\n infer TData,\n infer TQueryKey\n >[]\n ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>[]\n : // Fallback\n CreateQueryOptionsForCreateQueries[]\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n T extends any[],\n Result extends any[] = [],\n Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n ? CreateQueryResult[]\n : T extends []\n ? []\n : T extends [infer Head]\n ? [...Result, GetResults<Head>]\n : T extends [infer Head, ...infer Tail]\n ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>\n : T extends CreateQueryOptionsForCreateQueries<\n infer TQueryFnData,\n infer TError,\n infer TData,\n any\n >[]\n ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results\n CreateQueryResult<\n unknown extends TData ? TQueryFnData : TData,\n unknown extends TError ? DefaultError : TError\n >[]\n : // Fallback\n CreateQueryResult[]\n\nexport function createQueries<\n T extends any[],\n TCombinedResult = QueriesResults<T>,\n>(\n queriesOptions: Accessor<{\n queries: readonly [...QueriesOptions<T>]\n combine?: (result: QueriesResults<T>) => TCombinedResult\n }>,\n queryClient?: Accessor<QueryClient>,\n): TCombinedResult {\n const client = useQueryClient(queryClient?.())\n\n const defaultedQueries = queriesOptions().queries.map((options) => {\n const defaultedOptions = client.defaultQueryOptions(options)\n defaultedOptions._optimisticResults = 'optimistic'\n return defaultedOptions\n })\n\n const observer = new QueriesObserver(\n client,\n defaultedQueries,\n queriesOptions().combine\n ? ({\n combine: queriesOptions().combine,\n } as QueriesObserverOptions<TCombinedResult>)\n : undefined,\n )\n\n // @ts-expect-error - Types issue with solid-js createStore\n const [state, setState] = createStore<TCombinedResult>(\n observer.getOptimisticResult(defaultedQueries)[1](),\n )\n\n const unsubscribe = observer.subscribe((result) => {\n notifyManager.batchCalls(() => {\n setState(unwrap(result) as unknown as TCombinedResult)\n })()\n })\n\n onCleanup(unsubscribe)\n\n createComputed(() => {\n const updatedQueries = queriesOptions().queries.map((options) => {\n const defaultedOptions = client.defaultQueryOptions(options)\n defaultedOptions._optimisticResults = 'optimistic'\n return defaultedOptions\n })\n observer.setQueries(\n updatedQueries,\n queriesOptions().combine\n ? ({\n combine: queriesOptions().combine,\n } as QueriesObserverOptions<TCombinedResult>)\n : undefined,\n { listeners: false },\n )\n })\n\n return state\n}\n","import type { QueryKey, DefaultError } from '@tanstack/query-core'\nimport { QueryObserver } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport type { Accessor } from 'solid-js'\nimport { createMemo } from 'solid-js'\nimport { createBaseQuery } from './createBaseQuery'\nimport type {\n CreateQueryOptions,\n CreateQueryResult,\n DefinedCreateQueryResult,\n FunctionedParams,\n SolidQueryOptions,\n} from './types'\n\ntype UndefinedInitialDataOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n> = FunctionedParams<\n SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n initialData?: undefined\n }\n>\n\ntype DefinedInitialDataOptions<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n> = FunctionedParams<\n SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n initialData: TQueryFnData | (() => TQueryFnData)\n }\n>\n\nexport function queryOptions<\n TQueryFnData = unknown,\n TError = unknown,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions<\n TQueryFnData = unknown,\n TError = unknown,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions(options: unknown) {\n return options\n}\n\nexport function createQuery<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n queryClient?: () => QueryClient,\n): CreateQueryResult<TData, TError>\n\nexport function createQuery<\n TQueryFnData = unknown,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n queryClient?: () => QueryClient,\n): DefinedCreateQueryResult<TData, TError>\nexport function createQuery<\n TQueryFnData,\n TError = DefaultError,\n TData = TQueryFnData,\n TQueryKey extends QueryKey = QueryKey,\n>(\n options: CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n queryClient?: Accessor<QueryClient>,\n) {\n return createBaseQuery(\n createMemo(() => options()),\n QueryObserver,\n queryClient,\n )\n}\n","import type { QueryFilters } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport type { Accessor } from 'solid-js'\nimport { createMemo, createSignal, onCleanup } from 'solid-js'\nimport { useQueryClient } from './QueryClientProvider'\n\nexport function useIsFetching(\n filters?: Accessor<QueryFilters>,\n queryClient?: Accessor<QueryClient>,\n): Accessor<number> {\n const client = createMemo(() => useQueryClient(queryClient?.()))\n const queryCache = createMemo(() => client().getQueryCache())\n\n const [fetches, setFetches] = createSignal(client().isFetching(filters?.()))\n\n const unsubscribe = queryCache().subscribe(() => {\n setFetches(client().isFetching(filters?.()))\n })\n\n onCleanup(unsubscribe)\n\n return fetches\n}\n","import type { MutationFilters } from '@tanstack/query-core'\nimport type { QueryClient } from './QueryClient'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { Accessor } from 'solid-js'\nimport { createSignal, onCleanup, createMemo } from 'solid-js'\n\nexport function useIsMutating(\n filters?: Accessor<MutationFilters>,\n queryClient?: Accessor<QueryClient>,\n): Accessor<number> {\n const client = createMemo(() => useQueryClient(queryClient?.()))\n const mutationCache = createMemo(() => client().getMutationCache())\n\n const [mutations, setMutations] = createSignal(\n client().isMutating(filters?.()),\n )\n\n const unsubscribe = mutationCache().subscribe((_result) => {\n setMutations(client().isMutating(filters?.()))\n })\n\n onCleanup(unsubscribe)\n\n return mutations\n}\n"],"names":["notifyManager","setBatchNotifyFunction","batch","QueryClient","QueryCoreClient","constructor","config","super","QueryClientContext","createContext","undefined","useQueryClient","queryClient","client","useContext","Error","shouldThrowError","throwError","params","reconcileFn","store","result","reconcileOption","newData","data","reconcile","key","createBaseQuery","options","Observer","createMemo","defaultedOptions","defaultQueryOptions","_optimisticResults","structuralSharing","isServer","retry","throwOnError","observer","state","setState","createStore","getOptimisticResult","createClientSubscriber","subscribe","batchCalls","reconcileOptions","queryResource","loading","mutate","refetch","unsubscribe","createResource","Promise","resolve","reject","query","getCurrentQuery","rest","unwrap","unwrappedResult","dataUpdateCount","fetchFailureCount","isInvalidated","isError","process","env","console","error","isSuccess","createServerSubscriber","isLoading","initialValue","ssrLoadFrom","initialData","deferStream","onHydrated","_k","info","value","hydrate","queries","queryKey","queryHash","newOptions","staleTime","refetchOnMount","setOptions","onCleanup","createComputed","on","defer","status","isFetching","Proxy","get","target","prop","val","Reflect","noop","props","onMount","mount","unmount","_$createComponent","createComponent","Provider","children","InfiniteQueryObserver","MutationObserver","variables","mutateOptions","catch","getCurrentResult","mutateAsync","queriesOptions","defaultedQueries","map","QueriesObserver","combine","updatedQueries","setQueries","listeners","QueryObserver","filters","queryCache","getQueryCache","fetches","setFetches","createSignal","mutationCache","getMutationCache","mutations","setMutations","isMutating","_result"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/solid-query",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.34",
|
|
4
4
|
"description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
|
|
5
5
|
"author": "tannerlinsley",
|
|
6
6
|
"license": "MIT",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"vite-plugin-solid": "^2.3.9"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@tanstack/query-core": "5.0.0-alpha.
|
|
46
|
+
"@tanstack/query-core": "5.0.0-alpha.34"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"solid-js": "^1.6.13"
|
|
@@ -672,7 +672,7 @@ describe('useQueries', () => {
|
|
|
672
672
|
const QueriesObserverSpy = vi
|
|
673
673
|
.spyOn(QueriesObserverModule, 'QueriesObserver')
|
|
674
674
|
.mockImplementation((fn) => {
|
|
675
|
-
return new QueriesObserverMock(fn)
|
|
675
|
+
return new QueriesObserverMock(fn, [])
|
|
676
676
|
})
|
|
677
677
|
|
|
678
678
|
function Queries() {
|
package/src/createQueries.ts
CHANGED
|
@@ -3,11 +3,12 @@ import type {
|
|
|
3
3
|
QueryFunction,
|
|
4
4
|
QueryKey,
|
|
5
5
|
DefaultError,
|
|
6
|
+
QueriesObserverOptions,
|
|
6
7
|
} from '@tanstack/query-core'
|
|
7
8
|
import { notifyManager, QueriesObserver } from '@tanstack/query-core'
|
|
8
9
|
import type { QueryClient } from './QueryClient'
|
|
9
10
|
import type { Accessor } from 'solid-js'
|
|
10
|
-
import { createComputed, onCleanup
|
|
11
|
+
import { createComputed, onCleanup } from 'solid-js'
|
|
11
12
|
import { createStore, unwrap } from 'solid-js/store'
|
|
12
13
|
import { useQueryClient } from './QueryClientProvider'
|
|
13
14
|
import type { CreateQueryResult, SolidQueryOptions } from './types'
|
|
@@ -148,12 +149,16 @@ export type QueriesResults<
|
|
|
148
149
|
: // Fallback
|
|
149
150
|
CreateQueryResult[]
|
|
150
151
|
|
|
151
|
-
export function createQueries<
|
|
152
|
+
export function createQueries<
|
|
153
|
+
T extends any[],
|
|
154
|
+
TCombinedResult = QueriesResults<T>,
|
|
155
|
+
>(
|
|
152
156
|
queriesOptions: Accessor<{
|
|
153
157
|
queries: readonly [...QueriesOptions<T>]
|
|
158
|
+
combine?: (result: QueriesResults<T>) => TCombinedResult
|
|
154
159
|
}>,
|
|
155
160
|
queryClient?: Accessor<QueryClient>,
|
|
156
|
-
):
|
|
161
|
+
): TCombinedResult {
|
|
157
162
|
const client = useQueryClient(queryClient?.())
|
|
158
163
|
|
|
159
164
|
const defaultedQueries = queriesOptions().queries.map((options) => {
|
|
@@ -162,32 +167,45 @@ export function createQueries<T extends any[]>(
|
|
|
162
167
|
return defaultedOptions
|
|
163
168
|
})
|
|
164
169
|
|
|
165
|
-
const observer = new QueriesObserver(
|
|
170
|
+
const observer = new QueriesObserver(
|
|
171
|
+
client,
|
|
172
|
+
defaultedQueries,
|
|
173
|
+
queriesOptions().combine
|
|
174
|
+
? ({
|
|
175
|
+
combine: queriesOptions().combine,
|
|
176
|
+
} as QueriesObserverOptions<TCombinedResult>)
|
|
177
|
+
: undefined,
|
|
178
|
+
)
|
|
166
179
|
|
|
167
|
-
|
|
168
|
-
|
|
180
|
+
// @ts-expect-error - Types issue with solid-js createStore
|
|
181
|
+
const [state, setState] = createStore<TCombinedResult>(
|
|
182
|
+
observer.getOptimisticResult(defaultedQueries)[1](),
|
|
169
183
|
)
|
|
170
184
|
|
|
171
185
|
const unsubscribe = observer.subscribe((result) => {
|
|
172
186
|
notifyManager.batchCalls(() => {
|
|
173
|
-
setState(unwrap(result))
|
|
187
|
+
setState(unwrap(result) as unknown as TCombinedResult)
|
|
174
188
|
})()
|
|
175
189
|
})
|
|
176
190
|
|
|
177
191
|
onCleanup(unsubscribe)
|
|
178
192
|
|
|
179
|
-
onMount(() => {
|
|
180
|
-
observer.setQueries(defaultedQueries, { listeners: false })
|
|
181
|
-
})
|
|
182
|
-
|
|
183
193
|
createComputed(() => {
|
|
184
194
|
const updatedQueries = queriesOptions().queries.map((options) => {
|
|
185
195
|
const defaultedOptions = client.defaultQueryOptions(options)
|
|
186
196
|
defaultedOptions._optimisticResults = 'optimistic'
|
|
187
197
|
return defaultedOptions
|
|
188
198
|
})
|
|
189
|
-
observer.setQueries(
|
|
199
|
+
observer.setQueries(
|
|
200
|
+
updatedQueries,
|
|
201
|
+
queriesOptions().combine
|
|
202
|
+
? ({
|
|
203
|
+
combine: queriesOptions().combine,
|
|
204
|
+
} as QueriesObserverOptions<TCombinedResult>)
|
|
205
|
+
: undefined,
|
|
206
|
+
{ listeners: false },
|
|
207
|
+
)
|
|
190
208
|
})
|
|
191
209
|
|
|
192
|
-
return state
|
|
210
|
+
return state
|
|
193
211
|
}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import { createContext, useContext, onMount, onCleanup } from 'solid-js';
|
|
2
|
-
export const QueryClientContext = createContext(undefined);
|
|
3
|
-
export const useQueryClient = (queryClient) => {
|
|
4
|
-
const client = useContext(QueryClientContext);
|
|
5
|
-
if (queryClient) {
|
|
6
|
-
return queryClient;
|
|
7
|
-
}
|
|
8
|
-
if (!client) {
|
|
9
|
-
throw new Error('No QueryClient set, use QueryClientProvider to set one');
|
|
10
|
-
}
|
|
11
|
-
return client;
|
|
12
|
-
};
|
|
13
|
-
export const QueryClientProvider = (props) => {
|
|
14
|
-
onMount(() => {
|
|
15
|
-
props.client.mount();
|
|
16
|
-
});
|
|
17
|
-
onCleanup(() => props.client.unmount());
|
|
18
|
-
return (<QueryClientContext.Provider value={props.client}>
|
|
19
|
-
{props.children}
|
|
20
|
-
</QueryClientContext.Provider>);
|
|
21
|
-
};
|
|
@@ -1,121 +0,0 @@
|
|
|
1
|
-
import { render, screen, waitFor } from 'solid-testing-library';
|
|
2
|
-
import { queryKey } from './utils';
|
|
3
|
-
import { QueryCache } from '@tanstack/query-core';
|
|
4
|
-
import { createQuery, QueryClientProvider, useQueryClient } from '..';
|
|
5
|
-
import { createQueryClient, sleep } from './utils';
|
|
6
|
-
import { vi } from 'vitest';
|
|
7
|
-
describe('QueryClientProvider', () => {
|
|
8
|
-
it('sets a specific cache for all queries to use', async () => {
|
|
9
|
-
const key = queryKey();
|
|
10
|
-
const queryCache = new QueryCache();
|
|
11
|
-
const queryClient = createQueryClient({ queryCache });
|
|
12
|
-
function Page() {
|
|
13
|
-
const query = createQuery(() => ({
|
|
14
|
-
queryKey: key,
|
|
15
|
-
queryFn: async () => {
|
|
16
|
-
await sleep(10);
|
|
17
|
-
return 'test';
|
|
18
|
-
},
|
|
19
|
-
}));
|
|
20
|
-
return (<div>
|
|
21
|
-
<h1>{query.data}</h1>
|
|
22
|
-
</div>);
|
|
23
|
-
}
|
|
24
|
-
render(() => (<QueryClientProvider client={queryClient}>
|
|
25
|
-
<Page />
|
|
26
|
-
</QueryClientProvider>));
|
|
27
|
-
await waitFor(() => {
|
|
28
|
-
return screen.getByText('test');
|
|
29
|
-
});
|
|
30
|
-
expect(queryCache.find({ queryKey: key })).toBeDefined();
|
|
31
|
-
});
|
|
32
|
-
it('allows multiple caches to be partitioned', async () => {
|
|
33
|
-
const key1 = queryKey();
|
|
34
|
-
const key2 = queryKey();
|
|
35
|
-
const queryCache1 = new QueryCache();
|
|
36
|
-
const queryCache2 = new QueryCache();
|
|
37
|
-
const queryClient1 = createQueryClient({ queryCache: queryCache1 });
|
|
38
|
-
const queryClient2 = createQueryClient({ queryCache: queryCache2 });
|
|
39
|
-
function Page1() {
|
|
40
|
-
const query = createQuery(() => ({
|
|
41
|
-
queryKey: key1,
|
|
42
|
-
queryFn: async () => {
|
|
43
|
-
await sleep(10);
|
|
44
|
-
return 'test1';
|
|
45
|
-
},
|
|
46
|
-
}));
|
|
47
|
-
return (<div>
|
|
48
|
-
<h1>{query.data}</h1>
|
|
49
|
-
</div>);
|
|
50
|
-
}
|
|
51
|
-
function Page2() {
|
|
52
|
-
const query = createQuery(() => ({
|
|
53
|
-
queryKey: key2,
|
|
54
|
-
queryFn: async () => {
|
|
55
|
-
await sleep(10);
|
|
56
|
-
return 'test2';
|
|
57
|
-
},
|
|
58
|
-
}));
|
|
59
|
-
return (<div>
|
|
60
|
-
<h1>{query.data}</h1>
|
|
61
|
-
</div>);
|
|
62
|
-
}
|
|
63
|
-
render(() => (<>
|
|
64
|
-
<QueryClientProvider client={queryClient1}>
|
|
65
|
-
<Page1 />
|
|
66
|
-
</QueryClientProvider>
|
|
67
|
-
<QueryClientProvider client={queryClient2}>
|
|
68
|
-
<Page2 />
|
|
69
|
-
</QueryClientProvider>
|
|
70
|
-
</>));
|
|
71
|
-
await waitFor(() => screen.getByText('test1'));
|
|
72
|
-
await waitFor(() => screen.getByText('test2'));
|
|
73
|
-
expect(queryCache1.find({ queryKey: key1 })).toBeDefined();
|
|
74
|
-
expect(queryCache1.find({ queryKey: key2 })).not.toBeDefined();
|
|
75
|
-
expect(queryCache2.find({ queryKey: key1 })).not.toBeDefined();
|
|
76
|
-
expect(queryCache2.find({ queryKey: key2 })).toBeDefined();
|
|
77
|
-
});
|
|
78
|
-
it("uses defaultOptions for queries when they don't provide their own config", async () => {
|
|
79
|
-
const key = queryKey();
|
|
80
|
-
const queryCache = new QueryCache();
|
|
81
|
-
const queryClient = createQueryClient({
|
|
82
|
-
queryCache,
|
|
83
|
-
defaultOptions: {
|
|
84
|
-
queries: {
|
|
85
|
-
gcTime: Infinity,
|
|
86
|
-
},
|
|
87
|
-
},
|
|
88
|
-
});
|
|
89
|
-
function Page() {
|
|
90
|
-
const query = createQuery(() => ({
|
|
91
|
-
queryKey: key,
|
|
92
|
-
queryFn: async () => {
|
|
93
|
-
await sleep(10);
|
|
94
|
-
return 'test';
|
|
95
|
-
},
|
|
96
|
-
}));
|
|
97
|
-
return (<div>
|
|
98
|
-
<h1>{query.data}</h1>
|
|
99
|
-
</div>);
|
|
100
|
-
}
|
|
101
|
-
render(() => (<QueryClientProvider client={queryClient}>
|
|
102
|
-
<Page />
|
|
103
|
-
</QueryClientProvider>));
|
|
104
|
-
await waitFor(() => screen.getByText('test'));
|
|
105
|
-
expect(queryCache.find({ queryKey: key })).toBeDefined();
|
|
106
|
-
expect(queryCache.find({ queryKey: key })?.options.gcTime).toBe(Infinity);
|
|
107
|
-
});
|
|
108
|
-
describe('useQueryClient', () => {
|
|
109
|
-
it('should throw an error if no query client has been set', () => {
|
|
110
|
-
const consoleMock = vi
|
|
111
|
-
.spyOn(console, 'error')
|
|
112
|
-
.mockImplementation(() => undefined);
|
|
113
|
-
function Page() {
|
|
114
|
-
useQueryClient();
|
|
115
|
-
return null;
|
|
116
|
-
}
|
|
117
|
-
expect(() => render(() => <Page />)).toThrow('No QueryClient set, use QueryClientProvider to set one');
|
|
118
|
-
consoleMock.mockRestore();
|
|
119
|
-
});
|
|
120
|
-
});
|
|
121
|
-
});
|