@livestore/livestore 0.4.0-dev.3 → 0.4.0-dev.5

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

@@ -40,25 +40,6 @@ exports[`otel > QueryBuilder subscription - basic functionality 1`] = `
     },
     {
       "_name": "LiveStore:commits",
-      "children": [
-        {
-          "_name": "LiveStore:commit",
-          "attributes": {
-            "livestore.eventTags": [
-              "todo.created",
-            ],
-            "livestore.eventsCount": 1,
-          },
-          "children": [
-            {
-              "_name": "livestore.in-memory-db:execute",
-              "attributes": {
-                "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
-              },
-            },
-          ],
-        },
-      ],
     },
     {
       "_name": "LiveStore:queries",
@@ -113,6 +94,45 @@ exports[`otel > QueryBuilder subscription - basic functionality 1`] = `
 }
 `;
 
+exports[`otel > QueryBuilder subscription - basic functionality 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 (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;
+
 exports[`otel > QueryBuilder subscription - direct table subscription 1`] = `
 {
   "_name": "createStore",
@@ -153,25 +173,6 @@ exports[`otel > QueryBuilder subscription - direct table subscription 1`] = `
     },
     {
       "_name": "LiveStore:commits",
-      "children": [
-        {
-          "_name": "LiveStore:commit",
-          "attributes": {
-            "livestore.eventTags": [
-              "todo.created",
-            ],
-            "livestore.eventsCount": 1,
-          },
-          "children": [
-            {
-              "_name": "livestore.in-memory-db:execute",
-              "attributes": {
-                "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
-              },
-            },
-          ],
-        },
-      ],
     },
     {
       "_name": "LiveStore:queries",
@@ -226,6 +227,45 @@ exports[`otel > QueryBuilder subscription - direct table subscription 1`] = `
 }
 `;
 
+exports[`otel > QueryBuilder subscription - direct table subscription 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 (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;
+
 exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
 {
   "_name": "createStore",
@@ -273,42 +313,6 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
     },
     {
       "_name": "LiveStore:commits",
-      "children": [
-        {
-          "_name": "LiveStore:commit",
-          "attributes": {
-            "livestore.eventTags": [
-              "todo.created",
-            ],
-            "livestore.eventsCount": 1,
-          },
-          "children": [
-            {
-              "_name": "livestore.in-memory-db:execute",
-              "attributes": {
-                "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
-              },
-            },
-          ],
-        },
-        {
-          "_name": "LiveStore:commit",
-          "attributes": {
-            "livestore.eventTags": [
-              "todo.created",
-            ],
-            "livestore.eventsCount": 1,
-          },
-          "children": [
-            {
-              "_name": "livestore.in-memory-db:execute",
-              "attributes": {
-                "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
-              },
-            },
-          ],
-        },
-      ],
     },
     {
       "_name": "LiveStore:queries",
@@ -389,6 +393,79 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
 }
 `;
 
+exports[`otel > QueryBuilder subscription - unsubscribe functionality 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 (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  {
+    "_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 (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;
+
 exports[`otel > otel 3`] = `
 {
   "_name": "createStore",
@@ -429,25 +506,6 @@ exports[`otel > otel 3`] = `
     },
     {
       "_name": "LiveStore:commits",
-      "children": [
-        {
-          "_name": "LiveStore:commit",
-          "attributes": {
-            "livestore.eventTags": [
-              "todo.created",
-            ],
-            "livestore.eventsCount": 1,
-          },
-          "children": [
-            {
-              "_name": "livestore.in-memory-db:execute",
-              "attributes": {
-                "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
-              },
-            },
-          ],
-        },
-      ],
     },
     {
       "_name": "LiveStore:queries",
@@ -492,6 +550,45 @@ exports[`otel > otel 3`] = `
 }
 `;
 
+exports[`otel > otel 4`] = `
+[
+  {
+    "_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 (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;
+
 exports[`otel > with thunks 1`] = `
 {
   "atoms": [
@@ -704,25 +801,6 @@ exports[`otel > with thunks 7`] = `
     },
     {
       "_name": "LiveStore:commits",
-      "children": [
-        {
-          "_name": "LiveStore:commit",
-          "attributes": {
-            "livestore.eventTags": [
-              "todo.created",
-            ],
-            "livestore.eventsCount": 1,
-          },
-          "children": [
-            {
-              "_name": "livestore.in-memory-db:execute",
-              "attributes": {
-                "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
-              },
-            },
-          ],
-        },
-      ],
     },
     {
       "_name": "LiveStore:queries",
@@ -773,6 +851,45 @@ exports[`otel > with thunks 7`] = `
 }
 `;
 
+exports[`otel > with thunks 8`] = `
+[
+  {
+    "_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 (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;
+
 exports[`otel > with thunks with query builder and without labels 3`] = `
 {
   "_name": "createStore",
@@ -813,25 +930,6 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
     },
     {
       "_name": "LiveStore:commits",
-      "children": [
-        {
-          "_name": "LiveStore:commit",
-          "attributes": {
-            "livestore.eventTags": [
-              "todo.created",
-            ],
-            "livestore.eventsCount": 1,
-          },
-          "children": [
-            {
-              "_name": "livestore.in-memory-db:execute",
-              "attributes": {
-                "sql.query": "INSERT INTO 'todos' (id, text, completed) VALUES (?, ?, ?)",
-              },
-            },
-          ],
-        },
-      ],
     },
     {
       "_name": "LiveStore:queries",
@@ -881,3 +979,42 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
   ],
 }
 `;
+
+exports[`otel > with thunks with query builder and without labels 4`] = `
+[
+  {
+    "_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 (?, ?, ?)",
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+`;

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

@@ -6,7 +6,7 @@ import { expect } from 'vitest'
 
 import * as RG from '../reactive.ts'
 import { events, makeTodoMvc, tables } from '../utils/tests/fixture.ts'
-import { getSimplifiedRootSpan } from '../utils/tests/otel.ts'
+import { getAllSimplifiedRootSpans, getSimplifiedRootSpan } from '../utils/tests/otel.ts'
 import { computed } from './computed.ts'
 import { queryDb } from './db-query.ts'
 
@@ -83,7 +83,8 @@ Vitest.describe('otel', () => {
       Effect.tap(({ exporter, provider }) =>
         Effect.promise(async () => {
           await provider.forceFlush()
-          expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
           await provider.shutdown()
         }),
       ),
@@ -139,7 +140,8 @@ Vitest.describe('otel', () => {
       Effect.tap(({ exporter, provider }) =>
         Effect.promise(async () => {
           await provider.forceFlush()
-          expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
           await provider.shutdown()
         }),
       ),
@@ -183,7 +185,8 @@ Vitest.describe('otel', () => {
       Effect.tap(({ exporter, provider }) =>
         Effect.promise(async () => {
           await provider.forceFlush()
-          expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
           await provider.shutdown()
         }),
       ),
@@ -228,7 +231,8 @@ Vitest.describe('otel', () => {
       Effect.tap(({ exporter, provider }) =>
         Effect.promise(async () => {
           await provider.forceFlush()
-          expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
           await provider.shutdown()
         }),
       ),
@@ -283,7 +287,8 @@ Vitest.describe('otel', () => {
       Effect.tap(({ exporter, provider }) =>
         Effect.promise(async () => {
           await provider.forceFlush()
-          expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
           await provider.shutdown()
         }),
       ),
@@ -324,7 +329,8 @@ Vitest.describe('otel', () => {
       Effect.tap(({ exporter, provider }) =>
         Effect.promise(async () => {
           await provider.forceFlush()
-          expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()
+          expect(getSimplifiedRootSpan(exporter, 'createStore', mapAttributes)).toMatchSnapshot()
+          expect(getAllSimplifiedRootSpans(exporter, 'LiveStore:commit', mapAttributes)).toMatchSnapshot()
           await provider.shutdown()
         }),
       ),

package/src/mod.ts

@@ -14,6 +14,7 @@ export {
   SessionIdSymbol,
   type SqliteDb,
   StoreInterrupted,
+  type SyncState,
   sql,
 } from '@livestore/common'
 export * from '@livestore/common/schema'

package/src/reactive.test.ts

@@ -424,3 +424,103 @@ describe('error handling', () => {
     )
   })
 })
+
+// Bug: When an effect calls setRef during execution, it triggers nested runEffects calls.
+// The nested call would overwrite and clear the shared currentDebugRefresh state,
+// causing a TypeError when the outer runEffects tried to access currentDebugRefresh.refreshedAtoms.
+// Fix: Use local variables to capture debug state instead of relying on shared mutable state.
+describe('bug fix: currentDebugRefresh race condition', () => {
+  it('handles nested runEffects from effect calling setRef', () => {
+    const graph = new ReactiveGraph()
+    graph.context = {}
+
+    const a = graph.makeRef(1)
+    const b = graph.makeRef(2)
+
+    // Effect that calls setRef, triggering nested runEffects
+    graph
+      .makeEffect((get) => {
+        get(a)
+        graph.setRef(b, 3)
+      })
+      .doEffect()
+
+    // Effect observing b
+    graph.makeEffect((get) => get(b)).doEffect()
+
+    // Previously crashed with: Cannot read properties of undefined (reading 'refreshedAtoms')
+    // Now handles nested runEffects correctly
+    expect(() => graph.setRef(a, 2)).not.toThrow()
+  })
+
+  it('handles thunk calling setRef directly', () => {
+    const graph = new ReactiveGraph()
+    graph.context = {}
+
+    const a = graph.makeRef(1)
+    const b = graph.makeRef(2)
+
+    // Effect observing b so setRef(b) triggers runEffects
+    graph.makeEffect((get) => get(b)).doEffect()
+
+    // Thunk that calls setRef during its computation
+    const thunk = graph.makeThunk((get) => {
+      const val = get(a)
+      graph.setRef(b, val * 2) // This triggers nested runEffects
+      return val + get(b)
+    })
+
+    // With our fix, this handles nested currentDebugRefresh correctly
+    expect(() => thunk.computeResult()).not.toThrow()
+    expect(thunk.computeResult()).toBe(3) // 1 + 2 (b was already set to 2)
+  })
+
+  it('handles nested thunk computations', () => {
+    const graph = new ReactiveGraph()
+    graph.context = {}
+
+    const a = graph.makeRef(1)
+
+    // Outer thunk that creates and computes inner thunk
+    const outerThunk = graph.makeThunk((get) => {
+      const val = get(a)
+
+      // Create and compute inner thunk during outer computation
+      const innerThunk = graph.makeThunk((innerGet) => innerGet(a) * 2)
+
+      // Nested thunk computation - previously could corrupt currentDebugRefresh
+      return val + innerThunk.computeResult()
+    })
+
+    // With our fix, nested thunk computations work correctly
+    expect(() => outerThunk.computeResult()).not.toThrow()
+    expect(outerThunk.computeResult()).toBe(3) // 1 + (1 * 2)
+  })
+})
+
+// Bug: Nodes could have undefined or deleted super/sub properties in certain edge cases,
+// causing crashes with "Cannot read properties of undefined" errors.
+// Fix: Added validation checks in destroyNode to handle corrupted nodes gracefully.
+// Note: Full addEdge protection was removed, so some scenarios still crash with native errors.
+describe('bug fix: node corruption protection', () => {
+  it('handles node destruction during effect execution', () => {
+    const graph = new ReactiveGraph()
+    graph.context = {}
+
+    const a = graph.makeRef(1)
+    const thunk1 = graph.makeThunk((get) => get(a) * 2)
+    const thunk2 = graph.makeThunk((get) => get(thunk1))
+
+    let firstRun = true
+    const effect = graph.makeEffect((get) => {
+      if (firstRun) {
+        firstRun = false
+        graph.destroyNode(thunk1) // Destroy dependency mid-execution
+      }
+      get(thunk2)
+    })
+
+    // Should detect the destroyed node
+    expect(() => effect.doEffect()).toThrow('LiveStore Error: Attempted to compute destroyed')
+  })
+})