@tanstack/solid-query 4.11.0 → 4.12.0

package/build/lib/__tests__/QueryClientProvider.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/lib/__tests__/createInfiniteQuery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/lib/__tests__/createMutation.test.d.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

package/build/lib/__tests__/createQueries.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/lib/__tests__/createQuery.test.d.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

package/build/lib/__tests__/createQuery.types.test.d.ts

@@ -0,0 +1,2 @@
+export declare type Equal<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
+export declare type Expect<T extends true> = T;

package/build/lib/__tests__/suspense.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/lib/__tests__/transition.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/lib/__tests__/useIsFetching.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/lib/__tests__/useIsMutating.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/lib/__tests__/utils.d.ts

@@ -0,0 +1,27 @@
+/// <reference types="jest" />
+/// <reference types="node" />
+import type { QueryClientConfig } from '@tanstack/query-core';
+import { QueryClient } from '@tanstack/query-core';
+import type { ParentProps } from 'solid-js';
+export declare function queryKey(): () => Array<string>;
+export declare const Blink: (props: {
+    duration: number;
+} & ParentProps) => import("solid-js").JSX.Element;
+export declare function createQueryClient(config?: QueryClientConfig): QueryClient;
+export declare function mockVisibilityState(value: DocumentVisibilityState): jest.SpyInstance<DocumentVisibilityState, []>;
+export declare function mockNavigatorOnLine(value: boolean): jest.SpyInstance<boolean, []>;
+export declare const mockLogger: {
+    log: jest.Mock<any, any>;
+    warn: jest.Mock<any, any>;
+    error: jest.Mock<any, any>;
+};
+export declare function sleep(timeout: number): Promise<void>;
+export declare function setActTimeout(fn: () => void, ms?: number): NodeJS.Timeout;
+/**
+ * Assert the parameter is of a specific type.
+ */
+export declare function expectType<T>(_: T): void;
+/**
+ * Assert the parameter is not typed as `any`
+ */
+export declare function expectTypeNotAny<T>(_: 0 extends 1 & T ? never : T): void;

package/build/lib/createBaseQuery.esm.js

