@livestore/common 0.0.0-snapshot-8115ad48d5a57244358c943ecc92bb0a30274b87 → 0.0.0-snapshot-95d4278a98ec3caa352327892993ebc4ea9c589e

package/src/rehydrate-from-eventlog.ts

@@ -1,7 +1,7 @@
 import { memoizeByRef } from '@livestore/utils'
 import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect'
 
-import { type MigrationOptionsFromEventlog, type SqliteDb, UnexpectedError } from './adapter-types.js'
+import { type SqliteDb, UnexpectedError } from './adapter-types.js'
 import type { ApplyEvent } from './leader-thread/mod.js'
 import type { EventDef, EventlogMetaRow, LiveStoreSchema } from './schema/mod.js'
 import { EventId, EVENTLOG_META_TABLE, getEventDef, LiveStoreEvent } from './schema/mod.js'
@@ -13,14 +13,12 @@ export const rehydrateFromEventlog = ({
   // TODO re-use this db when bringing back the boot in-memory db implementation
   // db,
   schema,
-  migrationOptions,
   onProgress,
   applyEvent,
 }: {
   dbEventlog: SqliteDb
   // db: SqliteDb
   schema: LiveStoreSchema
-  migrationOptions: MigrationOptionsFromEventlog
   onProgress: (_: { done: number; total: number }) => Effect.Effect<void>
   applyEvent: ApplyEvent
 }) =>
@@ -34,8 +32,6 @@ export const rehydrateFromEventlog = ({
       Effect.gen(function* () {
         const eventDef = getEventDef(schema, row.name)
 
-        if (migrationOptions.excludeEvents?.has(row.name) === true) return
-
         if (hashEvent(eventDef.eventDef) !== row.schemaHash) {
           yield* Effect.logWarning(`Schema hash mismatch for mutation ${row.name}. Trying to apply mutation anyway.`)
         }

package/src/schema/schema.ts

@@ -49,7 +49,7 @@ export const makeSchema = <TInputSchema extends InputSchema>(
   /** Note when using the object-notation for tables/events, the object keys are ignored and not used as table/mutation names */
   inputSchema: TInputSchema & {
     /** "hard-reset" is currently the default strategy */
-    migrations?: MigrationOptions<FromInputSchema.DeriveSchema<TInputSchema>>
+    migrations?: MigrationOptions
   },
 ): FromInputSchema.DeriveSchema<TInputSchema> => {
   // const inputTables: ReadonlyArray<TableDef> = Array.isArray(inputSchema.tables)

package/src/schema/table-def.ts

@@ -2,7 +2,7 @@ import { type Nullable } from '@livestore/utils'
 import type { Schema, Types } from '@livestore/utils/effect'
 
 import type { QueryBuilder } from '../query-builder/mod.js'
-import { makeQueryBuilder, QueryBuilderAstSymbol } from '../query-builder/mod.js'
+import { makeQueryBuilder, QueryBuilderAstSymbol, QueryBuilderTypeId } from '../query-builder/mod.js'
 import { SqliteDsl } from './db-schema/mod.js'
 
 export const { blob, boolean, column, datetime, integer, isColumnDefinition, json, real, text } = SqliteDsl
@@ -108,8 +108,10 @@ export const table = <
     tableDef[key] = query[key]
   }
 
-  // @ts-expect-error TODO properly implement this
+  // @ts-expect-error TODO properly type this
   tableDef[QueryBuilderAstSymbol] = query[QueryBuilderAstSymbol]
+  // @ts-expect-error TODO properly type this
+  tableDef[QueryBuilderTypeId] = query[QueryBuilderTypeId]
 
   return tableDef as any
 }

package/src/version.ts

@@ -2,7 +2,7 @@
 // import packageJson from '../package.json' with { type: 'json' }
 // export const liveStoreVersion = packageJson.version
 
-export const liveStoreVersion = '0.3.0-dev.28' as const
+export const liveStoreVersion = '0.3.0-dev.30' as const
 
 /**
  * This version number is incremented whenever the internal storage format changes in a breaking way.