@livestore/livestore 0.3.0-dev.10 → 0.3.0-dev.11

package/dist/live-queries/db-query.js

@@ -0,0 +1,244 @@
+import { getResultSchema, isQueryBuilder, prepareBindValues, QueryBuilderAstSymbol, replaceSessionIdSymbol, UnexpectedError, } from '@livestore/common';
+import { deepEqual, shouldNeverHappen } from '@livestore/utils';
+import { Predicate, Schema, TreeFormatter } from '@livestore/utils/effect';
+import * as otel from '@opentelemetry/api';
+import { isThunk, NOT_REFRESHED_YET } from '../reactive.js';
+import { makeExecBeforeFirstRun, rowQueryLabel } from '../row-query-utils.js';
+import { isValidFunctionString } from '../utils/function-string.js';
+import { getDurationMsFromSpan } from '../utils/otel.js';
+import { defCounterRef, depsToString, LiveStoreQueryBase, makeGetAtomResult, withRCMap } from './base-class.js';
+export const isQueryInputRaw = (value) => Predicate.hasProperty(value, 'query') && Predicate.hasProperty(value, 'schema');
+/**
+ * NOTE `query` is only supposed to read data. Don't use it to insert/update/delete data but use mutations instead.
+ */
+export const queryDb = (queryInput, options) => {
+    const queryString = isQueryBuilder(queryInput)
+        ? queryInput.toString()
+        : isQueryInputRaw(queryInput)
+            ? queryInput.query
+            : typeof queryInput === 'function'
+                ? queryInput.toString()
+                : shouldNeverHappen(`Invalid query input: ${queryInput}`);
+    const hash = options?.deps ? queryString + '-' + depsToString(options.deps) : queryString;
+    if (isValidFunctionString(hash)._tag === 'invalid') {
+        throw new Error(`On Expo/React Native, db queries must provide a \`deps\` option`);
+    }
+    const label = options?.label ?? queryString;
+    return {
+        _tag: 'def',
+        id: ++defCounterRef.current,
+        make: withRCMap(hash, (ctx, otelContext) => {
+            // TODO onDestroy
+            return new LiveStoreDbQuery({
+                reactivityGraph: ctx.reactivityGraph.deref(),
+                queryInput,
+                label,
+                map: options?.map,
+                // We're not falling back to `None` here as the queryInfo will be set dynamically
+                queryInfo: options?.queryInfo,
+                otelContext,
+            });
+        }),
+        label,
+        hash,
+        queryInfo: options?.queryInfo ?? (isQueryBuilder(queryInput) ? queryInfoFromQueryBuilder(queryInput) : { _tag: 'None' }),
+    };
+};
+/* An object encapsulating a reactive SQL query */
+export class LiveStoreDbQuery extends LiveStoreQueryBase {
+    _tag = 'db';
+    /** A reactive thunk representing the query text */
+    queryInput$;
+    /** A reactive thunk representing the query results */
+    results$;
+    label;
+    queryInfo;
+    reactivityGraph;
+    mapResult;
+    constructor({ queryInput, label: inputLabel, reactivityGraph, map, queryInfo: inputQueryInfo, otelContext, }) {
+        super();
+        let label = inputLabel ?? 'db(unknown)';
+        let queryInfo = inputQueryInfo ?? { _tag: 'None' };
+        this.reactivityGraph = reactivityGraph;
+        this.mapResult = map === undefined ? (rows) => rows : map;
+        const schemaRef = {
+            current: typeof queryInput === 'function' ? undefined : isQueryBuilder(queryInput) ? undefined : queryInput.schema,
+        };
+        const execBeforeFirstRunRef = {
+            current: undefined,
+        };
+        let queryInputRaw$OrQueryInputRaw;
+        const fromQueryBuilder = (qb, otelContext) => {
+            try {
+                const qbRes = qb.asSql();
+                const schema = getResultSchema(qb);
+                const ast = qb[QueryBuilderAstSymbol];
+                return {
+                    queryInputRaw: {
+                        query: qbRes.query,
+                        schema,
+                        bindValues: qbRes.bindValues,
+                        queriedTables: new Set([ast.tableDef.sqliteDef.name]),
+                        queryInfo: queryInfoFromQueryBuilder(qb),
+                    },
+                    label: ast._tag === 'RowQuery' ? rowQueryLabel(ast.tableDef, ast.id) : qb.toString(),
+                    execBeforeFirstRun: ast._tag === 'RowQuery'
+                        ? makeExecBeforeFirstRun({
+                            table: ast.tableDef,
+                            insertValues: ast.insertValues,
+                            id: ast.id,
+                            otelContext,
+                        })
+                        : undefined,
+                };
+            }
+            catch (cause) {
+                throw new UnexpectedError({ cause, note: `Error building query for ${qb.toString()}`, payload: { qb } });
+            }
+        };
+        if (typeof queryInput === 'function') {
+            queryInputRaw$OrQueryInputRaw = this.reactivityGraph.makeThunk((get, setDebugInfo, ctx, otelContext) => {
+                const startMs = performance.now();
+                const queryInputResult = queryInput(makeGetAtomResult(get, ctx, otelContext ?? ctx.rootOtelContext, this.dependencyQueriesRef), ctx);
+                const durationMs = performance.now() - startMs;
+                let queryInputRaw;
+                if (isQueryBuilder(queryInputResult)) {
+                    const res = fromQueryBuilder(queryInputResult, otelContext);
+                    queryInputRaw = res.queryInputRaw;
+                    // setting label dynamically here
+                    this.label = res.label;
+                    execBeforeFirstRunRef.current = res.execBeforeFirstRun;
+                }
+                else {
+                    queryInputRaw = queryInputResult;
+                }
+                setDebugInfo({ _tag: 'computed', label: `${this.label}:queryInput`, query: queryInputRaw.query, durationMs });
+                schemaRef.current = queryInputRaw.schema;
+                if (inputQueryInfo === undefined && queryInputRaw.queryInfo !== undefined) {
+                    queryInfo = queryInputRaw.queryInfo;
+                }
+                return queryInputRaw;
+            }, {
+                label: `${label}:query`,
+                meta: { liveStoreThunkType: 'db.query' },
+                // NOTE we're not checking the schema here as we assume the query string to always change when the schema might change
+                equal: (a, b) => a.query === b.query && deepEqual(a.bindValues, b.bindValues),
+            });
+            this.queryInput$ = queryInputRaw$OrQueryInputRaw;
+        }
+        else {
+            let queryInputRaw;
+            if (isQueryBuilder(queryInput)) {
+                const res = fromQueryBuilder(queryInput, otelContext);
+                queryInputRaw = res.queryInputRaw;
+                label = res.label;
+                execBeforeFirstRunRef.current = res.execBeforeFirstRun;
+            }
+            else {
+                queryInputRaw = queryInput;
+            }
+            schemaRef.current = queryInputRaw.schema;
+            queryInputRaw$OrQueryInputRaw = queryInputRaw;
+            // this.label = inputLabel ? this.label : `db(${})`
+            if (inputLabel === undefined && isQueryBuilder(queryInput)) {
+                const ast = queryInput[QueryBuilderAstSymbol];
+                if (ast._tag === 'RowQuery') {
+                    label = `db(${rowQueryLabel(ast.tableDef, ast.id)})`;
+                }
+            }
+            if (inputQueryInfo === undefined && queryInputRaw.queryInfo !== undefined) {
+                queryInfo = queryInputRaw.queryInfo;
+            }
+        }
+        const queriedTablesRef = { current: undefined };
+        const makeResultsEqual = (resultSchema) => (a, b) => a === NOT_REFRESHED_YET || b === NOT_REFRESHED_YET ? false : Schema.equivalence(resultSchema)(a, b);
+        // NOTE we try to create the equality function eagerly as it might be expensive
+        // TODO also support derived equality for `map` (probably will depend on having an easy way to transform a schema without an `encode` step)
+        // This would mean dropping the `map` option
+        const resultsEqual = map === undefined
+            ? schemaRef.current === undefined
+                ? (a, b) => makeResultsEqual(schemaRef.current)(a, b)
+                : makeResultsEqual(schemaRef.current)
+            : undefined;
+        const results$ = this.reactivityGraph.makeThunk((get, setDebugInfo, queryContext, otelContext, debugRefreshReason) => queryContext.otelTracer.startActiveSpan('db:...', // NOTE span name will be overridden further down
+        {
+            attributes: {
+                'livestore.debugRefreshReason': Predicate.hasProperty(debugRefreshReason, 'label')
+                    ? debugRefreshReason.label
+                    : debugRefreshReason?._tag,
+            },
+        }, otelContext ?? queryContext.rootOtelContext, (span) => {
+            const otelContext = otel.trace.setSpan(otel.context.active(), span);
+            const { store } = queryContext;
+            if (execBeforeFirstRunRef.current !== undefined) {
+                execBeforeFirstRunRef.current(queryContext, otelContext);
+                execBeforeFirstRunRef.current = undefined;
+            }
+            const queryInputResult = isThunk(queryInputRaw$OrQueryInputRaw)
+                ? get(queryInputRaw$OrQueryInputRaw, otelContext, debugRefreshReason)
+                : queryInputRaw$OrQueryInputRaw;
+            const sqlString = queryInputResult.query;
+            const bindValues = queryInputResult.bindValues;
+            if (queriedTablesRef.current === undefined) {
+                queriedTablesRef.current = store.sqliteDbWrapper.getTablesUsed(sqlString);
+            }
+            if (bindValues !== undefined) {
+                replaceSessionIdSymbol(bindValues, store.clientSession.sessionId);
+            }
+            // Establish a reactive dependency on the tables used in the query
+            for (const tableName of queriedTablesRef.current) {
+                const tableRef = store.tableRefs[tableName] ?? shouldNeverHappen(`No table ref found for ${tableName}`);
+                get(tableRef, otelContext, debugRefreshReason);
+            }
+            span.setAttribute('sql.query', sqlString);
+            span.updateName(`db:${sqlString.slice(0, 50)}`);
+            const rawDbResults = store.sqliteDbWrapper.select(sqlString, bindValues ? prepareBindValues(bindValues, sqlString) : undefined, {
+                queriedTables: queriedTablesRef.current,
+                otelContext,
+            });
+            span.setAttribute('sql.rowsCount', rawDbResults.length);
+            const parsedResult = Schema.decodeEither(schemaRef.current)(rawDbResults);
+            if (parsedResult._tag === 'Left') {
+                const parseErrorStr = TreeFormatter.formatErrorSync(parsedResult.left);
+                const expectedSchemaStr = String(schemaRef.current.ast);
+                const bindValuesStr = bindValues === undefined ? '' : `\nBind values: ${JSON.stringify(bindValues)}`;
+                console.error(`\
+Error parsing SQL query result.
+
+Query: ${sqlString}\
+${bindValuesStr}
+
+Expected schema: ${expectedSchemaStr}
+
+Error: ${parseErrorStr}
+
+Result:`, rawDbResults);
+                return shouldNeverHappen(`Error parsing SQL query result: ${parsedResult.left}`);
+            }
+            const result = this.mapResult(parsedResult.right);
+            span.end();
+            const durationMs = getDurationMsFromSpan(span);
+            this.executionTimes.push(durationMs);
+            setDebugInfo({ _tag: 'db', label: `${label}:results`, query: sqlString, durationMs });
+            return result;
+        }), { label: `${label}:results`, meta: { liveStoreThunkType: 'db.result' }, equal: resultsEqual });
+        this.results$ = results$;
+        this.label = label;
+        this.queryInfo = queryInfo;
+    }
+    destroy = () => {
+        this.isDestroyed = true;
+        if (this.queryInput$ !== undefined) {
+            this.reactivityGraph.destroyNode(this.queryInput$);
+        }
+        this.reactivityGraph.destroyNode(this.results$);
+        for (const query of this.dependencyQueriesRef) {
+            query.deref();
+        }
+    };
+}
+const queryInfoFromQueryBuilder = (qb) => {
+    const ast = qb[QueryBuilderAstSymbol];
+    return ast._tag === 'RowQuery' ? { _tag: 'Row', table: ast.tableDef, id: ast.id } : { _tag: 'None' };
+};
+//# sourceMappingURL=db-query.js.map

