@tanstack/solid-query 5.75.5 → 5.75.7

package/build/dev.cjs

@@ -31,16 +31,6 @@ exports.QueryClientProvider = (props) => {
     }
   });
 };
-
-// src/utils.ts
-function shouldThrowError(throwError, params) {
-  if (typeof throwError === "function") {
-    return throwError(...params);
-  }
-  return !!throwError;
-}
-function noop() {
-}
 var IsRestoringContext = solidJs.createContext(() => false);
 exports.useIsRestoring = () => solidJs.useContext(IsRestoringContext);
 exports.IsRestoringProvider = IsRestoringContext.Provider;
@@ -184,7 +174,7 @@ function useBaseQuery(options, Observer, queryClient) {
           unsubscribe = createClientSubscriber();
         }
         obs.updateResult();
-        if (observerResult.isError && !observerResult.isFetching && !isRestoring() && shouldThrowError(obs.options.throwOnError, [
+        if (observerResult.isError && !observerResult.isFetching && !isRestoring() && queryCore.shouldThrowError(obs.options.throwOnError, [
           observerResult.error,
           obs.getCurrentQuery()
         ])) {
@@ -312,6 +302,12 @@ function useInfiniteQuery(options, queryClient) {
     queryClient
   );
 }
+
+// src/utils.ts
+function noop() {
+}
+
+// src/useMutation.ts
 function useMutation(options, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const observer = new queryCore.MutationObserver(
@@ -333,7 +329,7 @@ function useMutation(options, queryClient) {
     solidJs.on(
       () => state.status,
       () => {
-        if (state.isError && shouldThrowError(observer.options.throwOnError, [state.error])) {
+        if (state.isError && queryCore.shouldThrowError(observer.options.throwOnError, [state.error])) {
           throw state.error;
         }
       }

package/build/dev.js

@@ -1,4 +1,4 @@
-import { MutationObserver, QueriesObserver, QueryClient as QueryClient$1, replaceEqualDeep, hydrate, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
+import { MutationObserver, shouldThrowError, QueriesObserver, QueryClient as QueryClient$1, replaceEqualDeep, hydrate, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import { createContext, useContext, createRenderEffect, onCleanup, createMemo, createComputed, on, mergeProps, createResource, batch, onMount, createSignal, createEffect } from 'solid-js';
 import { createComponent, isServer } from 'solid-js/web';
@@ -30,16 +30,6 @@ var QueryClientProvider = (props) => {
     }
   });
 };
-
-// src/utils.ts
-function shouldThrowError(throwError, params) {
-  if (typeof throwError === "function") {
-    return throwError(...params);
-  }
-  return !!throwError;
-}
-function noop() {
-}
 var IsRestoringContext = createContext(() => false);
 var useIsRestoring = () => useContext(IsRestoringContext);
 var IsRestoringProvider = IsRestoringContext.Provider;
@@ -311,6 +301,12 @@ function useInfiniteQuery(options, queryClient) {
     queryClient
   );
 }
+
+// src/utils.ts
+function noop() {
+}
+
+// src/useMutation.ts
 function useMutation(options, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const observer = new MutationObserver(

package/build/index.cjs

@@ -31,16 +31,6 @@ exports.QueryClientProvider = (props) => {
     }
   });
 };
-
-// src/utils.ts
-function shouldThrowError(throwError, params) {
-  if (typeof throwError === "function") {
-    return throwError(...params);
-  }
-  return !!throwError;
-}
-function noop() {
-}
 var IsRestoringContext = solidJs.createContext(() => false);
 exports.useIsRestoring = () => solidJs.useContext(IsRestoringContext);
 exports.IsRestoringProvider = IsRestoringContext.Provider;
@@ -175,7 +165,7 @@ function useBaseQuery(options, Observer, queryClient) {
           unsubscribe = createClientSubscriber();
         }
         obs.updateResult();
-        if (observerResult.isError && !observerResult.isFetching && !isRestoring() && shouldThrowError(obs.options.throwOnError, [
+        if (observerResult.isError && !observerResult.isFetching && !isRestoring() && queryCore.shouldThrowError(obs.options.throwOnError, [
           observerResult.error,
           obs.getCurrentQuery()
         ])) {
@@ -303,6 +293,12 @@ function useInfiniteQuery(options, queryClient) {
     queryClient
   );
 }
+
+// src/utils.ts
+function noop() {
+}
+
+// src/useMutation.ts
 function useMutation(options, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const observer = new queryCore.MutationObserver(
@@ -324,7 +320,7 @@ function useMutation(options, queryClient) {
     solidJs.on(
       () => state.status,
       () => {
-        if (state.isError && shouldThrowError(observer.options.throwOnError, [state.error])) {
+        if (state.isError && queryCore.shouldThrowError(observer.options.throwOnError, [state.error])) {
           throw state.error;
         }
       }

package/build/index.js

@@ -1,4 +1,4 @@
-import { MutationObserver, QueriesObserver, QueryClient as QueryClient$1, replaceEqualDeep, hydrate, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
+import { MutationObserver, shouldThrowError, QueriesObserver, QueryClient as QueryClient$1, replaceEqualDeep, hydrate, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import { createContext, useContext, createRenderEffect, onCleanup, createMemo, createComputed, on, mergeProps, createResource, batch, onMount, createSignal, createEffect } from 'solid-js';
 import { createComponent, isServer } from 'solid-js/web';
@@ -30,16 +30,6 @@ var QueryClientProvider = (props) => {
     }
   });
 };
-
-// src/utils.ts
-function shouldThrowError(throwError, params) {
-  if (typeof throwError === "function") {
-    return throwError(...params);
-  }
-  return !!throwError;
-}
-function noop() {
-}
 var IsRestoringContext = createContext(() => false);
 var useIsRestoring = () => useContext(IsRestoringContext);
 var IsRestoringProvider = IsRestoringContext.Provider;
@@ -302,6 +292,12 @@ function useInfiniteQuery(options, queryClient) {
     queryClient
   );
 }
+
+// src/utils.ts
+function noop() {
+}
+
+// src/useMutation.ts
 function useMutation(options, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const observer = new MutationObserver(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.75.5",
+  "version": "5.75.7",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -46,14 +46,15 @@
     "!src/__tests__"
   ],
   "dependencies": {
-    "@tanstack/query-core": "5.75.5"
+    "@tanstack/query-core": "5.75.7"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",
     "npm-run-all2": "^5.0.0",
     "solid-js": "^1.9.5",
     "tsup-preset-solid": "^2.2.0",
-    "vite-plugin-solid": "^2.11.6"
+    "vite-plugin-solid": "^2.11.6",
+    "@tanstack/query-test-utils": "0.0.0"
   },
   "peerDependencies": {
     "solid-js": "^1.6.0"

package/src/useBaseQuery.ts

@@ -1,7 +1,7 @@
 // Had to disable the lint rule because isServer type is defined as false
 // in solid-js/web package. I'll create a GitHub issue with them to see
 // why that happens.
-import { hydrate, notifyManager } from '@tanstack/query-core'
+import { hydrate, notifyManager, shouldThrowError } from '@tanstack/query-core'
 import { isServer } from 'solid-js/web'
 import {
   createComputed,
@@ -13,7 +13,6 @@ import {
 } from 'solid-js'
 import { createStore, reconcile, unwrap } from 'solid-js/store'
 import { useQueryClient } from './QueryClientProvider'
-import { shouldThrowError } from './utils'
 import { useIsRestoring } from './isRestoring'
 import type { UseBaseQueryOptions } from './types'
 import type { Accessor, Signal } from 'solid-js'
@@ -230,7 +229,7 @@ export function useBaseQuery<
     Fixes #7275
     In a few cases, the observer could unmount before the resource is loaded.
     This leads to Suspense boundaries to be suspended indefinitely.
-    This resolver will be called when the observer is unmounting 
+    This resolver will be called when the observer is unmounting
     but the resource is still in a loading state
   */
   let resolver: ((value: ResourceData) => void) | null = null

package/src/useMutation.ts

@@ -1,8 +1,8 @@
-import { MutationObserver } from '@tanstack/query-core'
+import { MutationObserver, shouldThrowError } from '@tanstack/query-core'
 import { createComputed, createMemo, on, onCleanup } from 'solid-js'
 import { createStore } from 'solid-js/store'
 import { useQueryClient } from './QueryClientProvider'
-import { noop, shouldThrowError } from './utils'
+import { noop } from './utils'
 import type { DefaultError } from '@tanstack/query-core'
 import type { QueryClient } from './QueryClient'
 import type {

package/src/utils.ts

@@ -1,13 +1 @@
-export function shouldThrowError<T extends (...args: Array<any>) => boolean>(
-  throwError: boolean | T | undefined,
-  params: Parameters<T>,
-): boolean {
-  // Allow throwError function to override throwing behavior on a per-error basis
-  if (typeof throwError === 'function') {
-    return throwError(...params)
-  }
-
-  return !!throwError
-}
-
 export function noop(): void {}