@livestore/livestore 0.0.37 → 0.0.39-dev.2
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 -4
- package/dist/.tsbuildinfo +1 -1
- package/dist/__tests__/react/fixture.d.ts +97 -3
- package/dist/__tests__/react/fixture.d.ts.map +1 -1
- package/dist/__tests__/react/fixture.js +10 -7
- package/dist/__tests__/react/fixture.js.map +1 -1
- package/dist/__tests__/react/useQuery.test.js +12 -23
- package/dist/__tests__/react/useQuery.test.js.map +1 -1
- package/dist/__tests__/react/useRow.test.js +4 -4
- package/dist/__tests__/react/useRow.test.js.map +1 -1
- package/dist/__tests__/reactiveQueries/sql.test.js +32 -35
- package/dist/__tests__/reactiveQueries/sql.test.js.map +1 -1
- package/dist/effect/LiveStore.d.ts +3 -2
- package/dist/effect/LiveStore.d.ts.map +1 -1
- package/dist/effect/LiveStore.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/migrations.js +2 -2
- package/dist/migrations.js.map +1 -1
- package/dist/mutations.d.ts +3 -1
- package/dist/mutations.d.ts.map +1 -1
- package/dist/mutations.js +2 -2
- package/dist/mutations.js.map +1 -1
- package/dist/react/LiveStoreContext.d.ts +2 -2
- package/dist/react/LiveStoreContext.d.ts.map +1 -1
- package/dist/react/LiveStoreContext.js.map +1 -1
- package/dist/react/index.d.ts +1 -0
- package/dist/react/index.d.ts.map +1 -1
- package/dist/react/index.js +1 -0
- package/dist/react/index.js.map +1 -1
- package/dist/react/useAtom.d.ts +5 -0
- package/dist/react/useAtom.d.ts.map +1 -0
- package/dist/react/useAtom.js +16 -0
- package/dist/react/useAtom.js.map +1 -0
- package/dist/react/useQuery.d.ts +3 -3
- package/dist/react/useQuery.d.ts.map +1 -1
- package/dist/react/useQuery.js.map +1 -1
- package/dist/react/useRow.d.ts +5 -5
- package/dist/react/useRow.d.ts.map +1 -1
- package/dist/react/useRow.js +16 -30
- package/dist/react/useRow.js.map +1 -1
- package/dist/react/useTemporaryQuery.d.ts +3 -3
- package/dist/react/useTemporaryQuery.d.ts.map +1 -1
- package/dist/react/useTemporaryQuery.js.map +1 -1
- package/dist/reactiveQueries/base-class.d.ts +12 -4
- package/dist/reactiveQueries/base-class.d.ts.map +1 -1
- package/dist/reactiveQueries/base-class.js +1 -0
- package/dist/reactiveQueries/base-class.js.map +1 -1
- package/dist/reactiveQueries/graphql.d.ts +5 -5
- package/dist/reactiveQueries/graphql.d.ts.map +1 -1
- package/dist/reactiveQueries/graphql.js +11 -10
- package/dist/reactiveQueries/graphql.js.map +1 -1
- package/dist/reactiveQueries/js.d.ts +10 -7
- package/dist/reactiveQueries/js.d.ts.map +1 -1
- package/dist/reactiveQueries/js.js +19 -11
- package/dist/reactiveQueries/js.js.map +1 -1
- package/dist/reactiveQueries/sql.d.ts +21 -15
- package/dist/reactiveQueries/sql.d.ts.map +1 -1
- package/dist/reactiveQueries/sql.js +50 -28
- package/dist/reactiveQueries/sql.js.map +1 -1
- package/dist/row-query.d.ts +22 -21
- package/dist/row-query.d.ts.map +1 -1
- package/dist/row-query.js +62 -47
- package/dist/row-query.js.map +1 -1
- package/dist/schema/index.d.ts +3 -2
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js +3 -2
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/parse-utils.d.ts +6 -0
- package/dist/schema/parse-utils.d.ts.map +1 -0
- package/dist/schema/parse-utils.js +59 -0
- package/dist/schema/parse-utils.js.map +1 -0
- package/dist/schema/system-tables.d.ts +24 -8
- package/dist/schema/system-tables.d.ts.map +1 -1
- package/dist/schema/table-def.d.ts +32 -7
- package/dist/schema/table-def.d.ts.map +1 -1
- package/dist/schema/table-def.js +18 -6
- package/dist/schema/table-def.js.map +1 -1
- package/dist/store.d.ts +4 -8
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +7 -8
- package/dist/store.js.map +1 -1
- package/dist/update-path.d.ts +52 -0
- package/dist/update-path.d.ts.map +1 -0
- package/dist/update-path.js +33 -0
- package/dist/update-path.js.map +1 -0
- package/dist/utils/util.d.ts +1 -0
- package/dist/utils/util.d.ts.map +1 -1
- package/dist/utils/util.js.map +1 -1
- package/package.json +4 -4
- package/src/__tests__/react/fixture.tsx +13 -7
- package/src/__tests__/react/useQuery.test.tsx +12 -29
- package/src/__tests__/react/useRow.test.tsx +5 -7
- package/src/__tests__/reactiveQueries/sql.test.ts +33 -35
- package/src/effect/LiveStore.ts +3 -2
- package/src/index.ts +6 -6
- package/src/migrations.ts +2 -2
- package/src/mutations.ts +8 -3
- package/src/react/LiveStoreContext.ts +3 -2
- package/src/react/index.ts +1 -0
- package/src/react/useAtom.ts +25 -0
- package/src/react/useQuery.ts +7 -7
- package/src/react/useRow.ts +27 -47
- package/src/react/useTemporaryQuery.ts +4 -6
- package/src/reactiveQueries/base-class.ts +18 -4
- package/src/reactiveQueries/graphql.ts +16 -14
- package/src/reactiveQueries/js.ts +36 -15
- package/src/reactiveQueries/sql.ts +77 -37
- package/src/row-query.ts +155 -113
- package/src/schema/index.ts +5 -4
- package/src/schema/parse-utils.ts +84 -0
- package/src/schema/table-def.ts +80 -12
- package/src/store.ts +14 -29
- package/src/update-path.ts +102 -0
- package/src/utils/util.ts +2 -0
|
@@ -11,12 +11,47 @@ export type AppState = {
|
|
|
11
11
|
newTodoText: string;
|
|
12
12
|
filter: Filter;
|
|
13
13
|
};
|
|
14
|
+
export declare const todos: DbSchema.TableDef<DbSchema.__SqliteDsl.TableDefinition<"todos", {
|
|
15
|
+
id: {
|
|
16
|
+
columnType: "text";
|
|
17
|
+
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
18
|
+
default: import("effect/Option").None<never>;
|
|
19
|
+
nullable: false;
|
|
20
|
+
primaryKey: true;
|
|
21
|
+
} & DbSchema.__SqliteDsl.ColumnDefinition<string, string>;
|
|
22
|
+
text: {
|
|
23
|
+
columnType: "text";
|
|
24
|
+
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
25
|
+
default: import("effect/Option").Some<"">;
|
|
26
|
+
nullable: false;
|
|
27
|
+
primaryKey: false;
|
|
28
|
+
};
|
|
29
|
+
completed: {
|
|
30
|
+
columnType: "integer";
|
|
31
|
+
schema: import("@effect/schema/Schema").Schema<number, boolean>;
|
|
32
|
+
default: import("effect/Option").Some<false>;
|
|
33
|
+
nullable: false;
|
|
34
|
+
primaryKey: false;
|
|
35
|
+
};
|
|
36
|
+
}>, false, {
|
|
37
|
+
isSingleton: false;
|
|
38
|
+
dynamicRegistration: false;
|
|
39
|
+
disableAutomaticIdColumn: false;
|
|
40
|
+
}, import("@effect/schema/Schema").Schema<{
|
|
41
|
+
readonly id: string;
|
|
42
|
+
readonly text: string;
|
|
43
|
+
readonly completed: number;
|
|
44
|
+
}, {
|
|
45
|
+
readonly id: string;
|
|
46
|
+
readonly text: string;
|
|
47
|
+
readonly completed: boolean;
|
|
48
|
+
}>>;
|
|
14
49
|
export declare const schema: import("../../index.js").LiveStoreSchema<{
|
|
15
50
|
todos: DbSchema.__SqliteDsl.TableDefinition<"todos", {
|
|
16
51
|
id: {
|
|
17
52
|
columnType: "text";
|
|
18
53
|
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
19
|
-
default: import("effect/Option").
|
|
54
|
+
default: import("effect/Option").None<never>;
|
|
20
55
|
nullable: false;
|
|
21
56
|
primaryKey: true;
|
|
22
57
|
} & DbSchema.__SqliteDsl.ColumnDefinition<string, string>;
|
|
@@ -39,7 +74,7 @@ export declare const schema: import("../../index.js").LiveStoreSchema<{
|
|
|
39
74
|
id: {
|
|
40
75
|
columnType: "text";
|
|
41
76
|
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
42
|
-
default: import("effect/Option").
|
|
77
|
+
default: import("effect/Option").None<never>;
|
|
43
78
|
nullable: false;
|
|
44
79
|
primaryKey: true;
|
|
45
80
|
} & DbSchema.__SqliteDsl.ColumnDefinition<string, string>;
|
|
@@ -59,6 +94,11 @@ export declare const schema: import("../../index.js").LiveStoreSchema<{
|
|
|
59
94
|
};
|
|
60
95
|
}>;
|
|
61
96
|
}>;
|
|
97
|
+
export declare const parseTodos: (rawRows: readonly any[]) => readonly {
|
|
98
|
+
text: string;
|
|
99
|
+
id: string;
|
|
100
|
+
completed: boolean;
|
|
101
|
+
}[];
|
|
62
102
|
export declare const makeTodoMvc: ({ otelTracer, otelContext, useGlobalDbGraph, }?: {
|
|
63
103
|
otelTracer?: otel.Tracer | undefined;
|
|
64
104
|
otelContext?: otel.Context | undefined;
|
|
@@ -78,8 +118,62 @@ export declare const makeTodoMvc: ({ otelTracer, otelContext, useGlobalDbGraph,
|
|
|
78
118
|
isSingleton: false;
|
|
79
119
|
dynamicRegistration: false;
|
|
80
120
|
disableAutomaticIdColumn: false;
|
|
81
|
-
}
|
|
121
|
+
}, import("@effect/schema/Schema").Schema<{
|
|
122
|
+
readonly username: string;
|
|
123
|
+
readonly id: string;
|
|
124
|
+
}, {
|
|
125
|
+
readonly username: string;
|
|
126
|
+
readonly id: string;
|
|
127
|
+
}>>;
|
|
82
128
|
store: import("../../store.js").Store<import("../../store.js").BaseGraphQLContext>;
|
|
83
129
|
dbGraph: import("../../index.js").DbGraph;
|
|
130
|
+
mutations: import("../../mutations.js").Mutations<{
|
|
131
|
+
todos: DbSchema.__SqliteDsl.TableDefinition<"todos", {
|
|
132
|
+
id: {
|
|
133
|
+
columnType: "text";
|
|
134
|
+
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
135
|
+
default: import("effect/Option").None<never>;
|
|
136
|
+
nullable: false;
|
|
137
|
+
primaryKey: true;
|
|
138
|
+
} & DbSchema.__SqliteDsl.ColumnDefinition<string, string>;
|
|
139
|
+
text: {
|
|
140
|
+
columnType: "text";
|
|
141
|
+
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
142
|
+
default: import("effect/Option").Some<"">;
|
|
143
|
+
nullable: false;
|
|
144
|
+
primaryKey: false;
|
|
145
|
+
};
|
|
146
|
+
completed: {
|
|
147
|
+
columnType: "integer";
|
|
148
|
+
schema: import("@effect/schema/Schema").Schema<number, boolean>;
|
|
149
|
+
default: import("effect/Option").Some<false>;
|
|
150
|
+
nullable: false;
|
|
151
|
+
primaryKey: false;
|
|
152
|
+
};
|
|
153
|
+
}>;
|
|
154
|
+
app: DbSchema.__SqliteDsl.TableDefinition<"app", {
|
|
155
|
+
id: {
|
|
156
|
+
columnType: "text";
|
|
157
|
+
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
158
|
+
default: import("effect/Option").None<never>;
|
|
159
|
+
nullable: false;
|
|
160
|
+
primaryKey: true;
|
|
161
|
+
} & DbSchema.__SqliteDsl.ColumnDefinition<string, string>;
|
|
162
|
+
newTodoText: {
|
|
163
|
+
columnType: "text";
|
|
164
|
+
schema: import("@effect/schema/Schema").Schema<string | null, string | null>;
|
|
165
|
+
default: import("effect/Option").Some<"">;
|
|
166
|
+
nullable: true;
|
|
167
|
+
primaryKey: false;
|
|
168
|
+
};
|
|
169
|
+
filter: {
|
|
170
|
+
columnType: "text";
|
|
171
|
+
schema: import("@effect/schema/Schema").Schema<string, string>;
|
|
172
|
+
default: import("effect/Option").Some<"all">;
|
|
173
|
+
nullable: false;
|
|
174
|
+
primaryKey: false;
|
|
175
|
+
};
|
|
176
|
+
}>;
|
|
177
|
+
}>;
|
|
84
178
|
}>;
|
|
85
179
|
//# sourceMappingURL=fixture.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../src/__tests__/react/fixture.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,EAAe,QAAQ,
|
|
1
|
+
{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../src/__tests__/react/fixture.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,EAAe,QAAQ,EAA2D,MAAM,gBAAgB,CAAA;AAI/G,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAA;AAEnD,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAIhB,CAAA;AAEF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BjB,CAAA;AAEF,eAAO,MAAM,UAAU;;;;GAAyB,CAAA;AAEhD,eAAO,MAAM,WAAW;;;;;4BAkCS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKnC,CAAA"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import initSqlite3Wasm from 'sqlite-esm';
|
|
3
3
|
import { globalDbGraph } from '../../global-state.js';
|
|
4
|
-
import { createStore, DbSchema, makeDbGraph, makeSchema, sql } from '../../index.js';
|
|
4
|
+
import { createStore, DbSchema, makeDbGraph, makeMutations, makeSchema, ParseUtils, sql } from '../../index.js';
|
|
5
5
|
import * as LiveStoreReact from '../../react/index.js';
|
|
6
6
|
import { InMemoryStorage } from '../../storage/in-memory/index.js';
|
|
7
|
+
export const todos = DbSchema.table('todos', {
|
|
8
|
+
id: DbSchema.text({ primaryKey: true }),
|
|
9
|
+
text: DbSchema.text({ default: '', nullable: false }),
|
|
10
|
+
completed: DbSchema.boolean({ default: false, nullable: false }),
|
|
11
|
+
});
|
|
7
12
|
export const schema = makeSchema({
|
|
8
13
|
tables: {
|
|
9
|
-
todos
|
|
10
|
-
id: DbSchema.text({ primaryKey: true }),
|
|
11
|
-
text: DbSchema.text({ default: '', nullable: false }),
|
|
12
|
-
completed: DbSchema.boolean({ default: false, nullable: false }),
|
|
13
|
-
}),
|
|
14
|
+
todos,
|
|
14
15
|
app: DbSchema.table('app', {
|
|
15
16
|
id: DbSchema.text({ primaryKey: true }),
|
|
16
17
|
newTodoText: DbSchema.text({ default: '', nullable: true }),
|
|
@@ -35,6 +36,7 @@ export const schema = makeSchema({
|
|
|
35
36
|
setFilter: { statement: { sql: sql `UPDATE app SET filter = $filter;`, writeTables: ['app'] } },
|
|
36
37
|
},
|
|
37
38
|
});
|
|
39
|
+
export const parseTodos = ParseUtils.many(todos);
|
|
38
40
|
export const makeTodoMvc = async ({ otelTracer, otelContext, useGlobalDbGraph = true, } = {}) => {
|
|
39
41
|
const AppComponentSchema = DbSchema.table('UserInfo', {
|
|
40
42
|
username: DbSchema.text({ default: '' }),
|
|
@@ -53,8 +55,9 @@ export const makeTodoMvc = async ({ otelTracer, otelContext, useGlobalDbGraph =
|
|
|
53
55
|
otelTracer,
|
|
54
56
|
otelRootSpanContext: otelContext,
|
|
55
57
|
});
|
|
58
|
+
const mutations = makeMutations(schema);
|
|
56
59
|
const storeContext = { store };
|
|
57
60
|
const wrapper = ({ children }) => (React.createElement(LiveStoreReact.LiveStoreContext.Provider, { value: storeContext }, children));
|
|
58
|
-
return { wrapper, AppComponentSchema, store, dbGraph };
|
|
61
|
+
return { wrapper, AppComponentSchema, store, dbGraph, mutations };
|
|
59
62
|
};
|
|
60
63
|
//# sourceMappingURL=fixture.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../../src/__tests__/react/fixture.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,eAAe,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../../src/__tests__/react/fixture.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,40 +3,32 @@ import React from 'react';
|
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
4
|
import * as LiveStoreReact from '../../react/index.js';
|
|
5
5
|
import { querySQL } from '../../reactiveQueries/sql.js';
|
|
6
|
-
import {
|
|
7
|
-
import { makeTodoMvc } from './fixture.js';
|
|
6
|
+
import { makeTodoMvc, parseTodos } from './fixture.js';
|
|
8
7
|
describe('useQuery', () => {
|
|
9
8
|
it('simple', async () => {
|
|
10
9
|
let renderCount = 0;
|
|
11
|
-
const { wrapper, store } = await makeTodoMvc();
|
|
12
|
-
const allTodos$ = querySQL(`select * from todos
|
|
10
|
+
const { wrapper, store, mutations } = await makeTodoMvc();
|
|
11
|
+
const allTodos$ = querySQL(`select * from todos`, { map: parseTodos });
|
|
13
12
|
const { result } = renderHook(() => {
|
|
14
13
|
renderCount++;
|
|
15
14
|
return LiveStoreReact.useQuery(allTodos$);
|
|
16
15
|
}, { wrapper });
|
|
17
16
|
expect(result.current.length).toBe(0);
|
|
18
17
|
expect(renderCount).toBe(1);
|
|
19
|
-
act(() => store.
|
|
20
|
-
sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)`,
|
|
21
|
-
writeTables: ['todos'],
|
|
22
|
-
}));
|
|
18
|
+
act(() => store.applyEvents([mutations.todos.insert({ id: 't1', text: 'buy milk', completed: false })]));
|
|
23
19
|
expect(result.current.length).toBe(1);
|
|
24
20
|
expect(result.current[0].text).toBe('buy milk');
|
|
25
21
|
expect(renderCount).toBe(2);
|
|
26
22
|
});
|
|
27
23
|
it('same `useQuery` hook invoked with different queries', async () => {
|
|
28
24
|
let renderCount = 0;
|
|
29
|
-
const { wrapper, store } = await makeTodoMvc();
|
|
30
|
-
const todo1$ = querySQL(`select * from todos where id = 't1'`, { label: 'libraryTracksView1' });
|
|
31
|
-
const todo2$ = querySQL(`select * from todos where id = 't2'`, { label: 'libraryTracksView2' });
|
|
32
|
-
store.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
store.applyEvent('livestore.RawSql', {
|
|
37
|
-
sql: sql `INSERT INTO todos (id, text, completed) VALUES ('t2', 'buy eggs', 0)`,
|
|
38
|
-
writeTables: ['todos'],
|
|
39
|
-
});
|
|
25
|
+
const { wrapper, store, mutations } = await makeTodoMvc();
|
|
26
|
+
const todo1$ = querySQL(`select * from todos where id = 't1'`, { label: 'libraryTracksView1', map: parseTodos });
|
|
27
|
+
const todo2$ = querySQL(`select * from todos where id = 't2'`, { label: 'libraryTracksView2', map: parseTodos });
|
|
28
|
+
store.applyEvents([
|
|
29
|
+
mutations.todos.insert({ id: 't1', text: 'buy milk', completed: false }),
|
|
30
|
+
mutations.todos.insert({ id: 't2', text: 'buy eggs', completed: false }),
|
|
31
|
+
]);
|
|
40
32
|
const { result, rerender } = renderHook((todoId) => {
|
|
41
33
|
renderCount++;
|
|
42
34
|
const query$ = React.useMemo(() => (todoId === 't1' ? todo1$ : todo2$), [todoId]);
|
|
@@ -44,10 +36,7 @@ describe('useQuery', () => {
|
|
|
44
36
|
}, { wrapper, initialProps: 't1' });
|
|
45
37
|
expect(result.current).toBe('buy milk');
|
|
46
38
|
expect(renderCount).toBe(1);
|
|
47
|
-
act(() => store.
|
|
48
|
-
sql: sql `UPDATE todos SET text = 'buy soy milk' WHERE id = 't1'`,
|
|
49
|
-
writeTables: ['todos'],
|
|
50
|
-
}));
|
|
39
|
+
act(() => store.applyEvents([mutations.todos.update({ where: { id: 't1' }, values: { text: 'buy soy milk' } })]));
|
|
51
40
|
expect(result.current).toBe('buy soy milk');
|
|
52
41
|
expect(renderCount).toBe(2);
|
|
53
42
|
rerender('t2');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuery.test.js","sourceRoot":"","sources":["../../../src/__tests__/react/useQuery.test.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AACvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useQuery.test.js","sourceRoot":"","sources":["../../../src/__tests__/react/useQuery.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import React from 'react';
|
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
4
|
import * as LiveStore from '../../index.js';
|
|
5
5
|
import * as LiveStoreReact from '../../react/index.js';
|
|
6
|
-
import { makeTodoMvc } from './fixture.js';
|
|
6
|
+
import { makeTodoMvc, todos } from './fixture.js';
|
|
7
7
|
describe('useRow', () => {
|
|
8
8
|
it('should update the data based on component key', async () => {
|
|
9
9
|
let renderCount = 0;
|
|
@@ -83,7 +83,7 @@ describe('useRow', () => {
|
|
|
83
83
|
return (React.createElement("div", null, allTodos.map((_) => (React.createElement("div", { key: _.id, onClick: () => setTaskId(_.id) }, _.id)))));
|
|
84
84
|
};
|
|
85
85
|
const TaskDetails = ({ id }) => {
|
|
86
|
-
const todo = LiveStoreReact.
|
|
86
|
+
const [todo] = LiveStoreReact.useRow(todos, id, { dbGraph });
|
|
87
87
|
return React.createElement("div", { role: "content" }, JSON.stringify(todo));
|
|
88
88
|
};
|
|
89
89
|
const renderResult = render(React.createElement(AppRouter, null), { wrapper });
|
|
@@ -96,7 +96,7 @@ describe('useRow', () => {
|
|
|
96
96
|
expect(renderResult.getByRole('current-id').innerHTML).toMatchInlineSnapshot('"Current Task Id: -"');
|
|
97
97
|
act(() => globalSetState.currentTaskId('t1'));
|
|
98
98
|
expect(appRouterRenderCount).toBe(2);
|
|
99
|
-
expect(renderResult.getByRole('content').innerHTML).toMatchInlineSnapshot(`"{"id":"t1","text":"buy milk","completed":
|
|
99
|
+
expect(renderResult.getByRole('content').innerHTML).toMatchInlineSnapshot(`"{"id":"t1","text":"buy milk","completed":false}"`);
|
|
100
100
|
expect(renderResult.getByRole('current-id').innerHTML).toMatchInlineSnapshot('"Current Task Id: t1"');
|
|
101
101
|
act(() => store.applyEvents([
|
|
102
102
|
{
|
|
@@ -111,7 +111,7 @@ describe('useRow', () => {
|
|
|
111
111
|
args: {
|
|
112
112
|
id: 'singleton',
|
|
113
113
|
columnNames: ['currentTaskId'],
|
|
114
|
-
tableName: AppRouterSchema.
|
|
114
|
+
tableName: AppRouterSchema.sqliteDef.name,
|
|
115
115
|
bindValues: { currentTaskId: 't2' },
|
|
116
116
|
},
|
|
117
117
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRow.test.js","sourceRoot":"","sources":["../../../src/__tests__/react/useRow.test.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"useRow.test.js","sourceRoot":"","sources":["../../../src/__tests__/react/useRow.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import * as otel from '@opentelemetry/api';
|
|
2
2
|
import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
|
-
import {
|
|
5
|
-
import { makeTodoMvc } from '../react/fixture.js';
|
|
4
|
+
import { computed, ParseUtils, querySQL, sql } from '../../index.js';
|
|
5
|
+
import { makeTodoMvc, todos } from '../react/fixture.js';
|
|
6
|
+
/*
|
|
7
|
+
TODO write tests for:
|
|
8
|
+
|
|
9
|
+
- sql queries without and with `map` (incl. callback and schemas)
|
|
10
|
+
- optional and explicit `queriedTables` argument
|
|
11
|
+
*/
|
|
6
12
|
describe('otel', () => {
|
|
7
13
|
let cachedProvider;
|
|
8
14
|
const makeQuery = async () => {
|
|
@@ -143,14 +149,15 @@ describe('otel', () => {
|
|
|
143
149
|
});
|
|
144
150
|
it('with thunks', async () => {
|
|
145
151
|
const { store, exporter, span } = await makeQuery();
|
|
146
|
-
const defaultTodo = { id: '', text: '', completed:
|
|
147
|
-
const filter =
|
|
148
|
-
const query = querySQL((get) => `select * from todos ${get(filter)}`, {
|
|
149
|
-
|
|
152
|
+
const defaultTodo = { id: '', text: '', completed: false };
|
|
153
|
+
const filter = computed(() => `where completed = 0`, { label: 'where-filter' });
|
|
154
|
+
const query = querySQL((get) => `select * from todos ${get(filter)}`, {
|
|
155
|
+
label: 'all todos',
|
|
156
|
+
map: ParseUtils.first(todos, defaultTodo),
|
|
150
157
|
});
|
|
151
158
|
expect(query.run()).toMatchInlineSnapshot(`
|
|
152
159
|
{
|
|
153
|
-
"completed":
|
|
160
|
+
"completed": false,
|
|
154
161
|
"id": "",
|
|
155
162
|
"text": "",
|
|
156
163
|
}
|
|
@@ -161,7 +168,7 @@ describe('otel', () => {
|
|
|
161
168
|
});
|
|
162
169
|
expect(query.run()).toMatchInlineSnapshot(`
|
|
163
170
|
{
|
|
164
|
-
"completed":
|
|
171
|
+
"completed": false,
|
|
165
172
|
"id": "t1",
|
|
166
173
|
"text": "buy milk",
|
|
167
174
|
}
|
|
@@ -234,49 +241,39 @@ describe('otel', () => {
|
|
|
234
241
|
"_name": "LiveStore:queries",
|
|
235
242
|
"children": [
|
|
236
243
|
{
|
|
237
|
-
"_name": "
|
|
244
|
+
"_name": "sql:select * from todos where completed = 0",
|
|
245
|
+
"attributes": {
|
|
246
|
+
"sql.query": "select * from todos where completed = 0",
|
|
247
|
+
"sql.rowsCount": 0,
|
|
248
|
+
},
|
|
238
249
|
"children": [
|
|
239
250
|
{
|
|
240
|
-
"_name": "
|
|
251
|
+
"_name": "js:where-filter",
|
|
252
|
+
},
|
|
253
|
+
{
|
|
254
|
+
"_name": "sql-in-memory-select",
|
|
241
255
|
"attributes": {
|
|
256
|
+
"sql.cached": false,
|
|
242
257
|
"sql.query": "select * from todos where completed = 0",
|
|
243
258
|
"sql.rowsCount": 0,
|
|
244
259
|
},
|
|
245
|
-
"children": [
|
|
246
|
-
{
|
|
247
|
-
"_name": "js:where-filter",
|
|
248
|
-
},
|
|
249
|
-
{
|
|
250
|
-
"_name": "sql-in-memory-select",
|
|
251
|
-
"attributes": {
|
|
252
|
-
"sql.cached": false,
|
|
253
|
-
"sql.query": "select * from todos where completed = 0",
|
|
254
|
-
"sql.rowsCount": 0,
|
|
255
|
-
},
|
|
256
|
-
},
|
|
257
|
-
],
|
|
258
260
|
},
|
|
259
261
|
],
|
|
260
262
|
},
|
|
261
263
|
{
|
|
262
|
-
"_name": "
|
|
264
|
+
"_name": "sql:select * from todos where completed = 0",
|
|
265
|
+
"attributes": {
|
|
266
|
+
"sql.query": "select * from todos where completed = 0",
|
|
267
|
+
"sql.rowsCount": 1,
|
|
268
|
+
},
|
|
263
269
|
"children": [
|
|
264
270
|
{
|
|
265
|
-
"_name": "sql
|
|
271
|
+
"_name": "sql-in-memory-select",
|
|
266
272
|
"attributes": {
|
|
273
|
+
"sql.cached": false,
|
|
267
274
|
"sql.query": "select * from todos where completed = 0",
|
|
268
275
|
"sql.rowsCount": 1,
|
|
269
276
|
},
|
|
270
|
-
"children": [
|
|
271
|
-
{
|
|
272
|
-
"_name": "sql-in-memory-select",
|
|
273
|
-
"attributes": {
|
|
274
|
-
"sql.cached": false,
|
|
275
|
-
"sql.query": "select * from todos where completed = 0",
|
|
276
|
-
"sql.rowsCount": 1,
|
|
277
|
-
},
|
|
278
|
-
},
|
|
279
|
-
],
|
|
280
277
|
},
|
|
281
278
|
],
|
|
282
279
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.test.js","sourceRoot":"","sources":["../../../src/__tests__/reactiveQueries/sql.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAC9G,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sql.test.js","sourceRoot":"","sources":["../../../src/__tests__/reactiveQueries/sql.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,14 @@ import { Context, Deferred, Effect, Layer } from '@livestore/utils/effect';
|
|
|
3
3
|
import * as otel from '@opentelemetry/api';
|
|
4
4
|
import type { GraphQLSchema } from 'graphql';
|
|
5
5
|
import type { InMemoryDatabase } from '../inMemoryDatabase.js';
|
|
6
|
+
import type { LiveQuery } from '../reactiveQueries/base-class.js';
|
|
6
7
|
import type { LiveStoreSchema } from '../schema/index.js';
|
|
7
8
|
import type { StorageInit } from '../storage/index.js';
|
|
8
|
-
import type { BaseGraphQLContext, GraphQLOptions,
|
|
9
|
+
import type { BaseGraphQLContext, GraphQLOptions, Store } from '../store.js';
|
|
9
10
|
export type LiveStoreContext = {
|
|
10
11
|
store: Store;
|
|
11
12
|
};
|
|
12
|
-
export type QueryDefinition = (store: Store) =>
|
|
13
|
+
export type QueryDefinition = <TResult>(store: Store) => LiveQuery<TResult>;
|
|
13
14
|
export type LiveStoreCreateStoreOptions<GraphQLContext extends BaseGraphQLContext> = {
|
|
14
15
|
schema: LiveStoreSchema;
|
|
15
16
|
loadStorage: () => StorageInit | Promise<StorageInit>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveStore.d.ts","sourceRoot":"","sources":["../../src/effect/LiveStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAY,MAAM,EAAE,KAAK,EAA6B,MAAM,yBAAyB,CAAA;AAC/G,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAG5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"LiveStore.d.ts","sourceRoot":"","sources":["../../src/effect/LiveStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAY,MAAM,EAAE,KAAK,EAA6B,MAAM,yBAAyB,CAAA;AAC/G,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAG5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAW5E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,OAAO,CAAC,CAAA;AAE3E,MAAM,MAAM,2BAA2B,CAAC,cAAc,SAAS,kBAAkB,IAAI;IACnF,MAAM,EAAE,eAAe,CAAA;IACvB,WAAW,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IACrD,cAAc,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAA;IAC/C,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;IACxB,mBAAmB,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;IAClC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACnF,CAAA;AAED,eAAO,MAAM,gBAAgB,iDAAyE,CAAA;AAEtG,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;AAC7E,eAAO,MAAM,oBAAoB,yDAEhC,CAAA;AAID,MAAM,MAAM,qBAAqB,CAAC,cAAc,SAAS,kBAAkB,IAAI;IAC7E,MAAM,EAAE,eAAe,CAAA;IACvB,WAAW,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IACrD,cAAc,CAAC,EAAE;QACf,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAA;QACxD,WAAW,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,cAAc,CAAA;KACtD,CAAA;IACD,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CACnE,CAAA;AAED,eAAO,MAAM,qBAAqB,+FAE/B,WAAW,CAAC,KAAK,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAIhD,CAAA;AAEH,eAAO,MAAM,wBAAwB,iDAA+E,CAAA;AAEpH,eAAO,MAAM,oBAAoB,gKAKU,aAAa,CACtD,oBAAoB,GAAG,WAAW,GAAG,KAAK,MAAM,EAChD,KAAK,EACL,gBAAgB,CAgDf,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveStore.js","sourceRoot":"","sources":["../../src/effect/LiveStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,eAAe,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"LiveStore.js","sourceRoot":"","sources":["../../src/effect/LiveStore.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
export { Store, createStore } from './store.js';
|
|
2
|
-
export type {
|
|
2
|
+
export type { BaseGraphQLContext, QueryDebugInfo, RefreshReason } from './store.js';
|
|
3
3
|
export type { QueryDefinition, LiveStoreCreateStoreOptions, LiveStoreContext } from './effect/LiveStore.js';
|
|
4
4
|
export { InMemoryDatabase, type DebugInfo, emptyDebugInfo } from './inMemoryDatabase.js';
|
|
5
5
|
export type { Storage, StorageType, StorageInit } from './storage/index.js';
|
|
6
6
|
export type { GetAtom, AtomDebugInfo, RefreshDebugInfo, SerializedAtom, Atom, Node, Ref, Effect } from './reactive.js';
|
|
7
|
-
export { LiveStoreJSQuery,
|
|
8
|
-
export { LiveStoreSQLQuery, querySQL } from './reactiveQueries/sql.js';
|
|
7
|
+
export { LiveStoreJSQuery, computed } from './reactiveQueries/js.js';
|
|
8
|
+
export { LiveStoreSQLQuery, querySQL, type MapRows } from './reactiveQueries/sql.js';
|
|
9
9
|
export { LiveStoreGraphQLQuery, queryGraphQL } from './reactiveQueries/graphql.js';
|
|
10
|
-
export { type GetAtomResult, type DbGraph, makeDbGraph } from './reactiveQueries/base-class.js';
|
|
10
|
+
export { type GetAtomResult, type DbGraph, makeDbGraph, type LiveQuery } from './reactiveQueries/base-class.js';
|
|
11
11
|
export { globalDbGraph } from './global-state.js';
|
|
12
|
-
export { type RowResult, type RowResultEncoded,
|
|
12
|
+
export { type RowResult, type RowResultEncoded, rowQuery, deriveColQuery } from './row-query.js';
|
|
13
13
|
export * from './mutations.js';
|
|
14
|
-
export { defineAction, defineActions, makeSchema, DbSchema } from './schema/index.js';
|
|
14
|
+
export { defineAction, defineActions, makeSchema, DbSchema, ParseUtils } from './schema/index.js';
|
|
15
15
|
export type { LiveStoreSchema, InputSchema, GetActionArgs, GetApplyEventArgs, ActionDefinition, ActionDefinitions, SQLWriteStatement, SchemaMetaRow, } from './schema/index.js';
|
|
16
16
|
export { SqliteAst, SqliteDsl } from 'effect-db-schema';
|
|
17
17
|
export { prepareBindValues, sql, type Bindable, type PreparedBindValues } from './utils/util.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC/C,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC/C,YAAY,EAAE,kBAAkB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAEnF,YAAY,EAAE,eAAe,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE3G,OAAO,EAAE,gBAAgB,EAAE,KAAK,SAAS,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAExF,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAE3E,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtH,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAA;AACpF,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAClF,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,OAAO,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAE/G,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEhG,cAAc,gBAAgB,CAAA;AAE9B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEjG,YAAY,EACV,eAAe,EACf,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,GACd,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEvD,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,KAAK,QAAQ,EAAE,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAChG,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
export { Store, createStore } from './store.js';
|
|
2
2
|
export { InMemoryDatabase, emptyDebugInfo } from './inMemoryDatabase.js';
|
|
3
|
-
export { LiveStoreJSQuery,
|
|
3
|
+
export { LiveStoreJSQuery, computed } from './reactiveQueries/js.js';
|
|
4
4
|
export { LiveStoreSQLQuery, querySQL } from './reactiveQueries/sql.js';
|
|
5
5
|
export { LiveStoreGraphQLQuery, queryGraphQL } from './reactiveQueries/graphql.js';
|
|
6
6
|
export { makeDbGraph } from './reactiveQueries/base-class.js';
|
|
7
7
|
export { globalDbGraph } from './global-state.js';
|
|
8
|
-
export { rowQuery } from './row-query.js';
|
|
8
|
+
export { rowQuery, deriveColQuery } from './row-query.js';
|
|
9
9
|
export * from './mutations.js';
|
|
10
|
-
export { defineAction, defineActions, makeSchema, DbSchema } from './schema/index.js';
|
|
10
|
+
export { defineAction, defineActions, makeSchema, DbSchema, ParseUtils } from './schema/index.js';
|
|
11
11
|
export { SqliteAst, SqliteDsl } from 'effect-db-schema';
|
|
12
12
|
export { prepareBindValues, sql } from './utils/util.js';
|
|
13
13
|
export { isEqual } from 'lodash-es';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAK/C,OAAO,EAAE,gBAAgB,EAAkB,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAKxF,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAK/C,OAAO,EAAE,gBAAgB,EAAkB,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAKxF,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAgB,MAAM,0BAA0B,CAAA;AACpF,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAClF,OAAO,EAAoC,WAAW,EAAkB,MAAM,iCAAiC,CAAA;AAE/G,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAyC,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEhG,cAAc,gBAAgB,CAAA;AAE9B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAajG,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEvD,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAA0C,MAAM,iBAAiB,CAAA;AAChG,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA"}
|
package/dist/migrations.js
CHANGED
|
@@ -15,11 +15,11 @@ export const migrateDb = ({ db, otelContext, schema, }) => {
|
|
|
15
15
|
const tableDefs = new Set([
|
|
16
16
|
// NOTE it's important the `SCHEMA_META_TABLE` comes first since we're writing to it below
|
|
17
17
|
...systemTables,
|
|
18
|
-
...Array.from(schema.tables.values()).filter((_) => _.
|
|
18
|
+
...Array.from(schema.tables.values()).filter((_) => _.sqliteDef.name !== SCHEMA_META_TABLE),
|
|
19
19
|
...dynamicallyRegisteredTables.values(),
|
|
20
20
|
]);
|
|
21
21
|
for (const tableDef of tableDefs) {
|
|
22
|
-
const tableAst = tableDef.
|
|
22
|
+
const tableAst = tableDef.sqliteDef.ast;
|
|
23
23
|
const tableName = tableAst.name;
|
|
24
24
|
const dbSchemaHash = dbSchemaHashByTable[tableName];
|
|
25
25
|
const schemaHash = SqliteAst.hash(tableAst);
|