@livestore/livestore 0.0.19 → 0.0.22

package/dist/reactiveQueries/graphql.d.ts

@@ -1,25 +1,43 @@
 import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core';
-import type * as otel from '@opentelemetry/api';
-import type { ComponentKey } from '../componentKey.js';
+import * as otel from '@opentelemetry/api';
+import * as graphql from 'graphql';
 import type { Thunk } from '../reactive.js';
-import type { BaseGraphQLContext, GetAtomResult, Store } from '../store.js';
-import { LiveStoreQueryBase } from './base-class.js';
-import type { LiveStoreJSQuery } from './js.js';
-export declare class LiveStoreGraphQLQuery<TResult extends Record<string, any>, VariableValues extends Record<string, any>, TContext extends BaseGraphQLContext> extends LiveStoreQueryBase<TResult> {
+import type { BaseGraphQLContext, RefreshReason, Store } from '../store.js';
+import { type GetAtomResult, LiveStoreQueryBase } from './base-class.js';
+import { type DbContext } from './graph.js';
+import { LiveStoreJSQuery } from './js.js';
+export declare const queryGraphQL: <TResult extends Record<string, any>, TVariableValues extends Record<string, any>>(document: DocumentNode<TResult, TVariableValues>, genVariableValues: TVariableValues | ((get: GetAtomResult) => TVariableValues), { label }?: {
+    label?: string | undefined;
+}) => LiveStoreGraphQLQuery<TResult, TVariableValues, BaseGraphQLContext>;
+export declare class LiveStoreGraphQLQuery<TResult extends Record<string, any>, TVariableValues extends Record<string, any>, TContext extends BaseGraphQLContext> extends LiveStoreQueryBase<TResult> {
     _tag: 'graphql';
     /** The abstract GraphQL query */
-    document: DocumentNode<TResult, VariableValues>;
+    document: DocumentNode<TResult, TVariableValues>;
     /** A reactive thunk representing the query results */
-    results$: Thunk<TResult>;
-    constructor({ document, results$, ...baseProps }: {
-        document: DocumentNode<TResult, VariableValues>;
-        context: TContext;
-        results$: Thunk<TResult>;
-        componentKey: ComponentKey;
-        label: string;
-        store: Store<TContext>;
-        otelContext: otel.Context;
+    results$: Thunk<TResult, DbContext, RefreshReason>;
+    variableValues$: Thunk<TVariableValues, DbContext, RefreshReason>;
+    label: string;
+    constructor({ document, label, genVariableValues, }: {
+        document: DocumentNode<TResult, TVariableValues>;
+        genVariableValues: TVariableValues | ((get: GetAtomResult) => TVariableValues);
+        label?: string;
     });
-    pipe: <U>(f: (x: TResult, get: GetAtomResult) => U) => LiveStoreJSQuery<U>;
+    /**
+     * Returns a new reactive query that contains the result of
+     * running an arbitrary JS computation on the results of this SQL query.
+     */
+    pipe: <U>(fn: (result: TResult, get: GetAtomResult) => U) => LiveStoreJSQuery<U>;
+    queryOnce: ({ document, otelContext, otelTracer, variableValues, store, }: {
+        document: graphql.DocumentNode;
+        otelContext: otel.Context;
+        otelTracer: otel.Tracer;
+        variableValues: TVariableValues;
+        store: Store<TContext>;
+    }) => {
+        result: TResult;
+        queriedTables: string[];
+        durationMs: number;
+    };
+    destroy: () => void;
 }
 //# sourceMappingURL=graphql.d.ts.map

package/dist/reactiveQueries/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,IAAI,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAC1F,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,qBAAa,qBAAqB,CAChC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1C,QAAQ,SAAS,kBAAkB,CACnC,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IACnC,IAAI,EAAE,SAAS,CAAY;IAE3B,iCAAiC;IACjC,QAAQ,EAAE,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;IAE/C,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;gBAEZ,EACV,QAAQ,EACR,QAAQ,EACR,GAAG,SAAS,EACb,EAAE;QACD,QAAQ,EAAE,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;QAC/C,OAAO,EAAE,QAAQ,CAAA;QACjB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACxB,YAAY,EAAE,YAAY,CAAA;QAC1B,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QACtB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;KAC1B;IAOD,IAAI,aAAc,OAAO,OAAO,aAAa,+BAW1C;CACJ"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,IAAI,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAE1F,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAGlC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAC3E,OAAO,EAAE,KAAK,aAAa,EAAE,kBAAkB,EAAqB,MAAM,iBAAiB,CAAA;AAC3F,OAAO,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE1C,eAAO,MAAM,YAAY,mLAEqB,aAAa;;yEAEW,CAAA;AAEtE,qBAAa,qBAAqB,CAChC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3C,QAAQ,SAAS,kBAAkB,CACnC,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IACnC,IAAI,EAAE,SAAS,CAAY;IAE3B,iCAAiC;IACjC,QAAQ,EAAE,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IAEhD,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;IAElD,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;IAEjE,KAAK,EAAE,MAAM,CAAA;gBAED,EACV,QAAQ,EACR,KAAK,EACL,iBAAiB,GAClB,EAAE;QACD,QAAQ,EAAE,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QAChD,iBAAiB,EAAE,eAAe,GAAG,CAAC,CAAC,GAAG,EAAE,aAAa,KAAK,eAAe,CAAC,CAAA;QAC9E,KAAK,CAAC,EAAE,MAAM,CAAA;KACf;IAkDD;;;OAGG;IACH,IAAI,mBAAoB,OAAO,OAAO,aAAa,+BAQ/C;IAEJ,SAAS;kBAOG,oBAAoB;qBACjB,KAAK,OAAO;oBACb,KAAK,MAAM;wBACP,eAAe;eACxB,MAAM,QAAQ,CAAC;;;;;MA2CvB;IAED,OAAO,aAGN;CACF"}

package/dist/reactiveQueries/graphql.js

@@ -1,18 +1,94 @@
-import { LiveStoreQueryBase } from './base-class.js';
+import { assertNever, shouldNeverHappen } from '@livestore/utils';
+import * as otel from '@opentelemetry/api';
+import * as graphql from 'graphql';
+import { getDurationMsFromSpan } from '../otel.js';
+import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js';
+import { dbGraph } from './graph.js';
+import { LiveStoreJSQuery } from './js.js';
+export const queryGraphQL = (document, genVariableValues, { label } = {}) => new LiveStoreGraphQLQuery({ document, genVariableValues, label });
 export class LiveStoreGraphQLQuery extends LiveStoreQueryBase {
-    constructor({ document, results$, ...baseProps }) {
-        super(baseProps);
+    constructor({ document, label, genVariableValues, }) {
+        super();
         this._tag = 'graphql';
-        this.pipe = (f) => this.store.queryJS((get) => {
-            const results = get(this.results$);
-            return f(results, get);
-        }, {
-            componentKey: this.componentKey,
+        /**
+         * Returns a new reactive query that contains the result of
+         * running an arbitrary JS computation on the results of this SQL query.
+         */
+        this.pipe = (fn) => new LiveStoreJSQuery({
+            fn: (get) => {
+                const results = get(this.results$);
+                return fn(results, get);
+            },
             label: `${this.label}:js`,
-            otelContext: this.otelContext,
+            onDestroy: () => this.destroy(),
         });
+        this.queryOnce = ({ document, otelContext, otelTracer, variableValues, store, }) => {
+            const schema = store.graphQLSchema ?? shouldNeverHappen("Can't run a GraphQL query on a store without GraphQL schema");
+            const context = store.graphQLContext ?? shouldNeverHappen("Can't run a GraphQL query on a store without GraphQL context");
+            const operationName = graphql.getOperationAST(document)?.name?.value;
+            return otelTracer.startActiveSpan(`executeGraphQLQuery: ${operationName}`, {}, otelContext, (span) => {
+                span.setAttribute('graphql.variables', JSON.stringify(variableValues));
+                span.setAttribute('graphql.query', graphql.print(document));
+                context.queriedTables.clear();
+                context.otelContext = otel.trace.setSpan(otel.context.active(), span);
+                const res = graphql.executeSync({
+                    document,
+                    contextValue: context,
+                    schema: schema,
+                    variableValues,
+                });
+                // TODO track number of nested SQL queries via Otel + debug info
+                if (res.errors) {
+                    span.setStatus({ code: otel.SpanStatusCode.ERROR, message: 'GraphQL error' });
+                    span.setAttribute('graphql.error', res.errors.join('\n'));
+                    span.setAttribute('graphql.error-detail', JSON.stringify(res.errors));
+                    console.error(`graphql error (${operationName})`, res.errors);
+                }
+                span.end();
+                const durationMs = getDurationMsFromSpan(span);
+                return {
+                    result: res.data,
+                    queriedTables: Array.from(context.queriedTables.values()),
+                    durationMs,
+                };
+            });
+        };
+        this.destroy = () => {
+            dbGraph.destroy(this.variableValues$);
+            dbGraph.destroy(this.results$);
+        };
+        const labelWithDefault = label ?? graphql.getOperationAST(document)?.name?.value ?? 'graphql';
+        this.label = labelWithDefault;
         this.document = document;
-        this.results$ = results$;
+        // TODO don't even create a thunk if variables are static
+        const variableValues$ = dbGraph.makeThunk((get, _setDebugInfo, { rootOtelContext }, otelContext) => {
+            if (typeof genVariableValues === 'function') {
+                return genVariableValues(makeGetAtomResult(get, otelContext ?? rootOtelContext));
+            }
+            else {
+                return genVariableValues;
+            }
+        }, { label: `${labelWithDefault}:variableValues`, meta: { liveStoreThunkType: 'graphqlVariableValues' } });
+        this.variableValues$ = variableValues$;
+        const resultsLabel = `${labelWithDefault}:results`;
+        this.results$ = dbGraph.makeThunk((get, setDebugInfo, { store, otelTracer, rootOtelContext }, otelContext) => {
+            const variableValues = get(variableValues$);
+            const { result, queriedTables, durationMs } = this.queryOnce({
+                document,
+                variableValues,
+                otelContext: otelContext ?? rootOtelContext,
+                otelTracer,
+                store: store,
+            });
+            // Add dependencies on any tables that were used
+            for (const tableName of queriedTables) {
+                const tableRef = store.tableRefs[tableName];
+                assertNever(tableRef !== undefined, `No table ref found for ${tableName}`);
+                get(tableRef);
+            }
+            setDebugInfo({ _tag: 'graphql', label: resultsLabel, query: graphql.print(document), durationMs });
+            return result;
+        }, { label: resultsLabel, meta: { liveStoreThunkType: 'graphqlResults' } });
     }
 }
 //# sourceMappingURL=graphql.js.map

package/dist/reactiveQueries/graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/reactiveQueries/graphql.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAGpD,MAAM,OAAO,qBAIX,SAAQ,kBAA2B;IASnC,YAAY,EACV,QAAQ,EACR,QAAQ,EACR,GAAG,SAAS,EASb;QACC,KAAK,CAAC,SAAS,CAAC,CAAA;QArBlB,SAAI,GAAc,SAAS,CAAA;QA2B3B,SAAI,GAAG,CAAI,CAAwC,EAAuB,EAAE,CAC1E,IAAI,CAAC,KAAK,CAAC,OAAO,CAChB,CAAC,GAAG,EAAE,EAAE;YACN,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;QACxB,CAAC,EACD;YACE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,KAAK;YACzB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CACF,CAAA;QAfD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;CAcF"}
+{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/reactiveQueries/graphql.ts"],"names":[],"mappings":"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"}

package/dist/reactiveQueries/js.d.ts

@@ -1,19 +1,24 @@
-import type * as otel from '@opentelemetry/api';
-import type { ComponentKey } from '../componentKey.js';
-import type { GetAtom, Thunk } from '../reactive.js';
-import type { Store } from '../store.js';
-import { LiveStoreQueryBase } from './base-class.js';
+import type { Thunk } from '../reactive.js';
+import type { RefreshReason } from '../store.js';
+import { type GetAtomResult, LiveStoreQueryBase } from './base-class.js';
+import type { DbContext } from './graph.js';
+export declare const queryJS: <TResult>(fn: (get: GetAtomResult) => TResult, options: {
+    label: string;
+}) => LiveStoreJSQuery<TResult>;
 export declare class LiveStoreJSQuery<TResult> extends LiveStoreQueryBase<TResult> {
     _tag: 'js';
     /** A reactive thunk representing the query results */
-    results$: Thunk<TResult>;
-    constructor({ results$, ...baseProps }: {
-        results$: Thunk<TResult>;
-        componentKey: ComponentKey;
+    results$: Thunk<TResult, DbContext, RefreshReason>;
+    label: string;
+    /** Currently only used for "nested destruction" of piped queries */
+    private onDestroy;
+    constructor({ fn, label, onDestroy, }: {
         label: string;
-        store: Store;
-        otelContext: otel.Context;
+        fn: (get: GetAtomResult) => TResult;
+        /** Currently only used for "nested destruction" of piped queries */
+        onDestroy?: () => void;
     });
-    pipe: <U>(f: (x: TResult, get: GetAtom) => U) => LiveStoreJSQuery<U>;
+    pipe: <U>(fn: (result: TResult, get: GetAtomResult) => U) => LiveStoreJSQuery<U>;
+    destroy: () => void;
 }
 //# sourceMappingURL=js.d.ts.map

package/dist/reactiveQueries/js.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/js.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEpD,qBAAa,gBAAgB,CAAC,OAAO,CAAE,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IACxE,IAAI,EAAE,IAAI,CAAO;IACjB,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;gBAEZ,EACV,QAAQ,EACR,GAAG,SAAS,EACb,EAAE;QACD,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACxB,YAAY,EAAE,YAAY,CAAA;QAC1B,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,KAAK,CAAA;QACZ,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;KAC1B;IAMD,IAAI,aAAc,OAAO,OAAO,OAAO,+BAOpC;CACJ"}
+{"version":3,"file":"js.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/js.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,KAAK,aAAa,EAAE,kBAAkB,EAAqB,MAAM,iBAAiB,CAAA;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAG3C,eAAO,MAAM,OAAO,sBAAuB,aAAa,uBAAuB;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,8BACnC,CAAA;AAE7D,qBAAa,gBAAgB,CAAC,OAAO,CAAE,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IACxE,IAAI,EAAE,IAAI,CAAO;IAEjB,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;IAElD,KAAK,EAAE,MAAM,CAAA;IAEb,oEAAoE;IACpE,OAAO,CAAC,SAAS,CAA0B;gBAE/B,EACV,EAAE,EACF,KAAK,EACL,SAAS,GACV,EAAE;QACD,KAAK,EAAE,MAAM,CAAA;QACb,EAAE,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAA;QACnC,oEAAoE;QACpE,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;KACvB;IA0BD,IAAI,mBAAoB,OAAO,OAAO,aAAa,+BAQ/C;IAEJ,OAAO,aAGN;CACF"}

package/dist/reactiveQueries/js.js

@@ -1,13 +1,35 @@
-import { LiveStoreQueryBase } from './base-class.js';
+import * as otel from '@opentelemetry/api';
+import { getDurationMsFromSpan } from '../otel.js';
+import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js';
+import { dbGraph } from './graph.js';
+export const queryJS = (fn, options) => new LiveStoreJSQuery({ fn, label: options.label });
 export class LiveStoreJSQuery extends LiveStoreQueryBase {
-    constructor({ results$, ...baseProps }) {
-        super(baseProps);
+    constructor({ fn, label, onDestroy, }) {
+        super();
         this._tag = 'js';
-        this.pipe = (f) => this.store.queryJS((get) => {
-            const results = get(this.results$);
-            return f(results, get);
-        }, { componentKey: this.componentKey, label: `${this.label}:js`, otelContext: this.otelContext });
-        this.results$ = results$;
+        this.pipe = (fn) => new LiveStoreJSQuery({
+            fn: (get) => {
+                const results = get(this.results$);
+                return fn(results, get);
+            },
+            label: `${this.label}:js`,
+            onDestroy: () => this.destroy(),
+        });
+        this.destroy = () => {
+            dbGraph.destroy(this.results$);
+            this.onDestroy?.();
+        };
+        this.onDestroy = onDestroy;
+        this.label = label;
+        const queryLabel = `${label}:results`;
+        this.results$ = dbGraph.makeThunk((get, setDebugInfo, { otelTracer, rootOtelContext }, otelContext) => otelTracer.startActiveSpan(`js:${label}`, {}, otelContext ?? rootOtelContext, (span) => {
+            const otelContext = otel.trace.setSpan(otel.context.active(), span);
+            const res = fn(makeGetAtomResult(get, otelContext));
+            span.end();
+            const durationMs = getDurationMsFromSpan(span);
+            setDebugInfo({ _tag: 'js', label, query: fn.toString(), durationMs });
+            return res;
+        }), { label: queryLabel, meta: { liveStoreThunkType: 'jsResults' } });
     }
 }
 //# sourceMappingURL=js.js.map

package/dist/reactiveQueries/js.js.map

@@ -1 +1 @@
-{"version":3,"file":"js.js","sourceRoot":"","sources":["../../src/reactiveQueries/js.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEpD,MAAM,OAAO,gBAA0B,SAAQ,kBAA2B;IAKxE,YAAY,EACV,QAAQ,EACR,GAAG,SAAS,EAOb;QACC,KAAK,CAAC,SAAS,CAAC,CAAA;QAdlB,SAAI,GAAS,IAAI,CAAA;QAmBjB,SAAI,GAAG,CAAI,CAAkC,EAAuB,EAAE,CACpE,IAAI,CAAC,KAAK,CAAC,OAAO,CAChB,CAAC,GAAG,EAAE,EAAE;YACN,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;QACxB,CAAC,EACD,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAC9F,CAAA;QAVD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;CAUF"}
+{"version":3,"file":"js.js","sourceRoot":"","sources":["../../src/reactiveQueries/js.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAGlD,OAAO,EAAsB,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,MAAM,CAAC,MAAM,OAAO,GAAG,CAAU,EAAmC,EAAE,OAA0B,EAAE,EAAE,CAClG,IAAI,gBAAgB,CAAU,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;AAE7D,MAAM,OAAO,gBAA0B,SAAQ,kBAA2B;IAWxE,YAAY,EACV,EAAE,EACF,KAAK,EACL,SAAS,GAMV;QACC,KAAK,EAAE,CAAA;QApBT,SAAI,GAAS,IAAI,CAAA;QA6CjB,SAAI,GAAG,CAAI,EAA8C,EAAuB,EAAE,CAChF,IAAI,gBAAgB,CAAC;YACnB,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE;gBACV,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAClC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YACzB,CAAC;YACD,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,KAAK;YACzB,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;SAChC,CAAC,CAAA;QAEJ,YAAO,GAAG,GAAG,EAAE;YACb,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC9B,IAAI,CAAC,SAAS,EAAE,EAAE,CAAA;QACpB,CAAC,CAAA;QApCC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAElB,MAAM,UAAU,GAAG,GAAG,KAAK,UAAU,CAAA;QAErC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,CAC/B,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,EAAE,WAAW,EAAE,EAAE,CAClE,UAAU,CAAC,eAAe,CAAC,MAAM,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,IAAI,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACrF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAA;YACnE,MAAM,GAAG,GAAG,EAAE,CAAC,iBAAiB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAA;YAEnD,IAAI,CAAC,GAAG,EAAE,CAAA;YAEV,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;YAE9C,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;YAErE,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,EACJ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,CACjE,CAAA;IACH,CAAC;CAgBF"}

package/dist/reactiveQueries/sql.d.ts

@@ -1,31 +1,41 @@
-import type * as otel from '@opentelemetry/api';
-import type { ComponentKey } from '../componentKey.js';
-import type { GetAtom, Thunk } from '../reactive.js';
-import type { Store } from '../store.js';
-import { LiveStoreQueryBase } from './base-class.js';
-import type { LiveStoreJSQuery } from './js.js';
-export declare class LiveStoreSQLQuery<Row> extends LiveStoreQueryBase<Row> {
+import type { Thunk } from '../reactive.js';
+import type { RefreshReason } from '../store.js';
+import type { Bindable } from '../util.js';
+import { type GetAtomResult, LiveStoreQueryBase } from './base-class.js';
+import type { DbContext } from './graph.js';
+import { LiveStoreJSQuery } from './js.js';
+export declare const querySQL: <Row>(query: string | ((get: GetAtomResult) => string), options?: {
+    /**
+     * Can be provided explicitly to slightly speed up initial query performance
+     *
+     * NOTE In the future we want to do this automatically at build time
+     */
+    queriedTables?: ReadonlyArray<string>;
+    bindValues?: Bindable;
+    label?: string;
+}) => LiveStoreSQLQuery<Row>;
+export declare class LiveStoreSQLQuery<Row> extends LiveStoreQueryBase<ReadonlyArray<Row>> {
     _tag: 'sql';
     /** A reactive thunk representing the query text */
-    queryString$: Thunk<string>;
+    queryString$: Thunk<string, DbContext, RefreshReason>;
     /** A reactive thunk representing the query results */
-    results$: Thunk<ReadonlyArray<Row>>;
-    constructor({ queryString$, results$, ...baseProps }: {
-        queryString$: Thunk<string>;
-        results$: Thunk<ReadonlyArray<Row>>;
-        componentKey: ComponentKey;
-        label: string;
-        store: Store;
-        otelContext: otel.Context;
+    results$: Thunk<ReadonlyArray<Row>, DbContext, RefreshReason>;
+    label: string;
+    constructor({ genQueryString, queriedTables, bindValues, label: label_, }: {
+        label?: string;
+        genQueryString: string | ((get: GetAtomResult) => string);
+        queriedTables?: ReadonlyArray<string>;
+        bindValues?: Bindable;
     });
     /**
      * Returns a new reactive query that contains the result of
      * running an arbitrary JS computation on the results of this SQL query.
      */
-    pipe: <U>(fn: (result: ReadonlyArray<Row>, get: GetAtom) => U) => LiveStoreJSQuery<U>;
+    pipe: <U>(fn: (result: ReadonlyArray<Row>, get: GetAtomResult) => U) => LiveStoreJSQuery<U>;
     /** Returns a reactive query  */
     getFirstRow: (args?: {
         defaultValue?: Row;
-    }) => LiveStoreJSQuery<Row>;
+    }) => LiveStoreJSQuery<NonNullable<Row>>;
+    destroy: () => void;
 }
 //# sourceMappingURL=sql.d.ts.map

package/dist/reactiveQueries/sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAG/C,qBAAa,iBAAiB,CAAC,GAAG,CAAE,SAAQ,kBAAkB,CAAC,GAAG,CAAC;IACjE,IAAI,EAAE,KAAK,CAAQ;IACnB,mDAAmD;IACnD,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAC3B,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;gBAEvB,EACV,YAAY,EACZ,QAAQ,EACR,GAAG,SAAS,EACb,EAAE;QACD,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC3B,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;QACnC,YAAY,EAAE,YAAY,CAAA;QAC1B,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,KAAK,CAAA;QACZ,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;KAC1B;IAOD;;;OAGG;IACH,IAAI,mBAAoB,cAAc,GAAG,CAAC,OAAO,OAAO,+BAWrD;IAEH,gCAAgC;IAChC,WAAW,UAAW;QAAE,YAAY,CAAC,EAAE,GAAG,CAAA;KAAE,2BAWzC;CACJ"}
+{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/sql.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,EAAE,KAAK,aAAa,EAAE,kBAAkB,EAAqB,MAAM,iBAAiB,CAAA;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE1C,eAAO,MAAM,QAAQ,+BACI,aAAa,KAAK,MAAM,aACrC;IACR;;;;OAIG;IACH,aAAa,CAAC,EAAE,cAAc,MAAM,CAAC,CAAA;IACrC,UAAU,CAAC,EAAE,QAAQ,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,2BAOC,CAAA;AAGJ,qBAAa,iBAAiB,CAAC,GAAG,CAAE,SAAQ,kBAAkB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAChF,IAAI,EAAE,KAAK,CAAQ;IAEnB,mDAAmD;IACnD,YAAY,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;IAErD,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;IAE7D,KAAK,EAAE,MAAM,CAAA;gBAED,EACV,cAAc,EACd,aAAa,EACb,UAAU,EACV,KAAK,EAAE,MAAM,GACd,EAAE;QACD,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,cAAc,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,aAAa,KAAK,MAAM,CAAC,CAAA;QACzD,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QACrC,UAAU,CAAC,EAAE,QAAQ,CAAA;KACtB;IA2ED;;;OAGG;IACH,IAAI,mBAAoB,cAAc,GAAG,CAAC,OAAO,aAAa,+BAQ1D;IAEJ,gCAAgC;IAChC,WAAW,UAAW;QAAE,YAAY,CAAC,EAAE,GAAG,CAAA;KAAE,wCAaxC;IAEJ,OAAO,aAGN;CACF"}

package/dist/reactiveQueries/sql.js

@@ -1,31 +1,94 @@
-import { LiveStoreQueryBase } from './base-class.js';
+import { shouldNeverHappen } from '@livestore/utils';
+import * as otel from '@opentelemetry/api';
+import { getDurationMsFromSpan } from '../otel.js';
+import { prepareBindValues } from '../util.js';
+import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js';
+import { dbGraph } from './graph.js';
+import { LiveStoreJSQuery } from './js.js';
+export const querySQL = (query, options) => new LiveStoreSQLQuery({
+    label: options?.label,
+    genQueryString: query,
+    queriedTables: options?.queriedTables,
+    bindValues: options?.bindValues,
+});
 /* An object encapsulating a reactive SQL query */
 export class LiveStoreSQLQuery extends LiveStoreQueryBase {
-    constructor({ queryString$, results$, ...baseProps }) {
-        super(baseProps);
+    constructor({ genQueryString, queriedTables, bindValues, label: label_, }) {
+        super();
         this._tag = 'sql';
         /**
          * Returns a new reactive query that contains the result of
          * running an arbitrary JS computation on the results of this SQL query.
          */
-        this.pipe = (fn) => this.store.queryJS((get) => {
-            const results = get(this.results$);
-            return fn(results, get);
-        }, {
-            componentKey: this.componentKey,
+        this.pipe = (fn) => new LiveStoreJSQuery({
+            fn: (get) => {
+                const results = get(this.results$);
+                return fn(results, get);
+            },
             label: `${this.label}:js`,
-            otelContext: this.otelContext,
+            onDestroy: () => this.destroy(),
         });
         /** Returns a reactive query  */
-        this.getFirstRow = (args) => this.store.queryJS((get) => {
-            const results = get(this.results$);
-            if (results.length === 0 && args?.defaultValue === undefined) {
-                const queryLabel = this._tag === 'sql' ? this.queryString$.result : this.label;
-                throw new Error(`Expected query ${queryLabel} to return at least one result`);
+        this.getFirstRow = (args) => new LiveStoreJSQuery({
+            fn: (get) => {
+                const results = get(this.results$);
+                if (results.length === 0 && args?.defaultValue === undefined) {
+                    // const queryLabel = this._tag === 'sql' ? this.queryString$!.computeResult(otelContext) : this.label
+                    const queryLabel = this.label;
+                    throw new Error(`Expected query ${queryLabel} to return at least one result`);
+                }
+                return results[0] ?? args.defaultValue;
+            },
+            label: `${this.label}:first`,
+            onDestroy: () => this.destroy(),
+        });
+        this.destroy = () => {
+            dbGraph.destroy(this.queryString$);
+            dbGraph.destroy(this.results$);
+        };
+        const label = label_ ?? genQueryString.toString();
+        this.label = `sql(${label})`;
+        // TODO don't even create a thunk if query string is static
+        const queryString$ = dbGraph.makeThunk((get, setDebugInfo, { rootOtelContext }, otelContext) => {
+            if (typeof genQueryString === 'function') {
+                const startMs = performance.now();
+                const queryString = genQueryString(makeGetAtomResult(get, otelContext ?? rootOtelContext));
+                const durationMs = performance.now() - startMs;
+                setDebugInfo({ _tag: 'js', label: `${label}:queryString`, query: queryString, durationMs });
+                return queryString;
+            }
+            else {
+                return genQueryString;
             }
-            return (results[0] ?? args?.defaultValue);
-        }, { componentKey: this.componentKey, label: `${this.label}:first`, otelContext: this.otelContext });
+        }, { label: `${label}:queryString`, meta: { liveStoreThunkType: 'sqlQueryString' } });
         this.queryString$ = queryString$;
+        const queryLabel = `${label}:results`;
+        const queriedTablesRef = { current: queriedTables };
+        const results$ = dbGraph.makeThunk((get, setDebugInfo, { store, otelTracer, rootOtelContext }, otelContext) => otelTracer.startActiveSpan('sql:...', // NOTE span name will be overridden further down
+        {}, otelContext ?? rootOtelContext, (span) => {
+            const otelContext = otel.trace.setSpan(otel.context.active(), span);
+            const sqlString = get(queryString$, otelContext);
+            if (queriedTablesRef.current === undefined) {
+                queriedTablesRef.current = store.inMemoryDB.getTablesUsed(sqlString);
+            }
+            // 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);
+            }
+            span.setAttribute('sql.query', sqlString);
+            span.updateName(`sql:${sqlString.slice(0, 50)}`);
+            const results = store.inMemoryDB.select(sqlString, {
+                queriedTables,
+                bindValues: bindValues ? prepareBindValues(bindValues, sqlString) : undefined,
+                otelContext,
+            });
+            span.setAttribute('sql.rowsCount', results.length);
+            span.end();
+            const durationMs = getDurationMsFromSpan(span);
+            setDebugInfo({ _tag: 'sql', label, query: sqlString, durationMs });
+            return results;
+        }), { label: queryLabel });
         this.results$ = results$;
     }
 }

package/dist/reactiveQueries/sql.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../src/reactiveQueries/sql.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAGpD,kDAAkD;AAClD,MAAM,OAAO,iBAAuB,SAAQ,kBAAuB;IAOjE,YAAY,EACV,YAAY,EACZ,QAAQ,EACR,GAAG,SAAS,EAQb;QACC,KAAK,CAAC,SAAS,CAAC,CAAA;QAlBlB,SAAI,GAAU,KAAK,CAAA;QAwBnB;;;WAGG;QACH,SAAI,GAAG,CAAI,EAAmD,EAAuB,EAAE,CACrF,IAAI,CAAC,KAAK,CAAC,OAAO,CAChB,CAAC,GAAG,EAAE,EAAE;YACN,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;QACzB,CAAC,EACD;YACE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,KAAK;YACzB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CACF,CAAA;QAEH,gCAAgC;QAChC,gBAAW,GAAG,CAAC,IAA6B,EAAE,EAAE,CAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAChB,CAAC,GAAG,EAAE,EAAE;YACN,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,EAAE,YAAY,KAAK,SAAS,EAAE;gBAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAA;gBAC9E,MAAM,IAAI,KAAK,CAAC,kBAAkB,UAAU,gCAAgC,CAAC,CAAA;aAC9E;YACD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,YAAY,CAAQ,CAAA;QAClD,CAAC,EACD,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CACjG,CAAA;QAjCD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;CAgCF"}
+{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../src/reactiveQueries/sql.ts"],"names":[],"mappings":"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"}