chore(svelte-5-adapter): tidy-up functions (#7809)

* chore(svelte-5-adapter): tidy-up functions * Fix types * Update svelte
TanStack · Jul 29, 2024 · 7bccb14 · 7bccb14
1 parent 2c82fd6
commit 7bccb14
Show file tree

Hide file tree

Showing 16 changed files with 158 additions and 150 deletions.
diff --git a/examples/svelte/auto-refetching/package.json b/examples/svelte/auto-refetching/package.json
@@ -15,8 +15,8 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.2",
     "@sveltejs/kit": "^2.5.18",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
-    "svelte": "5.0.0-next.192",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "typescript": "5.3.3",
     "vite": "^5.3.5"

diff --git a/examples/svelte/basic/package.json b/examples/svelte/basic/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.2",
     "@sveltejs/kit": "^2.5.18",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
-    "svelte": "5.0.0-next.192",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "typescript": "5.3.3",
     "vite": "^5.3.5"

diff --git a/examples/svelte/load-more-infinite-scroll/package.json b/examples/svelte/load-more-infinite-scroll/package.json
@@ -15,8 +15,8 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.2",
     "@sveltejs/kit": "^2.5.18",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
-    "svelte": "5.0.0-next.192",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "typescript": "5.3.3",
     "vite": "^5.3.5"

diff --git a/examples/svelte/optimistic-updates/package.json b/examples/svelte/optimistic-updates/package.json
@@ -15,8 +15,8 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.2",
     "@sveltejs/kit": "^2.5.18",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
-    "svelte": "5.0.0-next.192",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "typescript": "5.3.3",
     "vite": "^5.3.5"

diff --git a/examples/svelte/playground/package.json b/examples/svelte/playground/package.json
@@ -15,8 +15,8 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.2",
     "@sveltejs/kit": "^2.5.18",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
-    "svelte": "5.0.0-next.192",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "typescript": "5.3.3",
     "vite": "^5.3.5"

diff --git a/examples/svelte/simple/package.json b/examples/svelte/simple/package.json
@@ -13,9 +13,9 @@
     "@tanstack/svelte-query-devtools": "^5.51.15"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
     "@tsconfig/svelte": "^5.0.4",
-    "svelte": "5.0.0-next.192",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "typescript": "5.3.3",
     "vite": "^5.3.5"

diff --git a/examples/svelte/ssr/package.json b/examples/svelte/ssr/package.json
@@ -15,8 +15,8 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.2",
     "@sveltejs/kit": "^2.5.18",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
-    "svelte": "5.0.0-next.192",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "typescript": "5.3.3",
     "vite": "^5.3.5"

diff --git a/examples/svelte/star-wars/package.json b/examples/svelte/star-wars/package.json
@@ -15,10 +15,10 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.2",
     "@sveltejs/kit": "^2.5.18",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.40",
-    "svelte": "5.0.0-next.192",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4",
     "tailwindcss": "^3.4.7",
     "typescript": "5.3.3",

diff --git a/integrations/svelte-vite/package.json b/integrations/svelte-vite/package.json
@@ -6,10 +6,10 @@
     "build": "vite build"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
     "@tanstack/svelte-query": "workspace:*",
     "@tanstack/svelte-query-devtools": "workspace:*",
-    "svelte": "5.0.0-next.192",
+    "svelte": "^5.0.0-next.200",
     "vite": "^5.3.5"
   }
 }
diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json
@@ -43,10 +43,10 @@
   },
   "devDependencies": {
     "@sveltejs/package": "^2.3.2",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
     "@tanstack/svelte-query": "workspace:*",
     "eslint-plugin-svelte": "^2.43.0",
-    "svelte": "5.0.0-next.192",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4"
   },
   "peerDependencies": {

diff --git a/packages/svelte-query-persist-client/package.json b/packages/svelte-query-persist-client/package.json
@@ -45,11 +45,11 @@
   },
   "devDependencies": {
     "@sveltejs/package": "^2.3.2",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
     "@tanstack/svelte-query": "workspace:*",
     "@testing-library/svelte": "^5.2.1",
     "eslint-plugin-svelte": "^2.43.0",
-    "svelte": "5.0.0-next.192",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4"
   },
   "peerDependencies": {

diff --git a/packages/svelte-query-persist-client/src/PersistQueryClientProvider.svelte b/packages/svelte-query-persist-client/src/PersistQueryClientProvider.svelte
@@ -17,6 +17,7 @@
     persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
     onSuccess?: () => void
   }
