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

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

@@ -1,4 +1,5 @@
 import { isNotNil } from '@livestore/utils'
+import { Predicate } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
 
 import * as RG from '../reactive.js'
@@ -22,18 +23,26 @@ export type ReactivityGraphContext = {
   effectsWrapper: (run: () => void) => void
 }
 
-export type GetResult<TQuery extends LiveQueryDef.Any | LiveQuery.Any> =
-  TQuery extends LiveQuery<infer TResult> ? TResult : TQuery extends LiveQueryDef<infer TResult> ? TResult : unknown
+export type GetResult<TQuery extends LiveQueryDef.Any | LiveQuery.Any | SignalDef<any>> =
+  TQuery extends LiveQuery<infer TResult>
+    ? TResult
+    : TQuery extends LiveQueryDef<infer TResult>
+      ? TResult
+      : TQuery extends SignalDef<infer TResult>
+        ? TResult
+        : unknown
 
 let queryIdCounter = 0
 
-export interface SignalDef<T> {
+export interface SignalDef<T> extends LiveQueryDef<T, 'signal-def'> {
   _tag: 'signal-def'
   defaultValue: T
+  hash: string
+  label: string
   make: (ctx: ReactivityGraphContext) => RcRef<ISignal<T>>
 }
 
-export interface ISignal<T> {
+export interface ISignal<T> extends LiveQuery<T> {
   _tag: 'signal'
   reactivityGraph: ReactivityGraph
   ref: RG.Ref<T, ReactivityGraphContext, RefreshReason>
@@ -60,16 +69,17 @@ export const depsToString = (deps: DepKey): string => {
   return deps.filter(isNotNil).join(',')
 }
 
-export interface LiveQueryDef<TResult> {
-  _tag: 'def'
+// TODO we should refactor/clean up how LiveQueryDef / SignalDef / LiveQuery / ISignal are defined (particularly on the type-level)
+export interface LiveQueryDef<TResult, TTag extends string = 'def'> {
+  _tag: TTag
   /** Creates a new LiveQuery instance bound to a specific store/reactivityGraph */
-  make: (ctx: ReactivityGraphContext, otelContext?: otel.Context) => RcRef<LiveQuery<TResult>>
+  make: (ctx: ReactivityGraphContext, otelContext?: otel.Context) => RcRef<LiveQuery<TResult> | ISignal<TResult>>
   label: string
   hash: string
 }
 
 export namespace LiveQueryDef {
-  export type Any = LiveQueryDef<any>
+  export type Any = LiveQueryDef<any, 'def' | 'signal-def'>
 }
 
 /**
@@ -77,7 +87,7 @@ export namespace LiveQueryDef {
  */
 export interface LiveQuery<TResult> {
   id: number
-  _tag: 'computed' | 'db' | 'graphql'
+  _tag: 'computed' | 'db' | 'graphql' | 'signal'
   [TypeId]: TypeId
 
   // reactivityGraph: ReactivityGraph
@@ -86,7 +96,7 @@ export interface LiveQuery<TResult> {
   '__result!': TResult
 
   /** A reactive thunk representing the query results */
-  results$: RG.Thunk<TResult, ReactivityGraphContext, RefreshReason>
+  results$: RG.Atom<TResult, ReactivityGraphContext, RefreshReason>
 
   label: string
 
@@ -106,7 +116,7 @@ export interface LiveQuery<TResult> {
   runs: number
 
   executionTimes: number[]
-  def: LiveQueryDef<TResult>
+  def: LiveQueryDef<TResult> | SignalDef<TResult>
 }
 
 export namespace LiveQuery {
@@ -117,21 +127,24 @@ export abstract class LiveStoreQueryBase<TResult> implements LiveQuery<TResult>
   '__result!'!: TResult
   id = queryIdCounter++;
   [TypeId]: TypeId = TypeId
-  abstract _tag: 'computed' | 'db' | 'graphql'
+  abstract _tag: 'computed' | 'db' | 'graphql' | 'signal'
 
   /** Human-readable label for the query for debugging */
   abstract label: string
 
-  abstract def: LiveQueryDef<TResult>
+  abstract def: LiveQueryDef<TResult> | SignalDef<TResult>
 
-  abstract results$: RG.Thunk<TResult, ReactivityGraphContext, RefreshReason>
+  abstract results$: RG.Atom<TResult, ReactivityGraphContext, RefreshReason>
 
   activeSubscriptions: Set<StackInfo> = new Set()
 
   abstract readonly reactivityGraph: ReactivityGraph
 
   get runs() {
-    return this.results$.recomputations
+    if (this.results$._tag === 'thunk') {
+      return this.results$.recomputations
+    }
+    return 0
   }
 
   executionTimes: number[] = []
@@ -183,7 +196,9 @@ export const makeGetAtomResult = (
     }
 
     // Signal case
-    if (atom._tag === 'signal') return get(atom.ref, otelContext, debugRefreshReason)
+    if (atom._tag === 'signal' && Predicate.hasProperty(atom, 'ref')) {
+      return get(atom.ref, otelContext, debugRefreshReason)
+    }
 
     // LiveQuery case
     return get(atom.results$, otelContext, debugRefreshReason)

package/src/live-queries/computed.ts

@@ -19,7 +19,7 @@ export const computed = <TResult>(
     throw new Error(`On Expo/React Native, computed queries must provide a \`deps\` option`)
   }
 
-  const def: LiveQueryDef.Any = {
+  const def: LiveQueryDef<any> = {
     _tag: 'def',
     make: withRCMap(hash, (ctx, _otelContext) => {
       // TODO onDestroy
@@ -41,7 +41,7 @@ export const computed = <TResult>(
 }
 
 export class LiveStoreComputedQuery<TResult> extends LiveStoreQueryBase<TResult> {
-  _tag: 'computed' = 'computed'
+  _tag = 'computed' as const
 
   /** A reactive thunk representing the query results */
   results$: Thunk<TResult, ReactivityGraphContext, RefreshReason>

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

@@ -102,8 +102,10 @@ export const queryDb: {
 } = (queryInput, options) => {
   const { queryString, extraDeps } = getQueryStringAndExtraDeps(queryInput)
 
-  const hash =
-    (options?.deps ? queryString + '-' + depsToString(options.deps) : queryString) + '-' + depsToString(extraDeps)
+  const hash = [queryString, options?.deps ? depsToString(options.deps) : undefined, depsToString(extraDeps)]
+    .filter(Boolean)
+    .join('-')
+
   if (isValidFunctionString(hash)._tag === 'invalid') {
     throw new Error(`On Expo/React Native, db queries must provide a \`deps\` option`)
   }
@@ -114,7 +116,7 @@ export const queryDb: {
 
   const label = options?.label ?? queryString
 
-  const def: LiveQueryDef.Any = {
+  const def: LiveQueryDef<any> = {
     _tag: 'def',
     make: withRCMap(hash, (ctx, otelContext) => {
       // TODO onDestroy
@@ -165,7 +167,7 @@ const getQueryStringAndExtraDeps = (
 
 /* An object encapsulating a reactive SQL query */
 export class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema> extends LiveStoreQueryBase<TResult> {
-  _tag: 'db' = 'db'
+  _tag = 'db' as const
 
   /** A reactive thunk representing the query text */
   queryInput$: Thunk<QueryInputRaw<any, any>, ReactivityGraphContext, RefreshReason> | undefined

package/src/live-queries/signal.ts

@@ -3,7 +3,7 @@ import { nanoid } from '@livestore/utils/nanoid'
 import type * as RG from '../reactive.js'
 import type { RefreshReason } from '../store/store-types.js'
 import type { ISignal, ReactivityGraph, ReactivityGraphContext, SignalDef } from './base-class.js'
-import { withRCMap } from './base-class.js'
+import { LiveStoreQueryBase, withRCMap } from './base-class.js'
 
 export const signal = <T>(
   defaultValue: T,
@@ -12,25 +12,59 @@ export const signal = <T>(
   },
 ): SignalDef<T> => {
   const id = nanoid()
-  return {
+  const def: SignalDef<T> = {
     _tag: 'signal-def',
     defaultValue,
-    make: withRCMap(id, (ctx) => new Signal(defaultValue, ctx.reactivityGraph.deref()!, options)),
+    hash: id,
+    label: options?.label ?? 'Signal',
+    make: withRCMap(
+      id,
+      (ctx) =>
+        new Signal({
+          defaultValue,
+          reactivityGraph: ctx.reactivityGraph.deref()!,
+          label: options?.label ?? 'Signal',
+          def,
+        }),
+    ),
   }
+
+  return def
 }
 
-export class Signal<T> implements ISignal<T> {
+export class Signal<T> extends LiveStoreQueryBase<T> implements ISignal<T> {
   _tag = 'signal' as const
   readonly ref: RG.Ref<T, ReactivityGraphContext, RefreshReason>
-
+  label: string
+  reactivityGraph: ReactivityGraph
+  results$: RG.Ref<T, ReactivityGraphContext, RefreshReason>
+  def: SignalDef<T>
   constructor(
-    private defaultValue: T,
-    readonly reactivityGraph: ReactivityGraph,
-    private options?: {
-      label?: string
+    // private defaultValue: T,
+    // readonly reactivityGraph: ReactivityGraph,
+    // private options?: {
+    //   label?: string
+    // },
+    {
+      defaultValue,
+      reactivityGraph,
+      label,
+      def,
+    }: {
+      defaultValue: T
+      reactivityGraph: ReactivityGraph
+      label: string
+      def: SignalDef<T>
     },
   ) {
-    this.ref = reactivityGraph.makeRef(defaultValue, { label: options?.label })
+    super()
+
+    this.ref = reactivityGraph.makeRef(defaultValue, { label })
+    this.label = label
+    this.reactivityGraph = reactivityGraph
+    this.def = def
+
+    this.results$ = this.ref
   }
 
   set = (value: T) => {

package/src/mod.ts

@@ -13,7 +13,16 @@ export {
 
 export { SqliteDbWrapper, emptyDebugInfo } from './SqliteDbWrapper.js'
 
-export { queryDb, computed, signal, type LiveQuery, type LiveQueryDef } from './live-queries/mod.js'
+export {
+  queryDb,
+  computed,
+  signal,
+  type LiveQuery,
+  type LiveQueryDef,
+  type Signal,
+  type SignalDef,
+  type RcRef,
+} from './live-queries/mod.js'
 
 export * from '@livestore/common/schema'
 export {

package/src/store/store.ts

@@ -135,7 +135,9 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
             this.sqliteDbWrapper.execute(statementSql, bindValues, { otelContext, writeTables })
 
             // durationMsTotal += durationMs
-            writeTables.forEach((table) => writeTablesForEvent.add(table))
+            for (const table of writeTables) {
+              writeTablesForEvent.add(table)
+            }
           }
         }
 
@@ -262,7 +264,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
    * ```
    */
   subscribe = <TResult>(
-    query: LiveQueryDef<TResult> | LiveQuery<TResult>,
+    query: LiveQueryDef<TResult, 'def' | 'signal-def'> | LiveQuery<TResult>,
     options: {
       /** Called when the query result has changed */
       onUpdate: (value: TResult) => void
@@ -289,10 +291,10 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
         const queryRcRef =
-          query._tag === 'def'
+          query._tag === 'def' || query._tag === 'signal-def'
             ? query.make(this.reactivityGraph.context!)
             : {
-                value: query,
+                value: query as LiveQuery<TResult>,
                 deref: () => {},
               }
         const query$ = queryRcRef.value