@tanstack/solid-query 5.17.15 → 5.18.0

package/build/dev.cjs

@@ -60,7 +60,7 @@ function reconcileFn(store$1, result, reconcileOption) {
   const newData = store.reconcile(result.data, { key: reconcileOption })(store$1.data);
   return { ...result, data: newData };
 }
-var hydrateableObserverResult = (query, result) => {
+var hydratableObserverResult = (query, result) => {
   if (!web.isServer)
     return result;
   return {
@@ -106,7 +106,7 @@ function createBaseQuery(options, Observer, queryClient) {
     return observer().subscribe((result) => {
       queryCore.notifyManager.batchCalls(() => {
         const query = observer().getCurrentQuery();
-        const unwrappedResult = hydrateableObserverResult(query, result);
+        const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
         } else {
@@ -146,7 +146,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.updateResult();
         if (!state.isLoading && !isRestoring()) {
           const query = obs.getCurrentQuery();
-          resolve(hydrateableObserverResult(query, state));
+          resolve(hydratableObserverResult(query, state));
         }
       });
     },
@@ -196,8 +196,8 @@ function createBaseQuery(options, Observer, queryClient) {
     solidJs.on(
       [isRestoring, observer],
       ([restoring]) => {
-        const unsub = unsubscribe;
-        queueMicrotask(() => unsub?.());
+        const _unsubscribe = unsubscribe;
+        queueMicrotask(() => _unsubscribe?.());
         unsubscribe = null;
         if (!restoring)
           refetch();
@@ -469,9 +469,9 @@ function createQueries(queriesOptions, queryClient) {
   const getProxies = () => state.map((s, index) => {
     return new Proxy(s, handler(index));
   });
-  const [proxifiedState, setProxifiedState] = store.createStore(getProxies());
-  solidJs.createRenderEffect(() => setProxifiedState(getProxies()));
-  return proxifiedState;
+  const [proxyState, setProxyState] = store.createStore(getProxies());
+  solidJs.createRenderEffect(() => setProxyState(getProxies()));
+  return proxyState;
 }
 
 exports.createInfiniteQuery = createInfiniteQuery;

package/build/dev.js

@@ -59,7 +59,7 @@ function reconcileFn(store, result, reconcileOption) {
   const newData = reconcile(result.data, { key: reconcileOption })(store.data);
   return { ...result, data: newData };
 }
-var hydrateableObserverResult = (query, result) => {
+var hydratableObserverResult = (query, result) => {
   if (!isServer)
     return result;
   return {
@@ -105,7 +105,7 @@ function createBaseQuery(options, Observer, queryClient) {
     return observer().subscribe((result) => {
       notifyManager.batchCalls(() => {
         const query = observer().getCurrentQuery();
-        const unwrappedResult = hydrateableObserverResult(query, result);
+        const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
         } else {
@@ -145,7 +145,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.updateResult();
         if (!state.isLoading && !isRestoring()) {
           const query = obs.getCurrentQuery();
-          resolve(hydrateableObserverResult(query, state));
+          resolve(hydratableObserverResult(query, state));
         }
       });
     },
@@ -195,8 +195,8 @@ function createBaseQuery(options, Observer, queryClient) {
     on(
       [isRestoring, observer],
       ([restoring]) => {
-        const unsub = unsubscribe;
-        queueMicrotask(() => unsub?.());
+        const _unsubscribe = unsubscribe;
+        queueMicrotask(() => _unsubscribe?.());
         unsubscribe = null;
         if (!restoring)
           refetch();
@@ -468,9 +468,9 @@ function createQueries(queriesOptions, queryClient) {
   const getProxies = () => state.map((s, index) => {
     return new Proxy(s, handler(index));
   });
-  const [proxifiedState, setProxifiedState] = createStore(getProxies());
-  createRenderEffect(() => setProxifiedState(getProxies()));
-  return proxifiedState;
+  const [proxyState, setProxyState] = createStore(getProxies());
+  createRenderEffect(() => setProxyState(getProxies()));
+  return proxyState;
 }
 
 export { IsRestoringProvider, QueryClient, QueryClientContext, QueryClientProvider, createInfiniteQuery, createMutation, createQueries, createQuery, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useMutationState, useQueryClient };

package/build/index.cjs

@@ -60,7 +60,7 @@ function reconcileFn(store$1, result, reconcileOption) {
   const newData = store.reconcile(result.data, { key: reconcileOption })(store$1.data);
   return { ...result, data: newData };
 }
-var hydrateableObserverResult = (query, result) => {
+var hydratableObserverResult = (query, result) => {
   if (!web.isServer)
     return result;
   return {
@@ -106,7 +106,7 @@ function createBaseQuery(options, Observer, queryClient) {
     return observer().subscribe((result) => {
       queryCore.notifyManager.batchCalls(() => {
         const query = observer().getCurrentQuery();
-        const unwrappedResult = hydrateableObserverResult(query, result);
+        const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
         } else {
@@ -146,7 +146,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.updateResult();
         if (!state.isLoading && !isRestoring()) {
           const query = obs.getCurrentQuery();
-          resolve(hydrateableObserverResult(query, state));
+          resolve(hydratableObserverResult(query, state));
         }
       });
     },
@@ -196,8 +196,8 @@ function createBaseQuery(options, Observer, queryClient) {
     solidJs.on(
       [isRestoring, observer],
       ([restoring]) => {
-        const unsub = unsubscribe;
-        queueMicrotask(() => unsub?.());
+        const _unsubscribe = unsubscribe;
+        queueMicrotask(() => _unsubscribe?.());
         unsubscribe = null;
         if (!restoring)
           refetch();
@@ -469,9 +469,9 @@ function createQueries(queriesOptions, queryClient) {
   const getProxies = () => state.map((s, index) => {
     return new Proxy(s, handler(index));
   });
-  const [proxifiedState, setProxifiedState] = store.createStore(getProxies());
-  solidJs.createRenderEffect(() => setProxifiedState(getProxies()));
-  return proxifiedState;
+  const [proxyState, setProxyState] = store.createStore(getProxies());
+  solidJs.createRenderEffect(() => setProxyState(getProxies()));
+  return proxyState;
 }
 
 exports.createInfiniteQuery = createInfiniteQuery;

package/build/index.d.cts

@@ -59,8 +59,8 @@ type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables
     mutateAsync: CreateMutateAsyncFunction<TData, TError, TVariables, TContext>;
 };
 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];
+type Override<TTargetA, TTargetB> = {
+    [AKey in keyof TTargetA]: AKey extends keyof TTargetB ? TTargetB[AKey] : TTargetA[AKey];
 };
 
 type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
@@ -139,25 +139,25 @@ type GetResults<T> = T extends {
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */
-type QueriesOptions<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[
+type QueriesOptions<T extends Array<any>, TResult extends Array<any> = [], TDepth extends ReadonlyArray<number> = []> = TDepth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...TResult, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[
     ...Tail
 ], [
-    ...Result,
+    ...TResult,
     GetOptions<Head>
 ], [
-    ...Depth,
+    ...TDepth,
     1
 ]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
 /**
  * QueriesResults reducer recursively maps type param to results
  */
-type QueriesResults<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[
+type QueriesResults<T extends Array<any>, TResult extends Array<any> = [], TDepth extends ReadonlyArray<number> = []> = TDepth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...TResult, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[
     ...Tail
 ], [
-    ...Result,
+    ...TResult,
     GetResults<Head>
 ], [
-    ...Depth,
+    ...TDepth,
     1
 ]> : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<CreateQueryResult>;
 declare function createQueries<T extends Array<any>, TCombinedResult extends QueriesResults<T> = QueriesResults<T>>(queriesOptions: Accessor<{

package/build/index.d.ts

@@ -59,8 +59,8 @@ type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables
     mutateAsync: CreateMutateAsyncFunction<TData, TError, TVariables, TContext>;
 };
 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];
+type Override<TTargetA, TTargetB> = {
+    [AKey in keyof TTargetA]: AKey extends keyof TTargetB ? TTargetB[AKey] : TTargetA[AKey];
 };
 
 type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
@@ -139,25 +139,25 @@ type GetResults<T> = T extends {
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */
-type QueriesOptions<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[
+type QueriesOptions<T extends Array<any>, TResult extends Array<any> = [], TDepth extends ReadonlyArray<number> = []> = TDepth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...TResult, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[
     ...Tail
 ], [
-    ...Result,
+    ...TResult,
     GetOptions<Head>
 ], [
-    ...Depth,
+    ...TDepth,
     1
 ]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
 /**
  * QueriesResults reducer recursively maps type param to results
  */
-type QueriesResults<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[
+type QueriesResults<T extends Array<any>, TResult extends Array<any> = [], TDepth extends ReadonlyArray<number> = []> = TDepth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...TResult, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[
     ...Tail
 ], [
-    ...Result,
+    ...TResult,
     GetResults<Head>
 ], [
-    ...Depth,
+    ...TDepth,
     1
 ]> : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<CreateQueryResult>;
 declare function createQueries<T extends Array<any>, TCombinedResult extends QueriesResults<T> = QueriesResults<T>>(queriesOptions: Accessor<{

package/build/index.js

@@ -59,7 +59,7 @@ function reconcileFn(store, result, reconcileOption) {
   const newData = reconcile(result.data, { key: reconcileOption })(store.data);
   return { ...result, data: newData };
 }
-var hydrateableObserverResult = (query, result) => {
+var hydratableObserverResult = (query, result) => {
   if (!isServer)
     return result;
   return {
@@ -105,7 +105,7 @@ function createBaseQuery(options, Observer, queryClient) {
     return observer().subscribe((result) => {
       notifyManager.batchCalls(() => {
         const query = observer().getCurrentQuery();
-        const unwrappedResult = hydrateableObserverResult(query, result);
+        const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
         } else {
@@ -145,7 +145,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.updateResult();
         if (!state.isLoading && !isRestoring()) {
           const query = obs.getCurrentQuery();
-          resolve(hydrateableObserverResult(query, state));
+          resolve(hydratableObserverResult(query, state));
         }
       });
     },
@@ -195,8 +195,8 @@ function createBaseQuery(options, Observer, queryClient) {
     on(
       [isRestoring, observer],
       ([restoring]) => {
-        const unsub = unsubscribe;
-        queueMicrotask(() => unsub?.());
+        const _unsubscribe = unsubscribe;
+        queueMicrotask(() => _unsubscribe?.());
         unsubscribe = null;
         if (!restoring)
           refetch();
@@ -468,9 +468,9 @@ function createQueries(queriesOptions, queryClient) {
   const getProxies = () => state.map((s, index) => {
     return new Proxy(s, handler(index));
   });
-  const [proxifiedState, setProxifiedState] = createStore(getProxies());
-  createRenderEffect(() => setProxifiedState(getProxies()));
-  return proxifiedState;
+  const [proxyState, setProxyState] = createStore(getProxies());
+  createRenderEffect(() => setProxyState(getProxies()));
+  return proxyState;
 }
 
 export { IsRestoringProvider, QueryClient, QueryClientContext, QueryClientProvider, createInfiniteQuery, createMutation, createQueries, createQuery, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useMutationState, useQueryClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.17.15",
+  "version": "5.18.0",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -48,7 +48,7 @@
   ],
   "dependencies": {
     "solid-js": "^1.8.7",
-    "@tanstack/query-core": "5.17.15"
+    "@tanstack/query-core": "5.18.0"
   },
   "devDependencies": {
     "tsup-preset-solid": "^2.2.0",

package/src/__tests__/createQuery.test.tsx

@@ -1214,7 +1214,7 @@ describe('createQuery', () => {
     })
   })
 
-  it('should not update disabled query when refetched with refetchQueries', async () => {
+  it('should not update disabled query when refetch with refetchQueries', async () => {
     const key = queryKey()
     const states: Array<CreateQueryResult<number>> = []
     let count = 0
@@ -1941,7 +1941,7 @@ describe('createQuery', () => {
     await sleep(20)
 
     // Since components are rendered once
-    // There wiil only be one pass
+    // There will only be one pass
     expect(renders).toBe(1)
   })
 
@@ -2215,7 +2215,7 @@ describe('createQuery', () => {
     expect(states[3]).toMatchObject({ data: 1, isFetching: false })
   })
 
-  it('should calculate focus behaviour for refetchOnWindowFocus depending on function', async () => {
+  it('should calculate focus behavior for refetchOnWindowFocus depending on function', async () => {
     const key = queryKey()
     const states: Array<CreateQueryResult<number>> = []
     let count = 0
@@ -2364,7 +2364,7 @@ describe('createQuery', () => {
       const state = createQuery(() => ({
         queryKey: key,
         queryFn: () => {
-          return Promise.reject(new Error('Error test jaylen'))
+          return Promise.reject(new Error('Error test'))
         },
         retry: false,
       }))
@@ -2384,7 +2384,7 @@ describe('createQuery', () => {
     ))
 
     await waitFor(() => rendered.getByText('error'))
-    await waitFor(() => rendered.getByText('Error test jaylen'))
+    await waitFor(() => rendered.getByText('Error test'))
 
     consoleMock.mockRestore()
   })
@@ -2399,7 +2399,7 @@ describe('createQuery', () => {
     function Page() {
       const state = createQuery(() => ({
         queryKey: key,
-        queryFn: () => Promise.reject(new Error('Error test jaylen')),
+        queryFn: () => Promise.reject(new Error('Error test')),
         retry: false,
         throwOnError: true,
       }))

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

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

package/src/__tests__/suspense.test.tsx

@@ -121,6 +121,7 @@ describe("useQuery's in Suspense mode", () => {
 
     await waitFor(() => rendered.getByText('data: 1'))
 
+    // eslint-disable-next-line @cspell/spellchecker
     // TODO(lukemurray): in react this is 1 in solid this is 2 because suspense
     // occurs on read.
     expect(states.length).toBe(2)
@@ -132,6 +133,7 @@ describe("useQuery's in Suspense mode", () => {
     fireEvent.click(rendered.getByText('next'))
     await waitFor(() => rendered.getByText('data: 2'))
 
+    // eslint-disable-next-line @cspell/spellchecker
     // TODO(lukemurray): in react this is 2 and in solid it is 4
     expect(states.length).toBe(4)
     expect(states[3]).toMatchObject({
@@ -705,7 +707,7 @@ describe("useQuery's in Suspense mode", () => {
     expect(queryFn).toHaveBeenCalledTimes(1)
   })
 
-  it('should error catched in error boundary without infinite loop', async () => {
+  it('should error caught in error boundary without infinite loop', async () => {
     const key = queryKey()
 
     const consoleMock = vi
@@ -776,7 +778,7 @@ describe("useQuery's in Suspense mode", () => {
     consoleMock.mockRestore()
   })
 
-  it('should error catched in error boundary without infinite loop when query keys changed', async () => {
+  it('should error caught in error boundary without infinite loop when query keys changed', async () => {
     let succeed = true
 
     const consoleMock = vi
@@ -840,7 +842,7 @@ describe("useQuery's in Suspense mode", () => {
     consoleMock.mockRestore()
   })
 
-  it('should error catched in error boundary without infinite loop when enabled changed', async () => {
+  it('should error caught in error boundary without infinite loop when enabled changed', async () => {
     const consoleMock = vi
       .spyOn(console, 'error')
       .mockImplementation(() => undefined)

package/src/__tests__/useIsFetching.test.tsx

@@ -59,12 +59,12 @@ describe('useIsFetching', () => {
     const key1 = queryKey()
     const key2 = queryKey()
 
-    const isFetchings: Array<number> = []
+    const isFetchingArray: Array<number> = []
 
     function IsFetching() {
       const isFetching = useIsFetching()
       createRenderEffect(() => {
-        isFetchings.push(isFetching())
+        isFetchingArray.push(isFetching())
       })
       return null
     }
@@ -117,7 +117,7 @@ describe('useIsFetching', () => {
       </QueryClientProvider>
     ))
     // unlike react, Updating renderSecond wont cause a rerender for FirstQuery
-    await waitFor(() => expect(isFetchings).toEqual([0, 1, 2, 1, 0]))
+    await waitFor(() => expect(isFetchingArray).toEqual([0, 1, 2, 1, 0]))
   })
 
   it('should be able to filter', async () => {
@@ -125,7 +125,7 @@ describe('useIsFetching', () => {
     const key1 = queryKey()
     const key2 = queryKey()
 
-    const isFetchings: Array<number> = []
+    const isFetchingArray: Array<number> = []
 
     function One() {
       createQuery(() => ({
@@ -156,7 +156,7 @@ describe('useIsFetching', () => {
       }))
 
       createRenderEffect(() => {
-        isFetchings.push(isFetching())
+        isFetchingArray.push(isFetching())
       })
 
       return (
@@ -184,7 +184,7 @@ describe('useIsFetching', () => {
     await rendered.findByText('isFetching: 1')
     await rendered.findByText('isFetching: 0')
     // at no point should we have isFetching: 2
-    expect(isFetchings).toEqual(expect.not.arrayContaining([2]))
+    expect(isFetchingArray).toEqual(expect.not.arrayContaining([2]))
   })
 
   it('should show the correct fetching state when mounted after a query', async () => {

package/src/__tests__/useIsMutating.test.tsx

@@ -7,13 +7,13 @@ import { createQueryClient, setActTimeout, sleep } from './utils'
 
 describe('useIsMutating', () => {
   it('should return the number of fetching mutations', async () => {
-    const isMutatings: Array<number> = []
+    const isMutatingArray: Array<number> = []
     const queryClient = createQueryClient()
 
     function IsMutating() {
       const isMutating = useIsMutating()
       createRenderEffect(() => {
-        isMutatings.push(isMutating())
+        isMutatingArray.push(isMutating())
       })
       return null
     }
@@ -58,17 +58,17 @@ describe('useIsMutating', () => {
         <Page />
       </QueryClientProvider>
     ))
-    await waitFor(() => expect(isMutatings).toEqual([0, 1, 2, 1, 0]))
+    await waitFor(() => expect(isMutatingArray).toEqual([0, 1, 2, 1, 0]))
   })
 
   it('should filter correctly by mutationKey', async () => {
-    const isMutatings: Array<number> = []
+    const isMutatingArray: Array<number> = []
     const queryClient = createQueryClient()
 
     function IsMutating() {
       const isMutating = useIsMutating(() => ({ mutationKey: ['mutation1'] }))
       createRenderEffect(() => {
-        isMutatings.push(isMutating())
+        isMutatingArray.push(isMutating())
       })
       return null
     }
@@ -103,11 +103,11 @@ describe('useIsMutating', () => {
       </QueryClientProvider>
     ))
     // Unlike React, IsMutating Wont re-render twice with mutation2
-    await waitFor(() => expect(isMutatings).toEqual([0, 1, 0]))
+    await waitFor(() => expect(isMutatingArray).toEqual([0, 1, 0]))
   })
 
   it('should filter correctly by predicate', async () => {
-    const isMutatings: Array<number> = []
+    const isMutatingArray: Array<number> = []
     const queryClient = createQueryClient()
 
     function IsMutating() {
@@ -116,7 +116,7 @@ describe('useIsMutating', () => {
           mutation.options.mutationKey?.[0] === 'mutation1',
       }))
       createRenderEffect(() => {
-        isMutatings.push(isMutating())
+        isMutatingArray.push(isMutating())
       })
       return null
     }
@@ -152,7 +152,7 @@ describe('useIsMutating', () => {
     ))
 
     // Again, No unnecessary re-renders like React
-    await waitFor(() => expect(isMutatings).toEqual([0, 1, 0]))
+    await waitFor(() => expect(isMutatingArray).toEqual([0, 1, 0]))
   })
 
   it('should use provided custom queryClient', async () => {

package/src/createBaseQuery.ts

@@ -46,33 +46,33 @@ function reconcileFn<TData, TError>(
   return { ...result, data: newData } as typeof result
 }
 
-type HydrateableQueryState<TData, TError> = QueryObserverResult<TData, TError> &
+type HydratableQueryState<TData, TError> = QueryObserverResult<TData, TError> &
   QueryState<TData, TError>
 
 /**
  * Solid's `onHydrated` functionality will silently "fail" (hydrate with an empty object)
  * if the resource data is not serializable.
  */
-const hydrateableObserverResult = <
+const hydratableObserverResult = <
   TQueryFnData,
   TError,
   TData,
   TQueryKey extends QueryKey,
-  T2,
+  TDataHydratable,
 >(
   query: Query<TQueryFnData, TError, TData, TQueryKey>,
-  result: QueryObserverResult<T2, TError>,
-): HydrateableQueryState<T2, TError> => {
+  result: QueryObserverResult<TDataHydratable, TError>,
+): HydratableQueryState<TDataHydratable, TError> => {
   // Including the extra properties is only relevant on the server
-  if (!isServer) return result as HydrateableQueryState<T2, TError>
+  if (!isServer) return result as HydratableQueryState<TDataHydratable, TError>
 
   return {
     ...unwrap(result),
 
     // cast to refetch function should be safe, since we only remove it on the server,
     // and refetch is not relevant on the server
-    refetch: undefined as unknown as HydrateableQueryState<
-      T2,
+    refetch: undefined as unknown as HydratableQueryState<
+      TDataHydratable,
       TError
     >['refetch'],
 
@@ -104,7 +104,7 @@ export function createBaseQuery<
   queryClient?: Accessor<QueryClient>,
 ) {
   type ResourceData =
-    | HydrateableQueryState<TData, TError>
+    | HydratableQueryState<TData, TError>
     | QueryObserverResult<TData, TError>
 
   const client = createMemo(() => useQueryClient(queryClient?.()))
@@ -144,7 +144,7 @@ export function createBaseQuery<
     return observer().subscribe((result) => {
       notifyManager.batchCalls(() => {
         const query = observer().getCurrentQuery()
-        const unwrappedResult = hydrateableObserverResult(query, result)
+        const unwrappedResult = hydratableObserverResult(query, result)
 
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error)
@@ -170,7 +170,7 @@ export function createBaseQuery<
             reconcileOptions === undefined ? false : reconcileOptions,
           )
         })
-        // If the query has data we dont suspend but instead mutate the resource
+        // If the query has data we don't suspend but instead mutate the resource
         // This could happen when placeholderData/initialData is defined
         if (
           queryResource()?.data &&
@@ -203,7 +203,7 @@ export function createBaseQuery<
 
         if (!state.isLoading && !isRestoring()) {
           const query = obs.getCurrentQuery()
-          resolve(hydrateableObserverResult(query, state))
+          resolve(hydratableObserverResult(query, state))
         }
       })
     },
@@ -263,8 +263,8 @@ export function createBaseQuery<
     on(
       [isRestoring, observer],
       ([restoring]) => {
-        const unsub = unsubscribe
-        queueMicrotask(() => unsub?.())
+        const _unsubscribe = unsubscribe
+        queueMicrotask(() => _unsubscribe?.())
         unsubscribe = null
         if (!restoring) refetch()
       },

package/src/createQueries.ts

@@ -131,19 +131,19 @@ type GetResults<T> =
  */
 type QueriesOptions<
   T extends Array<any>,
-  Result extends Array<any> = [],
-  Depth extends ReadonlyArray<number> = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
+  TResult extends Array<any> = [],
+  TDepth extends ReadonlyArray<number> = [],
+> = TDepth['length'] extends MAXIMUM_DEPTH
   ? Array<CreateQueryOptionsForCreateQueries>
   : T extends []
     ? []
     : T extends [infer Head]
-      ? [...Result, GetOptions<Head>]
+      ? [...TResult, GetOptions<Head>]
       : T extends [infer Head, ...infer Tail]
         ? QueriesOptions<
             [...Tail],
-            [...Result, GetOptions<Head>],
-            [...Depth, 1]
+            [...TResult, GetOptions<Head>],
+            [...TDepth, 1]
           >
         : Array<unknown> extends T
           ? T
@@ -173,19 +173,19 @@ type QueriesOptions<
  */
 type QueriesResults<
   T extends Array<any>,
-  Result extends Array<any> = [],
-  Depth extends ReadonlyArray<number> = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
+  TResult extends Array<any> = [],
+  TDepth extends ReadonlyArray<number> = [],
+> = TDepth['length'] extends MAXIMUM_DEPTH
   ? Array<CreateQueryResult>
   : T extends []
     ? []
     : T extends [infer Head]
-      ? [...Result, GetResults<Head>]
+      ? [...TResult, GetResults<Head>]
       : T extends [infer Head, ...infer Tail]
         ? QueriesResults<
             [...Tail],
-            [...Result, GetResults<Head>],
-            [...Depth, 1]
+            [...TResult, GetResults<Head>],
+            [...TDepth, 1]
           >
         : T extends Array<
               CreateQueryOptionsForCreateQueries<
@@ -354,8 +354,8 @@ export function createQueries<
       return new Proxy(s, handler(index))
     })
 
-  const [proxifiedState, setProxifiedState] = createStore(getProxies())
-  createRenderEffect(() => setProxifiedState(getProxies()))
+  const [proxyState, setProxyState] = createStore(getProxies())
+  createRenderEffect(() => setProxyState(getProxies()))
 
-  return proxifiedState as TCombinedResult
+  return proxyState as TCombinedResult
 }

package/src/types.ts

@@ -174,4 +174,8 @@ export type CreateMutationResult<
   TContext = unknown,
 > = CreateBaseMutationResult<TData, TError, TVariables, TContext>
 
-type Override<A, B> = { [K in keyof A]: K extends keyof B ? B[K] : A[K] }
+type Override<TTargetA, TTargetB> = {
+  [AKey in keyof TTargetA]: AKey extends keyof TTargetB
+    ? TTargetB[AKey]
+    : TTargetA[AKey]
+}