@tanstack/solid-query 5.0.0-alpha.7 → 5.0.0-alpha.75

package/dist/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["../../src/setBatchUpdatesFn.ts","../../src/QueryClient.ts","../../src/QueryClientProvider.tsx","../../src/utils.ts","../../src/createBaseQuery.ts","../../src/createQuery.ts","../../src/useIsFetching.ts","../../src/createInfiniteQuery.ts","../../src/createMutation.ts","../../src/useIsMutating.ts","../../src/createQueries.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  if (queryClient) {\n    return queryClient\n  }\n  const client = useContext(QueryClientContext)\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, 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 { 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 {\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 { 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 { 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","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"],"names":["notifyManager","setBatchNotifyFunction","batch","QueryClient","QueryCoreClient","constructor","config","QueryClientContext","createContext","undefined","useQueryClient","queryClient","client","useContext","Error","QueryClientProvider","props","onMount","mount","onCleanup","unmount","_$createComponent","Provider","value","children","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","createServerSubscriber","resolve","reject","subscribe","batchCalls","query","getCurrentQuery","refetch","rest","unwrap","unwrappedResult","dataUpdateCount","fetchFailureCount","isInvalidated","isError","process","env","console","error","isSuccess","createClientSubscriber","reconcileOptions","queryResource","loading","mutate","unsubscribe","createResource","Promise","isLoading","initialValue","ssrLoadFrom","initialData","deferStream","onHydrated","_k","info","hydrate","queries","queryKey","queryHash","newOptions","staleTime","refetchOnMount","setOptions","createComputed","on","defer","status","isFetching","handler","get","target","prop","val","Reflect","Proxy","queryOptions","createQuery","QueryObserver","useIsFetching","filters","queryCache","getQueryCache","fetches","setFetches","createSignal","createInfiniteQuery","InfiniteQueryObserver","createMutation","MutationObserver","variables","mutateOptions","catch","noop","getCurrentResult","mutateAsync","useIsMutating","mutationCache","getMutationCache","mutations","setMutations","isMutating","_result","createQueries","queriesOptions","defaultedQueries","map","QueriesObserver","combine","updatedQueries","setQueries","listeners"],"mappings":"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"}

package/dist/source/QueryClient.js

@@ -0,0 +1,6 @@
+import { QueryClient as QueryCoreClient } from '@tanstack/query-core';
+export class QueryClient extends QueryCoreClient {
+    constructor(config = {}) {
+        super(config);
+    }
+}

package/{build → dist}/source/createBaseQuery.js

@@ -1,25 +1,48 @@
-import { hydrate } from '@tanstack/query-core';
-import { notifyManager } from '@tanstack/query-core';
+import { hydrate, notifyManager } from '@tanstack/query-core';
 import { isServer } from 'solid-js/web';
-import { createComputed, createMemo, createResource, on, onCleanup, onMount, } from 'solid-js';
-import { createStore, unwrap } from 'solid-js/store';
+import { createComputed, createMemo, createResource, on, onCleanup, } from 'solid-js';
+import { createStore, reconcile, unwrap } from 'solid-js/store';
 import { useQueryClient } from './QueryClientProvider';
 import { shouldThrowError } from './utils';
