@livestore/livestore 0.0.58-dev.0 → 0.0.58-dev.10

package/src/row-query.ts

@@ -1,13 +1,19 @@
 import type { QueryInfoCol, QueryInfoNone, QueryInfoRow } from '@livestore/common'
-import { sql } from '@livestore/common'
+import { SessionIdSymbol, sql } from '@livestore/common'
 import { DbSchema } from '@livestore/common/schema'
+import type { SqliteDsl } from '@livestore/db-schema'
 import type { GetValForKey } from '@livestore/utils'
 import { shouldNeverHappen } from '@livestore/utils'
 import { Schema } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
-import type { SqliteDsl } from 'effect-db-schema'
 
-import type { LiveQuery, LiveQueryAny, QueryContext, ReactivityGraph } from './reactiveQueries/base-class.js'
+import type {
+  GetAtomResult,
+  LiveQuery,
+  LiveQueryAny,
+  QueryContext,
+  ReactivityGraph,
+} from './reactiveQueries/base-class.js'
 import { computed } from './reactiveQueries/js.js'
 import { LiveStoreSQLQuery } from './reactiveQueries/sql.js'
 import type { Store } from './store.js'
@@ -46,7 +52,7 @@ export type MakeRowQuery = {
   >(
     table: TTableDef,
     // TODO adjust so it works with arbitrary primary keys or unique constraints
-    id: string,
+    id: string | SessionIdSymbol,
     options?: RowQueryOptions<TTableDef, TResult> & RowQueryOptionsDefaulValues<TTableDef>,
   ): LiveQuery<TResult, QueryInfoRow<TTableDef>>
 }
