@livestore/livestore 0.3.0-dev.5 → 0.3.0-dev.50

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

@@ -14,7 +14,6 @@ exports[`otel > otel 3`] = `
         "sql.query": "
       PRAGMA page_size=32768;
       PRAGMA cache_size=10000;
-      PRAGMA journal_mode='MEMORY'; -- we don't flush to disk before committing a write
       PRAGMA synchronous='OFF';
       PRAGMA temp_store='MEMORY';
       PRAGMA foreign_keys='ON'; -- we want foreign key constraints to be enforced
@@ -22,33 +21,40 @@ exports[`otel > otel 3`] = `
       },
     },
     {
-      "_name": "LiveStore:createStore",
+      "_name": "@livestore/common:LeaderSyncProcessor:push",
+      "attributes": {
+        "batch": "undefined",
+        "batchSize": 1,
+      },
+    },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
     },
     {
       "_name": "LiveStore:sync",
     },
     {
-      "_name": "LiveStore:mutations",
+      "_name": "LiveStore:commits",
       "children": [
         {
-          "_name": "LiveStore:mutate",
+          "_name": "LiveStore:commit",
           "attributes": {
-            "livestore.mutateLabel": "mutate",
+            "livestore.eventTags": [
+              "livestore.RawSql",
+            ],
+            "livestore.eventsCount": 1,
           },
           "children": [
             {
-              "_name": "LiveStore:mutate:applyMutations",
+              "_name": "livestore.in-memory-db:execute",
               "attributes": {
-                "livestore.mutateLabel": "mutate",
+                "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
               },
-              "children": [
-                {
-                  "_name": "livestore.in-memory-db:execute",
-                  "attributes": {
-                    "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
-                  },
-                },
-              ],
             },
           ],
         },
@@ -97,7 +103,179 @@ exports[`otel > otel 3`] = `
 }
 `;
 
+exports[`otel > with thunks 1`] = `
+{
+  "atoms": [
+    {
+      "_tag": "ref",
+      "id": "node-1",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:todos",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 0,
+      "sub": [],
+      "super": [],
+    },
+    {
+      "_tag": "ref",
+      "id": "node-2",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:app",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 0,
+      "sub": [],
+      "super": [],
+    },
+  ],
+  "deferredEffects": [],
+  "effects": [],
+}
+`;
+
 exports[`otel > with thunks 3`] = `
+{
+  "atoms": [
+    {
+      "_tag": "ref",
+      "id": "node-1",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:todos",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 0,
+      "sub": [],
+      "super": [],
+    },
+    {
+      "_tag": "ref",
+      "id": "node-2",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:app",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 0,
+      "sub": [],
+      "super": [],
+    },
+  ],
+  "deferredEffects": [],
+  "effects": [],
+}
+`;
+
+exports[`otel > with thunks 4`] = `
+{
+  "atoms": [
+    {
+      "_tag": "ref",
+      "id": "node-1",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:todos",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 1,
+      "sub": [],
+      "super": [],
+    },
+    {
+      "_tag": "ref",
+      "id": "node-2",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:app",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 0,
+      "sub": [],
+      "super": [],
+    },
+  ],
+  "deferredEffects": [],
+  "effects": [],
+}
+`;
+
+exports[`otel > with thunks 6`] = `
+{
+  "atoms": [
+    {
+      "_tag": "ref",
+      "id": "node-1",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:todos",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 1,
+      "sub": [],
+      "super": [],
+    },
+    {
+      "_tag": "ref",
+      "id": "node-2",
+      "isDestroyed": false,
+      "isDirty": false,
+      "label": "tableRef:app",
+      "meta": {
+        "liveStoreRefType": "table",
+      },
+      "previousResult": {
+        "_tag": "Some",
+        "value": "null",
+      },
+      "refreshes": 0,
+      "sub": [],
+      "super": [],
+    },
+  ],
+  "deferredEffects": [],
+  "effects": [],
+}
+`;
+
+exports[`otel > with thunks 7`] = `
 {
   "_name": "createStore",
   "attributes": {
@@ -111,7 +289,6 @@ exports[`otel > with thunks 3`] = `
         "sql.query": "
       PRAGMA page_size=32768;
       PRAGMA cache_size=10000;
-      PRAGMA journal_mode='MEMORY'; -- we don't flush to disk before committing a write
       PRAGMA synchronous='OFF';
       PRAGMA temp_store='MEMORY';
       PRAGMA foreign_keys='ON'; -- we want foreign key constraints to be enforced
@@ -119,33 +296,40 @@ exports[`otel > with thunks 3`] = `
       },
     },
     {
-      "_name": "LiveStore:createStore",
+      "_name": "@livestore/common:LeaderSyncProcessor:push",
+      "attributes": {
+        "batch": "undefined",
+        "batchSize": 1,
+      },
+    },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
     },
     {
       "_name": "LiveStore:sync",
     },
     {
-      "_name": "LiveStore:mutations",
+      "_name": "LiveStore:commits",
       "children": [
         {
-          "_name": "LiveStore:mutate",
+          "_name": "LiveStore:commit",
           "attributes": {
-            "livestore.mutateLabel": "mutate",
+            "livestore.eventTags": [
+              "livestore.RawSql",
+            ],
+            "livestore.eventsCount": 1,
           },
           "children": [
             {
-              "_name": "LiveStore:mutate:applyMutations",
+              "_name": "livestore.in-memory-db:execute",
               "attributes": {
-                "livestore.mutateLabel": "mutate",
+                "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
               },
-              "children": [
-                {
-                  "_name": "livestore.in-memory-db:execute",
-                  "attributes": {
-                    "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
-                  },
-                },
-              ],
             },
           ],
         },
@@ -181,6 +365,9 @@ exports[`otel > with thunks 3`] = `
             "sql.rowsCount": 1,
           },
           "children": [
+            {
+              "_name": "js:where-filter",
+            },
             {
               "_name": "sql-in-memory-select",
               "attributes": {
@@ -211,7 +398,6 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
         "sql.query": "
       PRAGMA page_size=32768;
       PRAGMA cache_size=10000;
-      PRAGMA journal_mode='MEMORY'; -- we don't flush to disk before committing a write
       PRAGMA synchronous='OFF';
       PRAGMA temp_store='MEMORY';
       PRAGMA foreign_keys='ON'; -- we want foreign key constraints to be enforced
@@ -219,33 +405,40 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
       },
     },
     {
-      "_name": "LiveStore:createStore",
+      "_name": "@livestore/common:LeaderSyncProcessor:push",
+      "attributes": {
+        "batch": "undefined",
+        "batchSize": 1,
+      },
+    },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
     },
     {
       "_name": "LiveStore:sync",
     },
     {
-      "_name": "LiveStore:mutations",
+      "_name": "LiveStore:commits",
       "children": [
         {
-          "_name": "LiveStore:mutate",
+          "_name": "LiveStore:commit",
           "attributes": {
-            "livestore.mutateLabel": "mutate",
+            "livestore.eventTags": [
+              "livestore.RawSql",
+            ],
+            "livestore.eventsCount": 1,
           },
           "children": [
             {
-              "_name": "LiveStore:mutate:applyMutations",
+              "_name": "livestore.in-memory-db:execute",
               "attributes": {
-                "livestore.mutateLabel": "mutate",
+                "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
               },
-              "children": [
-                {
-                  "_name": "livestore.in-memory-db:execute",
-                  "attributes": {
-                    "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
-                  },
-                },
-              ],
             },
           ],
         },
@@ -281,6 +474,9 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
             "sql.rowsCount": 1,
           },
           "children": [
+            {
+              "_name": "js:() => ({ completed: false })",
+            },
             {
               "_name": "sql-in-memory-select",
               "attributes": {

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

@@ -1,72 +1,119 @@
-import type { QueryInfo } from '@livestore/common'
+import { isNotNil } from '@livestore/utils'
 import type * as otel from '@opentelemetry/api'
 
-import { type Atom, type GetAtom, ReactiveGraph, throwContextNotSetError, type Thunk } from '../reactive.js'
+import * as RG from '../reactive.js'
 import type { Store } from '../store/store.js'
 import type { QueryDebugInfo, RefreshReason } from '../store/store-types.js'
 import type { StackInfo } from '../utils/stack-info.js'
 
-export type ReactivityGraph = ReactiveGraph<RefreshReason, QueryDebugInfo, QueryContext>
+export type ReactivityGraph = RG.ReactiveGraph<RefreshReason, QueryDebugInfo, ReactivityGraphContext>
 
 export const makeReactivityGraph = (): ReactivityGraph =>
-  new ReactiveGraph<RefreshReason, QueryDebugInfo, QueryContext>()
+  new RG.ReactiveGraph<RefreshReason, QueryDebugInfo, ReactivityGraphContext>()
 
-export type QueryContext = {
+export type ReactivityGraphContext = {
   store: Store
+  /** Maps from the hash of the query definition to the RcRef of the query */
+  defRcMap: Map<string, RcRef<LiveQuery.Any | ISignal<any>>>
+  /** Back-reference to the reactivity graph for convenience */
+  reactivityGraph: WeakRef<ReactivityGraph>
   otelTracer: otel.Tracer
   rootOtelContext: otel.Context
   effectsWrapper: (run: () => void) => void
 }
 
-export type UnsubscribeQuery = () => void
-
-export type GetResult<TQuery extends LiveQueryAny> =
-  TQuery extends LiveQuery<infer TResult, infer _1> ? TResult : unknown
+export type GetResult<TQuery extends LiveQueryDef.Any | LiveQuery.Any> =
+  TQuery extends LiveQuery<infer TResult> ? TResult : TQuery extends LiveQueryDef<infer TResult> ? TResult : unknown
 
 let queryIdCounter = 0
 
-export type LiveQueryAny = LiveQuery<any, QueryInfo>
+export interface SignalDef<T> {
+  _tag: 'signal-def'
+  defaultValue: T
+  make: (ctx: ReactivityGraphContext) => RcRef<ISignal<T>>
+}
+
+export interface ISignal<T> {
+  _tag: 'signal'
+  reactivityGraph: ReactivityGraph
+  ref: RG.Ref<T, ReactivityGraphContext, RefreshReason>
+  set: (value: T) => void
+  get: () => T
+  destroy: () => void
+}
 
 export const TypeId = Symbol.for('LiveQuery')
 export type TypeId = typeof TypeId
 
-export interface LiveQuery<TResult, TQueryInfo extends QueryInfo = QueryInfo.None> {
+export interface RcRef<T> {
+  rc: number
+  value: T
+  deref: () => void
+}
+
+export type DepKey = string | number | ReadonlyArray<string | number | undefined | null>
+
+export const depsToString = (deps: DepKey): string => {
+  if (typeof deps === 'string' || typeof deps === 'number') {
+    return deps.toString()
+  }
+  return deps.filter(isNotNil).join(',')
+}
+
+export interface LiveQueryDef<TResult> {
+  _tag: 'def'
+  /** Creates a new LiveQuery instance bound to a specific store/reactivityGraph */
+  make: (ctx: ReactivityGraphContext, otelContext?: otel.Context) => RcRef<LiveQuery<TResult>>
+  label: string
+  hash: string
+}
+
+export namespace LiveQueryDef {
+  export type Any = LiveQueryDef<any>
+}
+
+/**
+ * A LiveQuery is stateful
+ */
+export interface LiveQuery<TResult> {
   id: number
   _tag: 'computed' | 'db' | 'graphql'
   [TypeId]: TypeId
 
+  // reactivityGraph: ReactivityGraph
+
   /** This should only be used on a type-level and doesn't hold any value during runtime */
   '__result!': TResult
 
   /** A reactive thunk representing the query results */
-  results$: Thunk<TResult, QueryContext, RefreshReason>
+  results$: RG.Thunk<TResult, ReactivityGraphContext, RefreshReason>
 
   label: string
 
-  run: (otelContext?: otel.Context, debugRefreshReason?: RefreshReason) => TResult
+  run: (args: { otelContext?: otel.Context; debugRefreshReason?: RefreshReason }) => TResult
 
-  runAndDestroy: (otelContext?: otel.Context, debugRefreshReason?: RefreshReason) => TResult
+  destroy: () => void
+  isDestroyed: boolean
 
-  destroy(): void
-
-  subscribe(
-    onNewValue: (value: TResult) => void,
-    onUnsubsubscribe?: () => void,
-    options?: { label?: string; otelContext?: otel.Context },
-  ): () => void
+  // subscribe(
+  //   onNewValue: (value: TResult) => void,
+  //   onUnsubsubscribe?: () => void,
+  //   options?: { label?: string; otelContext?: otel.Context },
+  // ): () => void
 
   activeSubscriptions: Set<StackInfo>
 
-  queryInfo: TQueryInfo
-
   runs: number
 
   executionTimes: number[]
+  def: LiveQueryDef<TResult>
 }
 
-export abstract class LiveStoreQueryBase<TResult, TQueryInfo extends QueryInfo>
-  implements LiveQuery<TResult, TQueryInfo>
-{
+export namespace LiveQuery {
+  export type Any = LiveQuery<any>
+}
+
+export abstract class LiveStoreQueryBase<TResult> implements LiveQuery<TResult> {
   '__result!'!: TResult
   id = queryIdCounter++;
   [TypeId]: TypeId = TypeId
@@ -75,13 +122,13 @@ export abstract class LiveStoreQueryBase<TResult, TQueryInfo extends QueryInfo>
   /** Human-readable label for the query for debugging */
   abstract label: string
 
-  abstract results$: Thunk<TResult, QueryContext, RefreshReason>
+  abstract def: LiveQueryDef<TResult>
 
-  activeSubscriptions: Set<StackInfo> = new Set()
+  abstract results$: RG.Thunk<TResult, ReactivityGraphContext, RefreshReason>
 
-  protected abstract reactivityGraph: ReactivityGraph
+  activeSubscriptions: Set<StackInfo> = new Set()
 
-  abstract queryInfo: TQueryInfo
+  abstract readonly reactivityGraph: ReactivityGraph
 
   get runs() {
     return this.results$.recomputations
@@ -89,33 +136,88 @@ export abstract class LiveStoreQueryBase<TResult, TQueryInfo extends QueryInfo>
 
   executionTimes: number[] = []
 
+  // TODO double check if this is needed
+  isDestroyed = false
   abstract destroy: () => void
 
-  run = (otelContext?: otel.Context, debugRefreshReason?: RefreshReason): TResult =>
-    this.results$.computeResult(otelContext, debugRefreshReason)
-
-  runAndDestroy = (otelContext?: otel.Context, debugRefreshReason?: RefreshReason): TResult => {
-    const result = this.run(otelContext, debugRefreshReason)
-    this.destroy()
-    return result
+  run = (args: { otelContext?: otel.Context; debugRefreshReason?: RefreshReason }): TResult => {
+    return this.results$.computeResult(args.otelContext, args.debugRefreshReason)
   }
 
-  subscribe = (
-    onNewValue: (value: TResult) => void,
-    onUnsubsubscribe?: () => void,
-    options?: { label?: string; otelContext?: otel.Context } | undefined,
-  ): (() => void) =>
-    this.reactivityGraph.context?.store.subscribe(this, onNewValue, onUnsubsubscribe, options) ??
-    throwContextNotSetError(this.reactivityGraph)
-}
+  protected dependencyQueriesRef: DependencyQueriesRef = new Set()
 
-export type GetAtomResult = <T>(atom: Atom<T, any, RefreshReason> | LiveQuery<T, any>) => T
+  // subscribe = (
+  //   onNewValue: (value: TResult) => void,
+  //   onUnsubsubscribe?: () => void,
+  //   options?: { label?: string; otelContext?: otel.Context } | undefined,
+  // ): (() => void) =>
+  //   this.reactivityGraph.context?.store.subscribe(this, onNewValue, onUnsubsubscribe, options) ??
+  //   RG.throwContextNotSetError(this.reactivityGraph)
+}
 
-export const makeGetAtomResult = (get: GetAtom, otelContext: otel.Context) => {
-  const getAtom: GetAtomResult = (atom) => {
-    if (atom._tag === 'thunk' || atom._tag === 'ref') return get(atom, otelContext)
-    return get(atom.results$, otelContext)
+export type GetAtomResult = <T>(
+  atom: RG.Atom<T, any, RefreshReason> | LiveQueryDef<T> | LiveQuery<T> | ISignal<T> | SignalDef<T>,
+  otelContext?: otel.Context | undefined,
+  debugRefreshReason?: RefreshReason | undefined,
+) => T
+
+export type DependencyQueriesRef = Set<RcRef<LiveQuery.Any | ISignal<any>>>
+
+export const makeGetAtomResult = (
+  get: RG.GetAtom,
+  ctx: ReactivityGraphContext,
+  otelContext: otel.Context,
+  dependencyQueriesRef: DependencyQueriesRef,
+) => {
+  // NOTE we're using the `otelContext` from `makeGetAtomResult` here, not the `otelContext` from `getAtom`
+  const getAtom: GetAtomResult = (atom, _otelContext, debugRefreshReason) => {
+    // ReactivityGraph atoms case
+    if (atom._tag === 'thunk' || atom._tag === 'ref') return get(atom, otelContext, debugRefreshReason)
+
+    // def case
+    if (atom._tag === 'def' || atom._tag === 'signal-def') {
+      const query = atom.make(ctx)
+      dependencyQueriesRef.add(query)
+      // TODO deref the query on destroy
+      return getAtom(query.value, _otelContext, debugRefreshReason)
+    }
+
+    // Signal case
+    if (atom._tag === 'signal') return get(atom.ref, otelContext, debugRefreshReason)
+
+    // LiveQuery case
+    return get(atom.results$, otelContext, debugRefreshReason)
   }
 
   return getAtom
 }
+
+export const withRCMap = <T extends LiveQuery.Any | ISignal<any>>(
+  id: string,
+  make: (ctx: ReactivityGraphContext, otelContext?: otel.Context) => T,
+): ((ctx: ReactivityGraphContext, otelContext?: otel.Context) => RcRef<T>) => {
+  return (ctx, otelContext) => {
+    let item = ctx.defRcMap.get(id)
+    if (item) {
+      item.rc++
+      return item as RcRef<T>
+    }
+
+    const query$ = make(ctx, otelContext)
+
+    item = {
+      rc: 1,
+      value: query$,
+      deref: () => {
+        item!.rc--
+        if (item!.rc === 0) {
+          item!.value.destroy()
+          ctx.defRcMap.delete(id)
+        }
+      },
+    }
+    ctx.defRcMap.set(id, item)
+
+    return item as RcRef<T>
+  }
+}