@@ -7,6 +7,7 @@ function createBaseQuery(options, Observer) {
   const queryClient = useQueryClient({
     context: options.context
   });
+  const emptyData = Symbol('empty');
   const defaultedOptions = queryClient.defaultQueryOptions(options);
   defaultedOptions._optimisticResults = 'optimistic';
   const observer = new Observer(queryClient, defaultedOptions);
@@ -18,6 +19,10 @@ function createBaseQuery(options, Observer) {
   }] = createResource(() => {
     return new Promise(resolve => {
       if (!(state.isFetching && state.isLoading)) {
+        if (unwrap(state.data) === emptyData) {
+          resolve(undefined);
+        }
+
         resolve(unwrap(state.data));
       }
     });
@@ -30,7 +35,18 @@ function createBaseQuery(options, Observer) {
   const unsubscribe = observer.subscribe(result => {
     taskQueue.push(() => {
       batch(() => {
-        setState(unwrap(result));
+        const unwrappedResult = { ...unwrap(result)
+        };
+
+        if (unwrappedResult.data === undefined) {
+          // This is a hack to prevent Solid
+          // from deleting the data property when it is `undefined`
+          // ref: https://www.solidjs.com/docs/latest/api#updating-stores
+          // @ts-ignore
+          unwrappedResult.data = emptyData;
+        }
+
+        setState(unwrap(unwrappedResult));
         mutate(() => unwrap(result.data));
         refetch();
       });
@@ -62,7 +78,7 @@ function createBaseQuery(options, Observer) {
   }));
   const handler = {
     get(target, prop) {
-      if (prop === 'data' && target.isLoading && target.isFetching) {
+      if (prop === 'data') {
         return dataResource();
       }
 

package/build/lib/createBaseQuery.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBaseQuery.esm.js","sources":["../../src/createBaseQuery.ts"],"sourcesContent":["import type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryKey, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions } from './types'\nimport { useQueryClient } from './QueryClientProvider'\nimport {\n  onMount,\n  onCleanup,\n  createComputed,\n  createResource,\n  on,\n  batch,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n): QueryObserverResult<TData, TError> {\n  const queryClient = useQueryClient({ context: options.context })\n\n  const defaultedOptions = queryClient.defaultQueryOptions(options)\n  defaultedOptions._optimisticResults = 'optimistic'\n  const observer = new Observer(queryClient, defaultedOptions)\n\n  const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n    // @ts-ignore\n    observer.getOptimisticResult(defaultedOptions),\n  )\n\n  const [dataResource, { refetch, mutate }] = createResource<TData | undefined>(\n    () => {\n      return new Promise((resolve) => {\n        if (!(state.isFetching && state.isLoading)) {\n          resolve(unwrap(state.data))\n        }\n      })\n    },\n  )\n\n  batch(() => {\n    mutate(() => unwrap(state.data))\n    refetch()\n  })\n\n  let taskQueue: Array<() => void> = []\n\n  const unsubscribe = observer.subscribe((result) => {\n    taskQueue.push(() => {\n      batch(() => {\n        setState(unwrap(result))\n        mutate(() => unwrap(result.data))\n        refetch()\n      })\n    })\n\n    queueMicrotask(() => {\n      const taskToRun = taskQueue.pop()\n      if (taskToRun) {\n        taskToRun()\n      }\n      taskQueue = []\n    })\n  })\n\n  onCleanup(() => unsubscribe())\n\n  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    const newDefaultedOptions = queryClient.defaultQueryOptions(options)\n    observer.setOptions(newDefaultedOptions)\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.useErrorBoundary, [\n            state.error,\n            observer.getCurrentQuery(),\n          ])\n        ) {\n          throw state.error\n        }\n      },\n    ),\n  )\n\n  const handler = {\n    get(\n      target: QueryObserverResult<TData, TError>,\n      prop: keyof QueryObserverResult<TData, TError>,\n    ): any {\n      if (prop === 'data' && target.isLoading && target.isFetching) {\n        return dataResource()\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler) as QueryObserverResult<TData, TError>\n}\n"],"names":["createBaseQuery","options","Observer","queryClient","useQueryClient","context","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","state","setState","createStore","getOptimisticResult","dataResource","refetch","mutate","createResource","Promise","resolve","isFetching","isLoading","unwrap","data","batch","taskQueue","unsubscribe","subscribe","result","push","queueMicrotask","taskToRun","pop","onCleanup","onMount","setOptions","listeners","createComputed","newDefaultedOptions","on","status","isError","shouldThrowError","useErrorBoundary","error","getCurrentQuery","handler","get","target","prop","Reflect","Proxy"],"mappings":"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"}
+{"version":3,"file":"createBaseQuery.esm.js","sources":["../../src/createBaseQuery.ts"],"sourcesContent":["import type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryKey, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions } from './types'\nimport { useQueryClient } from './QueryClientProvider'\nimport {\n  onMount,\n  onCleanup,\n  createComputed,\n  createResource,\n  on,\n  batch,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n): QueryObserverResult<TData, TError> {\n  const queryClient = useQueryClient({ context: options.context })\n  const emptyData = Symbol('empty')\n  const defaultedOptions = queryClient.defaultQueryOptions(options)\n  defaultedOptions._optimisticResults = 'optimistic'\n  const observer = new Observer(queryClient, defaultedOptions)\n\n  const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n    // @ts-ignore\n    observer.getOptimisticResult(defaultedOptions),\n  )\n\n  const [dataResource, { refetch, mutate }] = createResource<TData | undefined>(\n    () => {\n      return new Promise((resolve) => {\n        if (!(state.isFetching && state.isLoading)) {\n          if (unwrap(state.data) === emptyData) {\n            resolve(undefined)\n          }\n          resolve(unwrap(state.data))\n        }\n      })\n    },\n  )\n\n  batch(() => {\n    mutate(() => unwrap(state.data))\n    refetch()\n  })\n\n  let taskQueue: Array<() => void> = []\n\n  const unsubscribe = observer.subscribe((result) => {\n    taskQueue.push(() => {\n      batch(() => {\n        const unwrappedResult = { ...unwrap(result) }\n        if (unwrappedResult.data === undefined) {\n          // This is a hack to prevent Solid\n          // from deleting the data property when it is `undefined`\n          // ref: https://www.solidjs.com/docs/latest/api#updating-stores\n          // @ts-ignore\n          unwrappedResult.data = emptyData\n        }\n        setState(unwrap(unwrappedResult))\n        mutate(() => unwrap(result.data))\n        refetch()\n      })\n    })\n\n    queueMicrotask(() => {\n      const taskToRun = taskQueue.pop()\n      if (taskToRun) {\n        taskToRun()\n      }\n      taskQueue = []\n    })\n  })\n\n  onCleanup(() => unsubscribe())\n\n  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    const newDefaultedOptions = queryClient.defaultQueryOptions(options)\n    observer.setOptions(newDefaultedOptions)\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.useErrorBoundary, [\n            state.error,\n            observer.getCurrentQuery(),\n          ])\n        ) {\n          throw state.error\n        }\n      },\n    ),\n  )\n\n  const handler = {\n    get(\n      target: QueryObserverResult<TData, TError>,\n      prop: keyof QueryObserverResult<TData, TError>,\n    ): any {\n      if (prop === 'data') {\n        return dataResource()\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler) as QueryObserverResult<TData, TError>\n}\n"],"names":["createBaseQuery","options","Observer","queryClient","useQueryClient","context","emptyData","Symbol","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","state","setState","createStore","getOptimisticResult","dataResource","refetch","mutate","createResource","Promise","resolve","isFetching","isLoading","unwrap","data","undefined","batch","taskQueue","unsubscribe","subscribe","result","push","unwrappedResult","queueMicrotask","taskToRun","pop","onCleanup","onMount","setOptions","listeners","createComputed","newDefaultedOptions","on","status","isError","shouldThrowError","useErrorBoundary","error","getCurrentQuery","handler","get","target","prop","Reflect","Proxy"],"mappings":"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"}

package/build/lib/createBaseQuery.js

@@ -11,6 +11,7 @@ function createBaseQuery(options, Observer) {
   const queryClient = QueryClientProvider.useQueryClient({
     context: options.context
   });
+  const emptyData = Symbol('empty');
   const defaultedOptions = queryClient.defaultQueryOptions(options);
   defaultedOptions._optimisticResults = 'optimistic';
   const observer = new Observer(queryClient, defaultedOptions);
@@ -22,6 +23,10 @@ function createBaseQuery(options, Observer) {
   }] = solidJs.createResource(() => {
     return new Promise(resolve => {
       if (!(state.isFetching && state.isLoading)) {
+        if (store.unwrap(state.data) === emptyData) {
+          resolve(undefined);
+        }
+
         resolve(store.unwrap(state.data));
       }
     });
@@ -34,7 +39,18 @@ function createBaseQuery(options, Observer) {
   const unsubscribe = observer.subscribe(result => {
     taskQueue.push(() => {
       solidJs.batch(() => {
-        setState(store.unwrap(result));
+        const unwrappedResult = { ...store.unwrap(result)
+        };
+
+        if (unwrappedResult.data === undefined) {
+          // This is a hack to prevent Solid
+          // from deleting the data property when it is `undefined`
+          // ref: https://www.solidjs.com/docs/latest/api#updating-stores
+          // @ts-ignore
+          unwrappedResult.data = emptyData;
+        }
+
+        setState(store.unwrap(unwrappedResult));
         mutate(() => store.unwrap(result.data));
         refetch();
       });
@@ -66,7 +82,7 @@ function createBaseQuery(options, Observer) {
   }));
   const handler = {
     get(target, prop) {
-      if (prop === 'data' && target.isLoading && target.isFetching) {
+      if (prop === 'data') {
         return dataResource();
       }
 

package/build/lib/createBaseQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBaseQuery.js","sources":["../../src/createBaseQuery.ts"],"sourcesContent":["import type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryKey, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions } from './types'\nimport { useQueryClient } from './QueryClientProvider'\nimport {\n  onMount,\n  onCleanup,\n  createComputed,\n  createResource,\n  on,\n  batch,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n): QueryObserverResult<TData, TError> {\n  const queryClient = useQueryClient({ context: options.context })\n\n  const defaultedOptions = queryClient.defaultQueryOptions(options)\n  defaultedOptions._optimisticResults = 'optimistic'\n  const observer = new Observer(queryClient, defaultedOptions)\n\n  const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n    // @ts-ignore\n    observer.getOptimisticResult(defaultedOptions),\n  )\n\n  const [dataResource, { refetch, mutate }] = createResource<TData | undefined>(\n    () => {\n      return new Promise((resolve) => {\n        if (!(state.isFetching && state.isLoading)) {\n          resolve(unwrap(state.data))\n        }\n      })\n    },\n  )\n\n  batch(() => {\n    mutate(() => unwrap(state.data))\n    refetch()\n  })\n\n  let taskQueue: Array<() => void> = []\n\n  const unsubscribe = observer.subscribe((result) => {\n    taskQueue.push(() => {\n      batch(() => {\n        setState(unwrap(result))\n        mutate(() => unwrap(result.data))\n        refetch()\n      })\n    })\n\n    queueMicrotask(() => {\n      const taskToRun = taskQueue.pop()\n      if (taskToRun) {\n        taskToRun()\n      }\n      taskQueue = []\n    })\n  })\n\n  onCleanup(() => unsubscribe())\n\n  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    const newDefaultedOptions = queryClient.defaultQueryOptions(options)\n    observer.setOptions(newDefaultedOptions)\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.useErrorBoundary, [\n            state.error,\n            observer.getCurrentQuery(),\n          ])\n        ) {\n          throw state.error\n        }\n      },\n    ),\n  )\n\n  const handler = {\n    get(\n      target: QueryObserverResult<TData, TError>,\n      prop: keyof QueryObserverResult<TData, TError>,\n    ): any {\n      if (prop === 'data' && target.isLoading && target.isFetching) {\n        return dataResource()\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler) as QueryObserverResult<TData, TError>\n}\n"],"names":["createBaseQuery","options","Observer","queryClient","useQueryClient","context","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","state","setState","createStore","getOptimisticResult","dataResource","refetch","mutate","createResource","Promise","resolve","isFetching","isLoading","unwrap","data","batch","taskQueue","unsubscribe","subscribe","result","push","queueMicrotask","taskToRun","pop","onCleanup","onMount","setOptions","listeners","createComputed","newDefaultedOptions","on","status","isError","shouldThrowError","useErrorBoundary","error","getCurrentQuery","handler","get","target","prop","Reflect","Proxy"],"mappings":"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"}
+{"version":3,"file":"createBaseQuery.js","sources":["../../src/createBaseQuery.ts"],"sourcesContent":["import type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryKey, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions } from './types'\nimport { useQueryClient } from './QueryClientProvider'\nimport {\n  onMount,\n  onCleanup,\n  createComputed,\n  createResource,\n  on,\n  batch,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n): QueryObserverResult<TData, TError> {\n  const queryClient = useQueryClient({ context: options.context })\n  const emptyData = Symbol('empty')\n  const defaultedOptions = queryClient.defaultQueryOptions(options)\n  defaultedOptions._optimisticResults = 'optimistic'\n  const observer = new Observer(queryClient, defaultedOptions)\n\n  const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n    // @ts-ignore\n    observer.getOptimisticResult(defaultedOptions),\n  )\n\n  const [dataResource, { refetch, mutate }] = createResource<TData | undefined>(\n    () => {\n      return new Promise((resolve) => {\n        if (!(state.isFetching && state.isLoading)) {\n          if (unwrap(state.data) === emptyData) {\n            resolve(undefined)\n          }\n          resolve(unwrap(state.data))\n        }\n      })\n    },\n  )\n\n  batch(() => {\n    mutate(() => unwrap(state.data))\n    refetch()\n  })\n\n  let taskQueue: Array<() => void> = []\n\n  const unsubscribe = observer.subscribe((result) => {\n    taskQueue.push(() => {\n      batch(() => {\n        const unwrappedResult = { ...unwrap(result) }\n        if (unwrappedResult.data === undefined) {\n          // This is a hack to prevent Solid\n          // from deleting the data property when it is `undefined`\n          // ref: https://www.solidjs.com/docs/latest/api#updating-stores\n          // @ts-ignore\n          unwrappedResult.data = emptyData\n        }\n        setState(unwrap(unwrappedResult))\n        mutate(() => unwrap(result.data))\n        refetch()\n      })\n    })\n\n    queueMicrotask(() => {\n      const taskToRun = taskQueue.pop()\n      if (taskToRun) {\n        taskToRun()\n      }\n      taskQueue = []\n    })\n  })\n\n  onCleanup(() => unsubscribe())\n\n  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    const newDefaultedOptions = queryClient.defaultQueryOptions(options)\n    observer.setOptions(newDefaultedOptions)\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.useErrorBoundary, [\n            state.error,\n            observer.getCurrentQuery(),\n          ])\n        ) {\n          throw state.error\n        }\n      },\n    ),\n  )\n\n  const handler = {\n    get(\n      target: QueryObserverResult<TData, TError>,\n      prop: keyof QueryObserverResult<TData, TError>,\n    ): any {\n      if (prop === 'data') {\n        return dataResource()\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler) as QueryObserverResult<TData, TError>\n}\n"],"names":["createBaseQuery","options","Observer","queryClient","useQueryClient","context","emptyData","Symbol","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","state","setState","createStore","getOptimisticResult","dataResource","refetch","mutate","createResource","Promise","resolve","isFetching","isLoading","unwrap","data","undefined","batch","taskQueue","unsubscribe","subscribe","result","push","unwrappedResult","queueMicrotask","taskToRun","pop","onCleanup","onMount","setOptions","listeners","createComputed","newDefaultedOptions","on","status","isError","shouldThrowError","useErrorBoundary","error","getCurrentQuery","handler","get","target","prop","Reflect","Proxy"],"mappings":"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"}

package/build/lib/createBaseQuery.mjs

@@ -7,6 +7,7 @@ function createBaseQuery(options, Observer) {
   const queryClient = useQueryClient({
     context: options.context
   });
+  const emptyData = Symbol('empty');
   const defaultedOptions = queryClient.defaultQueryOptions(options);
   defaultedOptions._optimisticResults = 'optimistic';
   const observer = new Observer(queryClient, defaultedOptions);
@@ -18,6 +19,10 @@ function createBaseQuery(options, Observer) {
   }] = createResource(() => {
     return new Promise(resolve => {
       if (!(state.isFetching && state.isLoading)) {
+        if (unwrap(state.data) === emptyData) {
+          resolve(undefined);
+        }
+
         resolve(unwrap(state.data));
       }
     });
@@ -30,7 +35,18 @@ function createBaseQuery(options, Observer) {
   const unsubscribe = observer.subscribe(result => {
     taskQueue.push(() => {
       batch(() => {
-        setState(unwrap(result));
+        const unwrappedResult = { ...unwrap(result)
+        };
+
+        if (unwrappedResult.data === undefined) {
+          // This is a hack to prevent Solid
+          // from deleting the data property when it is `undefined`
+          // ref: https://www.solidjs.com/docs/latest/api#updating-stores
+          // @ts-ignore
+          unwrappedResult.data = emptyData;
+        }
+
+        setState(unwrap(unwrappedResult));
         mutate(() => unwrap(result.data));
         refetch();
       });
@@ -62,7 +78,7 @@ function createBaseQuery(options, Observer) {
   }));
   const handler = {
     get(target, prop) {
-      if (prop === 'data' && target.isLoading && target.isFetching) {
+      if (prop === 'data') {
         return dataResource();
       }
 

package/build/lib/createBaseQuery.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createBaseQuery.mjs","sources":["../../src/createBaseQuery.ts"],"sourcesContent":["import type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryKey, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions } from './types'\nimport { useQueryClient } from './QueryClientProvider'\nimport {\n  onMount,\n  onCleanup,\n  createComputed,\n  createResource,\n  on,\n  batch,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n): QueryObserverResult<TData, TError> {\n  const queryClient = useQueryClient({ context: options.context })\n\n  const defaultedOptions = queryClient.defaultQueryOptions(options)\n  defaultedOptions._optimisticResults = 'optimistic'\n  const observer = new Observer(queryClient, defaultedOptions)\n\n  const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n    // @ts-ignore\n    observer.getOptimisticResult(defaultedOptions),\n  )\n\n  const [dataResource, { refetch, mutate }] = createResource<TData | undefined>(\n    () => {\n      return new Promise((resolve) => {\n        if (!(state.isFetching && state.isLoading)) {\n          resolve(unwrap(state.data))\n        }\n      })\n    },\n  )\n\n  batch(() => {\n    mutate(() => unwrap(state.data))\n    refetch()\n  })\n\n  let taskQueue: Array<() => void> = []\n\n  const unsubscribe = observer.subscribe((result) => {\n    taskQueue.push(() => {\n      batch(() => {\n        setState(unwrap(result))\n        mutate(() => unwrap(result.data))\n        refetch()\n      })\n    })\n\n    queueMicrotask(() => {\n      const taskToRun = taskQueue.pop()\n      if (taskToRun) {\n        taskToRun()\n      }\n      taskQueue = []\n    })\n  })\n\n  onCleanup(() => unsubscribe())\n\n  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    const newDefaultedOptions = queryClient.defaultQueryOptions(options)\n    observer.setOptions(newDefaultedOptions)\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.useErrorBoundary, [\n            state.error,\n            observer.getCurrentQuery(),\n          ])\n        ) {\n          throw state.error\n        }\n      },\n    ),\n  )\n\n  const handler = {\n    get(\n      target: QueryObserverResult<TData, TError>,\n      prop: keyof QueryObserverResult<TData, TError>,\n    ): any {\n      if (prop === 'data' && target.isLoading && target.isFetching) {\n        return dataResource()\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler) as QueryObserverResult<TData, TError>\n}\n"],"names":["createBaseQuery","options","Observer","queryClient","useQueryClient","context","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","state","setState","createStore","getOptimisticResult","dataResource","refetch","mutate","createResource","Promise","resolve","isFetching","isLoading","unwrap","data","batch","taskQueue","unsubscribe","subscribe","result","push","queueMicrotask","taskToRun","pop","onCleanup","onMount","setOptions","listeners","createComputed","newDefaultedOptions","on","status","isError","shouldThrowError","useErrorBoundary","error","getCurrentQuery","handler","get","target","prop","Reflect","Proxy"],"mappings":"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"}
+{"version":3,"file":"createBaseQuery.mjs","sources":["../../src/createBaseQuery.ts"],"sourcesContent":["import type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryKey, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions } from './types'\nimport { useQueryClient } from './QueryClientProvider'\nimport {\n  onMount,\n  onCleanup,\n  createComputed,\n  createResource,\n  on,\n  batch,\n} from 'solid-js'\nimport { createStore, unwrap } from 'solid-js/store'\nimport { shouldThrowError } from './utils'\n\n// Base Query Function that is used to create the query.\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n): QueryObserverResult<TData, TError> {\n  const queryClient = useQueryClient({ context: options.context })\n  const emptyData = Symbol('empty')\n  const defaultedOptions = queryClient.defaultQueryOptions(options)\n  defaultedOptions._optimisticResults = 'optimistic'\n  const observer = new Observer(queryClient, defaultedOptions)\n\n  const [state, setState] = createStore<QueryObserverResult<TData, TError>>(\n    // @ts-ignore\n    observer.getOptimisticResult(defaultedOptions),\n  )\n\n  const [dataResource, { refetch, mutate }] = createResource<TData | undefined>(\n    () => {\n      return new Promise((resolve) => {\n        if (!(state.isFetching && state.isLoading)) {\n          if (unwrap(state.data) === emptyData) {\n            resolve(undefined)\n          }\n          resolve(unwrap(state.data))\n        }\n      })\n    },\n  )\n\n  batch(() => {\n    mutate(() => unwrap(state.data))\n    refetch()\n  })\n\n  let taskQueue: Array<() => void> = []\n\n  const unsubscribe = observer.subscribe((result) => {\n    taskQueue.push(() => {\n      batch(() => {\n        const unwrappedResult = { ...unwrap(result) }\n        if (unwrappedResult.data === undefined) {\n          // This is a hack to prevent Solid\n          // from deleting the data property when it is `undefined`\n          // ref: https://www.solidjs.com/docs/latest/api#updating-stores\n          // @ts-ignore\n          unwrappedResult.data = emptyData\n        }\n        setState(unwrap(unwrappedResult))\n        mutate(() => unwrap(result.data))\n        refetch()\n      })\n    })\n\n    queueMicrotask(() => {\n      const taskToRun = taskQueue.pop()\n      if (taskToRun) {\n        taskToRun()\n      }\n      taskQueue = []\n    })\n  })\n\n  onCleanup(() => unsubscribe())\n\n  onMount(() => {\n    observer.setOptions(defaultedOptions, { listeners: false })\n  })\n\n  createComputed(() => {\n    const newDefaultedOptions = queryClient.defaultQueryOptions(options)\n    observer.setOptions(newDefaultedOptions)\n  })\n\n  createComputed(\n    on(\n      () => state.status,\n      () => {\n        if (\n          state.isError &&\n          !state.isFetching &&\n          shouldThrowError(observer.options.useErrorBoundary, [\n            state.error,\n            observer.getCurrentQuery(),\n          ])\n        ) {\n          throw state.error\n        }\n      },\n    ),\n  )\n\n  const handler = {\n    get(\n      target: QueryObserverResult<TData, TError>,\n      prop: keyof QueryObserverResult<TData, TError>,\n    ): any {\n      if (prop === 'data') {\n        return dataResource()\n      }\n      return Reflect.get(target, prop)\n    },\n  }\n\n  return new Proxy(state, handler) as QueryObserverResult<TData, TError>\n}\n"],"names":["createBaseQuery","options","Observer","queryClient","useQueryClient","context","emptyData","Symbol","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","state","setState","createStore","getOptimisticResult","dataResource","refetch","mutate","createResource","Promise","resolve","isFetching","isLoading","unwrap","data","undefined","batch","taskQueue","unsubscribe","subscribe","result","push","unwrappedResult","queueMicrotask","taskToRun","pop","onCleanup","onMount","setOptions","listeners","createComputed","newDefaultedOptions","on","status","isError","shouldThrowError","useErrorBoundary","error","getCurrentQuery","handler","get","target","prop","Reflect","Proxy"],"mappings":"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"}

package/build/solid/__tests__/QueryClientProvider.test.jsx

@@ -0,0 +1,185 @@
+import { render, screen, waitFor } from 'solid-testing-library';
+import { queryKey } from './utils';
+import { QueryCache, QueryClient } from '@tanstack/query-core';
+import { createContext, useContext } from 'solid-js';
+import { renderToString } from 'solid-js/web';
+import { createQuery, QueryClientProvider, useQueryClient } from '..';
+import { createQueryClient, sleep } from './utils';
+describe('QueryClientProvider', () => {
+    it('sets a specific cache for all queries to use', async () => {
+        const key = queryKey();
+        const queryCache = new QueryCache();
+        const queryClient = createQueryClient({ queryCache });
+        function Page() {
+            const query = createQuery(key, async () => {
+                await sleep(10);
+                return 'test';
+            });
+            return (<div>
+          <h1>{query.data}</h1>
+        </div>);
+        }
+        render(() => (<QueryClientProvider client={queryClient}>
+        <Page />
+      </QueryClientProvider>));
+        await waitFor(() => {
+            return screen.getByText('test');
+        });
+        expect(queryCache.find(key())).toBeDefined();
+    });
+    it('allows multiple caches to be partitioned', async () => {
+        const key1 = queryKey();
+        const key2 = queryKey();
+        const queryCache1 = new QueryCache();
+        const queryCache2 = new QueryCache();
+        const queryClient1 = createQueryClient({ queryCache: queryCache1 });
+        const queryClient2 = createQueryClient({ queryCache: queryCache2 });
+        function Page1() {
+            const query = createQuery(key1, async () => {
+                await sleep(10);
+                return 'test1';
+            });
+            return (<div>
+          <h1>{query.data}</h1>
+        </div>);
+        }
+        function Page2() {
+            const query = createQuery(key2, async () => {
+                await sleep(10);
+                return 'test2';
+            });
+            return (<div>
+          <h1>{query.data}</h1>
+        </div>);
+        }
+        render(() => (<>
+        <QueryClientProvider client={queryClient1}>
+          <Page1 />
+        </QueryClientProvider>
+        <QueryClientProvider client={queryClient2}>
+          <Page2 />
+        </QueryClientProvider>
+      </>));
+        await waitFor(() => screen.getByText('test1'));
+        await waitFor(() => screen.getByText('test2'));
+        expect(queryCache1.find(key1())).toBeDefined();
+        expect(queryCache1.find(key2())).not.toBeDefined();
+        expect(queryCache2.find(key1())).not.toBeDefined();
+        expect(queryCache2.find(key2())).toBeDefined();
+    });
+    it("uses defaultOptions for queries when they don't provide their own config", async () => {
+        const key = queryKey();
+        const queryCache = new QueryCache();
+        const queryClient = createQueryClient({
+            queryCache,
+            defaultOptions: {
+                queries: {
+                    cacheTime: Infinity,
+                },
+            },
+        });
+        function Page() {
+            const query = createQuery(key, async () => {
+                await sleep(10);
+                return 'test';
+            });
+            return (<div>
+          <h1>{query.data}</h1>
+        </div>);
+        }
+        render(() => (<QueryClientProvider client={queryClient}>
+        <Page />
+      </QueryClientProvider>));
+        await waitFor(() => screen.getByText('test'));
+        expect(queryCache.find(key())).toBeDefined();
+        expect(queryCache.find(key())?.options.cacheTime).toBe(Infinity);
+    });
+    describe('with custom context', () => {
+        it('uses the correct context', async () => {
+            const key = queryKey();
+            const contextOuter = createContext(undefined);
+            const contextInner = createContext(undefined);
+            const queryCacheOuter = new QueryCache();
+            const queryClientOuter = new QueryClient({ queryCache: queryCacheOuter });
+            const queryCacheInner = new QueryCache();
+            const queryClientInner = new QueryClient({ queryCache: queryCacheInner });
+            const queryCacheInnerInner = new QueryCache();
+            const queryClientInnerInner = new QueryClient({
+                queryCache: queryCacheInnerInner,
+            });
+            function Page() {
+                const queryOuter = createQuery(key, async () => 'testOuter', {
+                    context: contextOuter,
+                });
+                const queryInner = createQuery(key, async () => 'testInner', {
+                    context: contextInner,
+                });
+                const queryInnerInner = createQuery(key, async () => 'testInnerInner');
+                return (<div>
+            <h1>
+              {queryOuter.data} {queryInner.data} {queryInnerInner.data}
+            </h1>
+          </div>);
+            }
+            // contextSharing should be ignored when passing a custom context.
+            const contextSharing = true;
+            render(() => (<QueryClientProvider client={queryClientOuter} context={contextOuter}>
+          <QueryClientProvider client={queryClientInner} context={contextInner}>
+            <QueryClientProvider client={queryClientInnerInner} contextSharing={contextSharing}>
+              <Page />
+            </QueryClientProvider>
+          </QueryClientProvider>
+        </QueryClientProvider>));
+            await waitFor(() => screen.getByText('testOuter testInner testInnerInner'));
+        });
+    });
+    describe('useQueryClient', () => {
+        it('should throw an error if no query client has been set', () => {
+            const consoleMock = jest
+                .spyOn(console, 'error')
+                .mockImplementation(() => undefined);
+            function Page() {
+                useQueryClient();
+                return null;
+            }
+            expect(() => render(() => <Page />)).toThrow('No QueryClient set, use QueryClientProvider to set one');
+            consoleMock.mockRestore();
+        });
+        it('should use window to get the context when contextSharing is true', () => {
+            const queryCache = new QueryCache();
+            const queryClient = createQueryClient({ queryCache });
+            let queryClientFromHook;
+            let queryClientFromWindow;
+            function Page() {
+                queryClientFromHook = useQueryClient();
+                queryClientFromWindow = useContext(window.SolidQueryClientContext);
+                return null;
+            }
+            render(() => (<QueryClientProvider client={queryClient} contextSharing={true}>
+          <Page />
+        </QueryClientProvider>));
+            expect(queryClientFromHook).toEqual(queryClient);
+            expect(queryClientFromWindow).toEqual(queryClient);
+        });
+        it.skip('should not use window to get the context when contextSharing is true and window does not exist', () => {
+            const queryCache = new QueryCache();
+            const queryClient = createQueryClient({ queryCache });
+            // Mock a non web browser environment
+            const windowSpy = jest
+                .spyOn(window, 'window', 'get')
+                .mockImplementation(undefined);
+            let queryClientFromHook;
+            function Page() {
+                queryClientFromHook = useQueryClient();
+                return null;
+            }
+            // TODO(lukemurray): fails because renderToString never calls Page
+            // probably an SSR-testing issue we need to fix.
+            renderToString(() => (<QueryClientProvider client={queryClient} contextSharing={true}>
+          <Page />
+        </QueryClientProvider>));
+            expect(queryClientFromHook).toEqual(queryClient);
+            windowSpy.mockRestore();
+        });
+    });
+});