@furystack/shades 14.0.0 → 15.0.0

package/src/components/nested-navigate.spec.ts

@@ -1,4 +1,5 @@
-import { Injector } from '@furystack/inject'
+import type { Injector } from '@furystack/inject'
+import { createInjector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
 import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import { LocationService } from '../services/location-service.js'
@@ -10,8 +11,8 @@ type TestRoute = Pick<NestedRoute<unknown, any, any>, 'component'>
 
 describe('nestedNavigate', () => {
   it('Should navigate to a simple path', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const spy = vi.spyOn(locationService, 'navigate')
 
       nestedNavigate(injector, { path: '/buttons' })
@@ -21,8 +22,8 @@ describe('nestedNavigate', () => {
   })
 
   it('Should compile params into the path', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const spy = vi.spyOn(locationService, 'navigate')
 
       nestedNavigate(injector, { path: '/users/:id', params: { id: '42' } })
@@ -32,8 +33,8 @@ describe('nestedNavigate', () => {
   })
 
   it('Should compile multiple params into the path', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const spy = vi.spyOn(locationService, 'navigate')
 
       nestedNavigate(injector, {
@@ -46,8 +47,8 @@ describe('nestedNavigate', () => {
   })
 
   it('Should append serialized query string when provided', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const spy = vi.spyOn(locationService, 'navigate')
 
       nestedNavigate(injector, { path: '/buttons', query: { page: 2 } })
@@ -62,8 +63,8 @@ describe('nestedNavigate', () => {
   })
 
   it('Should omit the query string when no keys are provided', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const spy = vi.spyOn(locationService, 'navigate')
 
       nestedNavigate(injector, { path: '/buttons', query: {} })
@@ -73,8 +74,8 @@ describe('nestedNavigate', () => {
   })
 
   it('Should append the hash segment when provided', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const spy = vi.spyOn(locationService, 'navigate')
 
       nestedNavigate(injector, { path: '/buttons', hash: 'overview' })
@@ -84,8 +85,8 @@ describe('nestedNavigate', () => {
   })
 
   it('Should combine params, query and hash in the correct order', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const spy = vi.spyOn(locationService, 'navigate')
 
       nestedNavigate(injector, {
@@ -197,7 +198,7 @@ describe('Type utilities', () => {
 
       const appNavigate = createNestedNavigate<Routes>()
       // @ts-expect-error -- '/nonexistent' is not a valid route path
-      appNavigate(new Injector(), { path: '/nonexistent' })
+      appNavigate(createInjector(), { path: '/nonexistent' })
     })
 
     it('Should accept routes with typed match parameters (NestedRoute<T>)', () => {

package/src/components/nested-navigate.ts

@@ -71,7 +71,7 @@ export const buildNestedNavigateUrl = (args: NestedNavigateArgs): string => {
  * @param args - The navigation arguments
  */
 export const nestedNavigate = (injector: Injector, args: NestedNavigateArgs): void => {
-  injector.getInstance(LocationService).navigate(buildNestedNavigateUrl(args))
+  injector.get(LocationService).navigate(buildNestedNavigateUrl(args))
 }
 
 /**

package/src/components/nested-replace.spec.ts

@@ -1,4 +1,5 @@
-import { Injector } from '@furystack/inject'
+import type { Injector } from '@furystack/inject'
+import { createInjector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
 import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import { LocationService } from '../services/location-service.js'
@@ -9,8 +10,8 @@ type TestRoute = Pick<NestedRoute<unknown, any, any>, 'component'>
 
 describe('nestedReplace', () => {
   it('Should replace the current history entry with a simple path', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const navigateSpy = vi.spyOn(locationService, 'navigate')
       const replaceSpy = vi.spyOn(locationService, 'replace')
 
@@ -22,8 +23,8 @@ describe('nestedReplace', () => {
   })
 
   it('Should compile params, query and hash for a replace call', async () => {
-    await usingAsync(new Injector(), async (injector) => {
-      const locationService = injector.getInstance(LocationService)
+    await usingAsync(createInjector(), async (injector) => {
+      const locationService = injector.get(LocationService)
       const replaceSpy = vi.spyOn(locationService, 'replace')
 
       nestedReplace(injector, {
@@ -69,7 +70,7 @@ describe('createNestedReplace', () => {
 
     const appReplace = createNestedReplace<Routes>()
     // @ts-expect-error -- '/nonexistent' is not a valid route path
-    appReplace(new Injector(), { path: '/nonexistent' })
+    appReplace(createInjector(), { path: '/nonexistent' })
   })
 
   it('Should enforce a declared required query shape', () => {

package/src/components/nested-replace.ts

@@ -18,7 +18,7 @@ import type { NestedRoute } from './nested-router.js'
  * @param args - The navigation arguments
  */
 export const nestedReplace = (injector: Injector, args: NestedNavigateArgs): void => {
-  injector.getInstance(LocationService).replace(buildNestedNavigateUrl(args))
+  injector.get(LocationService).replace(buildNestedNavigateUrl(args))
 }
 
 /**

package/src/components/nested-route-link.spec.tsx

@@ -1,4 +1,4 @@
-import { Injector } from '@furystack/inject'
+import { createInjector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
 import { afterEach, beforeEach, describe, expect, expectTypeOf, it, vi } from 'vitest'
 import { initializeShadeRoot } from '../initialize.js'
@@ -24,7 +24,7 @@ describe('NestedRouteLink', () => {
   })
 
   it('Should render a link with the correct href', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -44,11 +44,11 @@ describe('NestedRouteLink', () => {
   })
 
   it('Should trigger SPA navigation on click', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
       const onRouteChange = vi.fn()
 
-      injector.getInstance(LocationService).onLocationPathChanged.subscribe(onRouteChange)
+      injector.get(LocationService).onLocationPathChanged.subscribe(onRouteChange)
 
       initializeShadeRoot({
         injector,
@@ -68,7 +68,7 @@ describe('NestedRouteLink', () => {
   })
 
   it('Should compile route params in the href', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -88,7 +88,7 @@ describe('NestedRouteLink', () => {
   })
 
   it('Should compile route params with multiple segments', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -108,7 +108,7 @@ describe('NestedRouteLink', () => {
   })
 
   it('Should append a serialized query string to the rendered href', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -128,7 +128,7 @@ describe('NestedRouteLink', () => {
   })
 
   it('Should append the hash segment to the rendered href', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({

package/src/components/nested-route-link.tsx

@@ -73,7 +73,7 @@ const _NestedRouteLink = Shade<NestedRouteLinkProps>({
         ev.preventDefault()
         // eslint-disable-next-line furystack/prefer-location-service -- This IS the SPA link component; it must call pushState directly.
         history.pushState('', props.title || '', resolvedUrl)
-        injector.getInstance(LocationService).updateState()
+        injector.get(LocationService).updateState()
       },
     })
     return <>{children}</>

package/src/components/nested-router.spec.tsx

@@ -1,4 +1,4 @@
-import { Injector } from '@furystack/inject'
+import { createInjector } from '@furystack/inject'
 import { serializeValue } from '@furystack/rest'
 import { sleepAsync, usingAsync } from '@furystack/utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -438,7 +438,7 @@ describe('NestedRouter lifecycle hooks', () => {
       callOrder.push('leave-other')
     })
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -556,7 +556,7 @@ describe('NestedRouter query / hash re-render', () => {
     const onLeave = vi.fn(async () => {})
     const componentFn = vi.fn(({ hash }: { hash: string | undefined }) => <div id="content">hash={hash ?? 'none'}</div>)
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -581,7 +581,7 @@ describe('NestedRouter query / hash re-render', () => {
       expect(onVisit).toBeCalledTimes(1)
       expect(onLeave).not.toBeCalled()
 
-      const locationService = injector.getInstance(LocationService)
+      const locationService = injector.get(LocationService)
       locationService.navigate('/tabs#a')
       await flushUpdates()
       await flushUpdates()
@@ -609,7 +609,7 @@ describe('NestedRouter query / hash re-render', () => {
       <div id="content">page={query?.page ?? 'none'}</div>
     ))
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -633,7 +633,7 @@ describe('NestedRouter query / hash re-render', () => {
       expect(document.getElementById('content')?.innerHTML).toBe('page=none')
       expect(onVisit).toBeCalledTimes(1)
 
-      const locationService = injector.getInstance(LocationService)
+      const locationService = injector.get(LocationService)
       locationService.navigate(`/list?page=${serializeValue(2)}`)
       await flushUpdates()
       await flushUpdates()
@@ -662,7 +662,7 @@ describe('NestedRouter query / hash re-render', () => {
       </div>
     ))
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -686,7 +686,7 @@ describe('NestedRouter query / hash re-render', () => {
       expect(document.getElementById('content')?.innerHTML).toBe('a')
       bComponent.mockClear()
 
-      injector.getInstance(LocationService).navigate(`/b?page=${serializeValue(7)}#x`)
+      injector.get(LocationService).navigate(`/b?page=${serializeValue(7)}#x`)
       await flushUpdates()
       await flushUpdates()
 
@@ -731,7 +731,7 @@ describe('NestedRouter latest-wins on rapid navigation', () => {
       callOrder.push('leave-c')
     })
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -813,7 +813,7 @@ describe('NestedRouter lifecycle element scope', () => {
     const visitElements: Array<{ route: string; element: JSX.Element }> = []
     const leaveElements: Array<{ route: string; element: JSX.Element }> = []
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -906,7 +906,7 @@ describe('NestedRouter flat routes', () => {
   it('should render and navigate between flat (non-nested) Record routes', async () => {
     history.pushState(null, '', '/')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -967,7 +967,7 @@ describe('NestedRouter outlet composition', () => {
   it('should compose parent layout wrapping child content via outlet', async () => {
     history.pushState(null, '', '/dashboard/settings')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1012,7 +1012,7 @@ describe('NestedRouter outlet composition', () => {
   it('should render parent with fallback when navigating to parent URL without a child match', async () => {
     history.pushState(null, '', '/dashboard')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1065,7 +1065,7 @@ describe('NestedRouter route param changes', () => {
       callOrder.push('leave-user')
     })
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1141,7 +1141,7 @@ describe('NestedRouter route param changes', () => {
     const onVisitDash = vi.fn()
     const onLeaveDash = vi.fn()
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1214,9 +1214,9 @@ describe('NestedRouter + RouteMatchService integration', () => {
   it('should update RouteMatchService with the current match chain on navigation', async () => {
     history.pushState(null, '', '/parent/child-a')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
-      const routeMatchService = injector.getInstance(RouteMatchService)
+      const routeMatchService = injector.get(RouteMatchService)
 
       const parentRoute: NestedRoute = {
         meta: { title: 'Parent' },
@@ -1278,9 +1278,9 @@ describe('NestedRouter + RouteMatchService integration', () => {
   it('should expose match params through RouteMatchService', async () => {
     history.pushState(null, '', '/users/42')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
-      const routeMatchService = injector.getInstance(RouteMatchService)
+      const routeMatchService = injector.get(RouteMatchService)
 
       initializeShadeRoot({
         injector,
@@ -1378,7 +1378,7 @@ describe('NestedRouter view transitions', () => {
   it('should call startViewTransition when viewTransition is enabled', async () => {
     history.pushState(null, '', '/')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1414,7 +1414,7 @@ describe('NestedRouter view transitions', () => {
   it('should not call startViewTransition when viewTransition is not set', async () => {
     history.pushState(null, '', '/')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1449,7 +1449,7 @@ describe('NestedRouter view transitions', () => {
   it('should pass types to startViewTransition when configured', async () => {
     history.pushState(null, '', '/')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1484,7 +1484,7 @@ describe('NestedRouter view transitions', () => {
   it('should respect per-route viewTransition: false override', async () => {
     history.pushState(null, '', '/')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({
@@ -1525,7 +1525,7 @@ describe('NestedRouter view transitions', () => {
 
     history.pushState(null, '', '/')
 
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const rootElement = document.getElementById('root') as HTMLDivElement
 
       initializeShadeRoot({

package/src/components/nested-router.tsx

@@ -386,7 +386,7 @@ export const NestedRouter = Shade<NestedRouterProps>({
       chainElements: [],
     })
 
-    const locationService = injector.getInstance(LocationService)
+    const locationService = injector.get(LocationService)
 
     const updateUrl = async (currentUrl: string) => {
       const [lastState] = useState<NestedRouterState>('routerState', state)
@@ -426,7 +426,7 @@ export const NestedRouter = Shade<NestedRouterProps>({
 
             const applyUpdate = () => {
               setState({ matchChain: newChain, jsx: newResult.jsx, chainElements: newResult.chainElements })
-              injector.getInstance(RouteMatchService).currentMatchChain.setValue(newChain)
+              injector.get(RouteMatchService).currentMatchChain.setValue(newChain)
             }
 
             const vtConfig = resolveViewTransition(options.props.viewTransition, newChain)
@@ -451,7 +451,7 @@ export const NestedRouter = Shade<NestedRouterProps>({
               jsx: options.props.notFound || <div />,
               chainElements: [],
             })
-            injector.getInstance(RouteMatchService).currentMatchChain.setValue([])
+            injector.get(RouteMatchService).currentMatchChain.setValue([])
           }
 
           await maybeViewTransition(options.props.viewTransition, applyNotFound)

package/src/services/location-service.spec.ts

@@ -1,4 +1,4 @@
-import { Injector } from '@furystack/inject'
+import { createInjector } from '@furystack/inject'
 import { deserializeQueryString, serializeToQueryString, serializeValue } from '@furystack/rest'
 import { usingAsync } from '@furystack/utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -13,16 +13,17 @@ describe('LocationService', () => {
   })
 
   it('Shuld be constructed', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const s = i.getInstance(LocationService)
-      expect(s).toBeInstanceOf(LocationService)
+    await usingAsync(createInjector(), async (i) => {
+      const s = i.get(LocationService)
+      expect(s).toBeDefined()
+      expect(typeof s.navigate).toBe('function')
     })
   })
 
   it('Shuld update state on events', async () => {
-    await usingAsync(new Injector(), async (i) => {
+    await usingAsync(createInjector(), async (i) => {
       const onLocaionChanged = vi.fn()
-      const s = i.getInstance(LocationService)
+      const s = i.get(LocationService)
       s.onLocationPathChanged.subscribe(onLocaionChanged)
       expect(onLocaionChanged).toBeCalledTimes(0)
       history.pushState(null, '', '/loc1')
@@ -39,9 +40,9 @@ describe('LocationService', () => {
   })
 
   it('Should update location path when navigate is called', async () => {
-    await usingAsync(new Injector(), async (i) => {
+    await usingAsync(createInjector(), async (i) => {
       const onLocationChanged = vi.fn()
-      const s = i.getInstance(LocationService)
+      const s = i.get(LocationService)
       s.onLocationPathChanged.subscribe(onLocationChanged)
       s.navigate('/dashboard')
       expect(s.onLocationPathChanged.getValue()).toBe('/dashboard')
@@ -51,8 +52,8 @@ describe('LocationService', () => {
 
   describe('replace', () => {
     it('Should update the observable path without pushing a new history entry', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const s = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const s = i.get(LocationService)
         const lengthBefore = history.length
         s.replace('/replaced')
         expect(s.onLocationPathChanged.getValue()).toBe('/replaced')
@@ -61,8 +62,8 @@ describe('LocationService', () => {
     })
 
     it('Should call history.replaceState rather than pushState', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const s = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const s = i.get(LocationService)
         const pushSpy = vi.spyOn(history, 'pushState')
         const replaceSpy = vi.spyOn(history, 'replaceState')
 
@@ -78,8 +79,8 @@ describe('LocationService', () => {
     })
 
     it('Should notify path subscribers after replace', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const s = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const s = i.get(LocationService)
         const onLocationChanged = vi.fn()
         s.onLocationPathChanged.subscribe(onLocationChanged)
         s.replace('/notify')
@@ -90,8 +91,8 @@ describe('LocationService', () => {
 
   describe('useSearchParam', () => {
     it('Should create observables lazily', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const service = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const service = i.get(LocationService)
         const observables = service.searchParamObservables
 
         const testSearchParam = service.useSearchParam('test', null)
@@ -110,16 +111,16 @@ describe('LocationService', () => {
     })
 
     it('Should return the default value, if not present in the query string', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const service = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const service = i.get(LocationService)
         const testSearchParam = service.useSearchParam('test', { value: 'foo' })
         expect(testSearchParam.getValue()).toEqual({ value: 'foo' })
       })
     })
 
     it('Should return the value from the query string', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const service = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const service = i.get(LocationService)
         history.pushState(null, '', `/loc1?test=${serializeValue(1)}`)
         const testSearchParam = service.useSearchParam('test', 123)
         expect(testSearchParam.getValue()).toBe(1)
@@ -127,8 +128,8 @@ describe('LocationService', () => {
     })
 
     it('should update the observable value on push / replace states', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const service = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const service = i.get(LocationService)
         history.pushState(null, '', `/loc1?test=${serializeValue(1)}`)
         const testSearchParam = service.useSearchParam('test', 234)
         expect(testSearchParam.getValue()).toBe(1)
@@ -138,8 +139,8 @@ describe('LocationService', () => {
     })
 
     it('Should update the URL based on search value change', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const service = i.getInstance(LocationService)
+      await usingAsync(createInjector(), async (i) => {
+        const service = i.get(LocationService)
         history.pushState(null, '', `/loc1?test=${serializeValue('2')}`)
         const testSearchParam = service.useSearchParam('test', '')
         testSearchParam.setValue('2')
@@ -147,25 +148,28 @@ describe('LocationService', () => {
       })
     })
 
-    it('Should throw an error when trying to use a custom serializer after LocationService has been instantiated', async () => {
-      await usingAsync(new Injector(), async (i) => {
+    it('Should throw when called after LocationService has been resolved', async () => {
+      await usingAsync(createInjector(), async (i) => {
         const customSerializer = vi.fn((value: any) => serializeToQueryString(value))
         const customDeserializer = vi.fn((value: string) => deserializeQueryString(value))
-        i.getInstance(LocationService)
-        expect(() => useCustomSearchStateSerializer(i, customSerializer, customDeserializer)).toThrowError(
-          'useCustomSearchStateSerializer must be called before the LocationService is instantiated',
+
+        // Eagerly resolve once so the service patches history / adds listeners.
+        i.get(LocationService)
+
+        expect(() => useCustomSearchStateSerializer(i, customSerializer, customDeserializer)).toThrow(
+          /before LocationService is resolved/,
         )
       })
     })
 
     it('Should use custom serializer and deserializer', async () => {
-      await usingAsync(new Injector(), async (i) => {
+      await usingAsync(createInjector(), async (i) => {
         const customSerializer = vi.fn((value: any) => serializeToQueryString(value))
         const customDeserializer = vi.fn((value: string) => deserializeQueryString(value))
 
         useCustomSearchStateSerializer(i, customSerializer, customDeserializer)
 
-        const locationService = i.getInstance(LocationService)
+        const locationService = i.get(LocationService)
         const testSearchParam = locationService.useSearchParam('test', { value: 'foo' })
 
         testSearchParam.setValue({ value: 'bar' })