+function reconcileFn(store, result, reconcileOption) {
+    if (reconcileOption === false)
+        return result;
+    if (typeof reconcileOption === 'function') {
+        const newData = reconcileOption(store.data, result.data);
+        return { ...result, data: newData };
+    }
+    const newData = reconcile(result.data, { key: reconcileOption })(store.data);
+    return { ...result, data: newData };
+}
 // Base Query Function that is used to create the query.
 export function createBaseQuery(options, Observer, queryClient) {
     const client = createMemo(() => useQueryClient(queryClient?.()));
     const defaultedOptions = client().defaultQueryOptions(options());
     defaultedOptions._optimisticResults = 'optimistic';
+    defaultedOptions.structuralSharing = false;
     if (isServer) {
         defaultedOptions.retry = false;
-        defaultedOptions.throwErrors = true;
+        defaultedOptions.throwOnError = true;
     }
     const observer = new Observer(client(), defaultedOptions);
     const [state, setState] = createStore(observer.getOptimisticResult(defaultedOptions));
     const createServerSubscriber = (resolve, reject) => {
         return observer.subscribe((result) => {
             notifyManager.batchCalls(() => {
-                const unwrappedResult = { ...unwrap(result) };
+                const query = observer.getCurrentQuery();
+                const { refetch, ...rest } = unwrap(result);
+                const unwrappedResult = {
+                    ...rest,
+                    // hydrate() expects a QueryState object, which is similar but not
+                    // quite the same as a QueryObserverResult object. Thus, for now, we're
+                    // copying over the missing properties from state in order to support hydration
+                    dataUpdateCount: query.state.dataUpdateCount,
+                    fetchFailureCount: query.state.fetchFailureCount,
+                    // Removing these properties since they might not be serializable
+                    // fetchFailureReason: query.state.fetchFailureReason,
+                    // fetchMeta: query.state.fetchMeta,
+                    isInvalidated: query.state.isInvalidated,
+                };
                 if (unwrappedResult.isError) {
                     if (process.env['NODE_ENV'] === 'development') {
                         console.error(unwrappedResult.error);
@@ -27,6 +50,8 @@ export function createBaseQuery(options, Observer, queryClient) {
                     reject(unwrappedResult.error);
                 }
                 if (unwrappedResult.isSuccess) {
+                    // Use of any here is fine
+                    // We cannot include refetch since it is not serializable
                     resolve(unwrappedResult);
                 }
             })();
@@ -35,17 +60,21 @@ export function createBaseQuery(options, Observer, queryClient) {
     const createClientSubscriber = () => {
         return observer.subscribe((result) => {
             notifyManager.batchCalls(() => {
-                const unwrappedResult = { ...unwrap(result) };
+                // @ts-expect-error - This will error because the reconcile option does not
+                // exist on the query-core QueryObserverResult type
+                const reconcileOptions = observer.options.reconcile;
                 // If the query has data we dont suspend but instead mutate the resource
                 // This could happen when placeholderData/initialData is defined
-                if (queryResource()?.data &&
-                    unwrappedResult.data &&
-                    !queryResource.loading) {
-                    setState(unwrappedResult);
+                if (queryResource()?.data && result.data && !queryResource.loading) {
+                    setState((store) => {
+                        return reconcileFn(store, result, reconcileOptions === undefined ? 'id' : reconcileOptions);
+                    });
                     mutate(state);
                 }
                 else {
-                    setState(unwrappedResult);
+                    setState((store) => {
+                        return reconcileFn(store, result, reconcileOptions === undefined ? 'id' : reconcileOptions);
+                    });
                     refetch();
                 }
             })();
@@ -119,16 +148,15 @@ export function createBaseQuery(options, Observer, queryClient) {
             unsubscribe = null;
         }
     });
-    onMount(() => {
-        observer.setOptions(defaultedOptions, { listeners: false });
-    });
-    createComputed(() => {
-        observer.setOptions(client().defaultQueryOptions(options()));
-    });
+    createComputed(on(() => client().defaultQueryOptions(options()), () => observer.setOptions(client().defaultQueryOptions(options())), {
+        // Defer because we don't need to trigger on first render
+        // This only cares about changes to options after the observer is created
+        defer: true,
+    }));
     createComputed(on(() => state.status, () => {
         if (state.isError &&
             !state.isFetching &&
-            shouldThrowError(observer.options.throwErrors, [
+            shouldThrowError(observer.options.throwOnError, [
                 state.error,
                 observer.getCurrentQuery(),
             ])) {
@@ -137,10 +165,8 @@ export function createBaseQuery(options, Observer, queryClient) {
     }));
     const handler = {
         get(target, prop) {
-            if (prop === 'data') {
-                return queryResource()?.data;
-            }
-            return Reflect.get(target, prop);
+            const val = queryResource()?.[prop];
+            return val !== undefined ? val : Reflect.get(target, prop);
         },
     };
     return new Proxy(state, handler);

package/{build → dist}/source/createMutation.js

@@ -20,7 +20,7 @@ export function createMutation(options, queryClient) {
     });
     createComputed(on(() => state.status, () => {
         if (state.isError &&
-            shouldThrowError(observer.options.throwErrors, [state.error])) {
+            shouldThrowError(observer.options.throwOnError, [state.error])) {
             throw state.error;
         }
     }));

package/{build → dist}/source/createQueries.js

@@ -1,5 +1,5 @@
 import { notifyManager, QueriesObserver } from '@tanstack/query-core';
-import { createComputed, onCleanup, onMount } from 'solid-js';
+import { createComputed, onCleanup } from 'solid-js';
 import { createStore, unwrap } from 'solid-js/store';
 import { useQueryClient } from './QueryClientProvider';
 export function createQueries(queriesOptions, queryClient) {
@@ -9,24 +9,30 @@ export function createQueries(queriesOptions, queryClient) {
         defaultedOptions._optimisticResults = 'optimistic';
         return defaultedOptions;
     });
-    const observer = new QueriesObserver(client, defaultedQueries);
-    const [state, setState] = createStore(observer.getOptimisticResult(defaultedQueries));
+    const observer = new QueriesObserver(client, defaultedQueries, queriesOptions().combine
+        ? {
+            combine: queriesOptions().combine,
+        }
+        : undefined);
+    // @ts-expect-error - Types issue with solid-js createStore
+    const [state, setState] = createStore(observer.getOptimisticResult(defaultedQueries)[1]());
     const unsubscribe = observer.subscribe((result) => {
         notifyManager.batchCalls(() => {
             setState(unwrap(result));
         })();
     });
     onCleanup(unsubscribe);
-    onMount(() => {
-        observer.setQueries(defaultedQueries, { listeners: false });
-    });
     createComputed(() => {
         const updatedQueries = queriesOptions().queries.map((options) => {
             const defaultedOptions = client.defaultQueryOptions(options);
             defaultedOptions._optimisticResults = 'optimistic';
             return defaultedOptions;
         });
-        observer.setQueries(updatedQueries);
+        observer.setQueries(updatedQueries, queriesOptions().combine
+            ? {
+                combine: queriesOptions().combine,
+            }
+            : undefined, { listeners: false });
     });
     return state;
 }

package/{build → dist}/source/createQuery.js

@@ -1,6 +1,9 @@
 import { QueryObserver } from '@tanstack/query-core';
 import { createMemo } from 'solid-js';
 import { createBaseQuery } from './createBaseQuery';
+export function queryOptions(options) {
+    return options;
+}
 export function createQuery(options, queryClient) {
     return createBaseQuery(createMemo(() => options()), QueryObserver, queryClient);
 }

package/{build → dist}/source/index.js

@@ -5,7 +5,8 @@ import './setBatchUpdatesFn';
 export * from '@tanstack/query-core';
 // Solid Query
 export * from './types';
-export { createQuery } from './createQuery';
+export { QueryClient } from './QueryClient';
+export { createQuery, queryOptions } from './createQuery';
 export { QueryClientContext, QueryClientProvider, useQueryClient, } from './QueryClientProvider';
 export { useIsFetching } from './useIsFetching';
 export { createInfiniteQuery } from './createInfiniteQuery';

package/dist/types/QueryClient.d.ts

@@ -0,0 +1,29 @@
+import type { QueryClientConfig as QueryCoreClientConfig, DefaultOptions as CoreDefaultOptions, QueryObserverOptions as QueryCoreObserverOptions, InfiniteQueryObserverOptions as QueryCoreInfiniteQueryObserverOptions, DefaultError, QueryKey } from '@tanstack/query-core';
+import { QueryClient as QueryCoreClient } from '@tanstack/query-core';
+export interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryCoreObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
+    /**
+     * Set this to a reconciliation key to enable reconciliation between query results.
+     * Set this to `false` to disable reconciliation between query results.
+     * 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.
+     * Defaults reconciliation key to `id`.
+     */
+    reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
+}
+export interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<QueryCoreInfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
+    /**
+     * Set this to a reconciliation key to enable reconciliation between query results.
+     * Set this to `false` to disable reconciliation between query results.
+     * 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.
+     * Defaults reconciliation key to `id`.
+     */
+    reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
+}
+export interface DefaultOptions<TError = DefaultError> extends CoreDefaultOptions<TError> {
+    queries?: QueryObserverOptions<unknown, TError>;
+}
+export interface QueryClientConfig extends QueryCoreClientConfig {
+    defaultOptions?: DefaultOptions;
+}
+export declare class QueryClient extends QueryCoreClient {
+    constructor(config?: QueryClientConfig);
+}

package/{build → dist}/types/QueryClientProvider.d.ts

@@ -1,8 +1,8 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
 import type { JSX } from 'solid-js';
-export declare const QueryClientContext: import("solid-js").Context<QueryClient | undefined>;
+export declare const QueryClientContext: import("solid-js").Context<QueryClient>;
 export declare const useQueryClient: (queryClient?: QueryClient) => QueryClient;
-export declare type QueryClientProviderProps = {
+export type QueryClientProviderProps = {
     client: QueryClient;
     children?: JSX.Element;
 };

package/{build → dist}/types/createBaseQuery.d.ts

@@ -1,4 +1,5 @@
-import type { QueryClient, QueryKey, QueryObserver, QueryObserverResult } from '@tanstack/query-core';
+import type { QueryKey, QueryObserver, QueryObserverResult } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
 import type { Accessor } from 'solid-js';
 import type { CreateBaseQueryOptions } from './types';
 export declare function createBaseQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey>(options: Accessor<CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>>, Observer: typeof QueryObserver, queryClient?: Accessor<QueryClient>): QueryObserverResult<TData, TError>;

package/{build → dist}/types/createInfiniteQuery.d.ts

@@ -1,4 +1,5 @@
-import type { QueryKey, QueryClient, DefaultError, InfiniteData } from '@tanstack/query-core';
+import type { QueryKey, DefaultError, InfiniteData } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
 import type { CreateInfiniteQueryOptions, CreateInfiniteQueryResult } from './types';
 import type { Accessor } from 'solid-js';
 export declare function createInfiniteQuery<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: CreateInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient?: Accessor<QueryClient>): CreateInfiniteQueryResult<TData, TError>;

package/{build → dist}/types/createMutation.d.ts

@@ -1,4 +1,5 @@
-import type { QueryClient, DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
 import type { CreateMutationOptions, CreateMutationResult } from './types';
 import type { Accessor } from 'solid-js';
 export declare function createMutation<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(options: CreateMutationOptions<TData, TError, TVariables, TContext>, queryClient?: Accessor<QueryClient>): CreateMutationResult<TData, TError, TVariables, TContext>;

package/{build → dist}/types/createQueries.d.ts

@@ -1,11 +1,12 @@
-import type { QueriesPlaceholderDataFunction, QueryClient, QueryFunction, QueryKey, DefaultError } from '@tanstack/query-core';
+import type { QueriesPlaceholderDataFunction, QueryFunction, QueryKey, DefaultError } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
 import type { Accessor } from 'solid-js';
 import type { CreateQueryResult, SolidQueryOptions } from './types';
-declare type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Omit<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
+type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Omit<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
     placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
 };
-declare type MAXIMUM_DEPTH = 20;
-declare type GetOptions<T> = T extends {
+type MAXIMUM_DEPTH = 20;
+type GetOptions<T> = T extends {
     queryFnData: infer TQueryFnData;
     error?: infer TError;
     data: infer TData;
@@ -21,7 +22,7 @@ declare type GetOptions<T> = T extends {
 } ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
 } ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
-declare type GetResults<T> = T extends {
+type GetResults<T> = T extends {
     queryFnData: any;
     error?: infer TError;
     data: infer TData;
@@ -40,12 +41,13 @@ declare type GetResults<T> = T extends {
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */
-export declare type QueriesOptions<T extends any[], Result extends any[] = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? CreateQueryOptionsForCreateQueries[] : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]> : unknown[] extends T ? T : T extends CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>[] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>[] : CreateQueryOptionsForCreateQueries[];
+export type QueriesOptions<T extends any[], Result extends any[] = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? CreateQueryOptionsForCreateQueries[] : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]> : unknown[] extends T ? T : T extends CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>[] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>[] : CreateQueryOptionsForCreateQueries[];
 /**
  * QueriesResults reducer recursively maps type param to results
  */
-export declare type QueriesResults<T extends any[], Result extends any[] = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? CreateQueryResult[] : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]> : T extends CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>[] ? CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>[] : CreateQueryResult[];
-export declare function createQueries<T extends any[]>(queriesOptions: Accessor<{
+export type QueriesResults<T extends any[], Result extends any[] = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? CreateQueryResult[] : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]> : T extends CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>[] ? CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>[] : CreateQueryResult[];
+export declare function createQueries<T extends any[], TCombinedResult = QueriesResults<T>>(queriesOptions: Accessor<{
     queries: readonly [...QueriesOptions<T>];
-}>, queryClient?: Accessor<QueryClient>): QueriesResults<T>;
+    combine?: (result: QueriesResults<T>) => TCombinedResult;
+}>, queryClient?: Accessor<QueryClient>): TCombinedResult;
 export {};

package/dist/types/createQuery.d.ts

@@ -0,0 +1,14 @@
+import type { QueryKey, DefaultError } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
+import type { CreateQueryResult, DefinedCreateQueryResult, FunctionedParams, SolidQueryOptions } from './types';
+type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+    initialData?: undefined;
+}>;
+type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+    initialData: TQueryFnData | (() => TQueryFnData);
+}>;
+export declare function queryOptions<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>;
+export declare function queryOptions<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>;
+export declare function createQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: () => QueryClient): CreateQueryResult<TData, TError>;
+export declare function createQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: () => QueryClient): DefinedCreateQueryResult<TData, TError>;
+export {};

package/{build → dist}/types/index.d.ts

@@ -1,7 +1,9 @@
 import './setBatchUpdatesFn';
 export * from '@tanstack/query-core';
 export * from './types';
-export { createQuery } from './createQuery';
+export { QueryClient } from './QueryClient';
+export type { QueryObserverOptions, DefaultOptions, QueryClientConfig, InfiniteQueryObserverOptions, } from './QueryClient';
+export { createQuery, queryOptions } from './createQuery';
 export { QueryClientContext, QueryClientProvider, useQueryClient, } from './QueryClientProvider';
 export type { QueryClientProviderProps } from './QueryClientProvider';
 export { useIsFetching } from './useIsFetching';

package/dist/types/types.d.ts

@@ -0,0 +1,34 @@
+import type { QueryKey, QueryObserverResult, MutateFunction, MutationObserverOptions, MutationObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, WithRequired, DefaultError } from '@tanstack/query-core';
+import type { QueryObserverOptions, InfiniteQueryObserverOptions } from './QueryClient';
+export type FunctionedParams<T> = () => T;
+export interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends WithRequired<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, 'queryKey'> {
+    deferStream?: boolean;
+}
+export interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends WithRequired<CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>, 'queryKey'> {
+}
+export type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
+export type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserverResult<TData, TError>;
+export type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
+export type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError> = DefinedQueryObserverResult<TData, TError>;
+export type DefinedCreateQueryResult<TData = unknown, TError = DefaultError> = DefinedCreateBaseQueryResult<TData, TError>;
+export interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
+    queryKey: TQueryKey;
+    deferStream?: boolean;
+}
+export type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
+export type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = InfiniteQueryObserverResult<TData, TError>;
+export interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted' | 'variables'> {
+}
+export type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>;
+export type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
+export type CreateMutateAsyncFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = MutateFunction<TData, TError, TVariables, TContext>;
+export type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown> = Override<MutationObserverResult<TData, TError, TVariables, TContext>, {
+    mutate: CreateMutateFunction<TData, TError, TVariables, TContext>;
+}> & {
+    mutateAsync: CreateMutateAsyncFunction<TData, TError, TVariables, TContext>;
+};
+export type CreateMutationResult<TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown> = CreateBaseMutationResult<TData, TError, TVariables, TContext>;
+type Override<A, B> = {
+    [K in keyof A]: K extends keyof B ? B[K] : A[K];
+};
+export {};

package/{build → dist}/types/useIsFetching.d.ts

@@ -1,3 +1,4 @@
-import type { QueryClient, QueryFilters } from '@tanstack/query-core';
+import type { QueryFilters } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
 import type { Accessor } from 'solid-js';
 export declare function useIsFetching(filters?: Accessor<QueryFilters>, queryClient?: Accessor<QueryClient>): Accessor<number>;

package/{build → dist}/types/useIsMutating.d.ts

@@ -1,3 +1,4 @@
-import type { MutationFilters, QueryClient } from '@tanstack/query-core';
+import type { MutationFilters } from '@tanstack/query-core';
+import type { QueryClient } from './QueryClient';
 import type { Accessor } from 'solid-js';
 export declare function useIsMutating(filters?: Accessor<MutationFilters>, queryClient?: Accessor<QueryClient>): Accessor<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.0.0-alpha.7",
+  "version": "5.0.0-alpha.75",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -10,21 +10,21 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
-  "types": "build/types/index.d.ts",
-  "main": "build/cjs/index.js",
-  "module": "build/esm/index.js",
+  "type": "module",
+  "types": "dist/types/index.d.ts",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
-      "solid": "./build/source/index.js",
-      "import": "./build/esm/index.js",
+      "types": "./dist/types/index.d.ts",
+      "solid": "./dist/source/index.js",
+      "import": "./dist/esm/index.js",
       "browser": {
-        "import": "./build/esm/index.js",
-        "require": "./build/cjs/index.js"
+        "import": "./dist/esm/index.js",
+        "require": "./dist/cjs/index.cjs"
       },
-      "require": "./build/cjs/index.js",
-      "node": "./build/cjs/index.js",
-      "default": "./build/cjs/index.js"
+      "require": "./dist/cjs/index.cjs",
+      "node": "./dist/cjs/index.cjs"
     },
     "./package.json": "./package.json"
   },
@@ -32,29 +32,25 @@
     "./src/setBatchUpdatesFn.ts"
   ],
   "files": [
-    "build/esm/*",
-    "build/cjs/*",
-    "build/umd/*",
-    "build/source/*",
-    "build/types/*",
+    "dist",
     "src"
   ],
-  "devDependencies": {
-    "vite-plugin-solid": "^2.3.9"
-  },
   "dependencies": {
-    "@tanstack/query-core": "5.0.0-alpha.7"
+    "@tanstack/query-core": "5.0.0-alpha.70"
+  },
+  "devDependencies": {
+    "vite-plugin-solid": "^2.5.0"
   },
   "peerDependencies": {
-    "solid-js": "^1.6.2"
+    "solid-js": "^1.6.13"
   },
-  "peerDependenciesMeta": {},
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./dist && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "tsc --noEmit",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
-    "build:types": "tsc --build"
+    "test:build": "publint --strict",
+    "build": "rollup --config rollup.config.js"
   }
 }