@livestore/common 0.4.0-dev.20 → 0.4.0-dev.22

package/src/schema/state/sqlite/table-def.ts

@@ -381,14 +381,15 @@ export declare namespace SchemaToColumns {
   export type ColumnDefForType<TEncoded, TType> = SqliteDsl.ColumnDefinition<TEncoded, TType>
 
   // Create columns type from schema Type and Encoded
-  export type FromTypes<TType, TEncoded> = TEncoded extends Record<string, any>
-    ? {
-        [K in keyof TEncoded]-?: ColumnDefForType<
-          TEncoded[K],
-          TType extends Record<string, any> ? (K extends keyof TType ? TType[K] : TEncoded[K]) : TEncoded[K]
-        >
-      }
-    : SqliteDsl.Columns
+  export type FromTypes<TType, TEncoded> =
+    TEncoded extends Record<string, any>
+      ? {
+          [K in keyof TEncoded]-?: ColumnDefForType<
+            TEncoded[K],
+            TType extends Record<string, any> ? (K extends keyof TType ? TType[K] : TEncoded[K]) : TEncoded[K]
+          >
+        }
+      : SqliteDsl.Columns
 }
 
 export declare namespace TableDefInput {

package/src/sync/ClientSessionSyncProcessor.ts

@@ -22,6 +22,11 @@ import * as LiveStoreEvent from '../schema/LiveStoreEvent/mod.ts'
 import type { LiveStoreSchema } from '../schema/mod.ts'
 import * as SyncState from './syncstate.ts'
 
+// WORKAROUND: @effect/opentelemetry mis-parses `Span.addEvent(name, attributes)` and treats the attributes object as a
+// time input, causing `TypeError: {} is not iterable` at runtime.
+// Upstream: https://github.com/Effect-TS/effect/pull/5929
+// TODO: simplify back to the 2-arg overload once the upstream fix is released and adopted.
+
 /**
  * Rebase behaviour:
  * - We continously pull events from the leader and apply them to the local store.
@@ -245,13 +250,17 @@ export const makeClientSessionSyncProcessor = ({
           syncStateRef.current = mergeResult.newSyncState
 
           if (mergeResult._tag === 'rebase') {
-            span.addEvent('merge:pull:rebase', {
-              payloadTag: payload._tag,
-              payload: TRACE_VERBOSE ? JSON.stringify(payload) : undefined,
-              newEventsCount: mergeResult.newEvents.length,
-              rollbackCount: mergeResult.rollbackEvents.length,
-              res: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
-            })
+            span.addEvent(
+              'merge:pull:rebase',
+              {
+                payloadTag: payload._tag,
+                payload: TRACE_VERBOSE ? JSON.stringify(payload) : undefined,
+                newEventsCount: mergeResult.newEvents.length,
+                rollbackCount: mergeResult.rollbackEvents.length,
+                res: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
+              },
+              undefined,
+            )
 
             debugInfo.rebaseCount++
 
@@ -290,12 +299,16 @@ export const makeClientSessionSyncProcessor = ({
 
             yield* FiberHandle.run(leaderPushingFiberHandle, backgroundLeaderPushing)
           } else {
-            span.addEvent('merge:pull:advance', {
-              payloadTag: payload._tag,
-              payload: TRACE_VERBOSE ? JSON.stringify(payload) : undefined,
-              newEventsCount: mergeResult.newEvents.length,
-              res: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
-            })
+            span.addEvent(
+              'merge:pull:advance',
+              {
+                payloadTag: payload._tag,
+                payload: TRACE_VERBOSE ? JSON.stringify(payload) : undefined,
+                newEventsCount: mergeResult.newEvents.length,
+                res: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
+              },
+              undefined,
+            )
 
             debugInfo.advanceCount++
           }

package/src/version.ts

@@ -2,7 +2,15 @@
 // import packageJson from '../package.json' with { type: 'json' }
 // export const liveStoreVersion = packageJson.version
 
-export const liveStoreVersion = '0.4.0-dev.20' as const
+const _liveStoreVersion = '0.4.0-dev.22' as const
+
+/**
+ * Current LiveStore version used for DevTools version compatibility checks.
+ *
+ * Can be overridden at runtime via `globalThis.__LIVESTORE_VERSION_OVERRIDE__` for testing purposes.
+ * This allows Playwright tests to simulate version mismatch scenarios without rebuilding.
+ */
+export const liveStoreVersion: string = (globalThis as any).__LIVESTORE_VERSION_OVERRIDE__ ?? _liveStoreVersion
 
 /**
  * CRITICAL: Increment this version whenever you modify client-side EVENTLOG table schemas.