@livestore/livestore 0.4.0-dev.17 → 0.4.0-dev.19

package/src/live-queries/__snapshots__/db-query.test.ts.snap

@@ -75,7 +75,94 @@ exports[`otel > QueryBuilder subscription - async iterator 2`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;
+
+exports[`otel > QueryBuilder subscription - async iterator with skipInitialRun 1`] = `
+{
+  "_name": "createStore",
+  "attributes": {
+    "debugInstanceId": "test",
+    "storeId": "default",
+  },
+  "children": [
+    {
+      "_name": "livestore.in-memory-db:execute",
+      "attributes": {
+        "sql.query": "
+      PRAGMA page_size=32768;
+      PRAGMA cache_size=10000;
+      PRAGMA synchronous='OFF';
+      PRAGMA temp_store='MEMORY';
+      PRAGMA foreign_keys='ON'; -- we want foreign key constraints to be enforced
+    ",
+      },
+    },
+    {
+      "_name": "@livestore/common:LeaderSyncProcessor:push",
+      "attributes": {
+        "batch": "undefined",
+        "batchSize": 1,
+      },
+    },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
+    },
+    {
+      "_name": "LiveStore:sync",
+    },
+    {
+      "_name": "LiveStore:commits",
+    },
+    {
+      "_name": "LiveStore:queries",
+    },
+  ],
+}
+`;
+
+exports[`otel > QueryBuilder subscription - async iterator with skipInitialRun 2`] = `
+[
+  {
+    "_name": "LiveStore:commit",
+    "attributes": {
+      "livestore.eventTags": "[
+  "todo.created"
+]",
+      "livestore.eventsCount": 1,
+    },
+    "children": [
+      {
+        "_name": "client-session-sync-processor:push",
+        "attributes": {
+          "batchSize": 1,
+          "eventCounts": "{
+  "todo.created": 1
+}",
+          "mergeResultTag": "advance",
+        },
+        "children": [
+          {
+            "_name": "client-session-sync-processor:materialize-event",
+            "children": [
+              {
+                "_name": "livestore.in-memory-db:execute",
+                "attributes": {
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],
@@ -134,14 +221,14 @@ exports[`otel > QueryBuilder subscription - basic functionality 1`] = `
         {
           "_name": "LiveStore.subscribe",
           "attributes": {
-            "queryLabel": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+            "queryLabel": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
           },
           "children": [
             {
-              "_name": "db:SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+              "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
               "attributes": {
                 "livestore.debugRefreshReason": "subscribe-initial-run:undefined",
-                "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                 "sql.rowsCount": 0,
               },
               "children": [
@@ -149,17 +236,17 @@ exports[`otel > QueryBuilder subscription - basic functionality 1`] = `
                   "_name": "sql-in-memory-select",
                   "attributes": {
                     "sql.cached": false,
-                    "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                    "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                     "sql.rowsCount": 0,
                   },
                 },
               ],
             },
             {
-              "_name": "db:SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+              "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
               "attributes": {
                 "livestore.debugRefreshReason": "commit",
-                "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                 "sql.rowsCount": 1,
               },
               "children": [
@@ -167,7 +254,7 @@ exports[`otel > QueryBuilder subscription - basic functionality 1`] = `
                   "_name": "sql-in-memory-select",
                   "attributes": {
                     "sql.cached": false,
-                    "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                    "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                     "sql.rowsCount": 1,
                   },
                 },
@@ -208,7 +295,7 @@ exports[`otel > QueryBuilder subscription - basic functionality 2`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],
@@ -341,7 +428,140 @@ exports[`otel > QueryBuilder subscription - direct table subscription 2`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;
+
+exports[`otel > QueryBuilder subscription - skipInitialRun 1`] = `
+{
+  "_name": "createStore",
+  "attributes": {
+    "debugInstanceId": "test",
+    "storeId": "default",
+  },
+  "children": [
+    {
+      "_name": "livestore.in-memory-db:execute",
+      "attributes": {
+        "sql.query": "
+      PRAGMA page_size=32768;
+      PRAGMA cache_size=10000;
+      PRAGMA synchronous='OFF';
+      PRAGMA temp_store='MEMORY';
+      PRAGMA foreign_keys='ON'; -- we want foreign key constraints to be enforced
+    ",
+      },
+    },
+    {
+      "_name": "@livestore/common:LeaderSyncProcessor:push",
+      "attributes": {
+        "batch": "undefined",
+        "batchSize": 1,
+      },
+    },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
+    },
+    {
+      "_name": "LiveStore:sync",
+    },
+    {
+      "_name": "LiveStore:commits",
+    },
+    {
+      "_name": "LiveStore:queries",
+      "children": [
+        {
+          "_name": "LiveStore.subscribe",
+          "attributes": {
+            "queryLabel": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
+          },
+          "children": [
+            {
+              "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
+              "attributes": {
+                "livestore.debugRefreshReason": "subscribe-initial-run:undefined",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
+                "sql.rowsCount": 0,
+              },
+              "children": [
+                {
+                  "_name": "sql-in-memory-select",
+                  "attributes": {
+                    "sql.cached": false,
+                    "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
+                    "sql.rowsCount": 0,
+                  },
+                },
+              ],
+            },
+            {
+              "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
+              "attributes": {
+                "livestore.debugRefreshReason": "commit",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
+                "sql.rowsCount": 1,
+              },
+              "children": [
+                {
+                  "_name": "sql-in-memory-select",
+                  "attributes": {
+                    "sql.cached": false,
+                    "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
+                    "sql.rowsCount": 1,
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  ],
+}
+`;
+
+exports[`otel > QueryBuilder subscription - skipInitialRun 2`] = `
+[
+  {
+    "_name": "LiveStore:commit",
+    "attributes": {
+      "livestore.eventTags": "[
+  "todo.created"
+]",
+      "livestore.eventsCount": 1,
+    },
+    "children": [
+      {
+        "_name": "client-session-sync-processor:push",
+        "attributes": {
+          "batchSize": 1,
+          "eventCounts": "{
+  "todo.created": 1
+}",
+          "mergeResultTag": "advance",
+        },
+        "children": [
+          {
+            "_name": "client-session-sync-processor:materialize-event",
+            "children": [
+              {
+                "_name": "livestore.in-memory-db:execute",
+                "attributes": {
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],
@@ -407,14 +627,14 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
         {
           "_name": "LiveStore.subscribe",
           "attributes": {
-            "queryLabel": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+            "queryLabel": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
           },
           "children": [
             {
-              "_name": "db:SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+              "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
               "attributes": {
                 "livestore.debugRefreshReason": "subscribe-initial-run:undefined",
-                "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                 "sql.rowsCount": 0,
               },
               "children": [
@@ -422,17 +642,17 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
                   "_name": "sql-in-memory-select",
                   "attributes": {
                     "sql.cached": false,
-                    "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                    "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                     "sql.rowsCount": 0,
                   },
                 },
               ],
             },
             {
-              "_name": "db:SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+              "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
               "attributes": {
                 "livestore.debugRefreshReason": "commit",
-                "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                 "sql.rowsCount": 1,
               },
               "children": [
@@ -440,7 +660,7 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
                   "_name": "sql-in-memory-select",
                   "attributes": {
                     "sql.cached": false,
-                    "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                    "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                     "sql.rowsCount": 1,
                   },
                 },
@@ -451,14 +671,14 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
         {
           "_name": "LiveStore.subscribe",
           "attributes": {
-            "queryLabel": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+            "queryLabel": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
           },
           "children": [
             {
-              "_name": "db:SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+              "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
               "attributes": {
                 "livestore.debugRefreshReason": "commit",
-                "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                 "sql.rowsCount": 1,
               },
               "children": [
@@ -466,7 +686,7 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
                   "_name": "sql-in-memory-select",
                   "attributes": {
                     "sql.cached": false,
-                    "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                    "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                     "sql.rowsCount": 1,
                   },
                 },
@@ -507,7 +727,7 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 2`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],
@@ -541,7 +761,7 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 2`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],
@@ -664,7 +884,7 @@ exports[`otel > otel 4`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],
@@ -965,7 +1185,7 @@ exports[`otel > with thunks 8`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],
@@ -1022,9 +1242,9 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
       "_name": "LiveStore:queries",
       "children": [
         {
-          "_name": "db:SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+          "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
           "attributes": {
-            "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+            "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
             "sql.rowsCount": 0,
           },
           "children": [
@@ -1035,16 +1255,16 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
               "_name": "sql-in-memory-select",
               "attributes": {
                 "sql.cached": false,
-                "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                 "sql.rowsCount": 0,
               },
             },
           ],
         },
         {
-          "_name": "db:SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+          "_name": "db:SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ",
           "attributes": {
-            "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+            "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
             "sql.rowsCount": 1,
           },
           "children": [
@@ -1055,7 +1275,7 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
               "_name": "sql-in-memory-select",
               "attributes": {
                 "sql.cached": false,
-                "sql.query": "SELECT * FROM 'todos' WHERE completed = ? LIMIT ?",
+                "sql.query": "SELECT * FROM 'todos' WHERE "completed" = ? LIMIT ?",
                 "sql.rowsCount": 1,
               },
             },
@@ -1094,7 +1314,7 @@ exports[`otel > with thunks with query builder and without labels 4`] = `
               {
                 "_name": "livestore.in-memory-db:execute",
                 "attributes": {
-                  "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
+                  "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
             ],

package/src/live-queries/db-query.test.ts

@@ -6,7 +6,7 @@ import { assert, expect } from 'vitest'
 
 import * as RG from '../reactive.ts'
 import { StoreInternalsSymbol } from '../store/store-types.ts'
-import { events, makeTodoMvc, tables } from '../utils/tests/fixture.ts'
+import { events, makeTodoMvc, type Todo, tables } from '../utils/tests/fixture.ts'
 import { getAllSimplifiedRootSpans, getSimplifiedRootSpan } from '../utils/tests/otel.ts'
 import { computed } from './computed.ts'
 import { queryDb } from './db-query.ts'
@@ -238,6 +238,53 @@ Vitest.describe('otel', () => {
     ),
   )
 
+  Vitest.scopedLive('QueryBuilder subscription - skipInitialRun', () =>
+    Effect.gen(function* () {
+      const { store, exporter, span, provider } = yield* makeQuery
+
+      const callbackResults: Todo[] = []
+      const defaultTodo: Todo = { id: '', text: '', completed: false }
+
+      const queryBuilder = tables.todos
+        .where({ completed: false })
+        .first({ behaviour: 'fallback', fallback: () => defaultTodo })
+
+      const unsubscribe = store.subscribe(
+        queryBuilder,
+        (result) => {
+          callbackResults.push(result)
+        },
+        { skipInitialRun: true },
+      )
+
+      expect(callbackResults).toHaveLength(0)
+
+      store.commit(events.todoCreated({ id: 't-skip', text: 'skip initial', completed: false }))
+
+      expect(callbackResults).toHaveLength(1)
+      expect(callbackResults[0]).toMatchObject({
+        id: 't-skip',
+        text: 'skip initial',
+        completed: false,
+      })
+
+      unsubscribe()
+      span.end()
+
+      return { exporter, provider }
+    }).pipe(
+      Effect.scoped,
+      Effect.tap(({ exporter, provider }) =>
+        Effect.promise(async () => {
+          await provider.forceFlush()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
+          await provider.shutdown()
+        }),
+      ),
+    ),
+  )
+
   Vitest.scopedLive('QueryBuilder subscription - unsubscribe functionality', () =>
     Effect.gen(function* () {
       const { store, exporter, span, provider } = yield* makeQuery
@@ -294,7 +341,7 @@ Vitest.describe('otel', () => {
     Effect.gen(function* () {
       const { store, exporter, span, provider } = yield* makeQuery
 
-      const defaultTodo = { id: '', text: '', completed: false }
+      const defaultTodo: Todo = { id: '', text: '', completed: false }
 
       const queryBuilder = tables.todos
         .where({ completed: false })
@@ -338,6 +385,55 @@ Vitest.describe('otel', () => {
     ),
   )
 
+  Vitest.scopedLive('QueryBuilder subscription - async iterator with skipInitialRun', () =>
+    Effect.gen(function* () {
+      const { store, exporter, span, provider } = yield* makeQuery
+
+      const defaultTodo: Todo = { id: '', text: '', completed: false }
+
+      const queryBuilder = tables.todos
+        .where({ completed: false })
+        .first({ behaviour: 'fallback', fallback: () => defaultTodo })
+
+      yield* Effect.promise(async () => {
+        const iterator = store.subscribe(queryBuilder, { skipInitialRun: true })[Symbol.asyncIterator]()
+
+        const pending = Symbol('pending')
+        const nextPromise = iterator.next()
+        const raceResult = await Promise.race([nextPromise, Promise.resolve(pending)])
+        expect(raceResult).toBe(pending)
+
+        store.commit(events.todoCreated({ id: 't-async-skip', text: 'write tests later', completed: false }))
+
+        const update = await nextPromise
+        expect(update.done).toBe(false)
+        expect(update.value).toMatchObject({
+          id: 't-async-skip',
+          text: 'write tests later',
+          completed: false,
+        })
+
+        const doneResult = await iterator.return?.()
+        assert(doneResult)
+        expect(doneResult.done).toBe(true)
+      })
+
+      span.end()
+
+      return { exporter, provider }
+    }).pipe(
+      Effect.scoped,
+      Effect.tap(({ exporter, provider }) =>
+        Effect.promise(async () => {
+          await provider.forceFlush()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
+          await provider.shutdown()
+        }),
+      ),
+    ),
+  )
+
   Vitest.scopedLive('QueryBuilder subscription - direct table subscription', () =>
     Effect.gen(function* () {
       const { store, exporter, span, provider } = yield* makeQuery

package/src/live-queries/db-query.ts

@@ -7,7 +7,7 @@ import {
   QueryBuilderAstSymbol,
   replaceSessionIdSymbol,
   SessionIdSymbol,
-  UnexpectedError,
+  UnknownError,
 } from '@livestore/common'
 import { deepEqual, omitUndefineds, shouldNeverHappen } from '@livestore/utils'
 import { Equal, Hash, Predicate, Schema, TreeFormatter } from '@livestore/utils/effect'
@@ -254,7 +254,7 @@ export class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema> extends Li
               : undefined,
         }
       } catch (cause) {
-        throw new UnexpectedError({ cause, note: `Error building query for ${qb.toString()}`, payload: { qb } })
+        throw new UnknownError({ cause, note: `Error building query for ${qb.toString()}`, payload: { qb } })
       }
     }
 

package/src/store/create-store.ts

@@ -12,7 +12,7 @@ import {
   type MigrationsReport,
   provideOtel,
   type SyncError,
-  UnexpectedError,
+  UnknownError,
 } from '@livestore/common'
 import type { LiveStoreSchema } from '@livestore/common/schema'
 import { isDevEnv, LS_DEV, omitUndefineds } from '@livestore/utils'
@@ -60,7 +60,7 @@ export class LiveStoreContextRunning extends Context.Tag('@livestore/livestore/e
 
 export class DeferredStoreContext extends Context.Tag('@livestore/livestore/effect/DeferredStoreContext')<
   DeferredStoreContext,
-  Deferred.Deferred<LiveStoreContextRunning['Type'], UnexpectedError>
+  Deferred.Deferred<LiveStoreContextRunning['Type'], UnknownError>
 >() {}
 
 export type LiveStoreContextProps<
@@ -230,7 +230,7 @@ export const createStore = <
   syncPayloadSchema,
 }: CreateStoreOptions<TSchema, TContext, TSyncPayloadSchema>): Effect.Effect<
   Store<TSchema, TContext>,
-  UnexpectedError,
+  UnknownError,
   Scope.Scope | OtelTracer.OtelTracer
 > =>
   Effect.gen(function* () {
@@ -271,7 +271,7 @@ export const createStore = <
       const shutdown = (
         exit: Exit.Exit<
           IntentionalShutdownCause,
-          UnexpectedError | MaterializeError | SyncError | InvalidPullError | IsOfflineError
+          UnknownError | MaterializeError | SyncError | InvalidPullError | IsOfflineError
         >,
       ) =>
         Effect.gen(function* () {
@@ -301,7 +301,7 @@ export const createStore = <
       const syncPayloadEncoded =
         syncPayload === undefined
           ? undefined
-          : yield* Schema.encode(resolvedSyncPayloadSchema)(syncPayload).pipe(UnexpectedError.mapToUnexpectedError)
+          : yield* Schema.encode(resolvedSyncPayloadSchema)(syncPayload).pipe(UnknownError.mapToUnknownError)
 
       const clientSession: ClientSession = yield* adapter({
         schema,
@@ -354,7 +354,7 @@ export const createStore = <
         yield* Effect.tryAll(() =>
           boot(store, { migrationsReport: clientSession.leaderThread.initialState.migrationsReport, parentSpan: span }),
         ).pipe(
-          UnexpectedError.mapToUnexpectedError,
+          UnknownError.mapToUnknownError,
           Effect.provide(Layer.succeed(LiveStoreContextRunning, { stage: 'running', store: store as any as Store })),
           Effect.withSpan('createStore:boot'),
         )
@@ -384,7 +384,7 @@ const validateStoreId = (storeId: string) =>
     const validChars = /^[a-zA-Z0-9_-]+$/
 
     if (!validChars.test(storeId)) {
-      return yield* UnexpectedError.make({
+      return yield* UnknownError.make({
         cause: `Invalid storeId: ${storeId}. Only alphanumeric characters, underscores, and hyphens are allowed.`,
         payload: { storeId },
       })

package/src/store/devtools.ts

@@ -1,5 +1,5 @@
 import type { DebugInfo, SyncState } from '@livestore/common'
-import { Devtools, liveStoreVersion, UnexpectedError } from '@livestore/common'
+import { Devtools, liveStoreVersion, UnknownError } from '@livestore/common'
 import { throttle } from '@livestore/utils'
 import type { WebChannel } from '@livestore/utils/effect'
 import { Effect, Stream } from '@livestore/utils/effect'
@@ -332,4 +332,4 @@ export const connectDevtoolsToStore = ({
       Stream.runDrain,
       Effect.withSpan('LSD.devtools.onMessage'),
     )
-  }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('LSD.devtools.connectStoreToDevtools'))
+  }).pipe(UnknownError.mapToUnknownError, Effect.withSpan('LSD.devtools.connectStoreToDevtools'))