@livestore/livestore 0.1.0-dev.9 → 0.2.0-dev.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/dist/.tsbuildinfo +1 -1
- package/dist/global-state.d.ts +1 -1
- package/dist/global-state.d.ts.map +1 -1
- package/dist/global-state.js +1 -1
- package/dist/global-state.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -5
- package/dist/index.js.map +1 -1
- package/dist/live-queries/base-class.d.ts +64 -0
- package/dist/live-queries/base-class.d.ts.map +1 -0
- package/dist/live-queries/base-class.js +31 -0
- package/dist/live-queries/base-class.js.map +1 -0
- package/dist/live-queries/computed.d.ts +26 -0
- package/dist/live-queries/computed.d.ts.map +1 -0
- package/dist/{reactiveQueries/js.js → live-queries/computed.js} +7 -26
- package/dist/live-queries/computed.js.map +1 -0
- package/dist/live-queries/db.d.ts +66 -0
- package/dist/live-queries/db.d.ts.map +1 -0
- package/dist/live-queries/db.js +199 -0
- package/dist/live-queries/db.js.map +1 -0
- package/dist/live-queries/db.test.d.ts +2 -0
- package/dist/live-queries/db.test.d.ts.map +1 -0
- package/dist/live-queries/db.test.js +117 -0
- package/dist/live-queries/db.test.js.map +1 -0
- package/dist/live-queries/graphql.d.ts +49 -0
- package/dist/live-queries/graphql.d.ts.map +1 -0
- package/dist/live-queries/graphql.js +122 -0
- package/dist/live-queries/graphql.js.map +1 -0
- package/dist/live-queries/sql.d.ts +62 -0
- package/dist/live-queries/sql.d.ts.map +1 -0
- package/dist/live-queries/sql.js +175 -0
- package/dist/live-queries/sql.js.map +1 -0
- package/dist/live-queries/sql.test.d.ts +2 -0
- package/dist/live-queries/sql.test.d.ts.map +1 -0
- package/{src/reactiveQueries/sql.test.ts → dist/live-queries/sql.test.js} +68 -91
- package/dist/live-queries/sql.test.js.map +1 -0
- package/dist/reactiveQueries/base-class.d.ts +6 -2
- package/dist/reactiveQueries/base-class.d.ts.map +1 -1
- package/dist/reactiveQueries/base-class.js +2 -0
- package/dist/reactiveQueries/base-class.js.map +1 -1
- package/dist/reactiveQueries/computed.d.ts +4 -13
- package/dist/reactiveQueries/computed.d.ts.map +1 -1
- package/dist/reactiveQueries/computed.js +2 -21
- package/dist/reactiveQueries/computed.js.map +1 -1
- package/dist/reactiveQueries/graphql.d.ts +4 -8
- package/dist/reactiveQueries/graphql.d.ts.map +1 -1
- package/dist/reactiveQueries/graphql.js +1 -15
- package/dist/reactiveQueries/graphql.js.map +1 -1
- package/dist/reactiveQueries/sql.d.ts +36 -23
- package/dist/reactiveQueries/sql.d.ts.map +1 -1
- package/dist/reactiveQueries/sql.js +100 -55
- package/dist/reactiveQueries/sql.js.map +1 -1
- package/dist/reactiveQueries/sql.test.js +12 -11
- package/dist/reactiveQueries/sql.test.js.map +1 -1
- package/dist/row-query-utils.d.ts +17 -0
- package/dist/row-query-utils.d.ts.map +1 -0
- package/dist/row-query-utils.js +30 -0
- package/dist/row-query-utils.js.map +1 -0
- package/dist/row-query.d.ts +10 -27
- package/dist/row-query.d.ts.map +1 -1
- package/dist/row-query.js +16 -66
- package/dist/row-query.js.map +1 -1
- package/dist/store/create-store.d.ts +1 -1
- package/dist/store/create-store.d.ts.map +1 -1
- package/dist/store/devtools.d.ts +1 -1
- package/dist/store/devtools.d.ts.map +1 -1
- package/dist/store/devtools.js.map +1 -1
- package/dist/store/store-types.d.ts +2 -2
- package/dist/store/store-types.d.ts.map +1 -1
- package/dist/store/store.d.ts +8 -3
- package/dist/store/store.d.ts.map +1 -1
- package/dist/store/store.js +32 -4
- package/dist/store/store.js.map +1 -1
- package/dist/utils/tests/fixture.d.ts +168 -132
- package/dist/utils/tests/fixture.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/global-state.ts +1 -1
- package/src/index.ts +8 -5
- package/src/live-queries/__snapshots__/db.test.ts.snap +301 -0
- package/src/{reactiveQueries → live-queries}/base-class.ts +10 -5
- package/src/{reactiveQueries → live-queries}/computed.ts +5 -29
- package/src/live-queries/db.test.ts +153 -0
- package/src/live-queries/db.ts +350 -0
- package/src/{reactiveQueries → live-queries}/graphql.ts +6 -21
- package/src/row-query-utils.ts +65 -0
- package/src/store/create-store.ts +1 -1
- package/src/store/devtools.ts +1 -1
- package/src/store/store-types.ts +2 -2
- package/src/store/store.ts +44 -7
- package/dist/reactiveQueries/js.d.ts +0 -35
- package/dist/reactiveQueries/js.d.ts.map +0 -1
- package/dist/reactiveQueries/js.js.map +0 -1
- package/dist/store/store-context.d.ts +0 -26
- package/dist/store/store-context.d.ts.map +0 -1
- package/dist/store/store-context.js +0 -6
- package/dist/store/store-context.js.map +0 -1
- package/dist/store-context.d.ts +0 -26
- package/dist/store-context.d.ts.map +0 -1
- package/dist/store-context.js +0 -6
- package/dist/store-context.js.map +0 -1
- package/dist/store-devtools.d.ts +0 -19
- package/dist/store-devtools.d.ts.map +0 -1
- package/dist/store-devtools.js +0 -141
- package/dist/store-devtools.js.map +0 -1
- package/dist/store.d.ts +0 -175
- package/dist/store.d.ts.map +0 -1
- package/dist/store.js +0 -509
- package/dist/store.js.map +0 -1
- package/src/reactiveQueries/sql.ts +0 -226
- package/src/row-query.ts +0 -196
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import { Effect, Schema } from '@livestore/utils/effect';
|
|
2
|
+
import * as otel from '@opentelemetry/api';
|
|
3
|
+
import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
|
|
4
|
+
import { describe, expect, it } from 'vitest';
|
|
5
|
+
import { computed, queryDb, rawSqlMutation, sql } from '../index.js';
|
|
6
|
+
import { makeTodoMvc, tables } from '../utils/tests/fixture.js';
|
|
7
|
+
import { getSimplifiedRootSpan } from '../utils/tests/otel.js';
|
|
8
|
+
/*
|
|
9
|
+
TODO write tests for:
|
|
10
|
+
|
|
11
|
+
- sql queries without and with `map` (incl. callback and schemas)
|
|
12
|
+
- optional and explicit `queriedTables` argument
|
|
13
|
+
*/
|
|
14
|
+
describe('otel', () => {
|
|
15
|
+
let cachedProvider;
|
|
16
|
+
const makeQuery = Effect.gen(function* () {
|
|
17
|
+
const exporter = new InMemorySpanExporter();
|
|
18
|
+
const provider = cachedProvider ?? new BasicTracerProvider();
|
|
19
|
+
cachedProvider = provider;
|
|
20
|
+
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
|
|
21
|
+
provider.register();
|
|
22
|
+
const otelTracer = otel.trace.getTracer('test');
|
|
23
|
+
const span = otelTracer.startSpan('test');
|
|
24
|
+
const otelContext = otel.trace.setSpan(otel.context.active(), span);
|
|
25
|
+
const { store } = yield* makeTodoMvc({ otelTracer, otelContext });
|
|
26
|
+
return {
|
|
27
|
+
store,
|
|
28
|
+
otelTracer,
|
|
29
|
+
exporter,
|
|
30
|
+
span,
|
|
31
|
+
provider,
|
|
32
|
+
};
|
|
33
|
+
});
|
|
34
|
+
it('otel', async () => {
|
|
35
|
+
const { exporter } = await Effect.gen(function* () {
|
|
36
|
+
const { store, exporter, span } = yield* makeQuery;
|
|
37
|
+
const query$ = queryDb({
|
|
38
|
+
query: `select * from todos`,
|
|
39
|
+
schema: Schema.Array(tables.todos.schema),
|
|
40
|
+
queriedTables: new Set(['todos']),
|
|
41
|
+
});
|
|
42
|
+
expect(query$.run()).toMatchInlineSnapshot('[]');
|
|
43
|
+
store.mutate(rawSqlMutation({ sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)` }));
|
|
44
|
+
expect(query$.run()).toMatchInlineSnapshot(`
|
|
45
|
+
[
|
|
46
|
+
{
|
|
47
|
+
"completed": false,
|
|
48
|
+
"id": "t1",
|
|
49
|
+
"text": "buy milk",
|
|
50
|
+
},
|
|
51
|
+
]
|
|
52
|
+
`);
|
|
53
|
+
query$.destroy();
|
|
54
|
+
span.end();
|
|
55
|
+
return { exporter };
|
|
56
|
+
}).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise);
|
|
57
|
+
expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot();
|
|
58
|
+
});
|
|
59
|
+
it('with thunks', async () => {
|
|
60
|
+
const { exporter } = await Effect.gen(function* () {
|
|
61
|
+
const { store, exporter, span } = yield* makeQuery;
|
|
62
|
+
const defaultTodo = { id: '', text: '', completed: false };
|
|
63
|
+
const filter = computed(() => `where completed = 0`, { label: 'where-filter' });
|
|
64
|
+
const query$ = queryDb((get) => ({
|
|
65
|
+
query: `select * from todos ${get(filter)}`,
|
|
66
|
+
schema: Schema.Array(tables.todos.schema).pipe(Schema.headOrElse(() => defaultTodo)),
|
|
67
|
+
}), { label: 'all todos' });
|
|
68
|
+
expect(query$.run()).toMatchInlineSnapshot(`
|
|
69
|
+
{
|
|
70
|
+
"completed": false,
|
|
71
|
+
"id": "",
|
|
72
|
+
"text": "",
|
|
73
|
+
}
|
|
74
|
+
`);
|
|
75
|
+
store.mutate(rawSqlMutation({ sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)` }));
|
|
76
|
+
expect(query$.run()).toMatchInlineSnapshot(`
|
|
77
|
+
{
|
|
78
|
+
"completed": false,
|
|
79
|
+
"id": "t1",
|
|
80
|
+
"text": "buy milk",
|
|
81
|
+
}
|
|
82
|
+
`);
|
|
83
|
+
query$.destroy();
|
|
84
|
+
span.end();
|
|
85
|
+
return { exporter };
|
|
86
|
+
}).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise);
|
|
87
|
+
expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot();
|
|
88
|
+
});
|
|
89
|
+
it('with thunks with query builder and without labels', async () => {
|
|
90
|
+
const { exporter } = await Effect.gen(function* () {
|
|
91
|
+
const { store, exporter, span } = yield* makeQuery;
|
|
92
|
+
const defaultTodo = { id: '', text: '', completed: false };
|
|
93
|
+
const filter = computed(() => ({ completed: false }));
|
|
94
|
+
const query$ = queryDb((get) => tables.todos.query.where(get(filter)).first({ fallback: () => defaultTodo }));
|
|
95
|
+
expect(query$.run()).toMatchInlineSnapshot(`
|
|
96
|
+
{
|
|
97
|
+
"completed": false,
|
|
98
|
+
"id": "",
|
|
99
|
+
"text": "",
|
|
100
|
+
}
|
|
101
|
+
`);
|
|
102
|
+
store.mutate(rawSqlMutation({ sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)` }));
|
|
103
|
+
expect(query$.run()).toMatchInlineSnapshot(`
|
|
104
|
+
{
|
|
105
|
+
"completed": false,
|
|
106
|
+
"id": "t1",
|
|
107
|
+
"text": "buy milk",
|
|
108
|
+
}
|
|
109
|
+
`);
|
|
110
|
+
query$.destroy();
|
|
111
|
+
span.end();
|
|
112
|
+
return { exporter };
|
|
113
|
+
}).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise);
|
|
114
|
+
expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot();
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
//# sourceMappingURL=db.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"db.test.js","sourceRoot":"","sources":["../../src/live-queries/db.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core';
|
|
2
|
+
import type { QueryInfo } from '@livestore/common';
|
|
3
|
+
import { Schema } from '@livestore/utils/effect';
|
|
4
|
+
import * as otel from '@opentelemetry/api';
|
|
5
|
+
import * as graphql from 'graphql';
|
|
6
|
+
import { type Thunk } from '../reactive.js';
|
|
7
|
+
import type { Store } from '../store/store.js';
|
|
8
|
+
import type { BaseGraphQLContext, RefreshReason } from '../store/store-types.js';
|
|
9
|
+
import type { GetAtomResult, LiveQuery, QueryContext, ReactivityGraph } from './base-class.js';
|
|
10
|
+
import { LiveStoreQueryBase } from './base-class.js';
|
|
11
|
+
export type MapResult<To, From> = ((res: From, get: GetAtomResult) => To) | Schema.Schema<To, From>;
|
|
12
|
+
export declare const queryGraphQL: <TResult extends Record<string, any>, TVariableValues extends Record<string, any>, TResultMapped extends Record<string, any> = TResult>(document: DocumentNode<TResult, TVariableValues>, genVariableValues: TVariableValues | ((get: GetAtomResult) => TVariableValues), { label, reactivityGraph, map, }?: {
|
|
13
|
+
label?: string;
|
|
14
|
+
reactivityGraph?: ReactivityGraph;
|
|
15
|
+
map?: MapResult<TResultMapped, TResult>;
|
|
16
|
+
}) => LiveQuery<TResultMapped, QueryInfo.None>;
|
|
17
|
+
export declare class LiveStoreGraphQLQuery<TResult extends Record<string, any>, TVariableValues extends Record<string, any>, TContext extends BaseGraphQLContext, TResultMapped extends Record<string, any> = TResult> extends LiveStoreQueryBase<TResultMapped, QueryInfo.None> {
|
|
18
|
+
_tag: 'graphql';
|
|
19
|
+
/** The abstract GraphQL query */
|
|
20
|
+
document: DocumentNode<TResult, TVariableValues>;
|
|
21
|
+
/** A reactive thunk representing the query results */
|
|
22
|
+
results$: Thunk<TResultMapped, QueryContext, RefreshReason>;
|
|
23
|
+
variableValues$: Thunk<TVariableValues, QueryContext, RefreshReason> | undefined;
|
|
24
|
+
label: string;
|
|
25
|
+
protected reactivityGraph: ReactivityGraph;
|
|
26
|
+
queryInfo: QueryInfo.None;
|
|
27
|
+
private mapResult;
|
|
28
|
+
constructor({ document, label, genVariableValues, reactivityGraph, map, }: {
|
|
29
|
+
document: DocumentNode<TResult, TVariableValues>;
|
|
30
|
+
genVariableValues: TVariableValues | ((get: GetAtomResult) => TVariableValues);
|
|
31
|
+
label?: string;
|
|
32
|
+
reactivityGraph?: ReactivityGraph;
|
|
33
|
+
map?: MapResult<TResultMapped, TResult>;
|
|
34
|
+
});
|
|
35
|
+
queryOnce: ({ document, otelContext, otelTracer, variableValues, store, get, }: {
|
|
36
|
+
document: graphql.DocumentNode;
|
|
37
|
+
otelContext: otel.Context;
|
|
38
|
+
otelTracer: otel.Tracer;
|
|
39
|
+
variableValues: TVariableValues;
|
|
40
|
+
store: Store<TContext>;
|
|
41
|
+
get: GetAtomResult;
|
|
42
|
+
}) => {
|
|
43
|
+
result: TResultMapped;
|
|
44
|
+
queriedTables: string[];
|
|
45
|
+
durationMs: number;
|
|
46
|
+
};
|
|
47
|
+
destroy: () => void;
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=graphql.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/live-queries/graphql.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { shouldNeverHappen } from '@livestore/utils';
|
|
2
|
+
import { Schema, TreeFormatter } from '@livestore/utils/effect';
|
|
3
|
+
import * as otel from '@opentelemetry/api';
|
|
4
|
+
import * as graphql from 'graphql';
|
|
5
|
+
import { globalReactivityGraph } from '../global-state.js';
|
|
6
|
+
import { isThunk } from '../reactive.js';
|
|
7
|
+
import { getDurationMsFromSpan } from '../utils/otel.js';
|
|
8
|
+
import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js';
|
|
9
|
+
export const queryGraphQL = (document, genVariableValues, { label, reactivityGraph, map, } = {}) => new LiveStoreGraphQLQuery({ document, genVariableValues, label, reactivityGraph, map });
|
|
10
|
+
export class LiveStoreGraphQLQuery extends LiveStoreQueryBase {
|
|
11
|
+
_tag = 'graphql';
|
|
12
|
+
/** The abstract GraphQL query */
|
|
13
|
+
document;
|
|
14
|
+
/** A reactive thunk representing the query results */
|
|
15
|
+
results$;
|
|
16
|
+
variableValues$;
|
|
17
|
+
label;
|
|
18
|
+
reactivityGraph;
|
|
19
|
+
queryInfo = { _tag: 'None' };
|
|
20
|
+
mapResult;
|
|
21
|
+
constructor({ document, label, genVariableValues, reactivityGraph, map, }) {
|
|
22
|
+
super();
|
|
23
|
+
const labelWithDefault = label ?? graphql.getOperationAST(document)?.name?.value ?? 'graphql';
|
|
24
|
+
this.label = labelWithDefault;
|
|
25
|
+
this.document = document;
|
|
26
|
+
this.reactivityGraph = reactivityGraph ?? globalReactivityGraph;
|
|
27
|
+
this.mapResult =
|
|
28
|
+
map === undefined
|
|
29
|
+
? (res) => res
|
|
30
|
+
: Schema.isSchema(map)
|
|
31
|
+
? (res) => {
|
|
32
|
+
const parseResult = Schema.decodeEither(map)(res);
|
|
33
|
+
if (parseResult._tag === 'Left') {
|
|
34
|
+
console.error(`Error parsing GraphQL query result: ${TreeFormatter.formatErrorSync(parseResult.left)}`);
|
|
35
|
+
return shouldNeverHappen(`Error parsing SQL query result: ${parseResult.left}`);
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
return parseResult.right;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
: typeof map === 'function'
|
|
42
|
+
? map
|
|
43
|
+
: shouldNeverHappen(`Invalid map function ${map}`);
|
|
44
|
+
// TODO don't even create a thunk if variables are static
|
|
45
|
+
let variableValues$OrvariableValues;
|
|
46
|
+
if (typeof genVariableValues === 'function') {
|
|
47
|
+
variableValues$OrvariableValues = this.reactivityGraph.makeThunk((get, _setDebugInfo, { rootOtelContext }, otelContext) => {
|
|
48
|
+
return genVariableValues(makeGetAtomResult(get, otelContext ?? rootOtelContext));
|
|
49
|
+
}, { label: `${labelWithDefault}:variableValues`, meta: { liveStoreThunkType: 'graphql.variables' } });
|
|
50
|
+
this.variableValues$ = variableValues$OrvariableValues;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
variableValues$OrvariableValues = genVariableValues;
|
|
54
|
+
}
|
|
55
|
+
const resultsLabel = `${labelWithDefault}:results`;
|
|
56
|
+
this.results$ = this.reactivityGraph.makeThunk((get, setDebugInfo, { store, otelTracer, rootOtelContext }, otelContext) => {
|
|
57
|
+
const variableValues = isThunk(variableValues$OrvariableValues)
|
|
58
|
+
? get(variableValues$OrvariableValues)
|
|
59
|
+
: variableValues$OrvariableValues;
|
|
60
|
+
const { result, queriedTables, durationMs } = this.queryOnce({
|
|
61
|
+
document,
|
|
62
|
+
variableValues,
|
|
63
|
+
otelContext: otelContext ?? rootOtelContext,
|
|
64
|
+
otelTracer,
|
|
65
|
+
store: store,
|
|
66
|
+
get: makeGetAtomResult(get, otelContext ?? rootOtelContext),
|
|
67
|
+
});
|
|
68
|
+
// Add dependencies on any tables that were used
|
|
69
|
+
for (const tableName of queriedTables) {
|
|
70
|
+
const tableRef = store.tableRefs[tableName] ?? shouldNeverHappen(`No table ref found for ${tableName}`);
|
|
71
|
+
get(tableRef);
|
|
72
|
+
}
|
|
73
|
+
setDebugInfo({ _tag: 'graphql', label: resultsLabel, query: graphql.print(document), durationMs });
|
|
74
|
+
return result;
|
|
75
|
+
}, { label: resultsLabel, meta: { liveStoreThunkType: 'graphql.results' } });
|
|
76
|
+
}
|
|
77
|
+
queryOnce = ({ document, otelContext, otelTracer, variableValues, store, get, }) => {
|
|
78
|
+
const schema = store.graphQLSchema ?? shouldNeverHappen("Can't run a GraphQL query on a store without GraphQL schema");
|
|
79
|
+
const context = store.graphQLContext ?? shouldNeverHappen("Can't run a GraphQL query on a store without GraphQL context");
|
|
80
|
+
const operationName = graphql.getOperationAST(document)?.name?.value;
|
|
81
|
+
return otelTracer.startActiveSpan(`executeGraphQLQuery: ${operationName}`, {}, otelContext, (span) => {
|
|
82
|
+
span.setAttribute('graphql.variables', JSON.stringify(variableValues));
|
|
83
|
+
span.setAttribute('graphql.query', graphql.print(document));
|
|
84
|
+
context.queriedTables.clear();
|
|
85
|
+
context.otelContext = otel.trace.setSpan(otel.context.active(), span);
|
|
86
|
+
const res = graphql.executeSync({
|
|
87
|
+
document,
|
|
88
|
+
contextValue: context,
|
|
89
|
+
schema: schema,
|
|
90
|
+
variableValues,
|
|
91
|
+
});
|
|
92
|
+
// TODO track number of nested SQL queries via Otel + debug info
|
|
93
|
+
if (res.errors) {
|
|
94
|
+
span.setStatus({ code: otel.SpanStatusCode.ERROR, message: 'GraphQL error' });
|
|
95
|
+
span.setAttribute('graphql.error', res.errors.join('\n'));
|
|
96
|
+
span.setAttribute('graphql.error-detail', JSON.stringify(res.errors));
|
|
97
|
+
console.error(`graphql error (${operationName}) - ${res.errors.length} errors`);
|
|
98
|
+
for (const error of res.errors) {
|
|
99
|
+
console.error(error);
|
|
100
|
+
}
|
|
101
|
+
debugger;
|
|
102
|
+
shouldNeverHappen(`GraphQL error: ${res.errors.join('\n')}`);
|
|
103
|
+
}
|
|
104
|
+
span.end();
|
|
105
|
+
const result = this.mapResult(res.data, get);
|
|
106
|
+
const durationMs = getDurationMsFromSpan(span);
|
|
107
|
+
this.executionTimes.push(durationMs);
|
|
108
|
+
return {
|
|
109
|
+
result,
|
|
110
|
+
queriedTables: Array.from(context.queriedTables.values()),
|
|
111
|
+
durationMs,
|
|
112
|
+
};
|
|
113
|
+
});
|
|
114
|
+
};
|
|
115
|
+
destroy = () => {
|
|
116
|
+
if (this.variableValues$ !== undefined) {
|
|
117
|
+
this.reactivityGraph.destroyNode(this.variableValues$);
|
|
118
|
+
}
|
|
119
|
+
this.reactivityGraph.destroyNode(this.results$);
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=graphql.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/live-queries/graphql.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import type { Bindable, QueryBuilder, QueryInfo } from '@livestore/common';
|
|
2
|
+
import { Schema } from '@livestore/utils/effect';
|
|
3
|
+
import type { Thunk } from '../reactive.js';
|
|
4
|
+
import type { RefreshReason } from '../store/store-types.js';
|
|
5
|
+
import type { GetAtomResult, LiveQuery, QueryContext, ReactivityGraph } from './base-class.js';
|
|
6
|
+
import { LiveStoreQueryBase } from './base-class.js';
|
|
7
|
+
export type QueryInputRaw<TDecoded, TEncoded, TQueryInfo extends QueryInfo> = {
|
|
8
|
+
query: string;
|
|
9
|
+
schema: Schema.Schema<TDecoded, TEncoded>;
|
|
10
|
+
bindValues?: Bindable;
|
|
11
|
+
/**
|
|
12
|
+
* Can be provided explicitly to slightly speed up initial query performance
|
|
13
|
+
*
|
|
14
|
+
* NOTE In the future we want to do this automatically at build time
|
|
15
|
+
*/
|
|
16
|
+
queriedTables?: Set<string>;
|
|
17
|
+
queryInfo?: TQueryInfo;
|
|
18
|
+
execBeforeFirstRun?: (ctx: QueryContext) => void;
|
|
19
|
+
};
|
|
20
|
+
export type QueryInput<TDecoded, TEncoded, TQueryInfo extends QueryInfo> = QueryInputRaw<TDecoded, TEncoded, TQueryInfo> | QueryBuilder<TDecoded, any, any, TQueryInfo>;
|
|
21
|
+
/**
|
|
22
|
+
* NOTE `query` is only supposed to read data. Don't use it to insert/update/delete data but use mutations instead.
|
|
23
|
+
*/
|
|
24
|
+
export declare const queryDb: {
|
|
25
|
+
<TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None>(queryInput: QueryInputRaw<TResultSchema, ReadonlyArray<any>, TQueryInfo> | QueryBuilder<TResultSchema, any, any, TQueryInfo>, options?: {
|
|
26
|
+
map?: (rows: TResultSchema) => TResult;
|
|
27
|
+
/**
|
|
28
|
+
* Used for debugging / devtools
|
|
29
|
+
*/
|
|
30
|
+
label?: string;
|
|
31
|
+
reactivityGraph?: ReactivityGraph;
|
|
32
|
+
}): LiveQuery<TResult, TQueryInfo>;
|
|
33
|
+
<TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None>(queryInput: ((get: GetAtomResult) => QueryInputRaw<TResultSchema, ReadonlyArray<any>, TQueryInfo>) | ((get: GetAtomResult) => QueryBuilder<TResultSchema, any, any, TQueryInfo>), options?: {
|
|
34
|
+
map?: (rows: TResultSchema) => TResult;
|
|
35
|
+
/**
|
|
36
|
+
* Used for debugging / devtools
|
|
37
|
+
*/
|
|
38
|
+
label?: string;
|
|
39
|
+
reactivityGraph?: ReactivityGraph;
|
|
40
|
+
queryInfo?: TQueryInfo;
|
|
41
|
+
}): LiveQuery<TResult, TQueryInfo>;
|
|
42
|
+
};
|
|
43
|
+
export declare class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None> extends LiveStoreQueryBase<TResult, TQueryInfo> {
|
|
44
|
+
_tag: 'sql';
|
|
45
|
+
/** A reactive thunk representing the query text */
|
|
46
|
+
queryInput$: Thunk<QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo>, QueryContext, RefreshReason> | undefined;
|
|
47
|
+
/** A reactive thunk representing the query results */
|
|
48
|
+
results$: Thunk<TResult, QueryContext, RefreshReason>;
|
|
49
|
+
label: string;
|
|
50
|
+
queryInfo: TQueryInfo;
|
|
51
|
+
protected reactivityGraph: ReactivityGraph;
|
|
52
|
+
private mapResult;
|
|
53
|
+
constructor({ queryInput, label: inputLabel, reactivityGraph, map, queryInfo: queryInfo_, }: {
|
|
54
|
+
label?: string;
|
|
55
|
+
queryInput: QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo> | ((get: GetAtomResult, ctx: QueryContext) => QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo>);
|
|
56
|
+
reactivityGraph?: ReactivityGraph;
|
|
57
|
+
map?: (rows: TResultSchema) => TResult;
|
|
58
|
+
queryInfo?: TQueryInfo;
|
|
59
|
+
});
|
|
60
|
+
destroy: () => void;
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=sql.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/live-queries/sql.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { getResultSchema, isQueryBuilder, prepareBindValues, QueryBuilderAstSymbol, replaceSessionIdSymbol, } from '@livestore/common';
|
|
2
|
+
import { deepEqual, shouldNeverHappen } from '@livestore/utils';
|
|
3
|
+
import { Predicate, Schema, TreeFormatter } from '@livestore/utils/effect';
|
|
4
|
+
import * as otel from '@opentelemetry/api';
|
|
5
|
+
import { globalReactivityGraph } from '../global-state.js';
|
|
6
|
+
import { isThunk, NOT_REFRESHED_YET } from '../reactive.js';
|
|
7
|
+
import { makeExecBeforeFirstRun, rowQueryLabel } from '../row-query.js';
|
|
8
|
+
import { getDurationMsFromSpan } from '../utils/otel.js';
|
|
9
|
+
import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js';
|
|
10
|
+
/**
|
|
11
|
+
* NOTE `query` is only supposed to read data. Don't use it to insert/update/delete data but use mutations instead.
|
|
12
|
+
*/
|
|
13
|
+
export const queryDb = (queryInput, options) => new LiveStoreDbQuery({
|
|
14
|
+
queryInput,
|
|
15
|
+
label: options?.label,
|
|
16
|
+
reactivityGraph: options?.reactivityGraph,
|
|
17
|
+
map: options?.map,
|
|
18
|
+
queryInfo: Predicate.hasProperty(options, 'queryInfo') ? options.queryInfo : undefined,
|
|
19
|
+
});
|
|
20
|
+
/* An object encapsulating a reactive SQL query */
|
|
21
|
+
export class LiveStoreDbQuery extends LiveStoreQueryBase {
|
|
22
|
+
_tag = 'sql';
|
|
23
|
+
/** A reactive thunk representing the query text */
|
|
24
|
+
queryInput$;
|
|
25
|
+
/** A reactive thunk representing the query results */
|
|
26
|
+
results$;
|
|
27
|
+
label;
|
|
28
|
+
// TODO
|
|
29
|
+
queryInfo;
|
|
30
|
+
reactivityGraph;
|
|
31
|
+
mapResult;
|
|
32
|
+
constructor({ queryInput, label: inputLabel, reactivityGraph, map, queryInfo: queryInfo_, }) {
|
|
33
|
+
super();
|
|
34
|
+
// TODO implement a proper toString method
|
|
35
|
+
this.label = inputLabel ? `sql(${inputLabel})` : `sql(${queryInput.toString()})`;
|
|
36
|
+
this.reactivityGraph = reactivityGraph ?? globalReactivityGraph;
|
|
37
|
+
this.mapResult = map === undefined ? (rows) => rows : map;
|
|
38
|
+
const schemaRef = {
|
|
39
|
+
current: typeof queryInput === 'function' ? undefined : isQueryBuilder(queryInput) ? undefined : queryInput.schema,
|
|
40
|
+
};
|
|
41
|
+
const execBeforeFirstRunRef = {
|
|
42
|
+
current: undefined,
|
|
43
|
+
};
|
|
44
|
+
let queryInputRaw$OrQueryInputRaw;
|
|
45
|
+
const queryBuilderToQueryInputRaw = (qb) => {
|
|
46
|
+
const qbRes = qb.asSql();
|
|
47
|
+
const schema = getResultSchema(qb);
|
|
48
|
+
const ast = qb[QueryBuilderAstSymbol];
|
|
49
|
+
if (ast._tag === 'RowQuery') {
|
|
50
|
+
execBeforeFirstRunRef.current = makeExecBeforeFirstRun({
|
|
51
|
+
table: ast.tableDef,
|
|
52
|
+
insertValues: ast.insertValues,
|
|
53
|
+
id: ast.id,
|
|
54
|
+
});
|
|
55
|
+
this.label = rowQueryLabel(ast.tableDef, ast.id);
|
|
56
|
+
}
|
|
57
|
+
return {
|
|
58
|
+
query: qbRes.query,
|
|
59
|
+
schema,
|
|
60
|
+
bindValues: qbRes.bindValues,
|
|
61
|
+
queriedTables: new Set([ast.tableDef.sqliteDef.name]),
|
|
62
|
+
queryInfo: ast._tag === 'RowQuery' ? { _tag: 'Row', table: ast.tableDef, id: ast.id } : { _tag: 'None' },
|
|
63
|
+
};
|
|
64
|
+
};
|
|
65
|
+
if (typeof queryInput === 'function') {
|
|
66
|
+
queryInputRaw$OrQueryInputRaw = this.reactivityGraph.makeThunk((get, setDebugInfo, ctx, otelContext) => {
|
|
67
|
+
const startMs = performance.now();
|
|
68
|
+
const queryInputResult = queryInput(makeGetAtomResult(get, otelContext ?? ctx.rootOtelContext), ctx);
|
|
69
|
+
const durationMs = performance.now() - startMs;
|
|
70
|
+
const queryInputRaw = isQueryBuilder(queryInputResult)
|
|
71
|
+
? queryBuilderToQueryInputRaw(queryInputResult)
|
|
72
|
+
: queryInputResult;
|
|
73
|
+
setDebugInfo({ _tag: 'computed', label: `${this.label}:queryInput`, query: queryInputRaw.query, durationMs });
|
|
74
|
+
schemaRef.current = queryInputRaw.schema;
|
|
75
|
+
this.queryInfo = queryInputRaw.queryInfo;
|
|
76
|
+
return queryInputRaw;
|
|
77
|
+
}, {
|
|
78
|
+
label: `${this.label}:query`,
|
|
79
|
+
// TODO adjust to `sqlQueryInput` + adjust in devtools
|
|
80
|
+
meta: { liveStoreThunkType: 'sqlQuery' },
|
|
81
|
+
// NOTE we're not checking the schema here as we assume the query string to always change when the schema might change
|
|
82
|
+
equal: (a, b) => a.query === b.query && deepEqual(a.bindValues, b.bindValues),
|
|
83
|
+
});
|
|
84
|
+
// TODO come up with a better way to handle this
|
|
85
|
+
this.queryInfo = { _tag: 'None' };
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
const queryInputRaw = isQueryBuilder(queryInput) ? queryBuilderToQueryInputRaw(queryInput) : queryInput;
|
|
89
|
+
schemaRef.current = queryInputRaw.schema;
|
|
90
|
+
queryInputRaw$OrQueryInputRaw = queryInputRaw;
|
|
91
|
+
// this.label = inputLabel ? this.label : `sql(${})`
|
|
92
|
+
if (inputLabel === undefined && isQueryBuilder(queryInput)) {
|
|
93
|
+
const ast = queryInput[QueryBuilderAstSymbol];
|
|
94
|
+
if (ast._tag === 'RowQuery') {
|
|
95
|
+
this.label = `sql(${rowQueryLabel(ast.tableDef, ast.id)})`;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
this.queryInfo = queryInputRaw.queryInfo;
|
|
99
|
+
}
|
|
100
|
+
// TODO
|
|
101
|
+
const label = this.label;
|
|
102
|
+
const queriedTablesRef = { current: undefined };
|
|
103
|
+
// const schemaEqual = Schema.equivalence(schema)
|
|
104
|
+
// TODO also support derived equality for `map` (probably will depend on having an easy way to transform a schema without an `encode` step)
|
|
105
|
+
// This would mean dropping the `map` option
|
|
106
|
+
const resultsEqual = map === undefined
|
|
107
|
+
? (a, b) => a === NOT_REFRESHED_YET || b === NOT_REFRESHED_YET ? false : Schema.equivalence(schemaRef.current)(a, b)
|
|
108
|
+
: undefined;
|
|
109
|
+
const results$ = this.reactivityGraph.makeThunk((get, setDebugInfo, queryContext, otelContext) => queryContext.otelTracer.startActiveSpan('sql:...', // NOTE span name will be overridden further down
|
|
110
|
+
{}, otelContext ?? queryContext.rootOtelContext, (span) => {
|
|
111
|
+
const otelContext = otel.trace.setSpan(otel.context.active(), span);
|
|
112
|
+
const { store } = queryContext;
|
|
113
|
+
if (execBeforeFirstRunRef.current !== undefined) {
|
|
114
|
+
execBeforeFirstRunRef.current(queryContext, otelContext);
|
|
115
|
+
execBeforeFirstRunRef.current = undefined;
|
|
116
|
+
}
|
|
117
|
+
const queryInputResult = isThunk(queryInputRaw$OrQueryInputRaw)
|
|
118
|
+
? get(queryInputRaw$OrQueryInputRaw, otelContext)
|
|
119
|
+
: queryInputRaw$OrQueryInputRaw;
|
|
120
|
+
const sqlString = queryInputResult.query;
|
|
121
|
+
const bindValues = queryInputResult.bindValues;
|
|
122
|
+
if (queriedTablesRef.current === undefined) {
|
|
123
|
+
queriedTablesRef.current = store.syncDbWrapper.getTablesUsed(sqlString);
|
|
124
|
+
}
|
|
125
|
+
if (bindValues !== undefined) {
|
|
126
|
+
replaceSessionIdSymbol(bindValues, store.clientSession.coordinator.sessionId);
|
|
127
|
+
}
|
|
128
|
+
// Establish a reactive dependency on the tables used in the query
|
|
129
|
+
for (const tableName of queriedTablesRef.current) {
|
|
130
|
+
const tableRef = store.tableRefs[tableName] ?? shouldNeverHappen(`No table ref found for ${tableName}`);
|
|
131
|
+
get(tableRef, otelContext);
|
|
132
|
+
}
|
|
133
|
+
span.setAttribute('sql.query', sqlString);
|
|
134
|
+
span.updateName(`sql:${sqlString.slice(0, 50)}`);
|
|
135
|
+
const rawDbResults = store.syncDbWrapper.select(sqlString, {
|
|
136
|
+
queriedTables: queriedTablesRef.current,
|
|
137
|
+
bindValues: bindValues ? prepareBindValues(bindValues, sqlString) : undefined,
|
|
138
|
+
otelContext,
|
|
139
|
+
});
|
|
140
|
+
span.setAttribute('sql.rowsCount', rawDbResults.length);
|
|
141
|
+
const parsedResult = Schema.decodeEither(schemaRef.current)(rawDbResults);
|
|
142
|
+
if (parsedResult._tag === 'Left') {
|
|
143
|
+
const parseErrorStr = TreeFormatter.formatErrorSync(parsedResult.left);
|
|
144
|
+
const expectedSchemaStr = String(schemaRef.current.ast);
|
|
145
|
+
const bindValuesStr = bindValues === undefined ? '' : `\nBind values: ${JSON.stringify(bindValues)}`;
|
|
146
|
+
console.error(`\
|
|
147
|
+
Error parsing SQL query result.
|
|
148
|
+
|
|
149
|
+
Query: ${sqlString}\
|
|
150
|
+
${bindValuesStr}
|
|
151
|
+
|
|
152
|
+
Expected schema: ${expectedSchemaStr}
|
|
153
|
+
|
|
154
|
+
Error: ${parseErrorStr}
|
|
155
|
+
|
|
156
|
+
Result:`, rawDbResults);
|
|
157
|
+
return shouldNeverHappen(`Error parsing SQL query result: ${parsedResult.left}`);
|
|
158
|
+
}
|
|
159
|
+
const result = this.mapResult(parsedResult.right);
|
|
160
|
+
span.end();
|
|
161
|
+
const durationMs = getDurationMsFromSpan(span);
|
|
162
|
+
this.executionTimes.push(durationMs);
|
|
163
|
+
setDebugInfo({ _tag: 'sql', label: `${label}:results`, query: sqlString, durationMs });
|
|
164
|
+
return result;
|
|
165
|
+
}), { label: `${label}:results`, meta: { liveStoreThunkType: 'sqlResult' }, equal: resultsEqual });
|
|
166
|
+
this.results$ = results$;
|
|
167
|
+
}
|
|
168
|
+
destroy = () => {
|
|
169
|
+
if (this.queryInput$ !== undefined) {
|
|
170
|
+
this.reactivityGraph.destroyNode(this.queryInput$);
|
|
171
|
+
}
|
|
172
|
+
this.reactivityGraph.destroyNode(this.results$);
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=sql.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../src/live-queries/sql.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sql.test.d.ts","sourceRoot":"","sources":["../../src/live-queries/sql.test.ts"],"names":[],"mappings":""}
|