@tanstack/solid-query 5.0.0-rc.1 → 5.0.0-rc.12

package/build/dev.cjs

@@ -83,7 +83,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const isRestoring = exports.useIsRestoring();
   const defaultedOptions = solidJs.createMemo(
-    () => solidJs.mergeProps(client().defaultQueryOptions(options()), {
+    () => solidJs.mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -124,7 +124,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/build/dev.js

@@ -82,7 +82,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const isRestoring = useIsRestoring();
   const defaultedOptions = createMemo(
-    () => mergeProps(client().defaultQueryOptions(options()), {
+    () => mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -123,7 +123,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/build/index.cjs

@@ -83,7 +83,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const isRestoring = exports.useIsRestoring();
   const defaultedOptions = solidJs.createMemo(
-    () => solidJs.mergeProps(client().defaultQueryOptions(options()), {
+    () => solidJs.mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -124,7 +124,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/build/index.d.cts

@@ -9,7 +9,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
      * 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`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
@@ -18,7 +18,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
      * 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`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }

package/build/index.d.ts

@@ -9,7 +9,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
      * 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`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
@@ -18,7 +18,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
      * 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`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }

package/build/index.js

@@ -82,7 +82,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const isRestoring = useIsRestoring();
   const defaultedOptions = createMemo(
-    () => mergeProps(client().defaultQueryOptions(options()), {
+    () => mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -123,7 +123,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.12",
   "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.7.8",
-    "@tanstack/query-core": "5.0.0-rc.1"
+    "@tanstack/query-core": "5.0.0-rc.12"
   },
   "devDependencies": {
     "tsup-preset-solid": "^2.0.1",

package/src/QueryClient.ts

@@ -30,7 +30,7 @@ export interface QueryObserverOptions<
    * 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`.
+   * Defaults reconciliation to false.
    */
   reconcile?:
     | string
@@ -60,7 +60,7 @@ export interface InfiniteQueryObserverOptions<
    * 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`.
+   * Defaults reconciliation to false.
    */
   reconcile?:
     | string

package/src/__tests__/createQuery.test.tsx

@@ -1046,6 +1046,7 @@ describe('createQuery', () => {
           count++
           return count === 1 ? result1 : result2
         },
+        reconcile: 'id',
       }))
 
       createRenderEffect(() => {
@@ -3714,7 +3715,7 @@ describe('createQuery', () => {
           await sleep(10)
           return count++
         },
-        refetchInterval: (data = 0) => (data < 2 ? 10 : false),
+        refetchInterval: ({ state: { data = 0 } }) => (data < 2 ? 10 : false),
       }))
 
       createRenderEffect(() => {
@@ -5711,11 +5712,11 @@ describe('createQuery', () => {
           <div>data: {state.data}</div>
           <div>dataUpdatedAt: {state.dataUpdatedAt}</div>
           <button
-            onClick={() =>
+            onClick={() => {
               queryClient.setQueryData(key, 'newData', {
                 updatedAt: 100,
               })
-            }
+            }}
           >
             setQueryData
           </button>

package/src/createBaseQuery.ts

@@ -111,7 +111,7 @@ export function createBaseQuery<
   const isRestoring = useIsRestoring()
 
   const defaultedOptions = createMemo(() =>
-    mergeProps(client().defaultQueryOptions(options()), {
+    mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? 'isRestoring' : 'optimistic'
       },
@@ -167,7 +167,7 @@ export function createBaseQuery<
           return reconcileFn(
             store,
             result,
-            reconcileOptions === undefined ? 'id' : reconcileOptions,
+            reconcileOptions === undefined ? false : reconcileOptions,
           )
         })
         // If the query has data we dont suspend but instead mutate the resource