@tanstack/svelte-query 5.0.0-alpha.76 → 5.0.0-alpha.77

package/dist/createBaseQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBaseQuery.d.ts","sourceRoot":"","sources":["../../src/createBaseQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI5E,wBAAgB,eAAe,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,SAAS,QAAQ,EAE1B,OAAO,EAAE,sBAAsB,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,CACV,EACD,QAAQ,EAAE,OAAO,aAAa,EAC9B,WAAW,CAAC,EAAE,WAAW,GACxB,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,CAsCtC"}
+{"version":3,"file":"createBaseQuery.d.ts","sourceRoot":"","sources":["../../src/createBaseQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI5E,wBAAgB,eAAe,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,SAAS,QAAQ,EAE1B,OAAO,EAAE,sBAAsB,CAC7B,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,CACV,EACD,QAAQ,EAAE,OAAO,aAAa,EAC9B,WAAW,CAAC,EAAE,WAAW,GACxB,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,CA6CtC"}

package/dist/createBaseQuery.js

@@ -3,13 +3,17 @@ import { notifyManager } from '@tanstack/query-core';
 import { useQueryClient } from './useQueryClient';
 import { isSvelteStore } from './utils';
 export function createBaseQuery(options, Observer, queryClient) {
+    /** Load query client */
     const client = useQueryClient(queryClient);
+    /** Converts options to a svelte store if not already a store object */
     const optionsStore = isSvelteStore(options) ? options : readable(options);
-    const defaultedOptionsStore = derived(optionsStore, ($options) => {
-        const defaultedOptions = client.defaultQueryOptions($options);
+    /** Creates a store that has the default options applied */
+    const defaultedOptionsStore = derived(optionsStore, ($optionsStore) => {
+        const defaultedOptions = client.defaultQueryOptions($optionsStore);
         defaultedOptions._optimisticResults = 'optimistic';
         return defaultedOptions;
     });
+    /** Creates the observer */
     const observer = new Observer(client, get(defaultedOptionsStore));
     defaultedOptionsStore.subscribe(($defaultedOptions) => {
         // Do not notify on updates because of changes in the options because
@@ -19,9 +23,10 @@ export function createBaseQuery(options, Observer, queryClient) {
     const result = readable(observer.getCurrentResult(), (set) => {
         return observer.subscribe(notifyManager.batchCalls(set));
     });
-    const { subscribe } = derived(result, ($result) => {
-        $result = observer.getOptimisticResult(get(defaultedOptionsStore));
-        return !get(defaultedOptionsStore).notifyOnChangeProps
+    /** Subscribe to changes in result and defaultedOptionsStore */
+    const { subscribe } = derived([result, defaultedOptionsStore], ([$result, $defaultedOptionsStore]) => {
+        $result = observer.getOptimisticResult($defaultedOptionsStore);
+        return !$defaultedOptionsStore.notifyOnChangeProps
             ? observer.trackResult($result)
             : $result;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/svelte-query",
-  "version": "5.0.0-alpha.76",
+  "version": "5.0.0-alpha.77",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Svelte",
   "author": "Lachlan Collins",
   "license": "MIT",

package/src/createBaseQuery.ts

@@ -22,17 +22,20 @@ export function createBaseQuery<
   Observer: typeof QueryObserver,
   queryClient?: QueryClient,
 ): CreateBaseQueryResult<TData, TError> {
+  /** Load query client */
   const client = useQueryClient(queryClient)
 
+  /** Converts options to a svelte store if not already a store object */
   const optionsStore = isSvelteStore(options) ? options : readable(options)
 
-  const defaultedOptionsStore = derived(optionsStore, ($options) => {
-    const defaultedOptions = client.defaultQueryOptions($options)
+  /** Creates a store that has the default options applied */
+  const defaultedOptionsStore = derived(optionsStore, ($optionsStore) => {
+    const defaultedOptions = client.defaultQueryOptions($optionsStore)
     defaultedOptions._optimisticResults = 'optimistic'
-
     return defaultedOptions
   })
 
+  /** Creates the observer */
   const observer = new Observer<
     TQueryFnData,
     TError,
@@ -51,12 +54,16 @@ export function createBaseQuery<
     return observer.subscribe(notifyManager.batchCalls(set))
   })
 
-  const { subscribe } = derived(result, ($result) => {
-    $result = observer.getOptimisticResult(get(defaultedOptionsStore))
-    return !get(defaultedOptionsStore).notifyOnChangeProps
-      ? observer.trackResult($result)
-      : $result
-  })
+  /** Subscribe to changes in result and defaultedOptionsStore */
+  const { subscribe } = derived(
+    [result, defaultedOptionsStore],
+    ([$result, $defaultedOptionsStore]) => {
+      $result = observer.getOptimisticResult($defaultedOptionsStore)
+      return !$defaultedOptionsStore.notifyOnChangeProps
+        ? observer.trackResult($result)
+        : $result
+    },
+  )
 
   return { subscribe }
 }