@tanstack/solid-query 5.0.0-rc.8 → 5.0.5

package/build/dev.cjs

@@ -447,7 +447,7 @@ exports.queryOptions = queryOptions;
 exports.useIsFetching = useIsFetching;
 exports.useIsMutating = useIsMutating;
 Object.keys(queryCore).forEach(function (k) {
-  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
     get: function () { return queryCore[k]; }
   });

package/build/index.cjs

@@ -447,7 +447,7 @@ exports.queryOptions = queryOptions;
 exports.useIsFetching = useIsFetching;
 exports.useIsMutating = useIsMutating;
 Object.keys(queryCore).forEach(function (k) {
-  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
     get: function () { return queryCore[k]; }
   });

package/build/index.d.cts

@@ -1,8 +1,7 @@
-import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction } from '@tanstack/query-core';
+import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
-import * as solid_js_types_reactive_signal from 'solid-js/types/reactive/signal';
 
 interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
     /**
@@ -108,9 +107,11 @@ type GetOptions<T> = T extends {
 } ? CreateQueryOptionsForCreateQueries<unknown, TError, TData> : T extends [infer TQueryFnData, infer TError, infer TData] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData> : T extends [infer TQueryFnData, infer TError] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryOptionsForCreateQueries<TQueryFnData> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
     select: (data: any) => infer TData;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
 type GetResults<T> = T extends {
     queryFnData: any;
     error?: infer TError;
@@ -124,9 +125,11 @@ type GetResults<T> = T extends {
 } ? CreateQueryResult<TData, TError> : T extends [any, infer TError, infer TData] ? CreateQueryResult<TData, TError> : T extends [infer TQueryFnData, infer TError] ? CreateQueryResult<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryResult<TQueryFnData> : T extends {
     queryFn?: QueryFunction<unknown, any>;
     select: (data: any) => infer TData;
-} ? CreateQueryResult<TData> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, any>;
-} ? CreateQueryResult<TQueryFnData> : CreateQueryResult;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */
@@ -141,6 +144,6 @@ declare function createQueries<T extends Array<any>, TCombinedResult extends Que
 }>, queryClient?: Accessor<QueryClient>): TCombinedResult;
 
 declare const useIsRestoring: () => Accessor<boolean>;
-declare const IsRestoringProvider: solid_js_types_reactive_signal.ContextProviderComponent<Accessor<boolean>>;
+declare const IsRestoringProvider: solid_js.ContextProviderComponent<Accessor<boolean>>;
 
 export { CreateBaseMutationResult, CreateBaseQueryOptions, CreateBaseQueryResult, CreateInfiniteQueryOptions, CreateInfiniteQueryResult, CreateMutateAsyncFunction, CreateMutateFunction, CreateMutationOptions, CreateMutationResult, CreateQueryOptions, CreateQueryResult, DefaultOptions, DefinedCreateBaseQueryResult, DefinedCreateQueryResult, FunctionedParams, InfiniteQueryObserverOptions, IsRestoringProvider, QueryClient, QueryClientConfig, QueryClientContext, QueryClientProvider, QueryClientProviderProps, QueryObserverOptions, SolidInfiniteQueryOptions, SolidMutationOptions, SolidQueryOptions, createInfiniteQuery, createMutation, createQueries, createQuery, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useQueryClient };

package/build/index.d.ts

@@ -1,8 +1,7 @@
-import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction } from '@tanstack/query-core';
+import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
-import * as solid_js_types_reactive_signal from 'solid-js/types/reactive/signal';
 
 interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
     /**
@@ -108,9 +107,11 @@ type GetOptions<T> = T extends {
 } ? CreateQueryOptionsForCreateQueries<unknown, TError, TData> : T extends [infer TQueryFnData, infer TError, infer TData] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData> : T extends [infer TQueryFnData, infer TError] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryOptionsForCreateQueries<TQueryFnData> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
     select: (data: any) => infer TData;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
 type GetResults<T> = T extends {
     queryFnData: any;
     error?: infer TError;
@@ -124,9 +125,11 @@ type GetResults<T> = T extends {
 } ? CreateQueryResult<TData, TError> : T extends [any, infer TError, infer TData] ? CreateQueryResult<TData, TError> : T extends [infer TQueryFnData, infer TError] ? CreateQueryResult<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryResult<TQueryFnData> : T extends {
     queryFn?: QueryFunction<unknown, any>;
     select: (data: any) => infer TData;
-} ? CreateQueryResult<TData> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, any>;
-} ? CreateQueryResult<TQueryFnData> : CreateQueryResult;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */
@@ -141,6 +144,6 @@ declare function createQueries<T extends Array<any>, TCombinedResult extends Que
 }>, queryClient?: Accessor<QueryClient>): TCombinedResult;
 
 declare const useIsRestoring: () => Accessor<boolean>;
