@livestore/livestore 0.3.0-dev.33 → 0.3.0-dev.34

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`)
   }
 
-  return {
+  const def: LiveQueryDef.Any = {
     _tag: 'def',
     make: withRCMap(hash, (ctx, _otelContext) => {
       // TODO onDestroy
@@ -27,6 +27,7 @@ export const computed = <TResult>(
         fn,
         label: options?.label ?? fn.toString(),
         reactivityGraph: ctx.reactivityGraph.deref()!,
+        def,
       })
     }),
     label: options?.label ?? fn.toString(),
@@ -35,6 +36,8 @@ export const computed = <TResult>(
     // NOTE `fn.toString()` doesn't work in Expo as it always produces `[native code]`
     hash,
   }
+
+  return def
 }
 
 export class LiveStoreComputedQuery<TResult> extends LiveStoreQueryBase<TResult> {
@@ -46,20 +49,24 @@ export class LiveStoreComputedQuery<TResult> extends LiveStoreQueryBase<TResult>
   label: string
 
   reactivityGraph: ReactivityGraph
+  def: LiveQueryDef<TResult>
 
   constructor({
     fn,
     label,
     reactivityGraph,
+    def,
   }: {
     label: string
     fn: (get: GetAtomResult) => TResult
     reactivityGraph: ReactivityGraph
+    def: LiveQueryDef<TResult>
   }) {
     super()
 
     this.label = label
     this.reactivityGraph = reactivityGraph
+    this.def = def
 
     const queryLabel = `${label}:results`
 

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

@@ -1,7 +1,7 @@
 import { sql } from '@livestore/common'
 import { rawSqlEvent } from '@livestore/common/schema'
 import { Effect, ReadonlyRecord, Schema } from '@livestore/utils/effect'
-import { Vitest } from '@livestore/utils/node-vitest'
+import { Vitest } from '@livestore/utils-dev/node-vitest'
 import * as otel from '@opentelemetry/api'
 import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'
 import { expect } from 'vitest'

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

@@ -85,7 +85,7 @@ export const queryDb: {
 
   const label = options?.label ?? queryString
 
-  return {
+  const def: LiveQueryDef.Any = {
     _tag: 'def',
     make: withRCMap(hash, (ctx, otelContext) => {
       // TODO onDestroy
@@ -95,11 +95,14 @@ export const queryDb: {
         label,
         map: options?.map,
         otelContext,
+        def,
       })
     }),
     label,
     hash,
   }
+
+  return def
 }
 
 const bindValuesToDepKey = (bindValues: Bindable | undefined): DepKey => {
@@ -146,6 +149,7 @@ export class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema> extends Li
   readonly reactivityGraph
 
   private mapResult: (rows: TResultSchema) => TResult
+  def: LiveQueryDef<TResult>
 
   constructor({
     queryInput,
@@ -153,6 +157,7 @@ export class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema> extends Li
     reactivityGraph,
     map,
     otelContext,
+    def,
   }: {
     label?: string
     queryInput:
@@ -162,11 +167,13 @@ export class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema> extends Li
     map?: (rows: TResultSchema) => TResult
     /** Only used for the initial query execution */
     otelContext?: otel.Context
+    def: LiveQueryDef<TResult>
   }) {
     super()
 
     let label = inputLabel ?? 'db(unknown)'
     this.reactivityGraph = reactivityGraph
+    this.def = def
 
     this.mapResult = map === undefined ? (rows: any) => rows as TResult : map
 

package/src/store/devtools.ts

@@ -227,6 +227,7 @@ export const connectDevtoolsToStore = ({
                       _tag: q._tag,
                       id: q.id,
                       label: q.label,
+                      hash: q.def.hash,
                       runs: q.runs,
                       executionTimes: q.executionTimes.map((_) => Number(_.toString().slice(0, 5))),
                       lastestResult:

package/src/store/store.ts

@@ -20,14 +20,7 @@ import {
   replaceSessionIdSymbol,
 } from '@livestore/common'
 import type { LiveStoreSchema } from '@livestore/common/schema'
-import {
-  getEventDef,
-  LEADER_MERGE_COUNTER_TABLE,
-  LiveStoreEvent,
-  SCHEMA_EVENT_DEFS_META_TABLE,
-  SCHEMA_META_TABLE,
-  SESSION_CHANGESET_META_TABLE,
-} from '@livestore/common/schema'
+import { getEventDef, LiveStoreEvent, SystemTables } from '@livestore/common/schema'
 import { assertNever, isDevEnv } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
 import { Cause, Effect, Inspectable, OtelTracer, Runtime, Schema, Stream } from '@livestore/utils/effect'
@@ -114,7 +107,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       schema,
       clientSession,
       runtime: effectContext.runtime,
-      applyEvent: (eventDecoded, { otelContext, withChangeset }) => {
+      materializeEvent: (eventDecoded, { otelContext, withChangeset }) => {
         const eventDef = getEventDef(schema, eventDecoded.name)
 
         const execArgsArr = getExecArgsFromEvent({
@@ -201,14 +194,8 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       // NOTE we're excluding the LiveStore schema and events tables as they are not user-facing
       // unless LiveStore is running in the devtools
       __runningInDevtools
-        ? this.schema.tables.keys()
-        : Array.from(this.schema.tables.keys()).filter(
-            (_) =>
-              _ !== SCHEMA_META_TABLE &&
-              _ !== SCHEMA_EVENT_DEFS_META_TABLE &&
-              _ !== SESSION_CHANGESET_META_TABLE &&
-              _ !== LEADER_MERGE_COUNTER_TABLE,
-          ),
+        ? this.schema.state.sqlite.tables.keys()
+        : Array.from(this.schema.state.sqlite.tables.keys()).filter((_) => !SystemTables.isStateSystemTable(_)),
     )
     const existingTableRefs = new Map(
       Array.from(this.reactivityGraph.atoms.values())
@@ -540,13 +527,13 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
         try {
           const { writeTables } = (() => {
             try {
-              const applyEvents = () => this.syncProcessor.push(events, { otelContext })
+              const materializeEvents = () => this.syncProcessor.push(events, { otelContext })
 
               if (events.length > 1) {
                 // TODO: what to do about leader transaction here?
-                return this.sqliteDbWrapper.txn(applyEvents)
+                return this.sqliteDbWrapper.txn(materializeEvents)
               } else {
-                return applyEvents()
+                return materializeEvents()
               }
             } catch (e: any) {
               console.error(e)

package/tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "skipLibCheck": true,
-    "resolveJsonModule": true,
-    // "jsx": "preserve",
-    "tsBuildInfoFile": "./dist/.tsbuildinfo"
-  },
-  "include": ["./src"],
-  "references": [
-    { "path": "../common" },
-    { "path": "../adapter-web" },
-    { "path": "../utils" }
-  ]
-}

package/vitest.config.js

@@ -1,9 +0,0 @@
-import { defineConfig } from 'vite'
-
-export default defineConfig({
-  resolve: {
-    alias: {
-      '@livestore/wa-sqlite/dist/wa-sqlite.mjs': '@livestore/wa-sqlite/dist/wa-sqlite.node.mjs',
-    },
-  },
-})