@livestore/react 0.4.0 → 0.5.0-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/react",
-  "version": "0.4.0",
+  "version": "0.5.0-dev.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -22,10 +22,10 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@livestore/common": "^0.4.0",
-    "@livestore/framework-toolkit": "^0.4.0",
-    "@livestore/livestore": "^0.4.0",
-    "@livestore/utils": "^0.4.0"
+    "@livestore/framework-toolkit": "^0.5.0-dev.0",
+    "@livestore/livestore": "^0.5.0-dev.0",
+    "@livestore/utils": "^0.5.0-dev.0",
+    "@livestore/common": "^0.5.0-dev.0"
   },
   "devDependencies": {
     "@opentelemetry/sdk-trace-base": "2.2.0",
@@ -38,32 +38,23 @@
     "react": "19.2.3",
     "react-dom": "19.2.3",
     "react-window": "1.8.11",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
     "vite": "7.3.1",
-    "vitest": "3.2.4",
-    "@livestore/utils-dev": "^0.4.0",
-    "@livestore/adapter-web": "^0.4.0"
+    "vitest": "4.1.9",
+    "@livestore/utils-dev": "^0.5.0-dev.0",
+    "@livestore/adapter-web": "^0.5.0-dev.0"
   },
   "peerDependencies": {
-    "@effect/ai": "^0.35.0",
-    "@effect/cli": "^0.75.1",
-    "@effect/cluster": "^0.58.2",
-    "@effect/experimental": "^0.60.0",
-    "@effect/opentelemetry": "^0.63.0",
-    "@effect/platform": "^0.96.1",
-    "@effect/platform-browser": "^0.76.0",
-    "@effect/platform-bun": "^0.89.0",
-    "@effect/platform-node": "^0.106.0",
-    "@effect/printer": "^0.49.0",
-    "@effect/printer-ansi": "^0.49.0",
-    "@effect/rpc": "^0.75.1",
-    "@effect/sql": "^0.51.1",
-    "@effect/typeclass": "^0.40.0",
-    "@effect/vitest": "^0.29.0",
+    "@effect/opentelemetry": "^4.0.0-rc.111",
+    "@effect/platform-browser": "^4.0.0-rc.111",
+    "@effect/platform-bun": "^4.0.0-rc.111",
+    "@effect/platform-node": "^4.0.0-rc.111",
+    "@effect/platform-node-shared": "^4.0.0-rc.111",
+    "@effect/vitest": "^4.0.0-rc.111",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
     "@standard-schema/spec": "^1.1.0",
-    "effect": "^3.21.2",
+    "effect": "^4.0.0-rc.111",
     "react": "^19.0.0"
   },
   "$genie": {
@@ -73,7 +64,6 @@
       "packages/@livestore/adapter-web",
       "packages/@livestore/common",
       "packages/@livestore/common-cf",
-      "packages/@livestore/devtools-web-common",
       "packages/@livestore/framework-toolkit",
       "packages/@livestore/livestore",
       "packages/@livestore/react",

package/src/__snapshots__/useClientDocument.test.tsx.snap

@@ -27,10 +27,10 @@ exports[`useClientDocument > otel > should update the data based on component ke
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
@@ -38,12 +38,6 @@ exports[`useClientDocument > otel > should update the data based on component ke
           "attributes": {
             "batch": "undefined",
             "batchSize": 1,
-          },
-        },
-        {
-          "_name": "client-session-sync-processor:pull",
-          "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -217,6 +211,19 @@ exports[`useClientDocument > otel > should update the data based on component ke
     ",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -261,6 +268,19 @@ exports[`useClientDocument > otel > should update the data based on component ke
     ",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -307,10 +327,10 @@ exports[`useClientDocument > otel > should update the data based on component ke
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
@@ -318,12 +338,6 @@ exports[`useClientDocument > otel > should update the data based on component ke
           "attributes": {
             "batch": "undefined",
             "batchSize": 1,
-          },
-        },
-        {
-          "_name": "client-session-sync-processor:pull",
-          "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -435,6 +449,19 @@ exports[`useClientDocument > otel > should update the data based on component ke
     ",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -479,6 +506,19 @@ exports[`useClientDocument > otel > should update the data based on component ke
     ",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],

package/src/__tests__/fixture.tsx

@@ -1,3 +1,5 @@
+import React from 'react'
+
 import type { UnknownError } from '@livestore/common'
 import {
   type AppState,
@@ -11,13 +13,12 @@ import {
 } from '@livestore/framework-toolkit/testing'
 import type { Store } from '@livestore/livestore'
 import { Effect, type Scope } from '@livestore/utils/effect'
-import React from 'react'
 
 import * as LiveStoreReact from '../mod.ts'
 
+export type { AppState, Filter, Todo }
 // Re-export shared types and schema
 export { events, schema, tables }
-export type { AppState, Filter, Todo }
 
 export type MakeTodoMvcReactOptions = CreateTodoMvcStoreOptions & {
   strictMode?: boolean | undefined

package/src/experimental/components/LiveList.tsx

@@ -1,6 +1,7 @@
+import React from 'react'
+
 import type { LiveQueryDef, Store } from '@livestore/livestore'
 import { computed } from '@livestore/livestore'
-import React from 'react'
 
 import { useQuery } from '../../useQuery.ts'
 

package/src/useClientDocument.test.tsx

@@ -1,16 +1,15 @@
-/** biome-ignore-all lint/a11y/useValidAriaRole: not needed for testing */
-/** biome-ignore-all lint/a11y/noStaticElementInteractions: not needed for testing */
-import * as LiveStore from '@livestore/livestore'
-import { StoreInternalsSymbol } from '@livestore/livestore'
-import { getAllSimplifiedRootSpans, getSimplifiedRootSpan } from '@livestore/livestore/internal/testing-utils'
-import { Effect, ReadonlyRecord, Schema } from '@livestore/utils/effect'
-import { Vitest } from '@livestore/utils-dev/node-vitest'
 import * as otel from '@opentelemetry/api'
 import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'
 import * as ReactTesting from '@testing-library/react'
 import * as React from 'react'
 import { beforeEach, expect, it } from 'vitest'
 
+import * as LiveStore from '@livestore/livestore'
+import { StoreInternalsSymbol } from '@livestore/livestore'
+import { getAllSimplifiedRootSpans, getSimplifiedRootSpan } from '@livestore/livestore/internal/testing-utils'
+import { Vitest } from '@livestore/utils-dev/node-vitest'
+import { Effect, ReadonlyRecord, Schema } from '@livestore/utils/effect'
+
 import { events, makeTodoMvcReact, tables } from './__tests__/fixture.tsx'
 import type * as LiveStoreReact from './mod.ts'
 import { __resetUseRcResourceCache } from './useRcResource.ts'
@@ -18,12 +17,13 @@ import { __resetUseRcResourceCache } from './useRcResource.ts'
 // const strictMode = process.env.REACT_STRICT_MODE !== undefined
 
 // NOTE running tests concurrently doesn't work with the default global db graph
+/** Verifies: LS.SYS.INT.REACT-R01, LS.SYS.STATE.SQLITE-R07 */
 Vitest.describe('useClientDocument', () => {
   beforeEach(() => {
     __resetUseRcResourceCache()
   })
 
-  Vitest.scopedLive('should update the data based on component key', () =>
+  Vitest.live('should update the data based on component key', () =>
     Effect.gen(function* () {
       const { wrapper, store, renderCount } = yield* makeTodoMvcReact({})
 
@@ -54,7 +54,7 @@ Vitest.describe('useClientDocument', () => {
 
   // TODO add a test that makes sure React doesn't re-render when a setter is used to set the same value
 
-  Vitest.scopedLive('should update the data reactively - via setState', () =>
+  Vitest.live('should update the data reactively - via setState', () =>
     Effect.gen(function* () {
       const { wrapper, store, renderCount } = yield* makeTodoMvcReact({})
 
@@ -80,7 +80,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('should update the data reactively - via raw store commit', () =>
+  Vitest.live('should update the data reactively - via raw store commit', () =>
     Effect.gen(function* () {
       const { wrapper, store, renderCount } = yield* makeTodoMvcReact({})
 
@@ -106,7 +106,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('should work for a larger app', () =>
+  Vitest.live('should work for a larger app', () =>
     Effect.gen(function* () {
       const { wrapper, store, renderCount } = yield* makeTodoMvcReact({})
 
@@ -128,7 +128,11 @@ Vitest.describe('useClientDocument', () => {
           <div>
             <TasksList setTaskId={setCurrentTaskId} />
             <div role="current-id">Current Task Id: {state.currentTaskId ?? '-'}</div>
-            {state.currentTaskId !== null ? <TaskDetails id={state.currentTaskId} /> : <div>Click on a task to see details</div>}
+            {state.currentTaskId !== null ? (
+              <TaskDetails id={state.currentTaskId} />
+            ) : (
+              <div>Click on a task to see details</div>
+            )}
           </div>
         )
       }
@@ -192,7 +196,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('should work for a useClientDocument query chained with a useTemporary query', () =>
+  Vitest.live('should work for a useClientDocument query chained with a useTemporary query', () =>
     Effect.gen(function* () {
       const { store, wrapper, renderCount } = yield* makeTodoMvcReact({})
 
@@ -235,7 +239,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('kv client document overwrites value (Schema.Any, no partial merge)', () =>
+  Vitest.live('kv client document overwrites value (Schema.Any, no partial merge)', () =>
     Effect.gen(function* () {
       const { wrapper, store, renderCount } = yield* makeTodoMvcReact({})
 
@@ -264,81 +268,81 @@ Vitest.describe('useClientDocument', () => {
   )
 
   Vitest.describe('otel', () => {
-    it.each([
-      { strictMode: true },
-      { strictMode: false },
-    ])('should update the data based on component key strictMode=%s', async ({ strictMode }) => {
-      const exporter = new InMemorySpanExporter()
-
-      const provider = new BasicTracerProvider({
-        spanProcessors: [new SimpleSpanProcessor(exporter)],
-      })
-
-      const otelTracer = provider.getTracer(`testing-${strictMode !== undefined ? 'strict' : 'non-strict'}`)
-
-      const span = otelTracer.startSpan('test-root')
-      const otelContext = otel.trace.setSpan(otel.context.active(), span)
-
-      await Effect.gen(function* () {
-        const { wrapper, store, renderCount } = yield* makeTodoMvcReact({
-          otelContext,
-          otelTracer,
-          strictMode,
+    it.each([{ strictMode: true }, { strictMode: false }])(
+      'should update the data based on component key strictMode=%s',
+      async ({ strictMode }) => {
+        const exporter = new InMemorySpanExporter()
+
+        const provider = new BasicTracerProvider({
+          spanProcessors: [new SimpleSpanProcessor(exporter)],
         })
 
-        const { result, rerender, unmount } = ReactTesting.renderHook(
-          (userId: string) => {
-            renderCount.inc()
+        const otelTracer = provider.getTracer(`testing-${strictMode !== undefined ? 'strict' : 'non-strict'}`)
 
-            const [state, setState, id] = store.useClientDocument(tables.userInfo, userId)
-            return { state, setState, id }
-          },
-          { wrapper, initialProps: 'u1' },
-        )
+        const span = otelTracer.startSpan('test-root')
+        const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
-        expect(result.current.id).toBe('u1')
-        expect(result.current.state.username).toBe('')
-        expect(renderCount.val).toBe(1)
-
-        // For u2 we'll make sure that the row already exists,
-        // so the lazy `insert` will be skipped
-        ReactTesting.act(() => store.commit(events.UserInfoSet({ username: 'username_u2' }, 'u2')))
-
-        rerender('u2')
-
-        expect(result.current.id).toBe('u2')
-        expect(result.current.state.username).toBe('username_u2')
-        expect(renderCount.val).toBe(2)
-
-        unmount()
-        span.end()
-      }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise)
-
-      await provider.forceFlush()
-
-      const mapAttributes = (attributes: otel.Attributes) => {
-        return ReadonlyRecord.map(attributes, (val, key) => {
-          if (key === 'code.stacktrace') {
-            return '<STACKTRACE>'
-          } else if (key === 'firstStackInfo') {
-            const stackInfo = JSON.parse(val as string) as LiveStore.StackInfo
-            // stackInfo.frames.shift() // Removes `renderHook.wrapper` from the stack
-            stackInfo.frames.forEach((_) => {
-              if (_.name.includes('renderHook.wrapper') === true) {
-                _.name = 'renderHook.wrapper'
-              }
-              _.filePath = '__REPLACED_FOR_SNAPSHOT__'
-            })
-            return JSON.stringify(stackInfo)
-          }
-          return val
-        })
-      }
+        await Effect.gen(function* () {
+          const { wrapper, store, renderCount } = yield* makeTodoMvcReact({
+            otelContext,
+            otelTracer,
+            strictMode,
+          })
+
+          const { result, rerender, unmount } = ReactTesting.renderHook(
+            (userId: string) => {
+              renderCount.inc()
+
+              const [state, setState, id] = store.useClientDocument(tables.userInfo, userId)
+              return { state, setState, id }
+            },
+            { wrapper, initialProps: 'u1' },
+          )
+
+          expect(result.current.id).toBe('u1')
+          expect(result.current.state.username).toBe('')
+          expect(renderCount.val).toBe(1)
+
+          // For u2 we'll make sure that the row already exists,
+          // so the lazy `insert` will be skipped
+          ReactTesting.act(() => store.commit(events.UserInfoSet({ username: 'username_u2' }, 'u2')))
+
+          rerender('u2')
+
+          expect(result.current.id).toBe('u2')
+          expect(result.current.state.username).toBe('username_u2')
+          expect(renderCount.val).toBe(2)
+
+          unmount()
+          span.end()
+        }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise)
+
+        await provider.forceFlush()
+
+        const mapAttributes = (attributes: otel.Attributes) => {
+          return ReadonlyRecord.map(attributes, (val, key) => {
+            if (key === 'code.stacktrace') {
+              return '<STACKTRACE>'
+            } else if (key === 'firstStackInfo') {
+              const stackInfo = JSON.parse(val as string) as LiveStore.StackInfo
+              // stackInfo.frames.shift() // Removes `renderHook.wrapper` from the stack
+              stackInfo.frames.forEach((_) => {
+                if (_.name.includes('renderHook.wrapper') === true) {
+                  _.name = 'renderHook.wrapper'
+                }
+                _.filePath = '__REPLACED_FOR_SNAPSHOT__'
+              })
+              return JSON.stringify(stackInfo)
+            }
+            return val
+          })
+        }
 
-      expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
-      expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
+        expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+        expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
 
-      await provider.shutdown()
-    })
+        await provider.shutdown()
+      },
+    )
   })
 })

package/src/useQuery.test.tsx

@@ -1,20 +1,21 @@
-/** biome-ignore-all lint/a11y: test */
+import * as ReactTesting from '@testing-library/react'
+import React from 'react'
+import * as ReactWindow from 'react-window'
+import { expect } from 'vitest'
+
 import { makeInMemoryAdapter } from '@livestore/adapter-web'
 import { provideOtel } from '@livestore/common'
 import * as LiveStore from '@livestore/livestore'
 import { createStore, queryDb, StoreInternalsSymbol, signal } from '@livestore/livestore'
 import { RG } from '@livestore/livestore/internal/testing-utils'
-import { Effect, Schema } from '@livestore/utils/effect'
 import { Vitest } from '@livestore/utils-dev/node-vitest'
-import * as ReactTesting from '@testing-library/react'
-import React from 'react'
-import * as ReactWindow from 'react-window'
-import { expect } from 'vitest'
+import { Effect, Schema } from '@livestore/utils/effect'
 
 import { events, makeTodoMvcReact, schema, tables } from './__tests__/fixture.tsx'
 import { __resetUseRcResourceCache } from './useRcResource.ts'
 import { withReactApi } from './useStore.ts'
 
+/** Verifies: LS.SYS.INT.REACT-R01, LS.SYS.INT.REACT-R04, LS.SYS.INT.REACT-R05 */
 Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
   'useQuery (strictMode=%s)',
   ({ strictMode }) => {
@@ -23,7 +24,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
       __resetUseRcResourceCache()
     })
 
-    Vitest.scopedLive('simple', () =>
+    Vitest.live('simple', () =>
       Effect.gen(function* () {
         const { wrapper, store, renderCount } = yield* makeTodoMvcReact({ strictMode })
 
@@ -51,7 +52,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
       }),
     )
 
-    Vitest.scopedLive('same `useQuery` hook invoked with different queries', () =>
+    Vitest.live('same `useQuery` hook invoked with different queries', () =>
       Effect.gen(function* () {
         const { wrapper, store, renderCount } = yield* makeTodoMvcReact({ strictMode })
 
@@ -104,7 +105,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
       }),
     )
 
-    Vitest.scopedLive('filtered dependency query', () =>
+    Vitest.live('filtered dependency query', () =>
       Effect.gen(function* () {
         const { wrapper, store, renderCount } = yield* makeTodoMvcReact({ strictMode })
 
@@ -147,7 +148,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
     // NOTE this test covers some special react lifecyle paths which I couldn't easily reproduce without react-window
     // it basically causes a "query swap" in the `useMemo` and both a `useEffect` cleanup call.
     // To handle this properly we introduced the `_tag: 'destroyed'` state in the `spanAlreadyStartedCache`.
-    Vitest.scopedLive('should work for a list with react-window', () =>
+    Vitest.live('should work for a list with react-window', () =>
       Effect.gen(function* () {
         const { wrapper, store } = yield* makeTodoMvcReact({ strictMode })
 
@@ -181,7 +182,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
       }),
     )
 
-    Vitest.scopedLive('should work with signal', () =>
+    Vitest.live('should work with signal', () =>
       Effect.gen(function* () {
         const { wrapper, store } = yield* makeTodoMvcReact({ strictMode })
         const num$ = signal(0)
@@ -196,7 +197,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
       }),
     )
 
-    Vitest.scopedLive('supports query builders directly', () =>
+    Vitest.live('supports query builders directly', () =>
       Effect.gen(function* () {
         const { wrapper, store } = yield* makeTodoMvcReact({ strictMode })
 
@@ -215,7 +216,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
       }),
     )
 
-    Vitest.scopedLive('derives a fresh LiveQuery per Store instance', () =>
+    Vitest.live('derives a fresh LiveQuery per Store instance', () =>
       Effect.gen(function* () {
         const makeStore = () =>
           createStore({
@@ -248,7 +249,7 @@ Vitest.describe.each([{ strictMode: true }, { strictMode: false }] as const)(
       }),
     )
 
-    Vitest.scopedLive('union of different result types with useQuery', () =>
+    Vitest.live('union of different result types with useQuery', () =>
       Effect.gen(function* () {
         const { wrapper, store, renderCount } = yield* makeTodoMvcReact({ strictMode })
 

package/src/useRcResource.test.tsx

@@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { __resetUseRcResourceCache, useRcResource } from './useRcResource.ts'
 
+/** Verifies: LS.SYS.INT.REACT-R03, LS.SYS.INT.REACT-R05 */
 describe.each([{ strictMode: true }, { strictMode: false }])('useRcResource (strictMode=%s)', ({ strictMode }) => {
   beforeEach(() => {
     __resetUseRcResourceCache()

package/src/useRcResource.ts

@@ -87,7 +87,7 @@ export const useRcResource = <T>(
   createRef.current = create
   disposeRef.current = dispose
 
-  // biome-ignore lint/correctness/useExhaustiveDependencies: Dependencies are deliberately limited to `scope` and `key` to avoid unintended re-creations.
+  // oxlint-disable-next-line react/exhaustive-deps -- dependencies are deliberately limited to `scope` and `key` to avoid unintended re-creations
   const resource = React.useMemo(() => {
     const bucket = getBucket(scope)
 
@@ -130,7 +130,7 @@ export const useRcResource = <T>(
     return resource
   }, [scope, key])
 
-  // biome-ignore lint/correctness/useExhaustiveDependencies: We assume the `dispose` function is stable and won't change across renders
+  // oxlint-disable-next-line react/exhaustive-deps -- `disposeRef` keeps the latest dispose function without re-running cleanup
   React.useEffect(() => {
     return () => {
       if (didDisposeInMemo.current === true) {

package/src/useStore.test.tsx

@@ -1,3 +1,15 @@
+import {
+  act,
+  fireEvent,
+  type RenderHookResult,
+  type RenderResult,
+  render,
+  renderHook,
+  waitFor,
+} from '@testing-library/react'
+import * as React from 'react'
+import { describe, expect, it, vi } from 'vitest'
+
 import { makeInMemoryAdapter } from '@livestore/adapter-web'
 import {
   type RegistryStoreOptions,
@@ -7,14 +19,12 @@ import {
   storeOptions,
 } from '@livestore/livestore'
 import { shouldNeverHappen } from '@livestore/utils'
-import { act, type RenderHookResult, type RenderResult, fireEvent, render, renderHook, waitFor } from '@testing-library/react'
-import * as React from 'react'
-import { describe, expect, it, vi } from 'vitest'
 
 import { schema } from './__tests__/fixture.tsx'
 import { StoreRegistryProvider } from './StoreRegistryContext.tsx'
 import { useStore } from './useStore.ts'
 
+/** Verifies: LS.SYS.STORE-R06, LS.SYS.INT.REACT-R01 */
 describe('experimental useStore', () => {
   it('should return the same promise instance for concurrent getOrLoadStore calls', async () => {
     const storeRegistry = new StoreRegistry()

package/src/useStore.ts

@@ -57,7 +57,7 @@ import { useSyncStatus } from './useSyncStatus.ts'
 export const useStore = <
   TSchema extends LiveStoreSchema,
   TContext = {},
-  TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue,
+  TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json,
 >(
   options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>,
 ): Store<TSchema, TContext> & ReactApi => {