@livestore/react 0.4.0-dev.3 → 0.4.0-dev.6

package/src/__tests__/fixture.tsx

@@ -3,6 +3,7 @@ import { provideOtel, type UnexpectedError } from '@livestore/common'
 import { Events, makeSchema, State } from '@livestore/common/schema'
 import type { LiveStoreSchema, SqliteDsl, Store } from '@livestore/livestore'
 import { createStore } from '@livestore/livestore'
+import { omitUndefineds } from '@livestore/utils'
 import { Effect, Schema, type Scope } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
 import React from 'react'
@@ -86,7 +87,7 @@ export const events = {
 
 const materializers = State.SQLite.materializers(events, {
   todoCreated: ({ id, text, completed }) => todos.insert({ id, text, completed }),
-  todoUpdated: ({ id, text, completed }) => todos.update({ completed, text }).where({ id }),
+  todoUpdated: ({ id, text, completed }) => todos.update({ ...omitUndefineds({ completed, text }) }).where({ id }),
 })
 
 export const tables = { todos, app, userInfo, AppRouterSchema, kv }
@@ -163,4 +164,4 @@ export const makeTodoMvcReact: ({
     const renderCount = makeRenderCount()
 
     return { wrapper, store: storeWithReactApi, renderCount }
-  }).pipe(provideOtel({ parentSpanContext: otelContext, otelTracer }))
+  }).pipe(provideOtel(omitUndefineds({ parentSpanContext: otelContext, otelTracer })))

package/src/useClientDocument.test.tsx

@@ -1,7 +1,7 @@
 /** 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 { getSimplifiedRootSpan } from '@livestore/livestore/internal/testing-utils'
+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'
@@ -323,7 +323,8 @@ Vitest.describe('useClientDocument', () => {
           })
         }
 
-        expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()
+        expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+        expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
 
         await provider.shutdown()
       },

package/src/useClientDocument.ts

@@ -3,7 +3,7 @@ import { SessionIdSymbol } from '@livestore/common'
 import { State } from '@livestore/common/schema'
 import type { LiveQuery, LiveQueryDef, Store } from '@livestore/livestore'
 import { queryDb } from '@livestore/livestore'
-import { shouldNeverHappen } from '@livestore/utils'
+import { omitUndefineds, shouldNeverHappen } from '@livestore/utils'
 import React from 'react'
 
 import { LiveStoreContext } from './LiveStoreContext.ts'
@@ -105,8 +105,7 @@ export const useClientDocument: {
   const tableName = table.sqliteDef.name
 
   const store =
-    storeArg?.store ??
-    // biome-ignore lint/correctness/useHookAtTopLevel: store is stable
+    storeArg?.store ?? // biome-ignore lint/correctness/useHookAtTopLevel: store is stable
     React.useContext(LiveStoreContext)?.store ??
     shouldNeverHappen(`No store provided to useClientDocument`)
 
@@ -125,7 +124,7 @@ export const useClientDocument: {
 
   const queryRef = useQueryRef(queryDef, {
     otelSpanName: `LiveStore:useClientDocument:${tableName}:${idStr}`,
-    store: storeArg?.store,
+    ...omitUndefineds({ store: storeArg?.store }),
   })
 
   const setState = React.useMemo<StateSetters<TTableDef>>(

package/src/useQuery.ts

@@ -42,8 +42,7 @@ export const useQueryRef = <TQuery extends LiveQueryDef.Any>(
   queryRcRef: LiveQueries.RcRef<LiveQuery<LiveQueries.GetResult<TQuery>>>
 } => {
   const store =
-    options?.store ??
-    // biome-ignore lint/correctness/useHookAtTopLevel: store is stable
+    options?.store ?? // biome-ignore lint/correctness/useHookAtTopLevel: store is stable
     React.useContext(LiveStoreContext)?.store ??
     shouldNeverHappen(`No store provided to useQuery`)