@livestore/livestore 0.4.0-dev.9 → 0.5.0-dev.0

package/src/SqliteDbWrapper.test.ts

@@ -1,32 +1,56 @@
-import { Effect } from '@livestore/utils/effect'
-import { Vitest } from '@livestore/utils-dev/node-vitest'
+import * as otel from '@opentelemetry/api'
 import { expect } from 'vitest'
 
+import { Vitest } from '@livestore/utils-dev/node-vitest'
+import { Effect } from '@livestore/utils/effect'
+
+import { StoreInternalsSymbol } from './store/store-types.ts'
 import { makeTodoMvc } from './utils/tests/fixture.ts'
 
 Vitest.describe('SqliteDbWrapper', () => {
+  Vitest.live('works with the OpenTelemetry API no-op tracer', (_test) =>
+    Effect.gen(function* () {
+      const otelTracer = otel.trace.getTracer('sqlite-wrapper-noop-test')
+      const probeSpan = otelTracer.startSpan('verify-noop-tracer')
+      expect(probeSpan.isRecording()).toBe(false)
+      probeSpan.end()
+
+      // Store creation exercises the configureSQLite execute path.
+      const store = yield* makeTodoMvc({ otelTracer })
+      const sqliteDbWrapper = store[StoreInternalsSymbol].sqliteDbWrapper
+      const { durationMs } = sqliteDbWrapper.cachedExecute('CREATE TABLE noop_timing_test (id INTEGER)', undefined, {
+        hasNoEffects: true,
+      })
+
+      expect(sqliteDbWrapper.select('SELECT 1 AS value')).toEqual([{ value: 1 }])
+      expect(sqliteDbWrapper.debugInfo.queryFrameCount).toBeGreaterThan(0)
+      expect(sqliteDbWrapper.debugInfo.queryFrameDuration).toBeGreaterThanOrEqual(0)
+      expect(durationMs).toBeGreaterThanOrEqual(0)
+    }),
+  )
+
   Vitest.describe('getTablesUsed', () => {
     const getTablesUsed = (query: string) =>
       Effect.gen(function* () {
         const store = yield* makeTodoMvc({})
-        return store.sqliteDbWrapper.getTablesUsed(query)
+        return store[StoreInternalsSymbol].sqliteDbWrapper.getTablesUsed(query)
       })
 
-    Vitest.scopedLive('should return the correct tables used', (_test) =>
+    Vitest.live('should return the correct tables used', (_test) =>
       Effect.gen(function* () {
         const tablesUsed = yield* getTablesUsed('select * from todos')
         expect(tablesUsed).toEqual(new Set(['todos']))
       }),
     )
 
-    Vitest.scopedLive('should handle DELETE FROM statement without WHERE clause', (_test) =>
+    Vitest.live('should handle DELETE FROM statement without WHERE clause', (_test) =>
       Effect.gen(function* () {
         const tablesUsed = yield* getTablesUsed('DELETE FROM todos')
         expect(tablesUsed).toEqual(new Set(['todos']))
       }),
     )
 
-    Vitest.scopedLive('should handle INSERT with ON CONFLICT clause', (_test) =>
+    Vitest.live('should handle INSERT with ON CONFLICT clause', (_test) =>
       Effect.gen(function* () {
         const tablesUsed = yield* getTablesUsed(
           'INSERT INTO todos (id, text, completed) VALUES (?, ?, ?) ON CONFLICT(id) DO UPDATE SET text = ?',

package/src/SqliteDbWrapper.ts

@@ -1,9 +1,9 @@
+import type * as otel from '@opentelemetry/api'
+
 import {
   BoundArray,
   BoundMap,
   type DebugInfo,
-  getDurationMsFromSpan,
-  getStartTimeHighResFromSpan,
   type MutableDebugInfo,
   type PreparedBindValues,
   type PreparedStatement,
@@ -15,7 +15,6 @@ import {
   sql,
 } from '@livestore/common'
 import { isDevEnv, LS_DEV } from '@livestore/utils'
-import type * as otel from '@opentelemetry/api'
 
 import QueryCache from './QueryCache.ts'
 
@@ -103,7 +102,7 @@ export class SqliteDbWrapper implements SqliteDb {
       throw e
     }
 
-    if (!errored) {
+    if (errored === false) {
       this.execute(sql`commit;`)
     }
 
@@ -122,7 +121,8 @@ export class SqliteDbWrapper implements SqliteDb {
 
     return {
       result,
-      changeset: changeset ? { _tag: 'sessionChangeset', data: changeset, debug: null } : { _tag: 'no-op' },
+      changeset:
+        changeset !== undefined ? { _tag: 'sessionChangeset', data: changeset, debug: null } : { _tag: 'no-op' },
     }
   }
 
@@ -140,7 +140,7 @@ export class SqliteDbWrapper implements SqliteDb {
     }
 
     const cached = this.tablesUsedCache.get(query)
-    if (cached) {
+    if (cached !== undefined) {
       return cached
     }
     const stmt = this.tablesUsedStmt
@@ -161,7 +161,7 @@ export class SqliteDbWrapper implements SqliteDb {
 
   cachedExecute(
     queryStr: string,
-    bindValues?: PreparedBindValues | undefined,
+    bindValues?: PreparedBindValues,
     options?: {
       hasNoEffects?: boolean
       otelContext?: otel.Context
@@ -177,6 +177,8 @@ export class SqliteDbWrapper implements SqliteDb {
       { attributes: { 'sql.query': queryStr } },
       options?.otelContext ?? this.otelRootSpanContext,
       (span) => {
+        const startTimePerfNow = performance.now()
+
         try {
           let stmt = this.cachedStmts.get(queryStr)
           if (stmt === undefined) {
@@ -186,7 +188,7 @@ export class SqliteDbWrapper implements SqliteDb {
 
           stmt.execute(bindValues)
 
-          if (options?.hasNoEffects !== true && !this.resultCache.ignoreQuery(queryStr)) {
+          if (options?.hasNoEffects !== true && this.resultCache.ignoreQuery(queryStr) === false) {
             // TODO use write tables instead
             // check what queries actually end up here.
             this.resultCache.invalidate(options?.writeTables ?? this.getTablesUsed(queryStr))
@@ -194,19 +196,19 @@ export class SqliteDbWrapper implements SqliteDb {
 
           span.end()
 
-          const durationMs = getDurationMsFromSpan(span)
+          const durationMs = performance.now() - startTimePerfNow
 
           this.debugInfo.queryFrameDuration += durationMs
           this.debugInfo.queryFrameCount++
 
-          if (durationMs > 5 && isDevEnv()) {
+          if (durationMs > 5 && isDevEnv() === true) {
             this.debugInfo.slowQueries.push({
               queryStr,
               bindValues,
               durationMs,
               rowsCount: undefined,
               queriedTables: new Set(),
-              startTimePerfNow: getStartTimeHighResFromSpan(span),
+              startTimePerfNow,
             })
           }
 
@@ -214,8 +216,8 @@ export class SqliteDbWrapper implements SqliteDb {
         } catch (cause: any) {
           span.recordException(cause)
           span.end()
-          if (LS_DEV) {
-            // biome-ignore lint/suspicious/noDebugger: debug
+          if (LS_DEV === true) {
+            // oxlint-disable-next-line eslint(no-debugger) -- intentional breakpoint for SQL errors during development
             debugger
           }
           throw new SqliteError({ cause, query: { bindValues: bindValues ?? {}, sql: queryStr } })
@@ -230,7 +232,7 @@ export class SqliteDbWrapper implements SqliteDb {
 
   cachedSelect<T = any>(
     queryStr: string,
-    bindValues?: PreparedBindValues | undefined,
+    bindValues?: PreparedBindValues,
     options?: {
       queriedTables?: ReadonlySet<string>
       skipCache?: boolean
@@ -246,6 +248,8 @@ export class SqliteDbWrapper implements SqliteDb {
       {},
       otelContext ?? this.otelRootSpanContext,
       (span) => {
+        const startTimePerfNow = performance.now()
+
         try {
           span.setAttribute('sql.query', queryStr)
 
@@ -274,20 +278,20 @@ export class SqliteDbWrapper implements SqliteDb {
 
           span.end()
 
-          const durationMs = getDurationMsFromSpan(span)
+          const durationMs = performance.now() - startTimePerfNow
 
           this.debugInfo.queryFrameDuration += durationMs
           this.debugInfo.queryFrameCount++
 
           // TODO also enable in non-dev mode
-          if (durationMs > 5 && isDevEnv()) {
+          if (durationMs > 5 && isDevEnv() === true) {
             this.debugInfo.slowQueries.push({
               queryStr,
               bindValues,
               durationMs,
               rowsCount: result.length,
               queriedTables: queriedTables_,
-              startTimePerfNow: getStartTimeHighResFromSpan(span),
+              startTimePerfNow,
             })
           }
 

package/src/ambient.d.ts

@@ -1,10 +1,3 @@
-// interface Window {
-//   [key: `__debug${string}`]: any
-// }
-
-var __debugLiveStore: any
-var __debugLiveStoreUtils: any
-
 interface ImportMeta {
   readonly env: ImportMetaEnv
 }

package/src/effect/LiveStore.test.ts

@@ -0,0 +1,61 @@
+import { describe, it } from 'vitest'
+
+import { Effect, Layer } from '@livestore/utils/effect'
+
+import { schema } from '../utils/tests/fixture.ts'
+import { Store, type StoreTagClass } from './LiveStore.ts'
+
+/**
+ * Regression test for https://github.com/livestorejs/livestore/issues/1103
+ *
+ * `yield* MyStore` and `MyStore.query(...)` must produce the same R channel type
+ * so that a single layer provision satisfies both.
+ */
+describe('Store.Tag R channel consistency', () => {
+  class MainStore extends Store.Tag(schema, 'main') {}
+
+  const storeLayer = MainStore.layer({ adapter: {} as any, batchUpdates: (_: () => void) => {} })
+
+  it('yield* and method R channels unify so layer provision eliminates all requirements', () => {
+    const prog = Effect.gen(function* () {
+      const { store } = yield* MainStore
+      void store
+
+      const _queryResult = yield* MainStore.query({ get: () => 42 } as any)
+      void _queryResult
+
+      yield* MainStore.commit()
+    })
+
+    const _provided = prog.pipe(Effect.provide(storeLayer))
+    type _R = Effect.Services<typeof _provided>
+    /** Providing the store layer must fully eliminate MainStore from R */
+    type _MainStoreNotInR = StoreTagClass<typeof schema, 'main'> extends _R ? false : true
+    const _check: _MainStoreNotInR = true
+    void _check
+  })
+
+  it('use() helper R channel is satisfied by the same layer', () => {
+    const prog = MainStore.use(({ store }) => Effect.succeed(store))
+
+    const _provided = prog.pipe(Effect.provide(storeLayer))
+    type _R = Effect.Services<typeof _provided>
+    /** Providing the store layer must fully eliminate MainStore from R */
+    type _MainStoreNotInR = StoreTagClass<typeof schema, 'main'> extends _R ? false : true
+    const _check: _MainStoreNotInR = true
+    void _check
+  })
+
+  it('fromDeferred layer output satisfies the same R channel', () => {
+    const prog = MainStore
+
+    /** fromDeferred + DeferredLayer should satisfy MainStore in R */
+    const _provided = prog.pipe(Effect.provide(Layer.merge(MainStore.fromDeferred, MainStore.DeferredLayer)))
+
+    type _R = Effect.Services<typeof _provided>
+    /** MainStore should not be in R after providing fromDeferred */
+    type _MainStoreNotInR = StoreTagClass<typeof schema, 'main'> extends _R ? false : true
+    const _check: _MainStoreNotInR = true
+    void _check
+  })
+})