@tanstack/solid-query 5.0.0-alpha.4 → 5.0.0-alpha.6

package/build/umd/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/setBatchUpdatesFn.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 { QueryClient } from '@tanstack/query-core'\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  QueryClient,\n  QueryKey,\n  QueryObserver,\n  QueryObserverResult,\n} from '@tanstack/query-core'\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  onMount,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { CreateBaseQueryOptions } from './types'\nimport { shouldThrowError } from './utils'\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  if (isServer) {\n    defaultedOptions.retry = false\n    defaultedOptions.throwErrors = 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 unwrappedResult = { ...unwrap(result) }\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          resolve(unwrappedResult)\n        }\n      })()\n    })\n  }\n\n  const createClientSubscriber = () => {\n    return observer.subscribe((result) => {\n      notifyManager.batchCalls(() => {\n        const unwrappedResult = { ...unwrap(result) }\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 (\n          queryResource()?.data &&\n          unwrappedResult.data &&\n          !queryResource.loading\n        ) {\n          setState(unwrappedResult)\n          mutate(state)\n        } else {\n          setState(unwrappedResult)\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  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    observer.setOptions(client().defaultQueryOptions(options()))\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.throwErrors, [\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      if (prop === 'data') {\n        return queryResource()?.data\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler)\n}\n","import type { QueryClient, DefaultError } from '@tanstack/query-core'\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.throwErrors, [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  QueryClient,\n  DefaultError,\n  InfiniteData,\n} from '@tanstack/query-core'\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  QueryClient,\n  QueryFunction,\n  QueryKey,\n  DefaultError,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\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 { QueryClient, QueryKey, DefaultError } from '@tanstack/query-core'\nimport { QueryObserver } from '@tanstack/query-core'\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 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 { QueryClient, QueryFilters } from '@tanstack/query-core'\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, QueryClient } from '@tanstack/query-core'\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","QueryClientContext","createContext","undefined","useQueryClient","queryClient","client","useContext","Error","shouldThrowError","throwError","params","createBaseQuery","options","Observer","createMemo","defaultedOptions","defaultQueryOptions","_optimisticResults","isServer","retry","throwErrors","observer","state","setState","createStore","getOptimisticResult","createClientSubscriber","subscribe","result","batchCalls","unwrappedResult","unwrap","queryResource","data","loading","mutate","refetch","unsubscribe","createResource","Promise","resolve","reject","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","onMount","listeners","createComputed","on","status","isFetching","getCurrentQuery","Proxy","get","target","prop","Reflect","noop","props","mount","unmount","_$createComponent","createComponent","Provider","children","InfiniteQueryObserver","MutationObserver","variables","mutateOptions","catch","getCurrentResult","mutateAsync","queriesOptions","defaultedQueries","map","QueriesObserver","setQueries","updatedQueries","QueryObserver","filters","queryCache","getQueryCache","fetches","setFetches","createSignal","mutationCache","getMutationCache","mutations","setMutations","isMutating","_result"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../src/setBatchUpdatesFn.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 { QueryClient } from '@tanstack/query-core'\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  QueryClient,\n  QueryKey,\n  QueryObserver,\n  QueryObserverResult,\n} from '@tanstack/query-core'\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  onMount,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { CreateBaseQueryOptions } from './types'\nimport { shouldThrowError } from './utils'\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  if (isServer) {\n    defaultedOptions.retry = false\n    defaultedOptions.throwErrors = 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 unwrappedResult = { ...unwrap(result) }\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          resolve(unwrappedResult)\n        }\n      })()\n    })\n  }\n\n  const createClientSubscriber = () => {\n    return observer.subscribe((result) => {\n      notifyManager.batchCalls(() => {\n        const unwrappedResult = { ...unwrap(result) }\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 (\n          queryResource()?.data &&\n          unwrappedResult.data &&\n          !queryResource.loading\n        ) {\n          setState(unwrappedResult)\n          mutate(state)\n        } else {\n          setState(unwrappedResult)\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  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    observer.setOptions(client().defaultQueryOptions(options()))\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.throwErrors, [\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      if (prop === 'data') {\n        return queryResource()?.data\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler)\n}\n","import type { QueryClient, DefaultError } from '@tanstack/query-core'\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.throwErrors, [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  QueryClient,\n  DefaultError,\n  InfiniteData,\n} from '@tanstack/query-core'\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  QueryClient,\n  QueryFunction,\n  QueryKey,\n  DefaultError,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\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 { QueryClient, QueryKey, DefaultError } from '@tanstack/query-core'\nimport { QueryObserver } from '@tanstack/query-core'\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 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 { QueryClient, QueryFilters } from '@tanstack/query-core'\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, QueryClient } from '@tanstack/query-core'\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","QueryClientContext","createContext","undefined","useQueryClient","queryClient","client","useContext","Error","shouldThrowError","throwError","params","createBaseQuery","options","Observer","createMemo","defaultedOptions","defaultQueryOptions","_optimisticResults","isServer","retry","throwErrors","observer","state","setState","createStore","getOptimisticResult","createClientSubscriber","subscribe","result","batchCalls","unwrappedResult","unwrap","queryResource","data","loading","mutate","refetch","unsubscribe","createResource","Promise","resolve","reject","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","onMount","listeners","createComputed","on","status","isFetching","getCurrentQuery","Proxy","get","target","prop","Reflect","noop","props","mount","unmount","_$createComponent","createComponent","Provider","children","InfiniteQueryObserver","MutationObserver","variables","mutateOptions","catch","getCurrentResult","mutateAsync","queriesOptions","defaultedQueries","map","QueriesObserver","setQueries","updatedQueries","QueryObserver","filters","queryCache","getQueryCache","fetches","setFetches","createSignal","mutationCache","getMutationCache","mutations","setMutations","isMutating","_result"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.0.0-alpha.4",
+  "version": "5.0.0-alpha.6",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -40,10 +40,10 @@
     "src"
   ],
   "devDependencies": {
-    "solid-jest": "^0.2.0"
+    "vite-plugin-solid": "^2.3.9"
   },
   "dependencies": {
-    "@tanstack/query-core": "5.0.0-alpha.3"
+    "@tanstack/query-core": "5.0.0-alpha.6"
   },
   "peerDependencies": {
     "solid-js": "^1.6.2"
@@ -53,7 +53,7 @@
     "clean": "rimraf ./build",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
     "test:types": "tsc",
-    "test:lib": "jest --config ./jest.config.ts",
+    "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build:types": "tsc --build"
   }

package/src/__tests__/QueryClientProvider.test.tsx

@@ -4,6 +4,7 @@ import { queryKey } from './utils'
 import { QueryCache } from '@tanstack/query-core'
 import { createQuery, QueryClientProvider, useQueryClient } from '..'
 import { createQueryClient, sleep } from './utils'
+import { vi } from 'vitest'
 
 describe('QueryClientProvider', () => {
   it('sets a specific cache for all queries to use', async () => {
@@ -145,7 +146,7 @@ describe('QueryClientProvider', () => {
 
   describe('useQueryClient', () => {
     it('should throw an error if no query client has been set', () => {
-      const consoleMock = jest
+      const consoleMock = vi
         .spyOn(console, 'error')
         .mockImplementation(() => undefined)
 

package/src/__tests__/createInfiniteQuery.test.tsx

@@ -23,6 +23,8 @@ import {
   keepPreviousData,
 } from '..'
 import { Blink, queryKey, setActTimeout } from './utils'
+import { vi } from 'vitest'
+import type { Mock } from 'vitest'
 
 interface Result {
   items: number[]
@@ -712,14 +714,14 @@ describe('useInfiniteQuery', () => {
   it('should silently cancel an ongoing fetchNextPage request when another fetchNextPage is invoked', async () => {
     const key = queryKey()
     const start = 10
-    const onAborts: jest.Mock<any, any>[] = []
-    const abortListeners: jest.Mock<any, any>[] = []
-    const fetchPage = jest.fn<
-      Promise<number>,
-      [QueryFunctionContext<typeof key, number>]
+    const onAborts: Mock<any, any>[] = []
+    const abortListeners: Mock<any, any>[] = []
+    const fetchPage = vi.fn<
+      [QueryFunctionContext<typeof key, number>],
+      Promise<number>
     >(async ({ pageParam, signal }) => {
-      const onAbort = jest.fn()
-      const abortListener = jest.fn()
+      const onAbort = vi.fn()
+      const abortListener = vi.fn()
       onAborts.push(onAbort)
       abortListeners.push(abortListener)
       signal.onabort = onAbort
@@ -794,14 +796,14 @@ describe('useInfiniteQuery', () => {
   it('should not cancel an ongoing fetchNextPage request when another fetchNextPage is invoked if `cancelRefetch: false` is used ', async () => {
     const key = queryKey()
     const start = 10
-    const onAborts: jest.Mock<any, any>[] = []
-    const abortListeners: jest.Mock<any, any>[] = []
-    const fetchPage = jest.fn<
-      Promise<number>,
-      [QueryFunctionContext<typeof key, number>]
+    const onAborts: Mock<any, any>[] = []
+    const abortListeners: Mock<any, any>[] = []
+    const fetchPage = vi.fn<
+      [QueryFunctionContext<typeof key, number>],
+      Promise<number>
     >(async ({ pageParam, signal }) => {
-      const onAbort = jest.fn()
-      const abortListener = jest.fn()
+      const onAbort = vi.fn()
+      const abortListener = vi.fn()
       onAborts.push(onAbort)
       abortListeners.push(abortListener)
       signal.onabort = onAbort
@@ -1396,7 +1398,7 @@ describe('useInfiniteQuery', () => {
           >
             <Match when={state.status === 'pending'}>Loading...</Match>
             <Match when={state.status === 'error'}>
-              <span>Error: {state.error!.message}</span>
+              <span>Error: {state.error?.message}</span>
             </Match>
           </Switch>
         </div>
@@ -1523,7 +1525,7 @@ describe('useInfiniteQuery', () => {
           >
             <Match when={state.status === 'pending'}>Loading...</Match>
             <Match when={state.status === 'error'}>
-              <span>Error: {state.error!.message}</span>
+              <span>Error: {state.error?.message}</span>
             </Match>
           </Switch>
         </div>
@@ -1587,11 +1589,11 @@ describe('useInfiniteQuery', () => {
 
   it('should cancel the query function when there are no more subscriptions', async () => {
     const key = queryKey()
-    let cancelFn: jest.Mock = jest.fn()
+    let cancelFn: Mock = vi.fn()
 
     const queryFn = ({ signal }: { signal?: AbortSignal }) => {
       const promise = new Promise<string>((resolve, reject) => {
-        cancelFn = jest.fn(() => reject('Cancelled'))
+        cancelFn = vi.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
         sleep(20).then(() => resolve('OK'))
       })

package/src/__tests__/createMutation.test.tsx

@@ -20,6 +20,7 @@ import {
   setActTimeout,
   sleep,
 } from './utils'
+import { vi } from 'vitest'
 
 describe('createMutation', () => {
   const queryCache = new QueryCache()
@@ -108,8 +109,8 @@ describe('createMutation', () => {
 
   it('should be able to call `onSuccess` and `onSettled` after each successful mutate', async () => {
     const [count, setCount] = createSignal(0)
-    const onSuccessMock = jest.fn()
-    const onSettledMock = jest.fn()
+    const onSuccessMock = vi.fn()
+    const onSettledMock = vi.fn()
 
     function Page() {
       const mutation = createMutation(() => ({
@@ -174,7 +175,7 @@ describe('createMutation', () => {
     const [count, setCount] = createSignal(0)
     type Value = { count: number }
 
-    const mutateFn = jest.fn<Promise<Value>, [value: Value]>()
+    const mutateFn = vi.fn<[value: Value], Promise<Value>>()
 
     mutateFn.mockImplementationOnce(() => {
       return Promise.reject(new Error('Error test Jonas'))
@@ -231,8 +232,8 @@ describe('createMutation', () => {
   })
 
   it('should be able to call `onError` and `onSettled` after each failed mutate', async () => {
-    const onErrorMock = jest.fn()
-    const onSettledMock = jest.fn()
+    const onErrorMock = vi.fn()
+    const onSettledMock = vi.fn()
     const [count, setCount] = createSignal(0)
 
     function Page() {
@@ -562,7 +563,7 @@ describe('createMutation', () => {
 
   it('should call onMutate even if paused', async () => {
     const onlineMock = mockNavigatorOnLine(false)
-    const onMutate = jest.fn()
+    const onMutate = vi.fn()
     let count = 0
 
     function Page() {
@@ -870,8 +871,8 @@ describe('createMutation', () => {
   })
 
   it('should pass meta to mutation', async () => {
-    const errorMock = jest.fn()
-    const successMock = jest.fn()
+    const errorMock = vi.fn()
+    const successMock = vi.fn()
 
     const queryClientMutationMeta = createQueryClient({
       mutationCache: new MutationCache({
@@ -930,10 +931,10 @@ describe('createMutation', () => {
   })
 
   it('should call cache callbacks when unmounted', async () => {
-    const onSuccess = jest.fn()
-    const onSuccessMutate = jest.fn()
-    const onSettled = jest.fn()
-    const onSettledMutate = jest.fn()
+    const onSuccess = vi.fn()
+    const onSuccessMutate = vi.fn()
+    const onSettled = vi.fn()
+    const onSettledMutate = vi.fn()
     const mutationKey = queryKey()
     let count = 0
 
@@ -1006,10 +1007,10 @@ describe('createMutation', () => {
   })
 
   it('should call mutate callbacks only for the last observer', async () => {
-    const onSuccess = jest.fn()
-    const onSuccessMutate = jest.fn()
-    const onSettled = jest.fn()
-    const onSettledMutate = jest.fn()
+    const onSuccess = vi.fn()
+    const onSuccessMutate = vi.fn()
+    const onSettled = vi.fn()
+    const onSettledMutate = vi.fn()
     let count = 0
 
     function Page() {
@@ -1072,7 +1073,7 @@ describe('createMutation', () => {
 
   it('should go to error state if onSuccess callback errors', async () => {
     const error = new Error('error from onSuccess')
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const mutation = createMutation(() => ({
@@ -1148,7 +1149,7 @@ describe('createMutation', () => {
   it('should go to error state if onSettled callback errors', async () => {
     const error = new Error('error from onSettled')
     const mutateFnError = new Error('mutateFnError')
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const mutation = createMutation(() => ({

package/src/__tests__/createQueries.test.tsx

@@ -23,6 +23,7 @@ import {
   queryKey,
   sleep,
 } from './utils'
+import { vi } from 'vitest'
 
 describe('useQueries', () => {
   const queryCache = new QueryCache()
@@ -739,7 +740,7 @@ describe('useQueries', () => {
       }
     }
 
-    const QueriesObserverSpy = jest
+    const QueriesObserverSpy = vi
       .spyOn(QueriesObserverModule, 'QueriesObserver')
       .mockImplementation((fn) => {
         return new QueriesObserverMock(fn)
@@ -789,29 +790,4 @@ describe('useQueries', () => {
     await sleep(20)
     QueriesObserverSpy.mockRestore()
   })
-
-  it('should use provided custom queryClient', async () => {
-    const key = queryKey()
-    const queryFn = () => {
-      return Promise.resolve('custom client')
-    }
-
-    function Page() {
-      const state = createQueries(
-        () => ({
-          queries: [{ queryKey: key, queryFn }],
-        }),
-        () => queryClient,
-      )
-      return (
-        <div>
-          <h1>Status: {state[0].data}</h1>
-        </div>
-      )
-    }
-
-    render(() => <Page />)
-
-    await waitFor(() => screen.getByText('Status: custom client'))
-  })
 })

package/src/__tests__/createQuery.test.tsx

@@ -33,6 +33,8 @@ import {
   setActTimeout,
   sleep,
 } from './utils'
+import { vi } from 'vitest'
+import type { Mock } from 'vitest'
 
 describe('createQuery', () => {
   const queryCache = new QueryCache()
@@ -491,7 +493,7 @@ describe('createQuery', () => {
   it('should call onSuccess after a query has been fetched', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -523,7 +525,7 @@ describe('createQuery', () => {
   it('should call onSuccess after a disabled query has been fetched', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -561,7 +563,7 @@ describe('createQuery', () => {
   it('should not call onSuccess if a component has unmounted', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const [show, setShow] = createSignal(true)
@@ -601,7 +603,7 @@ describe('createQuery', () => {
   it('should call onError after a query has been fetched with an error', async () => {
     const key = queryKey()
     const states: CreateQueryResult<unknown>[] = []
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -632,7 +634,7 @@ describe('createQuery', () => {
 
   it('should not call onError when receiving a CancelledError', async () => {
     const key = queryKey()
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -666,7 +668,7 @@ describe('createQuery', () => {
   it('should call onSettled after a query has been fetched', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSettled = jest.fn()
+    const onSettled = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -696,7 +698,7 @@ describe('createQuery', () => {
   it('should call onSettled after a query has been fetched with an error', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSettled = jest.fn()
+    const onSettled = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -2452,7 +2454,7 @@ describe('createQuery', () => {
 
   it('should not refetch query on focus when `enabled` is set to `false`', async () => {
     const key = queryKey()
-    const queryFn = jest.fn<string, unknown[]>().mockReturnValue('data')
+    const queryFn = vi.fn<unknown[], string>().mockReturnValue('data')
 
     function Page() {
       const { data = 'default' } = createQuery(() => ({
@@ -3296,7 +3298,7 @@ describe('createQuery', () => {
   it('should retry specified number of times', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
     queryFn.mockImplementation(() => {
       return Promise.reject(new Error('Error test Barrett'))
     })
@@ -3337,7 +3339,7 @@ describe('createQuery', () => {
   it('should not retry if retry function `false`', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
 
     queryFn.mockImplementationOnce(() => {
       return Promise.reject(new Error('Error test Tanner'))
@@ -3385,7 +3387,7 @@ describe('createQuery', () => {
 
     type DelayError = { delay: number }
 
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
     queryFn.mockImplementation(() => {
       return Promise.reject({ delay: 50 })
     })
@@ -3596,10 +3598,10 @@ describe('createQuery', () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
 
-    const queryFn = jest.fn<string, unknown[]>()
+    const queryFn = vi.fn<unknown[], string>()
     queryFn.mockImplementation(() => 'data')
 
-    const prefetchQueryFn = jest.fn<string, unknown[]>()
+    const prefetchQueryFn = vi.fn<unknown[], string>()
     prefetchQueryFn.mockImplementation(() => 'not yet...')
 
     await queryClient.prefetchQuery({
@@ -3633,10 +3635,10 @@ describe('createQuery', () => {
   it('should not refetch if not stale after a prefetch', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<string, unknown[]>()
+    const queryFn = vi.fn<unknown[], string>()
     queryFn.mockImplementation(() => 'data')
 
-    const prefetchQueryFn = jest.fn<Promise<string>, unknown[]>()
+    const prefetchQueryFn = vi.fn<unknown[], Promise<string>>()
     prefetchQueryFn.mockImplementation(async () => {
       await sleep(10)
       return 'not yet...'
@@ -3909,7 +3911,7 @@ describe('createQuery', () => {
 
   it('it should support enabled:false in query object syntax', async () => {
     const key = queryKey()
-    const queryFn = jest.fn<string, unknown[]>()
+    const queryFn = vi.fn<unknown[], string>()
     queryFn.mockImplementation(() => 'data')
 
     function Page() {
@@ -3981,7 +3983,7 @@ describe('createQuery', () => {
     ))
 
     await waitFor(() => screen.getByText('fetched data'))
-    const setTimeoutSpy = jest.spyOn(window, 'setTimeout')
+    const setTimeoutSpy = vi.spyOn(window, 'setTimeout')
 
     result.unmount()
 
@@ -4007,7 +4009,7 @@ describe('createQuery', () => {
     ))
 
     await waitFor(() => screen.getByText('fetched data'))
-    const setTimeoutSpy = jest.spyOn(window, 'setTimeout')
+    const setTimeoutSpy = vi.spyOn(window, 'setTimeout')
 
     result.unmount()
 
@@ -4019,8 +4021,8 @@ describe('createQuery', () => {
 
   it('should not cause memo churn when data does not change', async () => {
     const key = queryKey()
-    const queryFn = jest.fn<string, unknown[]>().mockReturnValue('data')
-    const memoFn = jest.fn()
+    const queryFn = vi.fn<unknown[], string>().mockReturnValue('data')
+    const memoFn = vi.fn()
 
     function Page() {
       const result = createQuery(() => ({
@@ -4255,7 +4257,7 @@ describe('createQuery', () => {
   it('should refetch if any query instance becomes enabled', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<string, unknown[]>().mockReturnValue('data')
+    const queryFn = vi.fn<unknown[], string>().mockReturnValue('data')
 
     function Disabled() {
       createQuery(() => ({ queryKey: key, queryFn, enabled: false }))
@@ -4610,11 +4612,11 @@ describe('createQuery', () => {
 
   it('should cancel the query function when there are no more subscriptions', async () => {
     const key = queryKey()
-    let cancelFn: jest.Mock = jest.fn()
+    let cancelFn: Mock = vi.fn()
 
     const queryFn = ({ signal }: { signal?: AbortSignal }) => {
       const promise = new Promise<string>((resolve, reject) => {
-        cancelFn = jest.fn(() => reject('Cancelled'))
+        cancelFn = vi.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
         sleep(20).then(() => resolve('OK'))
       })
@@ -4958,7 +4960,7 @@ describe('createQuery', () => {
   })
 
   it('should refetch when changed enabled to true in error state', async () => {
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
     queryFn.mockImplementation(async () => {
       await sleep(10)
       return Promise.reject(new Error('Suspense Error Bingo'))
@@ -6052,7 +6054,7 @@ describe('createQuery', () => {
 
   it('setQueryData - should not call onSuccess callback of active observers', async () => {
     const key = queryKey()
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({