Fix current CI errors

Author: lachlancollins

packages/svelte-query-persist-client/src/PersistQueryClientProvider.svelte

@@ -12,11 +12,12 @@
     OmitKeyof,
     QueryClientProviderProps,
   } from '@tanstack/svelte-query'
-  import { box } from './utils.svelte'
+  import { box } from './utils.svelte.js'
 
   type PersistQueryClientProviderProps = QueryClientProviderProps & {
     persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
     onSuccess?: () => void
+    onError?: () => void
   }
 
   let {
@@ -41,13 +42,12 @@
 
   $effect(() => {
     isRestoring.current = true
-    persistQueryClientRestore(options).then(async () => {
-      try {
-        await props.onSuccess?.()
-      } finally {
+    persistQueryClientRestore(options)
+      .then(() => props.onSuccess?.())
+      .catch(() => props.onError?.())
+      .finally(() => {
         isRestoring.current = false
-      }
-    })
+      })
   })
 </script>
 

packages/svelte-query-persist-client/src/utils.svelte.ts

@@ -1,4 +1,4 @@
-export type Box<T> = { current: T }
+type Box<T> = { current: T }
 
 export function box<T>(initial: T): Box<T> {
   let current = $state(initial)

packages/svelte-query-persist-client/tests/PersistQueryClientProvider.svelte.test.ts

@@ -8,8 +8,7 @@ import InitialData from './InitialData/Provider.svelte'
 import RemoveCache from './RemoveCache/Provider.svelte'
 import RestoreCache from './RestoreCache/Provider.svelte'
 import UseQueries from './UseQueries/Provider.svelte'
-import { StatelessRef, createQueryClient, sleep } from './utils.svelte'
-
+import { StatelessRef, createQueryClient, sleep } from './utils.svelte.js'
 import type {
   PersistedClient,
   Persister,
@@ -52,7 +51,7 @@ const createMockErrorPersister = (
 
 describe('PersistQueryClientProvider', () => {
   test('restores cache from persister', async () => {
-    let states = new StatelessRef<Array<StatusResult<string>>>([])
+    const states = new StatelessRef<Array<StatusResult<string>>>([])
 
     const queryClient = createQueryClient()
     await queryClient.prefetchQuery({
@@ -98,7 +97,7 @@ describe('PersistQueryClientProvider', () => {
   })
 
   test.only('should also put useQueries into idle state', async () => {
-    let states = new StatelessRef<Array<StatusResult<string>>>([])
+    const states = new StatelessRef<Array<StatusResult<string>>>([])
 
     const queryClient = createQueryClient()
     await queryClient.prefetchQuery({
@@ -146,7 +145,7 @@ describe('PersistQueryClientProvider', () => {
   })
 
   test('should show initialData while restoring', async () => {
-    let states = new StatelessRef<Array<StatusResult<string>>>([])
+    const states = new StatelessRef<Array<StatusResult<string>>>([])
 
     const queryClient = createQueryClient()
     await queryClient.prefetchQuery({
@@ -193,7 +192,7 @@ describe('PersistQueryClientProvider', () => {
   })
 
   test('should not refetch after restoring when data is fresh', async () => {
-    let states = new StatelessRef<Array<StatusResult<string>>>([])
+    const states = new StatelessRef<Array<StatusResult<string>>>([])
 
     const queryClient = createQueryClient()
     await queryClient.prefetchQuery({
@@ -280,7 +279,7 @@ describe('PersistQueryClientProvider', () => {
 
     queryClient.clear()
 
-    let states = new StatelessRef<Array<string>>([])
+    const states = new StatelessRef<Array<string>>([])
 
     const rendered = render(AwaitOnSuccess, {
       props: {

packages/svelte-query-persist-client/tests/RemoveCache/Provider.svelte

@@ -7,11 +7,18 @@
   interface Props {
     queryClient: QueryClient
     persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
+    onSuccess: () => void
+    onError: () => void
   }
 
   let { queryClient, persistOptions, onError, onSuccess }: Props = $props()
 </script>
 
-<PersistQueryClientProvider client={queryClient} {persistOptions}>
+<PersistQueryClientProvider
+  client={queryClient}
+  {persistOptions}
+  {onSuccess}
+  {onError}
+>
   <RemoveCache />
 </PersistQueryClientProvider>

packages/svelte-query/src/containers.svelte.ts

@@ -3,6 +3,8 @@ import { createSubscriber } from 'svelte/reactivity'
 type VoidFn = () => void
 type Subscriber = (update: VoidFn) => void | VoidFn
 
+export type Box<T> = { current: T }
+
 export class ReactiveValue<T> implements Box<T> {
   #fn
   #subscribe
@@ -18,20 +20,6 @@ export class ReactiveValue<T> implements Box<T> {
   }
 }
 
-export type Box<T> = { current: T }
-
-export function box<T>(value: T): Box<T> {
-  let current = $state(value)
-  return {
-    get current() {
-      return current
-    },
-    set current(newValue) {
-      current = newValue
-    },
-  }
-}
-
 /**
  * Makes all of the top-level keys of an object into $state.raw fields whose initial values
  * are the same as in the original object. Does not mutate the original object. Provides an `update`

packages/svelte-query/tests/containers.svelte.test.ts

@@ -1,7 +1,7 @@
 import { flushSync } from 'svelte'
 import { describe, expect, it } from 'vitest'
-import { createRawRef } from '../src/containers.svelte'
-import { withEffectRoot } from './utils.svelte'
+import { createRawRef } from '../src/containers.svelte.js'
+import { withEffectRoot } from './utils.svelte.js'
 
 describe('createRawRef', () => {
   it('should create a reactive reference', () => {

packages/svelte-query/tests/createQueries.svelte.test.ts

@@ -1,6 +1,6 @@
 import { QueryCache, QueryClient, createQueries } from '@tanstack/svelte-query'
 import { beforeEach, describe, expect, expectTypeOf, it, vi } from 'vitest'
-import { promiseWithResolvers, withEffectRoot } from './utils.svelte'
+import { promiseWithResolvers, withEffectRoot } from './utils.svelte.js'
 import type {
   CreateQueryOptions,
   CreateQueryResult,

packages/svelte-query/tests/createQueries.test-d.ts

@@ -1,6 +1,6 @@
 import { describe, expectTypeOf, it } from 'vitest'
-import { createQueries, queryOptions } from '..'
-import type { CreateQueryResult } from '..'
+import { createQueries, queryOptions } from '@tanstack/svelte-query'
+import type { CreateQueryResult } from '@tanstack/svelte-query'
 
 describe('createQueries', () => {
   it('should return correct data for dynamic queries with mixed result types', () => {

packages/svelte-query/tests/createQuery.svelte.test.ts

@@ -6,7 +6,7 @@ import {
 } from '@tanstack/svelte-query'
 import { flushSync } from 'svelte'
 import { beforeEach, describe, expect, expectTypeOf, it, vi } from 'vitest'
-import { promiseWithResolvers, sleep, withEffectRoot } from './utils.svelte'
+import { promiseWithResolvers, sleep, withEffectRoot } from './utils.svelte.js'
 import type { CreateQueryResult } from '@tanstack/svelte-query'
 
 describe('createQuery', () => {
@@ -41,7 +41,7 @@ describe('createQuery', () => {
         expectTypeOf(query.error).toEqualTypeOf<Error | null>()
       }
 
-      let promise1 = query.promise
+      const promise1 = query.promise
 
       expect(query).toEqual({
         data: undefined,