package/dist/live-queries/db-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"db-query.js","sourceRoot":"","sources":["../../src/live-queries/db-query.ts"],"names":[],"mappings":"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"}

package/dist/live-queries/db-query.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=db-query.test.d.ts.map

package/dist/live-queries/db-query.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"db-query.test.d.ts","sourceRoot":"","sources":["../../src/live-queries/db-query.test.ts"],"names":[],"mappings":""}

package/dist/live-queries/db-query.test.js

@@ -0,0 +1,123 @@
+import { Effect, Schema } from '@livestore/utils/effect';
+import * as otel from '@opentelemetry/api';
+import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { computed, queryDb, rawSqlMutation, sql } from '../index.js';
+import * as RG from '../reactive.js';
+import { makeTodoMvc, tables } from '../utils/tests/fixture.js';
+import { getSimplifiedRootSpan } from '../utils/tests/otel.js';
+/*
+TODO write tests for:
+
+- sql queries without and with `map` (incl. callback and schemas)
+- optional and explicit `queriedTables` argument
+*/
+describe('otel', () => {
+    let cachedProvider;
+    beforeEach(() => {
+        RG.__resetIds();
+    });
+    const makeQuery = Effect.gen(function* () {
+        const exporter = new InMemorySpanExporter();
+        // const provider = cachedProvider ?? new BasicTracerProvider({ spanProcessors: [new SimpleSpanProcessor(exporter)] })
+        const provider = cachedProvider ?? new BasicTracerProvider();
+        cachedProvider = provider;
+        provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+        provider.register();
+        const otelTracer = otel.trace.getTracer('test');
+        const span = otelTracer.startSpan('test-root');
+        const otelContext = otel.trace.setSpan(otel.context.active(), span);
+        const store = yield* makeTodoMvc({ otelTracer, otelContext });
+        return {
+            store,
+            otelTracer,
+            exporter,
+            span,
+            provider,
+        };
+    });
+    it('otel', async () => {
+        const { exporter } = await Effect.gen(function* () {
+            const { store, exporter, span } = yield* makeQuery;
+            const query$ = queryDb({
+                query: `select * from todos`,
+                schema: Schema.Array(tables.todos.schema),
+                queriedTables: new Set(['todos']),
+            });
+            expect(store.query(query$)).toMatchInlineSnapshot('[]');
+            store.mutate(rawSqlMutation({ sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)` }));
+            expect(store.query(query$)).toMatchInlineSnapshot(`
+      [
+        {
+          "completed": false,
+          "id": "t1",
+          "text": "buy milk",
+        },
+      ]
+    `);
+            span.end();
+            return { exporter };
+        }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise);
+        expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot();
+    });
+    it('with thunks', async () => {
+        const { exporter } = await Effect.gen(function* () {
+            const { store, exporter, span } = yield* makeQuery;
+            const defaultTodo = { id: '', text: '', completed: false };
+            const filter = computed(() => `where completed = 0`, { label: 'where-filter' });
+            const query$ = queryDb((get) => ({
+                query: `select * from todos ${get(filter)}`,
+                schema: Schema.Array(tables.todos.schema).pipe(Schema.headOrElse(() => defaultTodo)),
+            }), { label: 'all todos' });
+            expect(store.reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+            expect(store.query(query$)).toMatchInlineSnapshot(`
+      {
+        "completed": false,
+        "id": "",
+        "text": "",
+      }
+    `);
+            expect(store.reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+            store.mutate(rawSqlMutation({ sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)` }));
+            expect(store.reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+            expect(store.query(query$)).toMatchInlineSnapshot(`
+      {
+        "completed": false,
+        "id": "t1",
+        "text": "buy milk",
+      }
+    `);
+            expect(store.reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+            span.end();
+            return { exporter };
+        }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise);
+        expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot();
+    });
+    it('with thunks with query builder and without labels', async () => {
+        const { exporter } = await Effect.gen(function* () {
+            const { store, exporter, span } = yield* makeQuery;
+            const defaultTodo = { id: '', text: '', completed: false };
+            const filter = computed(() => ({ completed: false }));
+            const query$ = queryDb((get) => tables.todos.query.where(get(filter)).first({ fallback: () => defaultTodo }));
+            expect(store.query(query$)).toMatchInlineSnapshot(`
+      {
+        "completed": false,
+        "id": "",
+        "text": "",
+      }
+    `);
+            store.mutate(rawSqlMutation({ sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)` }));
+            expect(store.query(query$)).toMatchInlineSnapshot(`
+      {
+        "completed": false,
+        "id": "t1",
+        "text": "buy milk",
+      }
+    `);
+            span.end();
+            return { exporter };
+        }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise);
+        expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=db-query.test.js.map

package/dist/live-queries/db-query.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"db-query.test.js","sourceRoot":"","sources":["../../src/live-queries/db-query.test.ts"],"names":[],"mappings":"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"}

package/dist/live-queries/db.d.ts

@@ -29,8 +29,6 @@ export declare const queryDb: {
          * Used for debugging / devtools
          */
         label?: string;
-        reactivityGraph?: ReactivityGraph;
-        otelContext?: otel.Context;
     }): LiveQuery<TResult, TQueryInfo>;
     <TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None>(queryInput: ((get: GetAtomResult) => QueryInputRaw<TResultSchema, ReadonlyArray<any>, TQueryInfo>) | ((get: GetAtomResult) => QueryBuilder<TResultSchema, any, any, TQueryInfo>), options?: {
         map?: (rows: TResultSchema) => TResult;
@@ -38,29 +36,28 @@ export declare const queryDb: {
          * Used for debugging / devtools
          */
         label?: string;
-        reactivityGraph?: ReactivityGraph;
         queryInfo?: TQueryInfo;
-        otelContext?: otel.Context;
     }): LiveQuery<TResult, TQueryInfo>;
 };
 export declare class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None> extends LiveStoreQueryBase<TResult, TQueryInfo> {
-    _tag: 'db';
-    /** A reactive thunk representing the query text */
-    queryInput$: Thunk<QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo>, QueryContext, RefreshReason> | undefined;
-    /** A reactive thunk representing the query results */
-    results$: Thunk<TResult, QueryContext, RefreshReason>;
+    readonly _tag: 'db';
+    private thunkMap;
     label: string;
     queryInfo: TQueryInfo;
-    protected reactivityGraph: ReactivityGraph;
-    private mapResult;
-    constructor({ queryInput, label: inputLabel, reactivityGraph, map, queryInfo: inputQueryInfo, otelContext, }: {
+    private readonly inputLabel;
+    private readonly inputQueryInfo;
+    private readonly mapResult;
+    private readonly queryInput;
+    constructor({ queryInput, label: inputLabel, map, queryInfo: inputQueryInfo, }: {
         label?: string;
         queryInput: QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo> | ((get: GetAtomResult, ctx: QueryContext) => QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo>);
-        reactivityGraph?: ReactivityGraph;
         map?: (rows: TResultSchema) => TResult;
         queryInfo?: TQueryInfo;
-        otelContext?: otel.Context;
     });
-    destroy: () => void;
+    getResults$: ({ reactivityGraph, otelContext, }: {
+        reactivityGraph: ReactivityGraph;
+        otelContext?: otel.Context;
+    }) => Thunk<TResult, QueryContext, RefreshReason>;
+    destroy: (reactivityGraph: ReactivityGraph) => void;
 }
 //# sourceMappingURL=db.d.ts.map

package/dist/live-queries/db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/live-queries/db.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/live-queries/db.ts"],"names":[],"mappings":"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"}

package/dist/live-queries/db.js

@@ -2,7 +2,6 @@ import { getResultSchema, isQueryBuilder, prepareBindValues, QueryBuilderAstSymb
 import { deepEqual, shouldNeverHappen } from '@livestore/utils';
 import { Predicate, Schema, TreeFormatter } from '@livestore/utils/effect';
 import * as otel from '@opentelemetry/api';
-import { globalReactivityGraph } from '../global-state.js';
 import { isThunk, NOT_REFRESHED_YET } from '../reactive.js';
 import { makeExecBeforeFirstRun, rowQueryLabel } from '../row-query-utils.js';
 import { getDurationMsFromSpan } from '../utils/otel.js';
@@ -13,28 +12,45 @@ import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js';
 export const queryDb = (queryInput, options) => new LiveStoreDbQuery({
     queryInput,
     label: options?.label,
-    reactivityGraph: options?.reactivityGraph,
     map: options?.map,
     queryInfo: Predicate.hasProperty(options, 'queryInfo') ? options.queryInfo : undefined,
-    otelContext: options?.otelContext,
+    // otelContext: options?.otelContext,
 });
 /* An object encapsulating a reactive SQL query */
 export class LiveStoreDbQuery extends LiveStoreQueryBase {
     _tag = 'db';
-    /** A reactive thunk representing the query text */
-    queryInput$;
-    /** A reactive thunk representing the query results */
-    results$;
+    thunkMap = new Map();
     label;
     queryInfo;
-    reactivityGraph;
+    inputLabel;
+    inputQueryInfo;
     mapResult;
-    constructor({ queryInput, label: inputLabel, reactivityGraph, map, queryInfo: inputQueryInfo, otelContext, }) {
+    // private readonly otelContext: otel.Context | undefined
+    queryInput;
+    constructor({ queryInput, label: inputLabel, map, queryInfo: inputQueryInfo, }) {
         super();
-        let label = inputLabel ?? 'db(unknown)';
-        let queryInfo = inputQueryInfo ?? { _tag: 'None' };
-        this.reactivityGraph = reactivityGraph ?? globalReactivityGraph;
+        const label = inputLabel ?? 'db(unknown)';
+        this.inputLabel = label;
+        // `this.label` will later be modified by the query
+        this.label = label;
+        const queryInfo = inputQueryInfo ?? { _tag: 'None' };
+        this.inputQueryInfo = queryInfo;
+        // `this.queryInfo` will later be modified by the query
+        this.queryInfo = queryInfo;
         this.mapResult = map === undefined ? (rows) => rows : map;
+        // this.otelContext = otelContext
+        this.queryInput = queryInput;
+    }
+    getResults$ = ({ reactivityGraph, otelContext, }) => {
+        if (this.thunkMap.has(reactivityGraph)) {
+            return this.thunkMap.get(reactivityGraph).results$;
+        }
+        const inputLabel = this.inputLabel;
+        const inputQueryInfo = this.inputQueryInfo;
+        const queryInput = this.queryInput;
+        const map = this.mapResult;
+        let label = inputLabel ?? 'db(unknown)';
+        // this.reactivityGraph = reactivityGraph ?? globalReactivityGraph
         const schemaRef = {
             current: typeof queryInput === 'function' ? undefined : isQueryBuilder(queryInput) ? undefined : queryInput.schema,
         };
@@ -71,9 +87,9 @@ export class LiveStoreDbQuery extends LiveStoreQueryBase {
             }
         };
         if (typeof queryInput === 'function') {
-            queryInputRaw$OrQueryInputRaw = this.reactivityGraph.makeThunk((get, setDebugInfo, ctx, otelContext) => {
+            queryInputRaw$OrQueryInputRaw = reactivityGraph.makeThunk((get, setDebugInfo, ctx, otelContext) => {
                 const startMs = performance.now();
-                const queryInputResult = queryInput(makeGetAtomResult(get, otelContext ?? ctx.rootOtelContext), ctx);
+                const queryInputResult = queryInput(makeGetAtomResult(get, reactivityGraph, otelContext ?? ctx.rootOtelContext), ctx);
                 const durationMs = performance.now() - startMs;
                 let queryInputRaw;
                 if (isQueryBuilder(queryInputResult)) {
@@ -89,7 +105,7 @@ export class LiveStoreDbQuery extends LiveStoreQueryBase {
                 setDebugInfo({ _tag: 'computed', label: `${this.label}:queryInput`, query: queryInputRaw.query, durationMs });
                 schemaRef.current = queryInputRaw.schema;
                 if (inputQueryInfo === undefined && queryInputRaw.queryInfo !== undefined) {
-                    queryInfo = queryInputRaw.queryInfo;
+                    this.queryInfo = queryInputRaw.queryInfo;
                 }
                 return queryInputRaw;
             }, {
@@ -120,7 +136,7 @@ export class LiveStoreDbQuery extends LiveStoreQueryBase {
                 }
             }
             if (inputQueryInfo === undefined && queryInputRaw.queryInfo !== undefined) {
-                queryInfo = queryInputRaw.queryInfo;
+                this.queryInfo = queryInputRaw.queryInfo;
             }
         }
         const queriedTablesRef = { current: undefined };
@@ -133,7 +149,7 @@ export class LiveStoreDbQuery extends LiveStoreQueryBase {
                 ? (a, b) => makeResultsEqual(schemaRef.current)(a, b)
                 : makeResultsEqual(schemaRef.current)
             : undefined;
-        const results$ = this.reactivityGraph.makeThunk((get, setDebugInfo, queryContext, otelContext) => queryContext.otelTracer.startActiveSpan('db:...', // NOTE span name will be overridden further down
+        const results$ = reactivityGraph.makeThunk((get, setDebugInfo, queryContext, otelContext) => queryContext.otelTracer.startActiveSpan('db:...', // NOTE span name will be overridden further down
         {}, otelContext ?? queryContext.rootOtelContext, (span) => {
             const otelContext = otel.trace.setSpan(otel.context.active(), span);
             const { store } = queryContext;
@@ -190,15 +206,18 @@ Result:`, rawDbResults);
             setDebugInfo({ _tag: 'db', label: `${label}:results`, query: sqlString, durationMs });
             return result;
         }), { label: `${label}:results`, meta: { liveStoreThunkType: 'db.result' }, equal: resultsEqual });
-        this.results$ = results$;
-        this.label = label;
-        this.queryInfo = queryInfo;
-    }
-    destroy = () => {
-        if (this.queryInput$ !== undefined) {
-            this.reactivityGraph.destroyNode(this.queryInput$);
+        const queryInput$ = isThunk(queryInputRaw$OrQueryInputRaw)
+            ? queryInputRaw$OrQueryInputRaw
+            : undefined;
+        this.thunkMap.set(reactivityGraph, { queryInput$, results$ });
+        return results$;
+    };
+    destroy = (reactivityGraph) => {
+        const { queryInput$, results$ } = this.thunkMap.get(reactivityGraph);
+        if (queryInput$ !== undefined) {
+            reactivityGraph.destroyNode(queryInput$);
         }
-        this.reactivityGraph.destroyNode(this.results$);
+        reactivityGraph.destroyNode(results$);
     };
 }
 //# sourceMappingURL=db.js.map