@@ -54,15 +60,15 @@ export type MakeRowQuery = {
 // TODO also allow other where clauses and multiple rows
 export const rowQuery: MakeRowQuery = <TTableDef extends DbSchema.TableDef>(
   table: TTableDef,
-  idOrOptions?: string | RowQueryOptions<TTableDef, any>,
+  idOrOptions?: string | SessionIdSymbol | RowQueryOptions<TTableDef, any>,
   options_?: RowQueryOptions<TTableDef, any> & RowQueryOptionsDefaulValues<TTableDef>,
 ) => {
-  const id = typeof idOrOptions === 'string' ? idOrOptions : undefined
-  const options = typeof idOrOptions === 'string' ? options_ : idOrOptions
+  const id = typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? idOrOptions : undefined
+  const options = typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? options_ : idOrOptions
   const defaultValues: Partial<RowResult<TTableDef>> | undefined = (options as any)?.defaultValues ?? {}
 
   // Validate query args
-  if (table.options.isSingleton === true && id !== undefined) {
+  if (table.options.isSingleton === true && id !== undefined && id !== SessionIdSymbol) {
     shouldNeverHappen(`Cannot query state table ${table.sqliteDef.name} with id "${id}" as it is a singleton`)
   } else if (table.options.isSingleton !== true && id === undefined) {
     shouldNeverHappen(`Cannot query state table ${table.sqliteDef.name} without id`)
@@ -71,14 +77,21 @@ export const rowQuery: MakeRowQuery = <TTableDef extends DbSchema.TableDef>(
   const tableSchema = table.sqliteDef
   const tableName = tableSchema.name
 
-  const whereClause = id === undefined ? '' : `where id = '${id}'`
-  const queryStr = sql`select * from ${tableName} ${whereClause} limit 1`
+  const makeQueryString = (id: string | undefined) =>
+    sql`select * from ${tableName} ${id === undefined ? '' : `where id = '${id}'`} limit 1`
+
+  const genQueryString =
+    id === SessionIdSymbol
+      ? (_: GetAtomResult, ctx: QueryContext) => makeQueryString(ctx.store.sessionId)
+      : makeQueryString(id)
 
   const rowSchema = table.isSingleColumn === true ? table.schema.pipe(Schema.pluck('value' as any)) : table.schema
 
   return new LiveStoreSQLQuery({
-    label: options?.label ?? `rowQuery:query:${tableSchema.name}${id === undefined ? '' : `:${id}`}`,
-    genQueryString: queryStr,
+    label:
+      options?.label ??
+      `rowQuery:query:${tableSchema.name}${id === undefined ? '' : id === SessionIdSymbol ? `:sessionId` : `:${id}`}`,
+    genQueryString,
     queriedTables: new Set([tableName]),
     reactivityGraph: options?.reactivityGraph,
     // While this code-path is not needed for singleton tables, it's still needed for `useRow` with non-existing rows for a given ID
@@ -91,7 +104,11 @@ export const rowQuery: MakeRowQuery = <TTableDef extends DbSchema.TableDef>(
     }),
     schema: rowSchema.pipe(Schema.Array, Schema.headOrElse()),
     map: options?.map,
-    queryInfo: { _tag: 'Row', table, id: id ?? 'singleton' },
+    queryInfo: {
+      _tag: 'Row',
+      table,
+      id: id === SessionIdSymbol ? 'sessionId' : (id ?? 'singleton'),
+    },
   })
 }
 
@@ -130,7 +147,7 @@ const makeExecBeforeFirstRun =
     otelContext: otelContext_,
     table,
   }: {
-    id?: string
+    id?: string | SessionIdSymbol
     defaultValues?: any
     skipInsertDefaultRow?: boolean
     otelContext?: otel.Context
@@ -158,12 +175,15 @@ const insertRowWithDefaultValuesOrIgnore = ({
   explicitDefaultValues,
 }: {
   store: Store
-  id: string
+  id: string | SessionIdSymbol
   table: DbSchema.TableDef
   otelContext: otel.Context
   explicitDefaultValues: Partial<RowResult<DbSchema.TableDef>> | undefined
 }) => {
-  const rowExists = store.syncDbWrapper.select(`select 1 from ${table.sqliteDef.name} where id = '${id}'`).length === 1
+  const idStr = id === SessionIdSymbol ? store.sessionId : id
+  const rowExists =
+    store.syncDbWrapper.select(`select 1 from ${table.sqliteDef.name} where id = '${idStr}'`).length === 1
+
   if (rowExists) return
 
   // const mutationDef = deriveCreateMutationDef(table)

package/src/store-devtools.ts

@@ -1,4 +1,4 @@
-import type { DebugInfo, StoreAdapter } from '@livestore/common'
+import type { ClientSession, DebugInfo } from '@livestore/common'
 import { Devtools, liveStoreVersion, UnexpectedError } from '@livestore/common'
 import { throttle } from '@livestore/utils'
 import type { WebChannel } from '@livestore/utils/effect'
@@ -11,7 +11,7 @@ import { emptyDebugInfo as makeEmptyDebugInfo } from './SynchronousDatabaseWrapp
 import type { ReferenceCountedSet } from './utils/data-structures.js'
 
 type IStore = {
-  adapter: StoreAdapter
+  clientSession: ClientSession
   reactivityGraph: ReactivityGraph
   syncDbWrapper: SynchronousDatabaseWrapper
   activeQueries: ReferenceCountedSet<LiveQuery<any>>
@@ -29,7 +29,7 @@ export const connectDevtoolsToStore = ({
   store: IStore
 }) =>
   Effect.gen(function* () {
-    const appHostId = store.adapter.coordinator.devtools.appHostId
+    const appHostId = store.clientSession.coordinator.devtools.appHostId
 
     const reactivityGraphSubcriptions: SubMap = new Map()
     const liveQueriesSubscriptions: SubMap = new Map()
@@ -49,14 +49,14 @@ export const connectDevtoolsToStore = ({
     const onMessage = (decodedMessage: typeof Devtools.MessageToAppHostStore.Type) => {
       // console.log('storeMessagePort message', decodedMessage)
 
-      if (decodedMessage.appHostId !== store.adapter.coordinator.devtools.appHostId) {
+      if (decodedMessage.appHostId !== store.clientSession.coordinator.devtools.appHostId) {
         // console.log(`Unknown message`, event)
         return
       }
 
       const requestId = decodedMessage.requestId
 
-      const requestIdleCallback = window.requestIdleCallback ?? ((cb: Function) => cb())
+      const requestIdleCallback = globalThis.requestIdleCallback ?? ((cb: () => void) => cb())
 
       switch (decodedMessage._tag) {
         case 'LSD.ReactivityGraphSubscribe': {