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

package/src/schema/state/sqlite/query-builder/impl.test.ts

@@ -73,7 +73,15 @@ const issue = State.SQLite.table({
   ],
 })
 
-const db = { todos, todosWithIntId, comments, issue, UiState, UiStateWithDefaultId }
+const selections = State.SQLite.table({
+  name: 'selections',
+  columns: {
+    id: State.SQLite.integer({ primaryKey: true }),
+    group: State.SQLite.text({}),
+  },
+})
+
+const db = { todos, todosWithIntId, comments, issue, selections, UiState, UiStateWithDefaultId }
 
 const dump = (qb: QueryBuilder<any, any, any>) => ({
   bindValues: qb.asSql().bindValues,
@@ -95,7 +103,7 @@ describe('query builder', () => {
       expect(dump(db.todos.select('id'))).toMatchInlineSnapshot(`
         {
           "bindValues": [],
-          "query": "SELECT id FROM 'todos'",
+          "query": "SELECT "id" FROM 'todos'",
           "schema": "ReadonlyArray<({ readonly id: string } <-> string)>",
         }
       `)
@@ -103,7 +111,7 @@ describe('query builder', () => {
       expect(dump(db.todos.select('id', 'text'))).toMatchInlineSnapshot(`
         {
           "bindValues": [],
-          "query": "SELECT id, text FROM 'todos'",
+          "query": "SELECT "id", "text" FROM 'todos'",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -115,7 +123,7 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT id, text FROM 'todos' LIMIT ?",
+          "query": "SELECT "id", "text" FROM 'todos' LIMIT ?",
           "schema": "(ReadonlyArray<{ readonly id: string; readonly text: string } | undefined> <-> { readonly id: string; readonly text: string } | undefined)",
         }
       `)
@@ -125,7 +133,7 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT id, text FROM 'todos' LIMIT ?",
+          "query": "SELECT "id", "text" FROM 'todos' LIMIT ?",
           "schema": "(ReadonlyArray<{ readonly id: string; readonly text: string }> <-> { readonly id: string; readonly text: string })",
         }
       `)
@@ -137,7 +145,7 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT id, text FROM 'todos' LIMIT ?",
+          "query": "SELECT "id", "text" FROM 'todos' LIMIT ?",
           "schema": "(ReadonlyArray<{ readonly id: string; readonly text: string }> | readonly [undefined] <-> { readonly id: string; readonly text: string } | undefined)",
         }
       `)
@@ -149,7 +157,7 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT id, text FROM 'todos' WHERE completed = ?",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" = ?",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -158,7 +166,7 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT id, text FROM 'todos' WHERE completed != ?",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" != ?",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -167,51 +175,51 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT id, text FROM 'todos' WHERE completed = ?",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" = ?",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
       expect(dump(db.todos.select('id', 'text').where({ completed: undefined }))).toMatchInlineSnapshot(`
         {
           "bindValues": [],
-          "query": "SELECT id, text FROM 'todos'",
+          "query": "SELECT "id", "text" FROM 'todos'",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
       expect(
         dump(db.todos.select('id', 'text').where({ deletedAt: { op: '<=', value: new Date('2024-01-01') } })),
       ).toMatchInlineSnapshot(`
-          {
-            "bindValues": [
-              "2024-01-01T00:00:00.000Z",
-            ],
-            "query": "SELECT id, text FROM 'todos' WHERE deletedAt <= ?",
-            "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
-          }
-        `)
+        {
+          "bindValues": [
+            "2024-01-01T00:00:00.000Z",
+          ],
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "deletedAt" <= ?",
+          "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
+        }
+      `)
       expect(
         dump(db.todos.select('id', 'text').where({ status: { op: 'IN', value: ['active'] } })),
       ).toMatchInlineSnapshot(`
-          {
-            "bindValues": [
-              "active",
-            ],
-            "query": "SELECT id, text FROM 'todos' WHERE status IN (?)",
-            "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
-          }
-        `)
+        {
+          "bindValues": [
+            "active",
+          ],
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "status" IN (?)",
+          "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
+        }
+      `)
       expect(
         dump(db.todos.select('id', 'text').where({ status: { op: 'NOT IN', value: ['active', 'completed'] } })),
       ).toMatchInlineSnapshot(`
-          {
-            "bindValues": [
-              "active",
-              "completed",
-            ],
-            "query": "SELECT id, text FROM 'todos' WHERE status NOT IN (?, ?)",
-            "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
-          }
-        `)
+        {
+          "bindValues": [
+            "active",
+            "completed",
+          ],
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "status" NOT IN (?, ?)",
+          "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
+        }
+      `)
 
       expect(
         dump(
@@ -222,15 +230,15 @@ describe('query builder', () => {
             .where({ deletedAt: undefined }),
         ),
       ).toMatchInlineSnapshot(`
-          {
-            "bindValues": [
-              0,
-              "active",
-            ],
-            "query": "SELECT id, text FROM 'todos' WHERE completed = ? AND status IN (?)",
-            "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
-          }
-        `)
+        {
+          "bindValues": [
+            0,
+            "active",
+          ],
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" = ? AND "status" IN (?)",
+          "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
+        }
+      `)
     })
 
     it('should handle OFFSET and LIMIT clauses', () => {
@@ -241,7 +249,7 @@ describe('query builder', () => {
             10,
             10,
           ],
-          "query": "SELECT id, text FROM 'todos' WHERE completed = ? OFFSET ? LIMIT ?",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" = ? OFFSET ? LIMIT ?",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -256,7 +264,7 @@ describe('query builder', () => {
             5,
             10,
           ],
-          "query": "SELECT id, text FROM 'todos' WHERE completed = ? OFFSET ? LIMIT ?",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" = ? OFFSET ? LIMIT ?",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -268,7 +276,7 @@ describe('query builder', () => {
             1,
             5,
           ],
-          "query": "SELECT id, text FROM 'todos' WHERE completed = ? OFFSET ?",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" = ? OFFSET ?",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -280,7 +288,7 @@ describe('query builder', () => {
             1,
             10,
           ],
-          "query": "SELECT id, text FROM 'todos' WHERE completed = ? LIMIT ?",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "completed" = ? LIMIT ?",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -299,7 +307,7 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT COUNT(*) as count FROM 'todos' WHERE completed = ?",
+          "query": "SELECT COUNT(*) as count FROM 'todos' WHERE "completed" = ?",
           "schema": "(ReadonlyArray<({ readonly count: number } <-> number)> <-> number)",
         }
       `)
@@ -308,7 +316,7 @@ describe('query builder', () => {
           "bindValues": [
             1,
           ],
-          "query": "SELECT COUNT(*) as count FROM 'todos' WHERE completed = ?",
+          "query": "SELECT COUNT(*) as count FROM 'todos' WHERE "completed" = ?",
           "schema": "(ReadonlyArray<({ readonly count: number } <-> number)> <-> number)",
         }
       `)
@@ -318,14 +326,14 @@ describe('query builder', () => {
       expect(dump(db.todos.select('id', 'text').where('deletedAt', '=', null))).toMatchInlineSnapshot(`
         {
           "bindValues": [],
-          "query": "SELECT id, text FROM 'todos' WHERE deletedAt IS NULL",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "deletedAt" IS NULL",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
       expect(dump(db.todos.select('id', 'text').where('deletedAt', '!=', null))).toMatchInlineSnapshot(`
         {
           "bindValues": [],
-          "query": "SELECT id, text FROM 'todos' WHERE deletedAt IS NOT NULL",
+          "query": "SELECT "id", "text" FROM 'todos' WHERE "deletedAt" IS NOT NULL",
           "schema": "ReadonlyArray<{ readonly id: string; readonly text: string }>",
         }
       `)
@@ -335,7 +343,7 @@ describe('query builder', () => {
       expect(dump(db.todos.orderBy('completed', 'desc'))).toMatchInlineSnapshot(`
         {
           "bindValues": [],
-          "query": "SELECT * FROM 'todos' ORDER BY completed desc",
+          "query": "SELECT * FROM 'todos' ORDER BY "completed" desc",
           "schema": "ReadonlyArray<todos>",
         }
       `)
@@ -343,7 +351,7 @@ describe('query builder', () => {
       expect(dump(db.todos.orderBy([{ col: 'completed', direction: 'desc' }]))).toMatchInlineSnapshot(`
         {
           "bindValues": [],
-          "query": "SELECT * FROM 'todos' ORDER BY completed desc",
+          "query": "SELECT * FROM 'todos' ORDER BY "completed" desc",
           "schema": "ReadonlyArray<todos>",
         }
       `)
@@ -402,7 +410,7 @@ describe('query builder', () => {
             "Buy milk",
             "active",
           ],
-          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?)",
+          "query": "INSERT INTO 'todos' ("id", "text", "status") VALUES (?, ?, ?)",
           "schema": "number",
         }
       `)
@@ -416,7 +424,7 @@ describe('query builder', () => {
             "Buy milk",
             "active",
           ],
-          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?)",
+          "query": "INSERT INTO 'todos' ("id", "text", "status") VALUES (?, ?, ?)",
           "schema": "number",
         }
       `)
@@ -447,7 +455,7 @@ describe('query builder', () => {
             "a2",
             "John Doe",
           ],
-          "query": "INSERT INTO 'issue' (id, title, priority, created, modified, kanbanorder, creator) VALUES (?, ?, ?, ?, ?, ?, ?)",
+          "query": "INSERT INTO 'issue' ("id", "title", "priority", "created", "modified", "kanbanorder", "creator") VALUES (?, ?, ?, ?, ?, ?, ?)",
           "schema": "number",
         }
       `)
@@ -460,7 +468,7 @@ describe('query builder', () => {
             "completed",
             "123",
           ],
-          "query": "UPDATE 'todos' SET status = ? WHERE id = ?",
+          "query": "UPDATE 'todos' SET "status" = ? WHERE "id" = ?",
           "schema": "number",
         }
       `)
@@ -482,7 +490,7 @@ describe('query builder', () => {
             "some text",
             "123",
           ],
-          "query": "UPDATE 'todos' SET text = ? WHERE id = ?",
+          "query": "UPDATE 'todos' SET "text" = ? WHERE "id" = ?",
           "schema": "number",
         }
       `)
@@ -496,7 +504,7 @@ describe('query builder', () => {
             "John Doe",
             1,
           ],
-          "query": "UPDATE 'issue' SET priority = ?, creator = ? WHERE id = ?",
+          "query": "UPDATE 'issue' SET "priority" = ?, "creator" = ? WHERE "id" = ?",
           "schema": "number",
         }
       `)
@@ -508,7 +516,7 @@ describe('query builder', () => {
           "bindValues": [
             "completed",
           ],
-          "query": "DELETE FROM 'todos' WHERE status = ?",
+          "query": "DELETE FROM 'todos' WHERE "status" = ?",
           "schema": "number",
         }
       `)
@@ -524,7 +532,7 @@ describe('query builder', () => {
             "Buy milk",
             "active",
           ],
-          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?) ON CONFLICT (id) DO NOTHING",
+          "query": "INSERT INTO 'todos' ("id", "text", "status") VALUES (?, ?, ?) ON CONFLICT ("id") DO NOTHING",
           "schema": "number",
         }
       `)
@@ -544,7 +552,7 @@ describe('query builder', () => {
             "Buy soy milk",
             "active",
           ],
-          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?) ON CONFLICT (id) DO UPDATE SET text = ?, status = ?",
+          "query": "INSERT INTO 'todos' ("id", "text", "status") VALUES (?, ?, ?) ON CONFLICT ("id") DO UPDATE SET "text" = ?, "status" = ?",
           "schema": "number",
         }
       `)
@@ -558,7 +566,31 @@ describe('query builder', () => {
             "Buy milk",
             "active",
           ],
-          "query": "INSERT OR REPLACE INTO 'todos' (id, text, status) VALUES (?, ?, ?)",
+          "query": "INSERT OR REPLACE INTO 'todos' ("id", "text", "status") VALUES (?, ?, ?)",
+          "schema": "number",
+        }
+      `)
+    })
+
+    it('should quote reserved column names', () => {
+      expect(dump(db.selections.insert({ id: 1, group: 'alpha' }).onConflict('id', 'ignore'))).toMatchInlineSnapshot(`
+        {
+          "bindValues": [
+            1,
+            "alpha",
+          ],
+          "query": "INSERT INTO 'selections' ("id", "group") VALUES (?, ?) ON CONFLICT ("id") DO NOTHING",
+          "schema": "number",
+        }
+      `)
+
+      expect(dump(db.selections.update({ group: 'beta' }).where({ id: 1 }))).toMatchInlineSnapshot(`
+        {
+          "bindValues": [
+            "beta",
+            1,
+          ],
+          "query": "UPDATE 'selections' SET "group" = ? WHERE "id" = ?",
           "schema": "number",
         }
       `)
@@ -574,7 +606,7 @@ describe('query builder', () => {
             "Buy milk",
             "active",
           ],
-          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?) ON CONFLICT (id, status) DO NOTHING",
+          "query": "INSERT INTO 'todos' ("id", "text", "status") VALUES (?, ?, ?) ON CONFLICT ("id", "status") DO NOTHING",
           "schema": "number",
         }
       `)
@@ -584,36 +616,36 @@ describe('query builder', () => {
       expect(
         dump(db.todos.insert({ id: '123', text: 'Buy milk', status: 'active' }).returning('id')),
       ).toMatchInlineSnapshot(`
-          {
-            "bindValues": [
-              "123",
-              "Buy milk",
-              "active",
-            ],
-            "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?) RETURNING id",
-            "schema": "ReadonlyArray<{ readonly id: string }>",
-          }
-        `)
+        {
+          "bindValues": [
+            "123",
+            "Buy milk",
+            "active",
+          ],
+          "query": "INSERT INTO 'todos' ("id", "text", "status") VALUES (?, ?, ?) RETURNING "id"",
+          "schema": "ReadonlyArray<{ readonly id: string }>",
+        }
+      `)
 
       expect(
         dump(db.todos.update({ status: 'completed' }).where({ id: '123' }).returning('id')),
       ).toMatchInlineSnapshot(`
-          {
-            "bindValues": [
-              "completed",
-              "123",
-            ],
-            "query": "UPDATE 'todos' SET status = ? WHERE id = ? RETURNING id",
-            "schema": "ReadonlyArray<{ readonly id: string }>",
-          }
-        `)
+        {
+          "bindValues": [
+            "completed",
+            "123",
+          ],
+          "query": "UPDATE 'todos' SET "status" = ? WHERE "id" = ? RETURNING "id"",
+          "schema": "ReadonlyArray<{ readonly id: string }>",
+        }
+      `)
 
       expect(dump(db.todos.delete().where({ status: 'completed' }).returning('id'))).toMatchInlineSnapshot(`
         {
           "bindValues": [
             "completed",
           ],
-          "query": "DELETE FROM 'todos' WHERE status = ? RETURNING id",
+          "query": "DELETE FROM 'todos' WHERE "status" = ? RETURNING "id"",
           "schema": "ReadonlyArray<{ readonly id: string }>",
         }
       `)
@@ -625,7 +657,7 @@ describe('query builder', () => {
           "bindValues": [
             "completed",
           ],
-          "query": "DELETE FROM 'todos' WHERE status = ?",
+          "query": "DELETE FROM 'todos' WHERE "status" = ?",
           "schema": "number",
         }
       `)
@@ -636,7 +668,7 @@ describe('query builder', () => {
           "bindValues": [
             "completed",
           ],
-          "query": "DELETE FROM 'todos' WHERE status = ? AND deletedAt IS NULL",
+          "query": "DELETE FROM 'todos' WHERE "status" = ? AND "deletedAt" IS NULL",
           "schema": "number",
         }
       `)
@@ -649,7 +681,7 @@ describe('query builder', () => {
             "completed",
             "123",
           ],
-          "query": "UPDATE 'todos' SET status = ? WHERE id = ?",
+          "query": "UPDATE 'todos' SET "status" = ? WHERE "id" = ?",
           "schema": "number",
         }
       `)
@@ -663,7 +695,7 @@ describe('query builder', () => {
             "completed",
             "123",
           ],
-          "query": "UPDATE 'todos' SET status = ? WHERE id = ? AND deletedAt IS NULL",
+          "query": "UPDATE 'todos' SET "status" = ? WHERE "id" = ? AND "deletedAt" IS NULL",
           "schema": "number",
         }
       `)
@@ -776,7 +808,7 @@ describe('query builder', () => {
             "Lovelace",
             "ada@example.com",
           ],
-          "query": "INSERT INTO 'contacts' (id, contactFirstName, contactLastName, contactEmail) VALUES (?, ?, ?, ?)",
+          "query": "INSERT INTO 'contacts' ("id", "contactFirstName", "contactLastName", "contactEmail") VALUES (?, ?, ?, ?)",
           "usedTables": Set {
             "contacts",
           },

package/src/schema/state/sqlite/query-builder/impl.ts

@@ -35,7 +35,6 @@ export const makeQueryBuilder = <TResult, TTableDef extends TableDefBase>(
         select: { columns },
       }) as any
     },
-    // biome-ignore lint/complexity/useArrowFunction: prefer function over arrow function for this case
     where: function () {
       if (ast._tag === 'InsertQuery') return invalidQueryBuilder('Cannot use where with insert')
       if (ast._tag === 'RowQuery') return invalidQueryBuilder('Cannot use where with row')

package/src/schema/state/sqlite/system-tables/eventlog-tables.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@livestore/utils/effect'
 
-import * as EventSequenceNumber from '../../../EventSequenceNumber.ts'
+import * as EventSequenceNumber from '../../../EventSequenceNumber/mod.ts'
 import { SqliteDsl } from '../db-schema/mod.ts'
 import { table } from '../table-def.ts'
 
@@ -22,11 +22,11 @@ export const eventlogMetaTable = table({
   name: EVENTLOG_META_TABLE,
   columns: {
     // TODO Adjust modeling so a global event never needs a client id component
-    seqNumGlobal: SqliteDsl.integer({ primaryKey: true, schema: EventSequenceNumber.GlobalEventSequenceNumber }),
-    seqNumClient: SqliteDsl.integer({ primaryKey: true, schema: EventSequenceNumber.ClientEventSequenceNumber }),
+    seqNumGlobal: SqliteDsl.integer({ primaryKey: true, schema: EventSequenceNumber.Global.Schema }),
+    seqNumClient: SqliteDsl.integer({ primaryKey: true, schema: EventSequenceNumber.Client.Schema }),
     seqNumRebaseGeneration: SqliteDsl.integer({ primaryKey: true }),
-    parentSeqNumGlobal: SqliteDsl.integer({ schema: EventSequenceNumber.GlobalEventSequenceNumber }),
-    parentSeqNumClient: SqliteDsl.integer({ schema: EventSequenceNumber.ClientEventSequenceNumber }),
+    parentSeqNumGlobal: SqliteDsl.integer({ schema: EventSequenceNumber.Global.Schema }),
+    parentSeqNumClient: SqliteDsl.integer({ schema: EventSequenceNumber.Client.Schema }),
     parentSeqNumRebaseGeneration: SqliteDsl.integer({}),
     /** Event definition name */
     name: SqliteDsl.text({}),

package/src/schema/state/sqlite/system-tables/state-tables.ts

@@ -1,4 +1,4 @@
-import * as EventSequenceNumber from '../../../EventSequenceNumber.ts'
+import * as EventSequenceNumber from '../../../EventSequenceNumber/mod.ts'
 import { SqliteDsl } from '../db-schema/mod.ts'
 import { table } from '../table-def.ts'
 
@@ -53,8 +53,8 @@ export const sessionChangesetMetaTable = table({
   name: SESSION_CHANGESET_META_TABLE,
   columns: {
     // TODO bring back primary key
-    seqNumGlobal: SqliteDsl.integer({ schema: EventSequenceNumber.GlobalEventSequenceNumber }),
-    seqNumClient: SqliteDsl.integer({ schema: EventSequenceNumber.ClientEventSequenceNumber }),
+    seqNumGlobal: SqliteDsl.integer({ schema: EventSequenceNumber.Global.Schema }),
+    seqNumClient: SqliteDsl.integer({ schema: EventSequenceNumber.Client.Schema }),
     seqNumRebaseGeneration: SqliteDsl.integer({}),
     changeset: SqliteDsl.blob({ nullable: true }),
     debug: SqliteDsl.json({ nullable: true }),

package/src/schema/unknown-events.ts

@@ -1,12 +1,12 @@
 import { Effect } from '@livestore/utils/effect'
 
 import { UnknownEventError } from '../errors.ts'
-import type { EventDef, Materializer } from './EventDef.ts'
-import type * as LiveStoreEvent from './LiveStoreEvent.ts'
+import type { EventDef, Materializer } from './EventDef/mod.ts'
+import type * as LiveStoreEvent from './LiveStoreEvent/mod.ts'
 import type { LiveStoreSchema } from './schema.ts'
 
 export type UnknownEventContext = {
-  readonly event: Pick<LiveStoreEvent.AnyEncoded, 'name' | 'args' | 'seqNum' | 'clientId' | 'sessionId'>
+  readonly event: Pick<LiveStoreEvent.Client.Encoded, 'name' | 'args' | 'seqNum' | 'clientId' | 'sessionId'>
   readonly reason: 'event-definition-missing' | 'materializer-missing'
   readonly operation: string
 }

package/src/schema-management/migrations.ts

@@ -34,7 +34,7 @@ import { Effect } from '@livestore/utils/effect'
 
 import type { SqliteDb } from '../adapter-types.ts'
 import type { MigrationsReport, MigrationsReportEntry } from '../defs.ts'
-import type { UnexpectedError } from '../errors.ts'
+import type { UnknownError } from '../errors.ts'
 import type { LiveStoreSchema } from '../schema/mod.ts'
 import { makeColumnSpec } from '../schema/state/sqlite/column-spec.ts'
 import { SqliteAst } from '../schema/state/sqlite/db-schema/mod.ts'
@@ -87,7 +87,7 @@ export const migrateDb = ({
   db: SqliteDb
   schema: LiveStoreSchema
   onProgress?: (opts: { done: number; total: number }) => Effect.Effect<void>
-}): Effect.Effect<MigrationsReport, UnexpectedError> =>
+}): Effect.Effect<MigrationsReport, UnknownError> =>
   Effect.gen(function* () {
     for (const tableDef of stateSystemTables) {
       yield* migrateTable({

package/src/schema-management/validate-schema.ts

@@ -1,7 +1,7 @@
 import { Effect, Schema } from '@livestore/utils/effect'
 
-import { UnexpectedError } from '../adapter-types.ts'
-import type { EventDef } from '../schema/EventDef.ts'
+import { UnknownError } from '../adapter-types.ts'
+import type { EventDef } from '../schema/EventDef/mod.ts'
 import type { LiveStoreSchema } from '../schema/mod.ts'
 import type { EventDefInfo, SchemaManager } from './common.ts'
 
@@ -15,7 +15,7 @@ export const validateSchema = (schema: LiveStoreSchema, schemaManager: SchemaMan
     )
 
     if (missingEventDefs.length > 0) {
-      return yield* new UnexpectedError({
+      return yield* new UnknownError({
         cause: `Missing mutation definitions: ${missingEventDefs.map((info) => info.eventName).join(', ')}`,
       })
     }

package/src/sqlite-types.ts

@@ -1,5 +1,5 @@
 import { type Effect, Schema } from '@livestore/utils/effect'
-import type { SqliteError, UnexpectedError } from './errors.ts'
+import type { SqliteError, UnknownError } from './errors.ts'
 import type { EventSequenceNumber } from './schema/mod.ts'
 import type { QueryBuilder } from './schema/state/sqlite/query-builder/api.ts'
 import type { PreparedBindValues } from './util.ts'
@@ -33,7 +33,7 @@ export interface SqliteDb<TReq = any, TMetadata extends TReq = TReq> {
   makeChangeset: (data: Uint8Array<ArrayBuffer>) => SqliteDbChangeset
 }
 
-export type SqliteDebugInfo = { head: EventSequenceNumber.EventSequenceNumber }
+export type SqliteDebugInfo = { head: EventSequenceNumber.Client.Composite }
 
 // TODO refactor this helper type. It's quite cumbersome to use and should be revisited.
 export type MakeSqliteDb<
@@ -46,7 +46,7 @@ export type MakeSqliteDb<
   TMetadata extends TMetadata_ & { _tag: TInput['_tag'] } = TMetadata_ & { _tag: TInput['_tag'] },
 >(
   input: TInput,
-) => Effect.Effect<SqliteDb<TReq, Extract<TMetadata, { _tag: TInput['_tag'] }>>, SqliteError | UnexpectedError, R>
+) => Effect.Effect<SqliteDb<TReq, Extract<TMetadata, { _tag: TInput['_tag'] }>>, SqliteError | UnknownError, R>
 
 export interface PreparedStatement {
   execute(bindValues: PreparedBindValues | undefined, options?: { onRowsChanged?: (rowsChanged: number) => void }): void