@tanstack/solid-query 5.66.4 → 5.66.11

package/build/dev.cjs

@@ -11,7 +11,7 @@ exports.QueryClient = class QueryClient extends queryCore.QueryClient {
     super(config);
   }
 };
-exports.QueryClientContext = solidJs.createContext(undefined);
+exports.QueryClientContext = solidJs.createContext(void 0);
 exports.useQueryClient = (queryClient) => {
   if (queryClient) {
     return queryClient;
@@ -59,7 +59,7 @@ function reconcileFn(store$1, result, reconcileOption, queryHash) {
     return { ...result, data: newData2 };
   }
   let data = result.data;
-  if (store$1.data === undefined) {
+  if (store$1.data === void 0) {
     try {
       data = structuredClone(data);
     } catch (error) {
@@ -84,11 +84,11 @@ var hydratableObserverResult = (query, result) => {
     ...store.unwrap(result),
     // During SSR, functions cannot be serialized, so we need to remove them
     // This is safe because we will add these functions back when the query is hydrated
-    refetch: undefined
+    refetch: void 0
   };
   if ("fetchNextPage" in result) {
-    obj.fetchNextPage = undefined;
-    obj.fetchPreviousPage = undefined;
+    obj.fetchNextPage = void 0;
+    obj.fetchPreviousPage = void 0;
   }
   obj.hydrationData = {
     state: query.state,
@@ -157,7 +157,7 @@ function createBaseQuery(options, Observer, queryClient) {
       return reconcileFn(
         store,
         res,
-        reconcileOptions === undefined ? false : reconcileOptions,
+        reconcileOptions === void 0 ? false : reconcileOptions,
         opts.queryHash
       );
     });
@@ -294,7 +294,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const handler = {
     get(target, prop) {
       if (prop === "data") {
-        if (state.data !== undefined) {
+        if (state.data !== void 0) {
           return queryResource.latest?.data;
         }
         return queryResource()?.data;
@@ -434,7 +434,7 @@ function createQueries(queriesOptions, queryClient) {
     defaultedQueries(),
     queriesOptions().combine ? {
       combine: queriesOptions().combine
-    } : undefined
+    } : void 0
   );
   const [state, setState] = store.createStore(
     observer.getOptimisticResult(
@@ -507,7 +507,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });
@@ -516,7 +516,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });

package/build/dev.js

@@ -1,4 +1,4 @@
-import { QueryClient as QueryClient$1, MutationObserver, replaceEqualDeep, QueriesObserver, hydrate, QueryObserver, InfiniteQueryObserver, notifyManager } from '@tanstack/query-core';
+import { QueryClient as QueryClient$1, MutationObserver, replaceEqualDeep, QueriesObserver, hydrate, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import { createContext, useContext, createRenderEffect, onCleanup, createMemo, createSignal, createComputed, on, createEffect, mergeProps, createResource, batch, onMount } from 'solid-js';
 import { createComponent, isServer } from 'solid-js/web';
@@ -10,7 +10,7 @@ var QueryClient = class extends QueryClient$1 {
     super(config);
   }
 };
-var QueryClientContext = createContext(undefined);
+var QueryClientContext = createContext(void 0);
 var useQueryClient = (queryClient) => {
   if (queryClient) {
     return queryClient;
@@ -58,7 +58,7 @@ function reconcileFn(store, result, reconcileOption, queryHash) {
     return { ...result, data: newData2 };
   }
   let data = result.data;
-  if (store.data === undefined) {
+  if (store.data === void 0) {
     try {
       data = structuredClone(data);
     } catch (error) {
@@ -83,11 +83,11 @@ var hydratableObserverResult = (query, result) => {
     ...unwrap(result),
     // During SSR, functions cannot be serialized, so we need to remove them
     // This is safe because we will add these functions back when the query is hydrated
-    refetch: undefined
+    refetch: void 0
   };
   if ("fetchNextPage" in result) {
-    obj.fetchNextPage = undefined;
-    obj.fetchPreviousPage = undefined;
+    obj.fetchNextPage = void 0;
+    obj.fetchPreviousPage = void 0;
   }
   obj.hydrationData = {
     state: query.state,
@@ -156,7 +156,7 @@ function createBaseQuery(options, Observer, queryClient) {
       return reconcileFn(
         store,
         res,
-        reconcileOptions === undefined ? false : reconcileOptions,
+        reconcileOptions === void 0 ? false : reconcileOptions,
         opts.queryHash
       );
     });
@@ -293,7 +293,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const handler = {
     get(target, prop) {
       if (prop === "data") {
-        if (state.data !== undefined) {
+        if (state.data !== void 0) {
           return queryResource.latest?.data;
         }
         return queryResource()?.data;
@@ -433,7 +433,7 @@ function createQueries(queriesOptions, queryClient) {
     defaultedQueries(),
     queriesOptions().combine ? {
       combine: queriesOptions().combine
-    } : undefined
+    } : void 0
   );
   const [state, setState] = createStore(
     observer.getOptimisticResult(
@@ -506,7 +506,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });
@@ -515,7 +515,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });

package/build/index.cjs

@@ -11,7 +11,7 @@ exports.QueryClient = class QueryClient extends queryCore.QueryClient {
     super(config);
   }
 };
-exports.QueryClientContext = solidJs.createContext(undefined);
+exports.QueryClientContext = solidJs.createContext(void 0);
 exports.useQueryClient = (queryClient) => {
   if (queryClient) {
     return queryClient;
@@ -59,7 +59,7 @@ function reconcileFn(store$1, result, reconcileOption, queryHash) {
     return { ...result, data: newData2 };
   }
   let data = result.data;
-  if (store$1.data === undefined) {
+  if (store$1.data === void 0) {
     try {
       data = structuredClone(data);
     } catch (error) {
@@ -75,11 +75,11 @@ var hydratableObserverResult = (query, result) => {
     ...store.unwrap(result),
     // During SSR, functions cannot be serialized, so we need to remove them
     // This is safe because we will add these functions back when the query is hydrated
-    refetch: undefined
+    refetch: void 0
   };
   if ("fetchNextPage" in result) {
-    obj.fetchNextPage = undefined;
-    obj.fetchPreviousPage = undefined;
+    obj.fetchNextPage = void 0;
+    obj.fetchPreviousPage = void 0;
   }
   obj.hydrationData = {
     state: query.state,
@@ -148,7 +148,7 @@ function createBaseQuery(options, Observer, queryClient) {
       return reconcileFn(
         store,
         res,
-        reconcileOptions === undefined ? false : reconcileOptions,
+        reconcileOptions === void 0 ? false : reconcileOptions,
         opts.queryHash
       );
     });
@@ -285,7 +285,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const handler = {
     get(target, prop) {
       if (prop === "data") {
-        if (state.data !== undefined) {
+        if (state.data !== void 0) {
           return queryResource.latest?.data;
         }
         return queryResource()?.data;
@@ -425,7 +425,7 @@ function createQueries(queriesOptions, queryClient) {
     defaultedQueries(),
     queriesOptions().combine ? {
       combine: queriesOptions().combine
-    } : undefined
+    } : void 0
   );
   const [state, setState] = store.createStore(
     observer.getOptimisticResult(
@@ -498,7 +498,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });
@@ -507,7 +507,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });

package/build/index.d.cts

@@ -1,4 +1,4 @@
-import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, DefinedInfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, Override, MutationObserverResult, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
+import { QueryClient as QueryClient$1, QueryClientConfig as QueryClientConfig$1, DefaultError, DefaultOptions as DefaultOptions$1, OmitKeyof, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, QueryObserverResult, DefinedQueryObserverResult, DefinedInfiniteQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, Override, MutationObserverResult, MutateFunction, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueryFunction, ThrowOnError, QueriesPlaceholderDataFunction } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
@@ -203,9 +203,13 @@ type QueriesResults<T extends Array<any>, TResult extends Array<any> = [], TDept
 ], [
     ...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>;
+]> : {
+    [K in keyof T]: GetResults<T[K]>;
+};
 declare function createQueries<T extends Array<any>, TCombinedResult extends QueriesResults<T> = QueriesResults<T>>(queriesOptions: Accessor<{
-    queries: readonly [...QueriesOptions<T>];
+    queries: readonly [...QueriesOptions<T>] | readonly [...{
+        [K in keyof T]: GetOptions<T[K]>;
+    }];
     combine?: (result: QueriesResults<T>) => TCombinedResult;
 }>, queryClient?: Accessor<QueryClient>): TCombinedResult;
 

package/build/index.d.ts

@@ -1,4 +1,4 @@
-import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, DefinedInfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, Override, MutationObserverResult, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
+import { QueryClient as QueryClient$1, QueryClientConfig as QueryClientConfig$1, DefaultError, DefaultOptions as DefaultOptions$1, OmitKeyof, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, QueryObserverResult, DefinedQueryObserverResult, DefinedInfiniteQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, Override, MutationObserverResult, MutateFunction, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueryFunction, ThrowOnError, QueriesPlaceholderDataFunction } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
@@ -203,9 +203,13 @@ type QueriesResults<T extends Array<any>, TResult extends Array<any> = [], TDept
 ], [
     ...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>;
+]> : {
+    [K in keyof T]: GetResults<T[K]>;
+};
 declare function createQueries<T extends Array<any>, TCombinedResult extends QueriesResults<T> = QueriesResults<T>>(queriesOptions: Accessor<{
-    queries: readonly [...QueriesOptions<T>];
+    queries: readonly [...QueriesOptions<T>] | readonly [...{
+        [K in keyof T]: GetOptions<T[K]>;
+    }];
     combine?: (result: QueriesResults<T>) => TCombinedResult;
 }>, queryClient?: Accessor<QueryClient>): TCombinedResult;
 

package/build/index.js

@@ -1,4 +1,4 @@
-import { QueryClient as QueryClient$1, MutationObserver, replaceEqualDeep, QueriesObserver, hydrate, QueryObserver, InfiniteQueryObserver, notifyManager } from '@tanstack/query-core';
+import { QueryClient as QueryClient$1, MutationObserver, replaceEqualDeep, QueriesObserver, hydrate, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import { createContext, useContext, createRenderEffect, onCleanup, createMemo, createSignal, createComputed, on, createEffect, mergeProps, createResource, batch, onMount } from 'solid-js';
 import { createComponent, isServer } from 'solid-js/web';
@@ -10,7 +10,7 @@ var QueryClient = class extends QueryClient$1 {
     super(config);
   }
 };
-var QueryClientContext = createContext(undefined);
+var QueryClientContext = createContext(void 0);
 var useQueryClient = (queryClient) => {
   if (queryClient) {
     return queryClient;
@@ -58,7 +58,7 @@ function reconcileFn(store, result, reconcileOption, queryHash) {
     return { ...result, data: newData2 };
   }
   let data = result.data;
-  if (store.data === undefined) {
+  if (store.data === void 0) {
     try {
       data = structuredClone(data);
     } catch (error) {
@@ -74,11 +74,11 @@ var hydratableObserverResult = (query, result) => {
     ...unwrap(result),
     // During SSR, functions cannot be serialized, so we need to remove them
     // This is safe because we will add these functions back when the query is hydrated
-    refetch: undefined
+    refetch: void 0
   };
   if ("fetchNextPage" in result) {
-    obj.fetchNextPage = undefined;
-    obj.fetchPreviousPage = undefined;
+    obj.fetchNextPage = void 0;
+    obj.fetchPreviousPage = void 0;
   }
   obj.hydrationData = {
     state: query.state,
@@ -147,7 +147,7 @@ function createBaseQuery(options, Observer, queryClient) {
       return reconcileFn(
         store,
         res,
-        reconcileOptions === undefined ? false : reconcileOptions,
+        reconcileOptions === void 0 ? false : reconcileOptions,
         opts.queryHash
       );
     });
@@ -284,7 +284,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const handler = {
     get(target, prop) {
       if (prop === "data") {
-        if (state.data !== undefined) {
+        if (state.data !== void 0) {
           return queryResource.latest?.data;
         }
         return queryResource()?.data;
@@ -424,7 +424,7 @@ function createQueries(queriesOptions, queryClient) {
     defaultedQueries(),
     queriesOptions().combine ? {
       combine: queriesOptions().combine
-    } : undefined
+    } : void 0
   );
   const [state, setState] = createStore(
     observer.getOptimisticResult(
@@ -497,7 +497,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });
@@ -506,7 +506,7 @@ function createQueries(queriesOptions, queryClient) {
       defaultedQueries(),
       queriesOptions().combine ? {
         combine: queriesOptions().combine
-      } : undefined,
+      } : void 0,
       { listeners: false }
     );
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.66.4",
+  "version": "5.66.11",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "!src/__tests__"
   ],
   "dependencies": {
-    "@tanstack/query-core": "5.66.4"
+    "@tanstack/query-core": "5.66.11"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",

package/src/createQueries.ts

@@ -183,30 +183,16 @@ type QueriesResults<
             [...TResult, GetResults<Head>],
             [...TDepth, 1]
           >
-        : T extends Array<
-              CreateQueryOptionsForCreateQueries<
-                infer TQueryFnData,
-                infer TError,
-                infer TData,
-                any
-              >
-            >
-          ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
-            Array<
-              CreateQueryResult<
-                unknown extends TData ? TQueryFnData : TData,
-                unknown extends TError ? DefaultError : TError
-              >
-            >
-          : // Fallback
-            Array<CreateQueryResult>
+        : { [K in keyof T]: GetResults<T[K]> }
 
 export function createQueries<
   T extends Array<any>,
   TCombinedResult extends QueriesResults<T> = QueriesResults<T>,
 >(
   queriesOptions: Accessor<{
-    queries: readonly [...QueriesOptions<T>]
+    queries:
+      | readonly [...QueriesOptions<T>]
+      | readonly [...{ [K in keyof T]: GetOptions<T[K]> }]
     combine?: (result: QueriesResults<T>) => TCombinedResult
   }>,
   queryClient?: Accessor<QueryClient>,