+
   let {
     client,
     children,
@@ -25,15 +26,18 @@
   }: PersistQueryClientProviderProps = $props()
 
   let isRestoring = $state(true)
+
   setIsRestoringContext(() => isRestoring)
+
   const options = $derived({
     ...persistOptions,
     queryClient: client,
   })
 
   $effect(() => {
-    return isRestoring ? () => 1 : persistQueryClientSubscribe(options)
+    return isRestoring ? () => {} : persistQueryClientSubscribe(options)
   })
+
   $effect(() => {
     isRestoring = true
     persistQueryClientRestore(options).then(async () => {

diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json
@@ -45,10 +45,10 @@
   },
   "devDependencies": {
     "@sveltejs/package": "^2.3.2",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
+    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
     "@testing-library/svelte": "^5.2.1",
     "eslint-plugin-svelte": "^2.43.0",
-    "svelte": "5.0.0-next.192",
+    "svelte": "^5.0.0-next.200",
     "svelte-check": "^3.8.4"
   },
   "peerDependencies": {

diff --git a/packages/svelte-query/src/createMutation.svelte.ts b/packages/svelte-query/src/createMutation.svelte.ts
@@ -30,6 +30,7 @@ export function createMutation<
       options(),
     ),
   )
+
   const mutate = $state<
     CreateMutateFunction<TData, TError, TVariables, TContext>
   >((variables, mutateOptions) => {
@@ -42,16 +43,16 @@ export function createMutation<
 
   const result = $state(observer.getCurrentResult())
 
-  const un = observer.subscribe((val) => {
+  const unsubscribe = observer.subscribe((val) => {
     notifyManager.batchCalls(() => {
       Object.assign(result, val)
-
-      // result = val
     })()
   })
+
   onDestroy(() => {
-    un()
+    unsubscribe()
   })
+
   // @ts-expect-error
   return new Proxy(result, {
     get: (_, prop) => {

diff --git a/packages/svelte-query/src/createQueries.svelte.ts b/packages/svelte-query/src/createQueries.svelte.ts
@@ -119,7 +119,7 @@ type GetCreateQueryResult<T> =
                     unknown extends TError ? DefaultError : TError
                   >
                 : // Fallback
-                  never
+                  QueryObserverResult
 
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -216,7 +216,7 @@ export function createQueries<
   const client = useQueryClient(queryClient)
   const isRestoring = useIsRestoring()
 
-  const defaultedQueriesStore = $derived(() => {
+  const defaultedQueries = $derived(() => {
     return queries().map((opts) => {
       const defaultedOptions = client.defaultQueryOptions(opts)
       // Make sure the results are already in fetching state before subscribing or updating options
@@ -226,22 +226,25 @@ export function createQueries<
       return defaultedOptions as QueryObserverOptions
     })
   })
+
   const observer = new QueriesObserver<TCombinedResult>(
     client,
-    defaultedQueriesStore(),
+    defaultedQueries(),
     options as QueriesObserverOptions<TCombinedResult>,
   )
+
   const [_, getCombinedResult, trackResult] = $derived(
     observer.getOptimisticResult(
-      defaultedQueriesStore(),
+      defaultedQueries(),
       (options as QueriesObserverOptions<TCombinedResult>).combine,
     ),
   )
+
   $effect(() => {
     // Do not notify on updates because of changes in the options because
     // these changes should already be reflected in the optimistic result.
     observer.setQueries(
-      defaultedQueriesStore(),
+      defaultedQueries(),
       options as QueriesObserverOptions<TCombinedResult>,
       { listeners: false },
     )
@@ -261,7 +264,7 @@ export function createQueries<
     return observer.subscribe((_result) => {
       notifyManager.batchCalls(() => {
         const res = observer.getOptimisticResult(
-          defaultedQueriesStore(),
+          defaultedQueries(),
           (options as QueriesObserverOptions<TCombinedResult>).combine,
         )
         // @ts-expect-error