@livestore/livestore 0.3.0-dev.28 → 0.3.0-dev.29

package/src/store/store.ts

@@ -9,7 +9,7 @@ import type {
 import {
   Devtools,
   getDurationMsFromSpan,
-  getExecArgsFromMutation,
+  getExecArgsFromEvent,
   getResultSchema,
   IntentionalShutdownCause,
   isQueryBuilder,
@@ -21,16 +21,16 @@ import {
 } from '@livestore/common'
 import type { LiveStoreSchema } from '@livestore/common/schema'
 import {
-  getMutationDef,
+  getEventDef,
   LEADER_MERGE_COUNTER_TABLE,
-  MutationEvent,
+  LiveStoreEvent,
+  SCHEMA_EVENT_DEFS_META_TABLE,
   SCHEMA_META_TABLE,
-  SCHEMA_MUTATIONS_META_TABLE,
   SESSION_CHANGESET_META_TABLE,
 } from '@livestore/common/schema'
 import { assertNever, isDevEnv } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
-import { Cause, Effect, Inspectable, OtelTracer, Predicate, Runtime, Schema, Stream } from '@livestore/utils/effect'
+import { Cause, Effect, Inspectable, OtelTracer, Runtime, Schema, Stream } from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
 import * as otel from '@opentelemetry/api'
 
@@ -42,13 +42,13 @@ import type {
   ReactivityGraphContext,
 } from '../live-queries/base-class.js'
 import { makeReactivityGraph } from '../live-queries/base-class.js'
+import { makeExecBeforeFirstRun } from '../live-queries/client-document-get-query.js'
 import type { Ref } from '../reactive.js'
-import { makeExecBeforeFirstRun } from '../row-query-utils.js'
 import { SqliteDbWrapper } from '../SqliteDbWrapper.js'
 import { ReferenceCountedSet } from '../utils/data-structures.js'
 import { downloadBlob, exposeDebugUtils } from '../utils/dev.js'
 import type { StackInfo } from '../utils/stack-info.js'
-import type { RefreshReason, StoreMutateOptions, StoreOptions, StoreOtel, Unsubscribe } from './store-types.js'
+import type { RefreshReason, StoreCommitOptions, StoreOptions, StoreOtel, Unsubscribe } from './store-types.js'
 
 if (isDevEnv()) {
   exposeDebugUtils()
@@ -76,8 +76,8 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
   /** RC-based set to see which queries are currently subscribed to */
   activeQueries: ReferenceCountedSet<LiveQuery<any>>
 
-  // NOTE this is currently exposed for the Devtools databrowser to emit mutation events
-  readonly __mutationEventSchema
+  // NOTE this is currently exposed for the Devtools databrowser to commit events
+  readonly __eventSchema
   readonly syncProcessor: ClientSessionSyncProcessor
 
   readonly boot: Effect.Effect<void, UnexpectedError, Scope.Scope>
@@ -114,12 +114,12 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       schema,
       clientSession,
       runtime: effectContext.runtime,
-      applyMutation: (mutationEventDecoded, { otelContext, withChangeset }) => {
-        const mutationDef = getMutationDef(schema, mutationEventDecoded.mutation)
+      applyEvent: (eventDecoded, { otelContext, withChangeset }) => {
+        const eventDef = getEventDef(schema, eventDecoded.name)
 
-        const execArgsArr = getExecArgsFromMutation({
-          mutationDef,
-          mutationEvent: { decoded: mutationEventDecoded, encoded: undefined },
+        const execArgsArr = getExecArgsFromEvent({
+          eventDef,
+          event: { decoded: eventDecoded, encoded: undefined },
         })
 
         const writeTablesForEvent = new Set<string>()
@@ -168,14 +168,14 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       confirmUnsavedChanges,
     })
 
-    this.__mutationEventSchema = MutationEvent.makeMutationEventSchemaMemo(schema)
+    this.__eventSchema = LiveStoreEvent.makeEventDefSchemaMemo(schema)
 
     // TODO generalize the `tableRefs` concept to allow finer-grained refs
     this.tableRefs = {}
     this.activeQueries = new ReferenceCountedSet()
 
-    const mutationsSpan = otelOptions.tracer.startSpan('LiveStore:mutations', {}, otelOptions.rootSpanContext)
-    const otelMuationsSpanContext = otel.trace.setSpan(otel.context.active(), mutationsSpan)
+    const commitsSpan = otelOptions.tracer.startSpan('LiveStore:commits', {}, otelOptions.rootSpanContext)
+    const otelMuationsSpanContext = otel.trace.setSpan(otel.context.active(), commitsSpan)
 
     const queriesSpan = otelOptions.tracer.startSpan('LiveStore:queries', {}, otelOptions.rootSpanContext)
     const otelQueriesSpanContext = otel.trace.setSpan(otel.context.active(), queriesSpan)
@@ -192,20 +192,20 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
 
     this.otel = {
       tracer: otelOptions.tracer,
-      mutationsSpanContext: otelMuationsSpanContext,
+      commitsSpanContext: otelMuationsSpanContext,
       queriesSpanContext: otelQueriesSpanContext,
     }
 
     // Need a set here since `schema.tables` might contain duplicates and some componentStateTables
     const allTableNames = new Set(
-      // NOTE we're excluding the LiveStore schema and mutations tables as they are not user-facing
+      // NOTE we're excluding the LiveStore schema and events tables as they are not user-facing
       // unless LiveStore is running in the devtools
       __runningInDevtools
         ? this.schema.tables.keys()
         : Array.from(this.schema.tables.keys()).filter(
             (_) =>
               _ !== SCHEMA_META_TABLE &&
-              _ !== SCHEMA_MUTATIONS_META_TABLE &&
+              _ !== SCHEMA_EVENT_DEFS_META_TABLE &&
               _ !== SESSION_CHANGESET_META_TABLE &&
               _ !== LEADER_MERGE_COUNTER_TABLE,
           ),
@@ -231,7 +231,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
 
           // End the otel spans
           syncSpan.end()
-          mutationsSpan.end()
+          commitsSpan.end()
           queriesSpan.end()
         }),
       )
@@ -259,11 +259,11 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
    * ```
    */
   subscribe = <TResult>(
-    query: LiveQueryDef<TResult, any> | LiveQuery<TResult, any>,
+    query: LiveQueryDef<TResult> | LiveQuery<TResult>,
     options: {
       /** Called when the query result has changed */
       onUpdate: (value: TResult) => void
-      onSubscribe?: (query$: LiveQuery<TResult, any>) => void
+      onSubscribe?: (query$: LiveQuery<TResult>) => void
       /** Gets called after the query subscription has been removed */
       onUnsubsubscribe?: () => void
       label?: string
@@ -337,7 +337,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
     )
 
   subscribeStream = <TResult>(
-    query$: LiveQueryDef<TResult, any>,
+    query$: LiveQueryDef<TResult>,
     options?: { label?: string; skipInitialRun?: boolean } | undefined,
   ): Stream.Stream<TResult> =>
     Stream.asyncPush<TResult>((emit) =>
@@ -377,8 +377,8 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
   query = <TResult>(
     query:
       | QueryBuilder<TResult, any, any>
-      | LiveQuery<TResult, any>
-      | LiveQueryDef<TResult, any>
+      | LiveQuery<TResult>
+      | LiveQueryDef<TResult>
       | { query: string; bindValues: ParamsObject },
     options?: { otelContext?: otel.Context; debugRefreshReason?: RefreshReason },
   ): TResult => {
@@ -392,7 +392,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
         makeExecBeforeFirstRun({
           table: ast.tableDef,
           id: ast.id,
-          insertValues: ast.insertValues,
+          explicitDefaultValues: ast.explicitDefaultValues,
           otelContext: options?.otelContext,
         })(this.reactivityGraph.context!)
       }
@@ -415,6 +415,8 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
     }
   }
 
+  atom = (): TODO => {}
+
   // makeLive: {
   //   <T>(def: LiveQueryDef<T, any>): LiveQuery<T, any>
   //   <T>(def: ILiveQueryRefDef<T>): ILiveQueryRef<T>
@@ -434,42 +436,42 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
 
   // #region commit
   /**
-   * Commit a list of mutations to the store which will immediately update the local database
-   * and sync the mutations across other clients (similar to a `git commit`).
+   * Commit a list of events to the store which will immediately update the local database
+   * and sync the events across other clients (similar to a `git commit`).
    *
    * @example
    * ```ts
-   * store.commit(mutations.todoCreated({ id: nanoid(), text: 'Make coffee' }))
+   * store.commit(events.todoCreated({ id: nanoid(), text: 'Make coffee' }))
    * ```
    *
-   * You can call `commit` with multiple mutations to apply them in a single database transaction.
+   * You can call `commit` with multiple events to apply them in a single database transaction.
    *
    * @example
    * ```ts
    * const todoId = nanoid()
    * store.commit(
-   *   mutations.todoCreated({ id: todoId, text: 'Make coffee' }),
-   *   mutations.todoCompleted({ id: todoId }))
+   *   events.todoCreated({ id: todoId, text: 'Make coffee' }),
+   *   events.todoCompleted({ id: todoId }))
    * ```
    *
    * For more advanced transaction scenarios, you can pass a synchronous function to `commit` which will receive a callback
-   * to which you can pass multiple mutations to be committed in the same database transaction.
-   * Under the hood this will simply collect all mutations and apply them in a single database transaction.
+   * to which you can pass multiple events to be committed in the same database transaction.
+   * Under the hood this will simply collect all events and apply them in a single database transaction.
    *
    * @example
    * ```ts
    * store.commit((commit) => {
    *   const todoId = nanoid()
    *   if (Math.random() > 0.5) {
-   *     commit(mutations.todoCreated({ id: todoId, text: 'Make coffee' }))
+   *     commit(events.todoCreated({ id: todoId, text: 'Make coffee' }))
    *   } else {
-   *     commit(mutations.todoCompleted({ id: todoId }))
+   *     commit(events.todoCompleted({ id: todoId }))
    *   }
    * })
    * ```
    *
-   * When committing a large batch of mutations, you can also skip the database refresh to improve performance
-   * and call `store.manualRefresh()` after all mutations have been committed.
+   * When committing a large batch of events, you can also skip the database refresh to improve performance
+   * and call `store.manualRefresh()` after all events have been committed.
    *
    * @example
    * ```ts
@@ -479,44 +481,44 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
    *   // ... 1000 more todos
    * ]
    * for (const todo of todos) {
-   *   store.commit({ skipRefresh: true }, mutations.todoCreated({ id: todo.id, text: todo.text }))
+   *   store.commit({ skipRefresh: true }, events.todoCreated({ id: todo.id, text: todo.text }))
    * }
    * store.manualRefresh()
    * ```
    */
   commit: {
-    <const TMutationArg extends ReadonlyArray<MutationEvent.PartialForSchema<TSchema>>>(...list: TMutationArg): void
+    <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(...list: TCommitArg): void
     (
-      txn: <const TMutationArg extends ReadonlyArray<MutationEvent.PartialForSchema<TSchema>>>(
-        ...list: TMutationArg
+      txn: <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(
+        ...list: TCommitArg
       ) => void,
     ): void
-    <const TMutationArg extends ReadonlyArray<MutationEvent.PartialForSchema<TSchema>>>(
-      options: StoreMutateOptions,
-      ...list: TMutationArg
+    <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(
+      options: StoreCommitOptions,
+      ...list: TCommitArg
     ): void
     (
-      options: StoreMutateOptions,
-      txn: <const TMutationArg extends ReadonlyArray<MutationEvent.PartialForSchema<TSchema>>>(
-        ...list: TMutationArg
+      options: StoreCommitOptions,
+      txn: <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(
+        ...list: TCommitArg
       ) => void,
     ): void
-  } = (firstMutationOrTxnFnOrOptions: any, ...restMutations: any[]) => {
-    const { mutationsEvents, options } = this.getMutateArgs(firstMutationOrTxnFnOrOptions, restMutations)
+  } = (firstEventOrTxnFnOrOptions: any, ...restEvents: any[]) => {
+    const { events, options } = this.getCommitArgs(firstEventOrTxnFnOrOptions, restEvents)
 
-    for (const mutationEvent of mutationsEvents) {
-      replaceSessionIdSymbol(mutationEvent.args, this.clientSession.sessionId)
+    for (const event of events) {
+      replaceSessionIdSymbol(event.args, this.clientSession.sessionId)
     }
 
-    if (mutationsEvents.length === 0) return
+    if (events.length === 0) return
 
     const skipRefresh = options?.skipRefresh ?? false
 
-    const mutationsSpan = otel.trace.getSpan(this.otel.mutationsSpanContext)!
-    mutationsSpan.addEvent('commit')
+    const commitsSpan = otel.trace.getSpan(this.otel.commitsSpanContext)!
+    commitsSpan.addEvent('commit')
 
     // console.group('LiveStore.commit', { skipRefresh, wasSyncMessage, label })
-    // mutationsEvents.forEach((_) => console.debug(_.mutation, _.id, _.args))
+    // events.forEach((_) => console.debug(_.name, _.id, _.args))
     // console.groupEnd()
 
     let durationMs: number
@@ -525,26 +527,26 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       'LiveStore:commit',
       {
         attributes: {
-          'livestore.mutationEventsCount': mutationsEvents.length,
-          'livestore.mutationEventTags': mutationsEvents.map((_) => _.mutation),
+          'livestore.eventsCount': events.length,
+          'livestore.eventTags': events.map((_) => _.name),
           'livestore.commitLabel': options?.label,
         },
         links: options?.spanLinks,
       },
-      options?.otelContext ?? this.otel.mutationsSpanContext,
+      options?.otelContext ?? this.otel.commitsSpanContext,
       (span) => {
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
         try {
           const { writeTables } = (() => {
             try {
-              const applyMutations = () => this.syncProcessor.push(mutationsEvents, { otelContext })
+              const applyEvents = () => this.syncProcessor.push(events, { otelContext })
 
-              if (mutationsEvents.length > 1) {
+              if (events.length > 1) {
                 // TODO: what to do about leader transaction here?
-                return this.sqliteDbWrapper.txn(applyMutations)
+                return this.sqliteDbWrapper.txn(applyEvents)
               } else {
-                return applyMutations()
+                return applyEvents()
               }
             } catch (e: any) {
               console.error(e)
@@ -564,7 +566,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
 
           const debugRefreshReason = {
             _tag: 'commit' as const,
-            mutations: mutationsEvents,
+            events,
             writeTables: Array.from(writeTables),
           }
 
@@ -587,7 +589,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
   // #endregion commit
 
   /**
-   * This can be used in combination with `skipRefresh` when applying mutations.
+   * This can be used in combination with `skipRefresh` when committing events.
    * We might need a better solution for this. Let's see.
    */
   manualRefresh = (options?: { label?: string }) => {
@@ -595,7 +597,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
     this.otel.tracer.startActiveSpan(
       'LiveStore:manualRefresh',
       { attributes: { 'livestore.manualRefreshLabel': label } },
-      this.otel.mutationsSpanContext,
+      this.otel.commitsSpanContext,
       (span) => {
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
         this.reactivityGraph.runDeferredEffects({ otelContext })
@@ -624,10 +626,10 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       }).pipe(this.runEffectFork)
     },
 
-    downloadMutationLogDb: () => {
+    downloadEventlogDb: () => {
       Effect.gen(this, function* () {
-        const data = yield* this.clientSession.leaderThread.getMutationLogData
-        downloadBlob(data, `livestore-mutationlog-${Date.now()}.db`)
+        const data = yield* this.clientSession.leaderThread.getEventlogData
+        downloadBlob(data, `livestore-eventlog-${Date.now()}.db`)
       }).pipe(this.runEffectFork)
     },
 
@@ -668,36 +670,40 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       Runtime.runFork(this.effectContext.runtime),
     )
 
-  private getMutateArgs = (
-    firstMutationOrTxnFnOrOptions: any,
-    restMutations: any[],
+  private getCommitArgs = (
+    firstEventOrTxnFnOrOptions: any,
+    restEvents: any[],
   ): {
-    mutationsEvents: (MutationEvent.ForSchema<TSchema> | MutationEvent.PartialForSchema<TSchema>)[]
-    options: StoreMutateOptions | undefined
+    events: LiveStoreEvent.PartialForSchema<TSchema>[]
+    options: StoreCommitOptions | undefined
   } => {
-    let mutationsEvents: (MutationEvent.ForSchema<TSchema> | MutationEvent.PartialForSchema<TSchema>)[]
-    let options: StoreMutateOptions | undefined
+    let events: LiveStoreEvent.PartialForSchema<TSchema>[]
+    let options: StoreCommitOptions | undefined
 
-    if (typeof firstMutationOrTxnFnOrOptions === 'function') {
+    if (typeof firstEventOrTxnFnOrOptions === 'function') {
       // TODO ensure that function is synchronous and isn't called in a async way (also write tests for this)
-      mutationsEvents = firstMutationOrTxnFnOrOptions((arg: any) => mutationsEvents.push(arg))
+      events = firstEventOrTxnFnOrOptions((arg: any) => events.push(arg))
     } else if (
-      firstMutationOrTxnFnOrOptions?.label !== undefined ||
-      firstMutationOrTxnFnOrOptions?.skipRefresh !== undefined ||
-      firstMutationOrTxnFnOrOptions?.otelContext !== undefined ||
-      firstMutationOrTxnFnOrOptions?.spanLinks !== undefined
+      firstEventOrTxnFnOrOptions?.label !== undefined ||
+      firstEventOrTxnFnOrOptions?.skipRefresh !== undefined ||
+      firstEventOrTxnFnOrOptions?.otelContext !== undefined ||
+      firstEventOrTxnFnOrOptions?.spanLinks !== undefined
     ) {
-      options = firstMutationOrTxnFnOrOptions
-      mutationsEvents = restMutations
-    } else if (firstMutationOrTxnFnOrOptions === undefined) {
-      // When `commit` is called with no arguments (which sometimes happens when dynamically filtering mutations)
-      mutationsEvents = []
+      options = firstEventOrTxnFnOrOptions
+      events = restEvents
+    } else if (firstEventOrTxnFnOrOptions === undefined) {
+      // When `commit` is called with no arguments (which sometimes happens when dynamically filtering events)
+      events = []
     } else {
-      mutationsEvents = [firstMutationOrTxnFnOrOptions, ...restMutations]
+      events = [firstEventOrTxnFnOrOptions, ...restEvents]
     }
 
-    mutationsEvents = mutationsEvents.filter((_) => Predicate.hasProperty(_, 'id') === false)
+    // for (const event of events) {
+    //   if (event.args.id === SessionIdSymbol) {
+    //     event.args.id = this.clientSession.sessionId
+    //   }
+    // }
 
-    return { mutationsEvents, options }
+    return { events, options }
   }
 }

package/src/utils/stack-info.test.ts

@@ -86,7 +86,7 @@ Error:
     at Object.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22757:18)
     at Object.process.env.NODE_ENV.exports.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react@19.0.0/node_modules/react/cjs/react.development.js:1488:34)
     at Module.useQueryRef (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useQuery.ts:54:27)
-    at Module.useRow (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20)
+    at Module.useClientDocument (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useClientDocument.ts:111:20)
     at TestComponent (/Users/schickling/Code/overtone/node_modules/.pnpm/@testing-library+react@16.1.0_@testing-library+dom@10.4.0_@types+react-dom@19.0.3_@types+reac_2jaiibiag2sxou3wtzbuqx3r5a/node_modules/@testing-library/react/dist/pure.js:309:27)
     at Object.react-stack-bottom-frame (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22428:20)
     at renderWithHooks (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:5757:22)
@@ -101,8 +101,8 @@ Error:
           "name": "TestComponent",
         },
         {
-          "filePath": "/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20",
-          "name": "useRow",
+          "filePath": "/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useClientDocument.ts:111:20",
+          "name": "useClientDocument",
         },
       ],
     }
@@ -117,7 +117,7 @@ Error:
     at Object.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22757:18)
     at Object.process.env.NODE_ENV.exports.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react@19.0.0/node_modules/react/cjs/react.development.js:1488:34)
     at Module.useQueryRef (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useQuery.ts:54:27)
-    at Module.useRow (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20)
+    at Module.useClientDocument (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useClientDocument.ts:111:20)
     at Object.react-stack-bottom-frame (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22428:20)
     at renderWithHooks (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:5757:22)
   `
@@ -127,8 +127,8 @@ Error:
     {
       "frames": [
         {
-          "filePath": "/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20",
-          "name": "useRow",
+          "filePath": "/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useClientDocument.ts:111:20",
+          "name": "useClientDocument",
         },
       ],
     }

package/src/utils/tests/fixture.ts

@@ -1,9 +1,7 @@
 import { makeInMemoryAdapter } from '@livestore/adapter-web'
 import { provideOtel } from '@livestore/common'
-import type { FromInputSchema } from '@livestore/common/schema'
-import type { Store } from '@livestore/livestore'
-import { createStore, DbSchema, makeSchema } from '@livestore/livestore'
-import { Effect } from '@livestore/utils/effect'
+import { createStore, makeSchema, State } from '@livestore/livestore'
+import { Effect, Schema } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
 
 export type Todo = {
@@ -19,30 +17,28 @@ export type AppState = {
   filter: Filter
 }
 
-export const todos = DbSchema.table(
-  'todos',
-  {
-    id: DbSchema.text({ primaryKey: true }),
-    text: DbSchema.text({ default: '', nullable: false }),
-    completed: DbSchema.boolean({ default: false, nullable: false }),
+export const todos = State.SQLite.table({
+  name: 'todos',
+  columns: {
+    id: State.SQLite.text({ primaryKey: true }),
+    text: State.SQLite.text({ default: '', nullable: false }),
+    completed: State.SQLite.boolean({ default: false, nullable: false }),
   },
-  { deriveMutations: true, isSingleton: false },
-)
-
-export const app = DbSchema.table(
-  'app',
-  {
-    id: DbSchema.text({ primaryKey: true, default: 'static' }),
-    newTodoText: DbSchema.text({ default: '', nullable: true }),
-    filter: DbSchema.text({ default: 'all', nullable: false }),
-  },
-  { isSingleton: true },
-)
+})
+
+export const app = State.SQLite.clientDocument({
+  name: 'app',
+  schema: Schema.Struct({
+    newTodoText: Schema.String,
+    filter: Schema.String,
+  }),
+  default: { value: { newTodoText: '', filter: 'all' } },
+})
 
 export const tables = { todos, app }
-export const schema = makeSchema({ tables })
 
-export interface FixtureSchema extends FromInputSchema.DeriveSchema<{ tables: typeof tables }> {}
+export const state = State.SQLite.makeState({ tables, materializers: {} })
+export const schema = makeSchema({ state, events: {} })
 
 export const makeTodoMvc = ({
   otelTracer,
@@ -52,7 +48,7 @@ export const makeTodoMvc = ({
   otelContext?: otel.Context
 } = {}) =>
   Effect.gen(function* () {
-    const store: Store<FixtureSchema> = yield* createStore({
+    const store = yield* createStore({
       schema,
       storeId: 'default',
       adapter: makeInMemoryAdapter(),

package/src/utils/tests/otel.ts

@@ -13,14 +13,21 @@ export const getSimplifiedRootSpan = (
   const mapAttributesfn = mapAttributes ?? identity
 
   spansMap.forEach((nestedSpan) => {
-    const parentSpan = nestedSpan.span.parentSpanId ? spansMap.get(nestedSpan.span.parentSpanId) : undefined
+    const parentId = nestedSpan.span.parentSpanContext?.spanId
+    const parentSpan = parentId ? spansMap.get(parentId) : undefined
     if (parentSpan) {
       parentSpan.children.push(nestedSpan)
     }
   })
 
   type NestedSpan = { span: ReadableSpan; children: NestedSpan[] }
-  const rootSpan = spansMap.get(spans.find((_) => _.name === 'createStore')!.spanContext().spanId)!
+  const createStoreSpanData = spans.find((_) => _.name === 'createStore')
+  if (createStoreSpanData === undefined) {
+    throw new Error(
+      "Could not find the root span named 'createStore'. Available spans: " + spans.map((s) => s.name).join(', '),
+    )
+  }
+  const rootSpan = spansMap.get(createStoreSpanData.spanContext().spanId)!
 
   const simplifySpanRec = (span: NestedSpan): SimplifiedNestedSpan =>
     omitEmpty({
@@ -88,7 +95,7 @@ export const toTraceFile = (spans: ReadableSpan[]) => {
             spans: spans.map((span) => ({
               traceId: span.spanContext().traceId,
               spanId: span.spanContext().spanId,
-              ...(span.parentSpanId ? { parentSpanId: span.parentSpanId } : {}),
+              ...(span.parentSpanContext?.spanId ? { parentSpanId: span.parentSpanContext.spanId } : {}),
               // traceState: span.spanContext().traceState ?? '',
               name: span.name,
               kind: 'SPAN_KIND_INTERNAL',

package/dist/row-query-utils.d.ts

@@ -1,17 +0,0 @@
-import type { QueryInfo } from '@livestore/common';
-import { SessionIdSymbol } from '@livestore/common';
-import { DbSchema } from '@livestore/common/schema';
-import type * as otel from '@opentelemetry/api';
-import type { GetResult, LiveQueryDef, ReactivityGraphContext } from './live-queries/base-class.js';
-export declare const rowQueryLabel: (table: DbSchema.TableDefBase, id: string | SessionIdSymbol | number | undefined) => string;
-export declare const deriveColQuery: {
-    <TQueryDef extends LiveQueryDef<any, QueryInfo.None>, TCol extends keyof GetResult<TQueryDef> & string>(queryDef: TQueryDef, colName: TCol): LiveQueryDef<GetResult<TQueryDef>[TCol], QueryInfo.None>;
-    <TQueryDef extends LiveQueryDef<any, QueryInfo.Row>, TCol extends keyof GetResult<TQueryDef> & string>(queryDef: TQueryDef, colName: TCol): LiveQueryDef<GetResult<TQueryDef>[TCol], QueryInfo.Col>;
-};
-export declare const makeExecBeforeFirstRun: ({ id, insertValues, table, otelContext: otelContext_, }: {
-    id?: string | SessionIdSymbol | number;
-    insertValues?: any;
-    table: DbSchema.TableDefBase;
-    otelContext: otel.Context | undefined;
-}) => ({ store }: ReactivityGraphContext) => undefined;
-//# sourceMappingURL=row-query-utils.d.ts.map

package/dist/row-query-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"row-query-utils.d.ts","sourceRoot":"","sources":["../src/row-query-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAEnD,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AAGnG,eAAO,MAAM,aAAa,GAAI,OAAO,QAAQ,CAAC,YAAY,EAAE,IAAI,MAAM,GAAG,eAAe,GAAG,MAAM,GAAG,SAAS,WACH,CAAA;AAE1G,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,SAAS,SAAS,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,SAAS,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,MAAM,EACpG,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,IAAI,GACZ,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;IAC3D,CAAC,SAAS,SAAS,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,IAAI,SAAS,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,MAAM,EACnG,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,IAAI,GACZ,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;CAc3D,CAAA;AAED,eAAO,MAAM,sBAAsB,GAChC,yDAKE;IACD,EAAE,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,MAAM,CAAA;IACtC,YAAY,CAAC,EAAE,GAAG,CAAA;IAClB,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAA;IAC5B,WAAW,EAAE,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;CACtC,MACA,WAAW,sBAAsB,cA2BjC,CAAA"}

package/dist/row-query-utils.js

@@ -1,34 +0,0 @@
-import { SessionIdSymbol } from '@livestore/common';
-import { DbSchema } from '@livestore/common/schema';
-import { shouldNeverHappen } from '@livestore/utils';
-import { computed } from './live-queries/computed.js';
-export const rowQueryLabel = (table, id) => `row:${table.sqliteDef.name}${id === undefined ? '' : id === SessionIdSymbol ? `:sessionId` : `:${id}`}`;
-export const deriveColQuery = (queryDef, colName) => {
-    return computed((get) => get(queryDef)[colName], {
-        label: `deriveColQuery:${queryDef.label}:${colName}`,
-        queryInfo: queryDef.queryInfo._tag === 'Row'
-            ? { _tag: 'Col', table: queryDef.queryInfo.table, column: colName, id: queryDef.queryInfo.id }
-            : undefined,
-        deps: [
-            queryDef.queryInfo.table.sqliteDef.name,
-            queryDef.queryInfo.id === SessionIdSymbol ? 'sessionId' : queryDef.queryInfo.id,
-            queryDef.queryInfo._tag === 'Col' ? queryDef.queryInfo.column : undefined,
-        ],
-    });
-};
-export const makeExecBeforeFirstRun = ({ id, insertValues, table, otelContext: otelContext_, }) => ({ store }) => {
-    const otelContext = otelContext_ ?? store.otel.queriesSpanContext;
-    if (table.options.isSingleton === false) {
-        const idVal = id === SessionIdSymbol ? store.sessionId : id;
-        const rowExists = store.sqliteDbWrapper.select(`SELECT 1 FROM '${table.sqliteDef.name}' WHERE id = ?`, [idVal], { otelContext }).length === 1;
-        if (rowExists)
-            return;
-        if (DbSchema.tableHasDerivedMutations(table) === false) {
-            return shouldNeverHappen(`Cannot insert row for table "${table.sqliteDef.name}" which does not have 'deriveMutations: true' set`);
-        }
-        // It's important that we only commit and don't refresh here, as this function might be called during a render
-        // and otherwise we might end up in a "reactive loop"
-        store.commit({ otelContext, skipRefresh: true, label: `rowQuery:${table.sqliteDef.name}:${idVal}` }, table.insert({ id, ...insertValues }));
-    }
-};
-//# sourceMappingURL=row-query-utils.js.map

package/dist/row-query-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"row-query-utils.js","sourceRoot":"","sources":["../src/row-query-utils.ts"],"names":[],"mappings":"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"}