@livestore/livestore 0.4.0 → 0.5.0-dev.0

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

@@ -27,16 +27,17 @@ exports[`otel > QueryBuilder subscription - async iterator 1`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -48,6 +49,52 @@ exports[`otel > QueryBuilder subscription - async iterator 1`] = `
     },
     {
       "_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,
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      ],
     },
   ],
 }
@@ -79,6 +126,19 @@ exports[`otel > QueryBuilder subscription - async iterator 2`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -125,16 +185,17 @@ exports[`otel > QueryBuilder subscription - async iterator with skipInitialRun 1
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -146,6 +207,52 @@ exports[`otel > QueryBuilder subscription - async iterator with skipInitialRun 1
     },
     {
       "_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,
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      ],
     },
   ],
 }
@@ -177,6 +284,19 @@ exports[`otel > QueryBuilder subscription - async iterator with skipInitialRun 2
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -223,16 +343,17 @@ exports[`otel > QueryBuilder subscription - basic functionality 1`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -321,6 +442,19 @@ exports[`otel > QueryBuilder subscription - basic functionality 2`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -367,16 +501,17 @@ exports[`otel > QueryBuilder subscription - direct table subscription 1`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -465,6 +600,19 @@ exports[`otel > QueryBuilder subscription - direct table subscription 2`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -511,16 +659,17 @@ exports[`otel > QueryBuilder subscription - skipInitialRun 1`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -609,6 +758,19 @@ exports[`otel > QueryBuilder subscription - skipInitialRun 2`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -655,10 +817,10 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
@@ -666,12 +828,6 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 1`] = `
           "attributes": {
             "batch": "undefined",
             "batchSize": 1,
-          },
-        },
-        {
-          "_name": "client-session-sync-processor:pull",
-          "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -786,6 +942,19 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 2`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -826,6 +995,19 @@ exports[`otel > QueryBuilder subscription - unsubscribe functionality 2`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -872,16 +1054,17 @@ exports[`otel > otel 3`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -960,6 +1143,19 @@ exports[`otel > otel 4`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -1178,16 +1374,17 @@ exports[`otel > with thunks 7`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -1272,6 +1469,19 @@ exports[`otel > with thunks 8`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],
@@ -1318,16 +1528,17 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
       "_name": "client-session-sync-processor:boot",
       "children": [
         {
-          "_name": "@livestore/common:LeaderSyncProcessor:push",
+          "_name": "client-session-sync-processor:pull",
           "attributes": {
-            "batch": "undefined",
-            "batchSize": 1,
+            "span.label": "⚠︎ Interrupted",
+            "status.interrupted": true,
           },
         },
         {
-          "_name": "client-session-sync-processor:pull",
+          "_name": "@livestore/common:LeaderSyncProcessor:push",
           "attributes": {
-            "code.stacktrace": "<STACKTRACE>",
+            "batch": "undefined",
+            "batchSize": 1,
             "span.label": "⚠︎ Interrupted",
             "status.interrupted": true,
           },
@@ -1412,6 +1623,19 @@ exports[`otel > with thunks with query builder and without labels 4`] = `
                   "sql.query": "INSERT INTO 'todos' ("id", "text", "completed") VALUES (?, ?, ?)",
                 },
               },
+              {
+                "_name": "@livestore/common:execSql",
+                "attributes": {
+                  "bindValueKeys": "[
+  "$id",
+  "$seqNumGlobal",
+  "$seqNumClient",
+  "$seqNumRebaseGeneration"
+]",
+                  "span.label": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                  "sql": "INSERT OR REPLACE INTO __livestore_state_head (id, seqNumGlobal, seqNumClient, seqNumRebaseGeneration) VALUES ($id, $seqNumGlobal, $seqNumClient, $seqNumRebaseGeneration)",
+                },
+              },
             ],
           },
         ],

package/src/live-queries/base-class.ts

@@ -1,6 +1,5 @@
 import type * as otel from '@opentelemetry/api'
 
-import { isNotNil } from '@livestore/utils'
 import { Equal, Hash, Predicate } from '@livestore/utils/effect'
 
 import * as RG from '../reactive.ts'
@@ -54,7 +53,7 @@ export interface SignalDef<T> extends LiveQueryDef<T, 'signal-def'> {
   label: string
   /** Creates a reference-counted signal instance bound to a Store's reactivity graph */
   make: (ctx: ReactivityGraphContext) => RcRef<ISignal<T>>
-  [Equal.symbol](that: SignalDef<T>): boolean
+  [Equal.symbol](that: Equal.Equal): boolean
   [Hash.symbol](): number
 }
 
@@ -122,7 +121,7 @@ export const depsToString = (deps: DepKey): string => {
   if (typeof deps === 'string' || typeof deps === 'number') {
     return deps.toString()
   }
-  return deps.filter(isNotNil).join(',')
+  return deps.filter(Predicate.isNotNullish).join(',')
 }
 
 /**
@@ -146,7 +145,7 @@ export interface LiveQueryDef<TResult, TTag extends string = 'def'> {
   label: string
   /** Unique identifier derived from the query string or explicit deps; used for caching */
   hash: string
-  [Equal.symbol](that: LiveQueryDef<TResult, TTag>): boolean
+  [Equal.symbol](that: Equal.Equal): boolean
   [Hash.symbol](): number
 }
 
@@ -154,6 +153,39 @@ export namespace LiveQueryDef {
   export type Any = LiveQueryDef<any, 'def' | 'signal-def'>
 }
 
+/**
+ * Type guard that checks if a value is a query or signal definition.
+ *
+ * Use this to distinguish between definitions (blueprints) and instances (live queries).
+ * Definitions are created by `queryDb()`, `computed()`, and `signal()`.
+ *
+ * @example
+ * ```ts
+ * const todos$ = queryDb(tables.todos.all())
+ *
+ * if (isLiveQueryDef(todos$)) {
+ *   console.log('This is a definition:', todos$.label)
+ * }
+ * ```
+ */
+export const isLiveQueryDef = (value: unknown): value is LiveQueryDef<any> | SignalDef<any> => {
+  if (Predicate.isTagged(value, 'def') === false && Predicate.isTagged(value, 'signal-def') === false) {
+    return false
+  }
+
+  return (
+    Predicate.hasProperty(value, 'make') &&
+    Predicate.isFunction(value.make) &&
+    Predicate.hasProperty(value, 'hash') &&
+    Predicate.isString(value.hash) &&
+    Predicate.hasProperty(value, 'label') &&
+    Predicate.isString(value.label)
+  )
+}
+
+export const isSignalDef = (value: unknown): value is SignalDef<any> =>
+  isLiveQueryDef(value) && Predicate.isTagged(value, 'signal-def')
+
 /**
  * A live query instance bound to a specific Store.
  *
@@ -273,8 +305,8 @@ export abstract class LiveStoreQueryBase<TResult> implements LiveQuery<TResult>
  */
 export type GetAtomResult = <T>(
   atom: RG.Atom<T, any, RefreshReason> | LiveQueryDef<T> | LiveQuery<T> | ISignal<T> | SignalDef<T>,
-  otelContext?: otel.Context  ,
-  debugRefreshReason?: RefreshReason  ,
+  otelContext?: otel.Context,
+  debugRefreshReason?: RefreshReason,
 ) => T
 
 export type DependencyQueriesRef = Set<RcRef<LiveQuery.Any | ISignal<any>>>

package/src/live-queries/computed.ts

@@ -1,13 +1,12 @@
 import * as otel from '@opentelemetry/api'
 
-import { getDurationMsFromSpan } from '@livestore/common'
 import { Equal, Hash } from '@livestore/utils/effect'
 
 import type { Thunk } from '../reactive.ts'
 import type { RefreshReason } from '../store/store-types.ts'
 import { isValidFunctionString } from '../utils/function-string.ts'
 import type { DepKey, GetAtomResult, LiveQueryDef, ReactivityGraph, ReactivityGraphContext } from './base-class.ts'
-import { depsToString, LiveStoreQueryBase, makeGetAtomResult, withRCMap } from './base-class.ts'
+import { depsToString, isLiveQueryDef, LiveStoreQueryBase, makeGetAtomResult, withRCMap } from './base-class.ts'
 
 /**
  * Creates a derived query that computes a value from other queries or signals.
@@ -86,8 +85,8 @@ export const computed = <TResult>(
     // TODO we should figure out whether this could cause some problems and/or if there's a better way to do this
     // NOTE `fn.toString()` doesn't work in Expo as it always produces `[native code]`
     hash,
-    [Equal.symbol](that: LiveQueryDef<any>): boolean {
-      return this.hash === that.hash
+    [Equal.symbol](that: Equal.Equal): boolean {
+      return isLiveQueryDef(that) && that._tag === 'def' && this.hash === that.hash
     },
     [Hash.symbol](): number {
       return Hash.string(this.hash)
@@ -137,12 +136,13 @@ export class LiveStoreComputedQuery<TResult> extends LiveStoreQueryBase<TResult>
     this.results$ = this.reactivityGraph.makeThunk(
       (get, setDebugInfo, ctx, otelContext) =>
         ctx.otelTracer.startActiveSpan(`js:${label}`, {}, otelContext ?? ctx.rootOtelContext, (span) => {
+          const startTimePerfNow = performance.now()
           const otelContext = otel.trace.setSpan(otel.context.active(), span)
           const res = fn(makeGetAtomResult(get, ctx, otelContext, this.dependencyQueriesRef))
 
           span.end()
 
-          const durationMs = getDurationMsFromSpan(span)
+          const durationMs = performance.now() - startTimePerfNow
 
           this.executionTimes.push(durationMs)