@livestore/livestore 0.0.13 → 0.0.14

package/dist/reactiveQueries/base-class.d.ts

@@ -1,24 +1,32 @@
-import * as otel from '@opentelemetry/api';
-import type { ComponentKey } from '../componentKey.js';
-import type { Store } from '../store.js';
+import type * as otel from '@opentelemetry/api';
+import type { StackInfo } from '../react/utils/extractStackInfoFromStackTrace.js';
+import type { Atom, GetAtom, Thunk } from '../reactive.js';
+import { type DbContext } from './graph.js';
+import type { LiveStoreJSQuery } from './js.js';
 export type UnsubscribeQuery = () => void;
-export declare abstract class LiveStoreQueryBase {
-    /** The key for the associated component */
-    componentKey: ComponentKey;
-    /** Human-readable label for the query for debugging */
+export interface ILiveStoreQuery<TResult> {
+    id: number;
+    /** A reactive thunk representing the query results */
+    results$: Thunk<TResult, DbContext>;
     label: string;
-    /** A pointer back to the store containing this query */
-    store: Store<any>;
-    /** Otel Span is started in LiveStore store but ended in this query */
-    otelContext: otel.Context;
-    /** The string key is used to identify a subscription from "outside" */
-    activeSubscriptions: Map<string, UnsubscribeQuery>;
-    constructor({ componentKey, label, store, otelContext, }: {
-        componentKey: ComponentKey;
-        label: string;
-        store: Store<any>;
-        otelContext: otel.Context;
-    });
-    destroy: () => void;
+    run: (otelContext?: otel.Context) => TResult;
+    destroy(): void;
+    activeSubscriptions: Set<SubscriberInfo>;
+}
+export type SubscriberInfo = {
+    stack: StackInfo[];
+};
+export declare abstract class LiveStoreQueryBase<TResult> implements ILiveStoreQuery<TResult> {
+    id: number;
+    /** Human-readable label for the query for debugging */
+    abstract label: string;
+    abstract results$: Thunk<TResult, DbContext>;
+    activeSubscriptions: Set<SubscriberInfo>;
+    get runs(): number;
+    abstract destroy: () => void;
+    run: (otelContext?: otel.Context) => TResult;
+    runAndDestroy: (otelContext?: otel.Context) => TResult;
 }
+export type GetAtomResult = <T>(atom: Atom<T, any> | LiveStoreJSQuery<T>) => T;
+export declare const makeGetAtomResult: (get: GetAtom, otelContext: otel.Context) => GetAtomResult;
 //# sourceMappingURL=base-class.d.ts.map

package/dist/reactiveQueries/base-class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-class.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/base-class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAA;AAEzC,8BAAsB,kBAAkB;IACtC,2CAA2C;IAC3C,YAAY,EAAE,YAAY,CAAA;IAC1B,uDAAuD;IACvD,KAAK,EAAE,MAAM,CAAA;IACb,wDAAwD;IACxD,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;IACjB,sEAAsE;IACtE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;IAEzB,uEAAuE;IACvE,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAY;gBAElD,EACV,YAAY,EACZ,KAAK,EACL,KAAK,EACL,WAAW,GACZ,EAAE;QACD,YAAY,EAAE,YAAY,CAAA;QAC1B,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;QACjB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;KAC1B;IAOD,OAAO,aAUN;CACF"}
+{"version":3,"file":"base-class.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/base-class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kDAAkD,CAAA;AACjF,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC1D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,MAAM,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAA;AAIzC,MAAM,WAAW,eAAe,CAAC,OAAO;IACtC,EAAE,EAAE,MAAM,CAAA;IAEV,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IAEnC,KAAK,EAAE,MAAM,CAAA;IAEb,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,KAAK,OAAO,CAAA;IAE5C,OAAO,IAAI,IAAI,CAAA;IAEf,mBAAmB,EAAE,GAAG,CAAC,cAAc,CAAC,CAAA;CACzC;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,SAAS,EAAE,CAAA;CACnB,CAAA;AAED,8BAAsB,kBAAkB,CAAC,OAAO,CAAE,YAAW,eAAe,CAAC,OAAO,CAAC;IACnF,EAAE,SAAmB;IAErB,uDAAuD;IACvD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IAEtB,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IAE5C,mBAAmB,EAAE,GAAG,CAAC,cAAc,CAAC,CAAY;IAEpD,IAAI,IAAI,WAEP;IAED,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;IAQ5B,GAAG,iBAAkB,KAAK,OAAO,KAAG,OAAO,CAA4C;IAEvF,aAAa,iBAAkB,KAAK,OAAO,KAAG,OAAO,CAIpD;CACF;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;AAE9E,eAAO,MAAM,iBAAiB,QAAS,OAAO,eAAe,KAAK,OAAO,kBAOxE,CAAA"}

package/dist/reactiveQueries/base-class.js

@@ -1,22 +1,30 @@
-import * as otel from '@opentelemetry/api';
+let queryIdCounter = 0;
 export class LiveStoreQueryBase {
-    constructor({ componentKey, label, store, otelContext, }) {
-        /** The string key is used to identify a subscription from "outside" */
-        this.activeSubscriptions = new Map();
-        this.destroy = () => {
-            const span = otel.trace.getSpan(this.otelContext);
-            span.end();
-            // NOTE usually the `unsubscribe` function is called by `useLiveStoreComponent` but this code path
-            // is used for manual store destruction, so we need to manually unsubscribe here
-            for (const [_key, unsubscribe] of this.activeSubscriptions) {
-                // unsubscribe from the query
-                unsubscribe();
-            }
+    constructor() {
+        this.id = queryIdCounter++;
+        this.activeSubscriptions = new Set();
+        // subscribe = (
+        //   onNewValue: (value: TResult) => void,
+        //   onSubsubscribe?: () => void,
+        //   options?: { label?: string } | undefined,
+        // ): (() => void) => this.store.subscribe(this as any, onNewValue as any, onSubsubscribe, options)
+        this.run = (otelContext) => this.results$.computeResult(otelContext);
+        this.runAndDestroy = (otelContext) => {
+            const result = this.run(otelContext);
+            this.destroy();
+            return result;
         };
-        this.componentKey = componentKey;
-        this.label = label;
-        this.store = store;
-        this.otelContext = otelContext;
+    }
+    get runs() {
+        return this.results$.recomputations;
     }
 }
+export const makeGetAtomResult = (get, otelContext) => {
+    const getAtom = (atom) => {
+        if (atom._tag === 'thunk' || atom._tag === 'ref')
+            return get(atom, otelContext);
+        return get(atom.results$, otelContext);
+    };
+    return getAtom;
+};
 //# sourceMappingURL=base-class.js.map

package/dist/reactiveQueries/base-class.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-class.js","sourceRoot":"","sources":["../../src/reactiveQueries/base-class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAO1C,MAAM,OAAgB,kBAAkB;IAatC,YAAY,EACV,YAAY,EACZ,KAAK,EACL,KAAK,EACL,WAAW,GAMZ;QAbD,uEAAuE;QACvE,wBAAmB,GAAkC,IAAI,GAAG,EAAE,CAAA;QAmB9D,YAAO,GAAG,GAAG,EAAE;YACb,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAE,CAAA;YAClD,IAAI,CAAC,GAAG,EAAE,CAAA;YAEV,kGAAkG;YAClG,gFAAgF;YAChF,KAAK,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,CAAC,mBAAmB,EAAE;gBAC1D,6BAA6B;gBAC7B,WAAW,EAAE,CAAA;aACd;QACH,CAAC,CAAA;QAhBC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAChC,CAAC;CAaF"}
+{"version":3,"file":"base-class.js","sourceRoot":"","sources":["../../src/reactiveQueries/base-class.ts"],"names":[],"mappings":"AASA,IAAI,cAAc,GAAG,CAAC,CAAA;AAqBtB,MAAM,OAAgB,kBAAkB;IAAxC;QACE,OAAE,GAAG,cAAc,EAAE,CAAA;QAOrB,wBAAmB,GAAwB,IAAI,GAAG,EAAE,CAAA;QAQpD,gBAAgB;QAChB,0CAA0C;QAC1C,iCAAiC;QACjC,8CAA8C;QAC9C,mGAAmG;QAEnG,QAAG,GAAG,CAAC,WAA0B,EAAW,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;QAEvF,kBAAa,GAAG,CAAC,WAA0B,EAAW,EAAE;YACtD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACpC,IAAI,CAAC,OAAO,EAAE,CAAA;YACd,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IACH,CAAC;IAnBC,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAA;IACrC,CAAC;CAiBF;AAID,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAY,EAAE,WAAyB,EAAE,EAAE;IAC3E,MAAM,OAAO,GAAkB,CAAC,IAAI,EAAE,EAAE;QACtC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK;YAAE,OAAO,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;QAC/E,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;IACxC,CAAC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/dist/reactiveQueries/graph.d.ts

@@ -0,0 +1,10 @@
+import type * as otel from '@opentelemetry/api';
+import { ReactiveGraph } from '../reactive.js';
+import type { QueryDebugInfo, RefreshReason, Store } from '../store.js';
+export type DbContext = {
+    store: Store;
+    otelTracer: otel.Tracer;
+    rootOtelContext: otel.Context;
+};
+export declare const dbGraph: ReactiveGraph<RefreshReason, QueryDebugInfo, DbContext>;
+//# sourceMappingURL=graph.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/reactiveQueries/graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAG/C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEvE,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,KAAK,CAAA;IACZ,UAAU,EAAE,IAAI,CAAC,MAAM,CAAA;IACvB,eAAe,EAAE,IAAI,CAAC,OAAO,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,OAAO,yDAElB,CAAA"}

package/dist/reactiveQueries/graph.js

@@ -0,0 +1,6 @@
+import ReactDOM from 'react-dom';
+import { ReactiveGraph } from '../reactive.js';
+export const dbGraph = new ReactiveGraph({
+    effectsWrapper: (run) => ReactDOM.unstable_batchedUpdates(() => run()),
+});
+//# sourceMappingURL=graph.js.map

package/dist/reactiveQueries/graph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../src/reactiveQueries/graph.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAS9C,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,aAAa,CAA2C;IACjF,cAAc,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;CACvE,CAAC,CAAA"}

package/dist/reactiveQueries/graphql.d.ts

@@ -1,25 +1,42 @@
 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 type { GetAtom, Thunk } from '../reactive.js';
-import type { BaseGraphQLContext, 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 {
+import * as otel from '@opentelemetry/api';
+import * as graphql from 'graphql';
+import type { Thunk } from '../reactive.js';
+import { type BaseGraphQLContext, type 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>;
+    variableValues$: Thunk<TVariableValues, DbContext>;
+    label: string;
+    constructor({ document, label, genVariableValues, }: {
+        document: DocumentNode<TResult, TVariableValues>;
+        genVariableValues: TVariableValues | ((get: GetAtomResult) => TVariableValues);
+        label?: string;
     });
-    pipe: <U>(f: (x: TResult, get: GetAtom) => 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[];
+    };
+    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,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAC5D,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;IAC1B,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,OAAO,+BAWpC;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;AAElC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAA;AACjE,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,CAAC,CAAA;IAEnC,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,SAAS,CAAC,CAAA;IAElD,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;IAuDD;;;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;;;;MAyCvB;IAED,OAAO,aAGN;CACF"}

package/dist/reactiveQueries/graphql.js

@@ -1,18 +1,99 @@
-import { LiveStoreQueryBase } from './base-class.js';
+import { assertNever, shouldNeverHappen } from '@livestore/utils';
+import * as otel from '@opentelemetry/api';
+import * as graphql from 'graphql';
+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, // context,
+     }) {
+        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 = this.schema
+            // const context = this.context
+            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) => {
+                try {
+                    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);
+                    }
+                    return { result: res.data, queriedTables: Array.from(context.queriedTables.values()) };
+                }
+                finally {
+                    span.end();
+                }
+            });
+        };
+        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$;
+        // if (context === undefined) {
+        //   return shouldNeverHappen("Can't run a GraphQL query on a store without GraphQL context")
+        // }
+        // TODO don't even create a thunk if variables are static
+        const variableValues$ = dbGraph.makeThunk((get, _addDebugInfo, { 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.temporaryQueries ? ':temp' : '')
+        const resultsLabel = `${labelWithDefault}:results`;
+        this.results$ = dbGraph.makeThunk((get, addDebugInfo, { store, otelTracer, rootOtelContext }, otelContext) => {
+            const variableValues = get(variableValues$);
+            const { result, queriedTables } = 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);
+            }
+            addDebugInfo({ _tag: 'graphql', label: resultsLabel, query: graphql.print(document) });
+            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,kBAAkB;IAS1B,YAAY,EACV,QAAQ,EACR,QAAQ,EACR,GAAG,SAAS,EASb;QACC,KAAK,CAAC,SAAS,CAAC,CAAA;QArBlB,SAAI,GAAc,SAAS,CAAA;QA2B3B,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;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,23 @@
-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';
-export declare class LiveStoreJSQuery<TResult> extends LiveStoreQueryBase {
+import type { Thunk } from '../reactive.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>;
+    label: string;
+    /** Currently only used for "nested destruction" of piped queries */
+    private onDestroy;
+    constructor({ fn, label, onDestroy, }: {
         label: string;
-        store: Store<any>;
-        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;IAC/D,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,CAAC,GAAG,CAAC,CAAA;QACjB,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":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,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,CAAC,CAAA;IAEnC,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;IAwBD,IAAI,mBAAoB,OAAO,OAAO,aAAa,+BAQ/C;IAEJ,OAAO,aAGN;CACF"}

package/dist/reactiveQueries/js.js

@@ -1,13 +1,36 @@
-import { LiveStoreQueryBase } from './base-class.js';
+import * as otel from '@opentelemetry/api';
+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, addDebugInfo, { otelTracer, rootOtelContext }, otelContext) => otelTracer.startActiveSpan(`js:${label}`, {}, otelContext ?? rootOtelContext, (span) => {
+            try {
+                addDebugInfo({ _tag: 'js', label, query: fn.toString() });
+                const otelContext = otel.trace.setSpan(otel.context.active(), span);
+                return fn(makeGetAtomResult(get, otelContext));
+            }
+            finally {
+                span.end();
+            }
+        }), { 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,kBAAkB;IAK/D,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;AAG1C,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;QA2CjB,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;QAlCC,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,IAAI;gBACF,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;gBAEzD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAA;gBACnE,OAAO,EAAE,CAAC,iBAAiB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAA;aAC/C;oBAAS;gBACR,IAAI,CAAC,GAAG,EAAE,CAAA;aACX;QACH,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,35 @@
-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 {
+import type { Thunk } from '../reactive.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: {
+    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>;
     /** A reactive thunk representing the query results */
-    results$: Thunk<Row[]>;
-    constructor({ queryString$, results$, ...baseProps }: {
-        queryString$: Thunk<string>;
-        results$: Thunk<Row[]>;
-        componentKey: ComponentKey;
-        label: string;
-        store: Store<any>;
-        otelContext: otel.Context;
+    results$: Thunk<ReadonlyArray<Row>, DbContext>;
+    label: string;
+    constructor({ genQueryString, queriedTables, bindValues, 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>(f: (result: 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;IAC5D,IAAI,EAAE,KAAK,CAAQ;IACnB,mDAAmD;IACnD,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAC3B,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAA;gBAEV,EACV,YAAY,EACZ,QAAQ,EACR,GAAG,SAAS,EACb,EAAE;QACD,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC3B,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAA;QACtB,YAAY,EAAE,YAAY,CAAA;QAC1B,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;QACjB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;KAC1B;IAOD;;;OAGG;IACH,IAAI,kBAAmB,GAAG,EAAE,OAAO,OAAO,+BAWvC;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":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,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,YACtC;IACP,aAAa,EAAE,cAAc,MAAM,CAAC,CAAA;IACpC,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,CAAC,CAAA;IAEtC,sDAAsD;IACtD,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAA;IAE9C,KAAK,EAAE,MAAM,CAAA;gBAED,EACV,cAAc,EACd,aAAa,EACb,UAAU,EACV,KAAK,GACN,EAAE;QACD,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,cAAc,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,aAAa,KAAK,MAAM,CAAC,CAAA;QACzD,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QACpC,UAAU,CAAC,EAAE,QAAQ,CAAA;KACtB;IAyED;;;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"}