-declare const IsRestoringProvider: solid_js_types_reactive_signal.ContextProviderComponent<Accessor<boolean>>;
+declare const IsRestoringProvider: solid_js.ContextProviderComponent<Accessor<boolean>>;
 
 export { CreateBaseMutationResult, CreateBaseQueryOptions, CreateBaseQueryResult, CreateInfiniteQueryOptions, CreateInfiniteQueryResult, CreateMutateAsyncFunction, CreateMutateFunction, CreateMutationOptions, CreateMutationResult, CreateQueryOptions, CreateQueryResult, DefaultOptions, DefinedCreateBaseQueryResult, DefinedCreateQueryResult, FunctionedParams, InfiniteQueryObserverOptions, IsRestoringProvider, QueryClient, QueryClientConfig, QueryClientContext, QueryClientProvider, QueryClientProviderProps, QueryObserverOptions, SolidInfiniteQueryOptions, SolidMutationOptions, SolidQueryOptions, createInfiniteQuery, createMutation, createQueries, createQuery, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useQueryClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.0.0-rc.8",
+  "version": "5.0.5",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -48,10 +48,10 @@
   ],
   "dependencies": {
     "solid-js": "^1.7.8",
-    "@tanstack/query-core": "5.0.0-rc.6"
+    "@tanstack/query-core": "5.0.5"
   },
   "devDependencies": {
-    "tsup-preset-solid": "^2.0.1",
+    "tsup-preset-solid": "^2.1.0",
     "vite-plugin-solid": "^2.7.0"
   },
   "peerDependencies": {

package/src/__tests__/QueryClientProvider.test.tsx

@@ -1,7 +1,6 @@
+import { describe, expect, it, vi } from 'vitest'
 import { render, screen, waitFor } from '@solidjs/testing-library'
-
 import { QueryCache } from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { QueryClientProvider, createQuery, useQueryClient } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 

package/src/__tests__/createInfiniteQuery.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
 
 import {
@@ -10,7 +11,6 @@ import {
   createSignal,
   on,
 } from 'solid-js'
-import { vi } from 'vitest'
 import {
   QueryCache,
   QueryClientProvider,

package/src/__tests__/createMutation.test.tsx

@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom'
+import { describe, expect, it, vi } from 'vitest'
 import {
   ErrorBoundary,
   createEffect,
@@ -6,7 +6,6 @@ import {
   createSignal,
 } from 'solid-js'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-import { vi } from 'vitest'
 import {
   MutationCache,
   QueryCache,

package/src/__tests__/createQueries.test.tsx

@@ -1,8 +1,8 @@
+import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
 import * as QueryCore from '@tanstack/query-core'
 
 import { createRenderEffect, createSignal } from 'solid-js'
-import { vi } from 'vitest'
 import {
   QueriesObserver,
   QueryCache,

package/src/__tests__/createQuery.test.tsx

@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom'
+import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import {
   ErrorBoundary,
   Match,
@@ -10,7 +10,6 @@ import {
   on,
 } from 'solid-js'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-import { vi } from 'vitest'
 import { reconcile } from 'solid-js/store'
 import {
   QueryCache,
@@ -3715,7 +3714,7 @@ describe('createQuery', () => {
           await sleep(10)
           return count++
         },
-        refetchInterval: (data = 0) => (data < 2 ? 10 : false),
+        refetchInterval: ({ state: { data = 0 } }) => (data < 2 ? 10 : false),
       }))
 
       createRenderEffect(() => {

package/src/__tests__/createQuery.types.test.tsx

@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { createQuery, queryOptions } from '../index'
 
 export type Equal<X, Y> = (<T>() => T extends X ? 1 : 2) extends <

package/src/__tests__/suspense.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
 
 import {
@@ -8,7 +9,6 @@ import {
   createSignal,
   on,
 } from 'solid-js'
-import { vi } from 'vitest'
 import {
   QueryCache,
   QueryClientProvider,

package/src/__tests__/transition.test.tsx

@@ -1,5 +1,5 @@
+import { describe, it } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-
 import { Show, Suspense, createSignal, startTransition } from 'solid-js'
 import { QueryCache, QueryClientProvider, createQuery } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'

package/src/__tests__/useIsFetching.test.tsx

@@ -1,5 +1,5 @@
+import { describe, expect, it } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-
 import { Show, createEffect, createRenderEffect, createSignal } from 'solid-js'
 import { QueryCache, QueryClientProvider, createQuery, useIsFetching } from '..'
 import { createQueryClient, queryKey, setActTimeout, sleep } from './utils'

package/src/__tests__/useIsMutating.test.tsx

@@ -1,8 +1,7 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-
 import { Show, createEffect, createRenderEffect, createSignal } from 'solid-js'
 import * as QueryCore from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { QueryClientProvider, createMutation, useIsMutating } from '..'
 import { createQueryClient, setActTimeout, sleep } from './utils'
 

package/src/__tests__/utils.tsx

@@ -1,5 +1,5 @@
-import { Show, createEffect, createSignal, onCleanup } from 'solid-js'
 import { vi } from 'vitest'
+import { Show, createEffect, createSignal, onCleanup } from 'solid-js'
 import { onlineManager } from '@tanstack/query-core'
 import { QueryClient } from '../QueryClient'
 import type { QueryClientConfig } from '@tanstack/query-core'

package/src/createQueries.ts

@@ -23,6 +23,7 @@ import type {
   QueryFunction,
   QueryKey,
   QueryObserverResult,
+  ThrowOnError,
 } from '@tanstack/query-core'
 
 // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
@@ -65,12 +66,16 @@ type GetOptions<T> =
     T extends {
         queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
         select: (data: any) => infer TData
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
+      }
+    ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>
+    : T extends {
+        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
       }
-    ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey>
-    : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }
     ? CreateQueryOptionsForCreateQueries<
         TQueryFnData,
-        Error,
+        TError,
         TQueryFnData,
         TQueryKey
       >
@@ -96,10 +101,17 @@ type GetResults<T> =
     T extends {
         queryFn?: QueryFunction<unknown, any>
         select: (data: any) => infer TData
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
       }
-    ? CreateQueryResult<TData>
-    : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }
-    ? CreateQueryResult<TQueryFnData>
+    ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError>
+    : T extends {
+        queryFn?: QueryFunction<infer TQueryFnData, any>
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
+      }
+    ? CreateQueryResult<
+        TQueryFnData,
+        unknown extends TError ? DefaultError : TError
+      >
     : // Fallback
       CreateQueryResult