@livestore/react 0.3.0-dev.47 → 0.3.0-dev.49
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/dist/.tsbuildinfo +1 -1
- package/dist/LiveStoreProvider.d.ts +4 -1
- package/dist/LiveStoreProvider.d.ts.map +1 -1
- package/dist/LiveStoreProvider.js +17 -17
- package/dist/LiveStoreProvider.js.map +1 -1
- package/dist/LiveStoreProvider.test.js +49 -12
- package/dist/LiveStoreProvider.test.js.map +1 -1
- package/dist/useQuery.d.ts.map +1 -1
- package/dist/useQuery.js +2 -1
- package/dist/useQuery.js.map +1 -1
- package/package.json +6 -6
- package/src/LiveStoreProvider.test.tsx +91 -12
- package/src/LiveStoreProvider.tsx +22 -17
- package/src/__snapshots__/useClientDocument.test.tsx.snap +44 -0
- package/src/useQuery.ts +2 -1
|
@@ -58,8 +58,11 @@ export interface LiveStoreProviderProps {
|
|
|
58
58
|
* @default undefined
|
|
59
59
|
*/
|
|
60
60
|
syncPayload?: Schema.JsonValue;
|
|
61
|
+
debug?: {
|
|
62
|
+
instanceId?: string;
|
|
63
|
+
};
|
|
61
64
|
}
|
|
62
|
-
export declare const LiveStoreProvider: ({ renderLoading, renderError, renderShutdown, otelOptions, children, schema, storeId, boot, adapter, batchUpdates, disableDevtools, signal, confirmUnsavedChanges, syncPayload, }: LiveStoreProviderProps & {
|
|
65
|
+
export declare const LiveStoreProvider: ({ renderLoading, renderError, renderShutdown, otelOptions, children, schema, storeId, boot, adapter, batchUpdates, disableDevtools, signal, confirmUnsavedChanges, syncPayload, debug, }: LiveStoreProviderProps & {
|
|
63
66
|
children?: ReactNode;
|
|
64
67
|
}) => React.ReactElement;
|
|
65
68
|
//# sourceMappingURL=LiveStoreProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveStoreProvider.d.ts","sourceRoot":"","sources":["../src/LiveStoreProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACxG,OAAO,EAAe,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAGV,WAAW,EAEX,KAAK,EACN,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAqC,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAGL,MAAM,EAKN,MAAM,EAGP,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,eAAe,CAAA;IACvB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,CACL,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,EAC7B,GAAG,EAAE;QAAE,gBAAgB,EAAE,gBAAgB,CAAC;QAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAA;KAAE,KAC/D,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;IAC/E,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAClC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,YAAY,CAAA;IACpD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,KAAK,YAAY,CAAA;IAChE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,wBAAwB,GAAG,gBAAgB,KAAK,YAAY,CAAA;IACrF,OAAO,EAAE,OAAO,CAAA;IAChB;;;;;;;;;;;OAWG;IACH,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK,IAAI,CAAA;IACvC,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"LiveStoreProvider.d.ts","sourceRoot":"","sources":["../src/LiveStoreProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACxG,OAAO,EAAe,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAGV,WAAW,EAEX,KAAK,EACN,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAqC,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAGL,MAAM,EAKN,MAAM,EAGP,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,eAAe,CAAA;IACvB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,CACL,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,EAC7B,GAAG,EAAE;QAAE,gBAAgB,EAAE,gBAAgB,CAAC;QAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAA;KAAE,KAC/D,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;IAC/E,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAClC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,YAAY,CAAA;IACpD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,KAAK,YAAY,CAAA;IAChE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,wBAAwB,GAAG,gBAAgB,KAAK,YAAY,CAAA;IACrF,OAAO,EAAE,OAAO,CAAA;IAChB;;;;;;;;;;;OAWG;IACH,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK,IAAI,CAAA;IACvC,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,SAAS,CAAA;IAC9B,KAAK,CAAC,EAAE;QACN,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;CACF;AAyBD,eAAO,MAAM,iBAAiB,GAAI,0LAgB/B,sBAAsB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,KAAG,KAAK,CAAC,YAkC5D,CAAA"}
|
|
@@ -25,7 +25,7 @@ const defaultRenderLoading = (status) => IS_REACT_NATIVE ? React.createElement(R
|
|
|
25
25
|
"LiveStore is loading (",
|
|
26
26
|
status.stage,
|
|
27
27
|
")...");
|
|
28
|
-
export const LiveStoreProvider = ({ renderLoading = defaultRenderLoading, renderError = defaultRenderError, renderShutdown = defaultRenderShutdown, otelOptions, children, schema, storeId = 'default', boot, adapter, batchUpdates, disableDevtools, signal, confirmUnsavedChanges = true, syncPayload, }) => {
|
|
28
|
+
export const LiveStoreProvider = ({ renderLoading = defaultRenderLoading, renderError = defaultRenderError, renderShutdown = defaultRenderShutdown, otelOptions, children, schema, storeId = 'default', boot, adapter, batchUpdates, disableDevtools, signal, confirmUnsavedChanges = true, syncPayload, debug, }) => {
|
|
29
29
|
const storeCtx = useCreateStore({
|
|
30
30
|
storeId,
|
|
31
31
|
schema,
|
|
@@ -37,6 +37,7 @@ export const LiveStoreProvider = ({ renderLoading = defaultRenderLoading, render
|
|
|
37
37
|
signal,
|
|
38
38
|
confirmUnsavedChanges,
|
|
39
39
|
syncPayload,
|
|
40
|
+
debug,
|
|
40
41
|
});
|
|
41
42
|
if (storeCtx.stage === 'error') {
|
|
42
43
|
return renderError(storeCtx.error);
|
|
@@ -51,26 +52,19 @@ export const LiveStoreProvider = ({ renderLoading = defaultRenderLoading, render
|
|
|
51
52
|
if (Object.keys(globalThis.__debugLiveStore).length === 0) {
|
|
52
53
|
globalThis.__debugLiveStore['_'] = storeCtx.store;
|
|
53
54
|
}
|
|
54
|
-
globalThis.__debugLiveStore[storeId] = storeCtx.store;
|
|
55
|
+
globalThis.__debugLiveStore[debug?.instanceId ?? storeId] = storeCtx.store;
|
|
55
56
|
return React.createElement(LiveStoreContext.Provider, { value: storeCtx }, children);
|
|
56
57
|
};
|
|
57
|
-
const
|
|
58
|
-
const withSemaphore = (storeId) => {
|
|
59
|
-
let semaphore = semaphoreMap.get(storeId);
|
|
60
|
-
if (!semaphore) {
|
|
61
|
-
semaphore = Effect.makeSemaphore(1).pipe(Effect.runSync);
|
|
62
|
-
semaphoreMap.set(storeId, semaphore);
|
|
63
|
-
}
|
|
64
|
-
return semaphore.withPermits(1);
|
|
65
|
-
};
|
|
66
|
-
const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpdates, disableDevtools, signal, context, params, confirmUnsavedChanges, syncPayload, }) => {
|
|
58
|
+
const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpdates, disableDevtools, signal, context, params, confirmUnsavedChanges, syncPayload, debug, }) => {
|
|
67
59
|
const [_, rerender] = React.useState(0);
|
|
68
60
|
const ctxValueRef = React.useRef({
|
|
69
61
|
value: { stage: 'loading' },
|
|
70
62
|
componentScope: undefined,
|
|
71
63
|
shutdownDeferred: undefined,
|
|
64
|
+
previousShutdownDeferred: undefined,
|
|
72
65
|
counter: 0,
|
|
73
66
|
});
|
|
67
|
+
const debugInstanceId = debug?.instanceId;
|
|
74
68
|
// console.debug(`useCreateStore (${ctxValueRef.current.counter})`, ctxValueRef.current.value.stage)
|
|
75
69
|
const inputPropsCacheRef = React.useRef({
|
|
76
70
|
schema,
|
|
@@ -84,6 +78,7 @@ const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpda
|
|
|
84
78
|
params,
|
|
85
79
|
confirmUnsavedChanges,
|
|
86
80
|
syncPayload,
|
|
81
|
+
debugInstanceId,
|
|
87
82
|
});
|
|
88
83
|
const interrupt = (componentScope, shutdownDeferred, error) => Effect.gen(function* () {
|
|
89
84
|
// console.log('[@livestore/livestore/react] interupting', error)
|
|
@@ -102,6 +97,7 @@ const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpda
|
|
|
102
97
|
params: inputPropsCacheRef.current.params !== params,
|
|
103
98
|
confirmUnsavedChanges: inputPropsCacheRef.current.confirmUnsavedChanges !== confirmUnsavedChanges,
|
|
104
99
|
syncPayload: inputPropsCacheRef.current.syncPayload !== syncPayload,
|
|
100
|
+
debugInstanceId: inputPropsCacheRef.current.debugInstanceId !== debugInstanceId,
|
|
105
101
|
};
|
|
106
102
|
if (inputPropChanges.schema ||
|
|
107
103
|
inputPropChanges.otelOptions ||
|
|
@@ -126,6 +122,7 @@ const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpda
|
|
|
126
122
|
params,
|
|
127
123
|
confirmUnsavedChanges,
|
|
128
124
|
syncPayload,
|
|
125
|
+
debugInstanceId,
|
|
129
126
|
};
|
|
130
127
|
if (ctxValueRef.current.componentScope !== undefined && ctxValueRef.current.shutdownDeferred !== undefined) {
|
|
131
128
|
const changedInputProps = Object.keys(inputPropChanges).filter((key) => inputPropChanges[key]);
|
|
@@ -137,6 +134,7 @@ const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpda
|
|
|
137
134
|
value: { stage: 'loading' },
|
|
138
135
|
componentScope: undefined,
|
|
139
136
|
shutdownDeferred: undefined,
|
|
137
|
+
previousShutdownDeferred: ctxValueRef.current.shutdownDeferred,
|
|
140
138
|
counter: ctxValueRef.current.counter + 1,
|
|
141
139
|
};
|
|
142
140
|
}
|
|
@@ -158,6 +156,10 @@ const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpda
|
|
|
158
156
|
}
|
|
159
157
|
});
|
|
160
158
|
const cancel = Effect.gen(function* () {
|
|
159
|
+
// Wait for the previous store to fully shutdown before creating a new one
|
|
160
|
+
if (ctxValueRef.current.previousShutdownDeferred) {
|
|
161
|
+
yield* Deferred.await(ctxValueRef.current.previousShutdownDeferred);
|
|
162
|
+
}
|
|
161
163
|
const componentScope = yield* Scope.make().pipe(Effect.acquireRelease(Scope.close));
|
|
162
164
|
const shutdownDeferred = yield* makeShutdownDeferred;
|
|
163
165
|
ctxValueRef.current.componentScope = componentScope;
|
|
@@ -181,16 +183,13 @@ const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpda
|
|
|
181
183
|
// NOTE sometimes when status come in in rapid succession, only the last value will be rendered by React
|
|
182
184
|
setContextValue(status);
|
|
183
185
|
},
|
|
186
|
+
debug: { instanceId: debugInstanceId },
|
|
184
187
|
}).pipe(Effect.tapErrorCause((cause) => Deferred.failCause(shutdownDeferred, cause)));
|
|
185
188
|
setContextValue({ stage: 'running', store });
|
|
186
189
|
}).pipe(Scope.extend(componentScope), Effect.forkIn(componentScope));
|
|
187
190
|
const shutdownContext = (cause) => Effect.sync(() => setContextValue({ stage: 'shutdown', cause }));
|
|
188
191
|
yield* Deferred.await(shutdownDeferred).pipe(Effect.tapErrorCause((cause) => Effect.logDebug('[@livestore/livestore/react] shutdown', Cause.pretty(cause))), Effect.catchTag('LiveStore.IntentionalShutdownCause', (cause) => shutdownContext(cause)), Effect.catchTag('LiveStore.StoreInterrupted', (cause) => shutdownContext(cause)), Effect.tapError((error) => Effect.sync(() => setContextValue({ stage: 'error', error }))), Effect.tapDefect((defect) => Effect.sync(() => setContextValue({ stage: 'error', error: defect }))), Effect.exit);
|
|
189
|
-
}).pipe(Effect.scoped,
|
|
190
|
-
// NOTE we're running the code above in a semaphore to make sure a previous store is always fully
|
|
191
|
-
// shutdown before a new one is created - especially when shutdown logic is async. You can't trust `React.useEffect`.
|
|
192
|
-
// Thank you to Mattia Manzati for this idea.
|
|
193
|
-
withSemaphore(storeId), Effect.withSpan('@livestore/react:useCreateStore'), LS_DEV ? TaskTracing.withAsyncTaggingTracing((name) => console.createTask(name)) : identity, provideOtel({ parentSpanContext: otelOptions?.rootSpanContext, otelTracer: otelOptions?.tracer }), Effect.tapCauseLogPretty, Effect.annotateLogs({ thread: 'window' }), Effect.provide(Logger.prettyWithThread('window')), Logger.withMinimumLogLevel(LogLevel.Debug), Effect.runCallback);
|
|
192
|
+
}).pipe(Effect.scoped, Effect.withSpan('@livestore/react:useCreateStore'), LS_DEV ? TaskTracing.withAsyncTaggingTracing((name) => console.createTask(name)) : identity, provideOtel({ parentSpanContext: otelOptions?.rootSpanContext, otelTracer: otelOptions?.tracer }), Effect.tapCauseLogPretty, Effect.annotateLogs({ thread: 'window' }), Effect.provide(Logger.prettyWithThread('window')), Logger.withMinimumLogLevel(LogLevel.Debug), Effect.runCallback);
|
|
194
193
|
return () => {
|
|
195
194
|
cancel();
|
|
196
195
|
if (ctxValueRef.current.componentScope !== undefined && ctxValueRef.current.shutdownDeferred !== undefined) {
|
|
@@ -212,6 +211,7 @@ const useCreateStore = ({ schema, storeId, otelOptions, boot, adapter, batchUpda
|
|
|
212
211
|
params,
|
|
213
212
|
confirmUnsavedChanges,
|
|
214
213
|
syncPayload,
|
|
214
|
+
debugInstanceId,
|
|
215
215
|
]);
|
|
216
216
|
return ctxValueRef.current.value;
|
|
217
217
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveStoreProvider.js","sourceRoot":"","sources":["../src/LiveStoreProvider.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAShE,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC1F,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzE,OAAO,EACL,KAAK,EACL,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,MAAM,EACN,KAAK,EACL,WAAW,GACZ,MAAM,yBAAyB,CAAA;AAGhC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"LiveStoreProvider.js","sourceRoot":"","sources":["../src/LiveStoreProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,11 @@ import { sql } from '@livestore/common';
|
|
|
3
3
|
import { rawSqlEvent } from '@livestore/common/schema';
|
|
4
4
|
import { queryDb } from '@livestore/livestore';
|
|
5
5
|
import { Schema } from '@livestore/utils/effect';
|
|
6
|
-
import
|
|
6
|
+
import * as ReactTesting from '@testing-library/react';
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import { unstable_batchedUpdates as batchUpdates } from 'react-dom';
|
|
9
9
|
import { describe, expect, it } from 'vitest';
|
|
10
|
-
import { schema, tables } from './__tests__/fixture.js';
|
|
10
|
+
import { events, schema, tables } from './__tests__/fixture.js';
|
|
11
11
|
import { LiveStoreProvider } from './LiveStoreProvider.js';
|
|
12
12
|
import * as LiveStoreReact from './mod.js';
|
|
13
13
|
describe.each([true, false])('LiveStoreProvider (strictMode: %s)', (strictMode) => {
|
|
@@ -34,16 +34,16 @@ describe.each([true, false])('LiveStoreProvider (strictMode: %s)', (strictMode)
|
|
|
34
34
|
status.stage), adapter: adapterMemo, boot: bootCb, signal: abortController.signal, batchUpdates: batchUpdates },
|
|
35
35
|
React.createElement(App, null))));
|
|
36
36
|
};
|
|
37
|
-
const { rerender } = render(React.createElement(Root, { forceUpdate: 1 }));
|
|
37
|
+
const { rerender } = ReactTesting.render(React.createElement(Root, { forceUpdate: 1 }));
|
|
38
38
|
expect(appRenderCount).toBe(0);
|
|
39
|
-
await waitForElementToBeRemoved(() => screen.getByText((_) => _.startsWith('Loading LiveStore')));
|
|
39
|
+
await ReactTesting.waitForElementToBeRemoved(() => ReactTesting.screen.getByText((_) => _.startsWith('Loading LiveStore')));
|
|
40
40
|
expect(appRenderCount).toBe(strictMode ? 2 : 1);
|
|
41
41
|
rerender(React.createElement(Root, { forceUpdate: 2 }));
|
|
42
|
-
await waitFor(() => screen.getByText('Loading LiveStore: loading'));
|
|
43
|
-
await waitFor(() => screen.getByText((_) => _.includes('buy milk')));
|
|
42
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText('Loading LiveStore: loading'));
|
|
43
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText((_) => _.includes('buy milk')));
|
|
44
44
|
expect(appRenderCount).toBe(strictMode ? 4 : 2);
|
|
45
45
|
abortController.abort();
|
|
46
|
-
await waitFor(() => screen.getByText('LiveStore Shutdown due to interrupted', { exact: false }));
|
|
46
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText('LiveStore Shutdown due to interrupted', { exact: false }));
|
|
47
47
|
});
|
|
48
48
|
// TODO test aborting during boot
|
|
49
49
|
it('error during boot', async () => {
|
|
@@ -64,9 +64,9 @@ describe.each([true, false])('LiveStoreProvider (strictMode: %s)', (strictMode)
|
|
|
64
64
|
status.stage), adapter: adapterMemo, boot: bootCb, batchUpdates: batchUpdates },
|
|
65
65
|
React.createElement(App, null))));
|
|
66
66
|
};
|
|
67
|
-
render(React.createElement(Root, { forceUpdate: 1 }));
|
|
67
|
+
ReactTesting.render(React.createElement(Root, { forceUpdate: 1 }));
|
|
68
68
|
expect(appRenderCount).toBe(0);
|
|
69
|
-
await waitFor(() => screen.getByText((_) => _.startsWith('LiveStore.UnexpectedError')));
|
|
69
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText((_) => _.startsWith('LiveStore.UnexpectedError')));
|
|
70
70
|
});
|
|
71
71
|
it('unmounts when store is shutdown', async () => {
|
|
72
72
|
let appRenderCount = 0;
|
|
@@ -92,12 +92,49 @@ describe.each([true, false])('LiveStoreProvider (strictMode: %s)', (strictMode)
|
|
|
92
92
|
status.stage), adapter: adapter, batchUpdates: batchUpdates },
|
|
93
93
|
React.createElement(App, null))));
|
|
94
94
|
};
|
|
95
|
-
render(React.createElement(Root, null));
|
|
95
|
+
ReactTesting.render(React.createElement(Root, null));
|
|
96
96
|
expect(appRenderCount).toBe(0);
|
|
97
|
-
await waitFor(() => screen.getByText('[]'));
|
|
97
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText('[]'));
|
|
98
98
|
React.act(() => shutdownDeferred.resolve());
|
|
99
99
|
expect(appRenderCount).toBe(strictMode ? 2 : 1);
|
|
100
|
-
await waitFor(() => screen.getByText('LiveStore Shutdown due to manual shutdown', { exact: false }));
|
|
100
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText('LiveStore Shutdown due to manual shutdown', { exact: false }));
|
|
101
101
|
});
|
|
102
102
|
});
|
|
103
|
+
it('should work two stores with the same storeId', async () => {
|
|
104
|
+
const allTodos$ = queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.rowSchema) });
|
|
105
|
+
const appRenderCount = {
|
|
106
|
+
store1: 0,
|
|
107
|
+
store2: 0,
|
|
108
|
+
};
|
|
109
|
+
const App = () => {
|
|
110
|
+
const { store } = LiveStoreReact.useStore();
|
|
111
|
+
const instanceId = store.clientSession.debugInstanceId;
|
|
112
|
+
appRenderCount[instanceId]++;
|
|
113
|
+
const todos = store.useQuery(allTodos$);
|
|
114
|
+
return (React.createElement("div", { id: instanceId },
|
|
115
|
+
React.createElement("div", { role: "heading" }, instanceId),
|
|
116
|
+
React.createElement("div", { role: "content" }, JSON.stringify(todos)),
|
|
117
|
+
React.createElement("button", { onClick: () => store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false })) },
|
|
118
|
+
"create todo ",
|
|
119
|
+
instanceId)));
|
|
120
|
+
};
|
|
121
|
+
const Root = () => {
|
|
122
|
+
const storeId = 'fixed-store-id';
|
|
123
|
+
return (React.createElement("div", null,
|
|
124
|
+
React.createElement(LiveStoreProvider, { storeId: storeId, debug: { instanceId: 'store1' }, schema: schema, adapter: makeInMemoryAdapter(), batchUpdates: batchUpdates },
|
|
125
|
+
React.createElement(App, null)),
|
|
126
|
+
React.createElement(LiveStoreProvider, { storeId: storeId, debug: { instanceId: 'store2' }, schema: schema, adapter: makeInMemoryAdapter(), batchUpdates: batchUpdates },
|
|
127
|
+
React.createElement(App, null))));
|
|
128
|
+
};
|
|
129
|
+
const { container } = ReactTesting.render(React.createElement(Root, null));
|
|
130
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByRole('heading', { name: 'store1' }));
|
|
131
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByRole('heading', { name: 'store2' }));
|
|
132
|
+
expect(appRenderCount.store1).toBe(1);
|
|
133
|
+
expect(appRenderCount.store2).toBe(1);
|
|
134
|
+
ReactTesting.fireEvent.click(ReactTesting.screen.getByText('create todo store1'));
|
|
135
|
+
expect(appRenderCount.store1).toBe(2);
|
|
136
|
+
expect(container.querySelector('#store1 > div[role="content"]')?.textContent).toBe('[{"id":"t1","text":"buy milk","completed":false}]');
|
|
137
|
+
expect(container.querySelector('#store2 > div[role="content"]')?.textContent).toBe('[]');
|
|
138
|
+
});
|
|
139
|
+
// TODO test that checks that there are no two exact same instances (i.e. same storeId, clientId, sessionId)
|
|
103
140
|
//# sourceMappingURL=LiveStoreProvider.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveStoreProvider.test.js","sourceRoot":"","sources":["../src/LiveStoreProvider.test.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"LiveStoreProvider.test.js","sourceRoot":"","sources":["../src/LiveStoreProvider.test.tsx"],"names":[],"mappings":"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"}
|
package/dist/useQuery.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAE1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,GAAI,MAAM,SAAS,YAAY,CAAC,GAAG,EACtD,UAAU,MAAM,EAChB,UAAU;IAAE,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,KAC1B,WAAW,CAAC,SAAS,CAAC,MAAM,CAAoD,CAAA;AAEnF;GACG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,SAAS,YAAY,CAAC,GAAG,EACzD,UAAU,MAAM,EAChB,UAAU;IACR,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,wCAAwC;IACxC,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;IAC1B,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,KACA;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IACxD,UAAU,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAE1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,GAAI,MAAM,SAAS,YAAY,CAAC,GAAG,EACtD,UAAU,MAAM,EAChB,UAAU;IAAE,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,KAC1B,WAAW,CAAC,SAAS,CAAC,MAAM,CAAoD,CAAA;AAEnF;GACG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,SAAS,YAAY,CAAC,GAAG,EACzD,UAAU,MAAM,EAChB,UAAU;IACR,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,wCAAwC;IACxC,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;IAC1B,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,KACA;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IACxD,UAAU,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;CAqHxE,CAAA"}
|
package/dist/useQuery.js
CHANGED
|
@@ -25,7 +25,8 @@ export const useQueryRef = (queryDef, options) => {
|
|
|
25
25
|
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
26
26
|
React.useContext(LiveStoreContext)?.store ??
|
|
27
27
|
shouldNeverHappen(`No store provided to useQuery`);
|
|
28
|
-
|
|
28
|
+
// It's important to use all "aspects" of a store instance here, otherwise we get unexpected cache mappings
|
|
29
|
+
const rcRefKey = `${store.storeId}_${store.clientId}_${store.sessionId}_${queryDef.hash}`;
|
|
29
30
|
const stackInfo = React.useMemo(() => {
|
|
30
31
|
Error.stackTraceLimit = 10;
|
|
31
32
|
// eslint-disable-next-line unicorn/error-message
|
package/dist/useQuery.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExF,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACvE,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAA;AAEtF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAgB,EAChB,OAA2B,EACI,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAA;AAEnF;GACG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,QAAgB,EAChB,OAMC,EAID,EAAE;IACF,MAAM,KAAK,GACT,OAAO,EAAE,KAAK;QACd,sDAAsD;QACtD,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,KAAK;QACzC,iBAAiB,CAAC,+BAA+B,CAAC,CAAA;IAEpD,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/react",
|
|
3
|
-
"version": "0.3.0-dev.
|
|
3
|
+
"version": "0.3.0-dev.49",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"exports": {
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@opentelemetry/api": "1.9.0",
|
|
26
|
-
"@livestore/common": "0.3.0-dev.
|
|
27
|
-
"@livestore/livestore": "0.3.0-dev.
|
|
28
|
-
"@livestore/utils": "0.3.0-dev.
|
|
26
|
+
"@livestore/common": "0.3.0-dev.49",
|
|
27
|
+
"@livestore/livestore": "0.3.0-dev.49",
|
|
28
|
+
"@livestore/utils": "0.3.0-dev.49"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@opentelemetry/sdk-trace-base": "^2.0.0",
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
"typescript": "^5.8.3",
|
|
41
41
|
"vite": "^6.3.4",
|
|
42
42
|
"vitest": "^3.1.2",
|
|
43
|
-
"@livestore/adapter-web": "0.3.0-dev.
|
|
44
|
-
"@livestore/utils-dev": "0.3.0-dev.
|
|
43
|
+
"@livestore/adapter-web": "0.3.0-dev.49",
|
|
44
|
+
"@livestore/utils-dev": "0.3.0-dev.49"
|
|
45
45
|
},
|
|
46
46
|
"files": [
|
|
47
47
|
"package.json",
|
|
@@ -3,12 +3,12 @@ import { sql } from '@livestore/common'
|
|
|
3
3
|
import { rawSqlEvent } from '@livestore/common/schema'
|
|
4
4
|
import { queryDb, type Store } from '@livestore/livestore'
|
|
5
5
|
import { Schema } from '@livestore/utils/effect'
|
|
6
|
-
import
|
|
6
|
+
import * as ReactTesting from '@testing-library/react'
|
|
7
7
|
import React from 'react'
|
|
8
8
|
import { unstable_batchedUpdates as batchUpdates } from 'react-dom'
|
|
9
9
|
import { describe, expect, it } from 'vitest'
|
|
10
10
|
|
|
11
|
-
import { schema, tables } from './__tests__/fixture.js'
|
|
11
|
+
import { events, schema, tables } from './__tests__/fixture.js'
|
|
12
12
|
import { LiveStoreProvider } from './LiveStoreProvider.js'
|
|
13
13
|
import * as LiveStoreReact from './mod.js'
|
|
14
14
|
|
|
@@ -59,24 +59,28 @@ describe.each([true, false])('LiveStoreProvider (strictMode: %s)', (strictMode)
|
|
|
59
59
|
)
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
const { rerender } = render(<Root forceUpdate={1} />)
|
|
62
|
+
const { rerender } = ReactTesting.render(<Root forceUpdate={1} />)
|
|
63
63
|
|
|
64
64
|
expect(appRenderCount).toBe(0)
|
|
65
65
|
|
|
66
|
-
await waitForElementToBeRemoved(() =>
|
|
66
|
+
await ReactTesting.waitForElementToBeRemoved(() =>
|
|
67
|
+
ReactTesting.screen.getByText((_) => _.startsWith('Loading LiveStore')),
|
|
68
|
+
)
|
|
67
69
|
|
|
68
70
|
expect(appRenderCount).toBe(strictMode ? 2 : 1)
|
|
69
71
|
|
|
70
72
|
rerender(<Root forceUpdate={2} />)
|
|
71
73
|
|
|
72
|
-
await waitFor(() => screen.getByText('Loading LiveStore: loading'))
|
|
73
|
-
await waitFor(() => screen.getByText((_) => _.includes('buy milk')))
|
|
74
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText('Loading LiveStore: loading'))
|
|
75
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText((_) => _.includes('buy milk')))
|
|
74
76
|
|
|
75
77
|
expect(appRenderCount).toBe(strictMode ? 4 : 2)
|
|
76
78
|
|
|
77
79
|
abortController.abort()
|
|
78
80
|
|
|
79
|
-
await waitFor(() =>
|
|
81
|
+
await ReactTesting.waitFor(() =>
|
|
82
|
+
ReactTesting.screen.getByText('LiveStore Shutdown due to interrupted', { exact: false }),
|
|
83
|
+
)
|
|
80
84
|
})
|
|
81
85
|
|
|
82
86
|
// TODO test aborting during boot
|
|
@@ -117,11 +121,11 @@ describe.each([true, false])('LiveStoreProvider (strictMode: %s)', (strictMode)
|
|
|
117
121
|
)
|
|
118
122
|
}
|
|
119
123
|
|
|
120
|
-
render(<Root forceUpdate={1} />)
|
|
124
|
+
ReactTesting.render(<Root forceUpdate={1} />)
|
|
121
125
|
|
|
122
126
|
expect(appRenderCount).toBe(0)
|
|
123
127
|
|
|
124
|
-
await waitFor(() => screen.getByText((_) => _.startsWith('LiveStore.UnexpectedError')))
|
|
128
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText((_) => _.startsWith('LiveStore.UnexpectedError')))
|
|
125
129
|
})
|
|
126
130
|
|
|
127
131
|
it('unmounts when store is shutdown', async () => {
|
|
@@ -164,16 +168,91 @@ describe.each([true, false])('LiveStoreProvider (strictMode: %s)', (strictMode)
|
|
|
164
168
|
)
|
|
165
169
|
}
|
|
166
170
|
|
|
167
|
-
render(<Root />)
|
|
171
|
+
ReactTesting.render(<Root />)
|
|
168
172
|
|
|
169
173
|
expect(appRenderCount).toBe(0)
|
|
170
174
|
|
|
171
|
-
await waitFor(() => screen.getByText('[]'))
|
|
175
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByText('[]'))
|
|
172
176
|
|
|
173
177
|
React.act(() => shutdownDeferred.resolve())
|
|
174
178
|
|
|
175
179
|
expect(appRenderCount).toBe(strictMode ? 2 : 1)
|
|
176
180
|
|
|
177
|
-
await waitFor(() =>
|
|
181
|
+
await ReactTesting.waitFor(() =>
|
|
182
|
+
ReactTesting.screen.getByText('LiveStore Shutdown due to manual shutdown', { exact: false }),
|
|
183
|
+
)
|
|
178
184
|
})
|
|
179
185
|
})
|
|
186
|
+
|
|
187
|
+
it('should work two stores with the same storeId', async () => {
|
|
188
|
+
const allTodos$ = queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.rowSchema) })
|
|
189
|
+
|
|
190
|
+
const appRenderCount = {
|
|
191
|
+
store1: 0,
|
|
192
|
+
store2: 0,
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
const App = () => {
|
|
196
|
+
const { store } = LiveStoreReact.useStore()
|
|
197
|
+
const instanceId = store.clientSession.debugInstanceId as 'store1' | 'store2'
|
|
198
|
+
appRenderCount[instanceId]!++
|
|
199
|
+
|
|
200
|
+
const todos = store.useQuery(allTodos$)
|
|
201
|
+
|
|
202
|
+
return (
|
|
203
|
+
<div id={instanceId}>
|
|
204
|
+
<div role="heading">{instanceId}</div>
|
|
205
|
+
<div role="content">{JSON.stringify(todos)}</div>
|
|
206
|
+
<button onClick={() => store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false }))}>
|
|
207
|
+
create todo {instanceId}
|
|
208
|
+
</button>
|
|
209
|
+
</div>
|
|
210
|
+
)
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
const Root = () => {
|
|
214
|
+
const storeId = 'fixed-store-id'
|
|
215
|
+
return (
|
|
216
|
+
<div>
|
|
217
|
+
<LiveStoreProvider
|
|
218
|
+
storeId={storeId}
|
|
219
|
+
debug={{ instanceId: 'store1' }}
|
|
220
|
+
schema={schema}
|
|
221
|
+
adapter={makeInMemoryAdapter()}
|
|
222
|
+
batchUpdates={batchUpdates}
|
|
223
|
+
>
|
|
224
|
+
<App />
|
|
225
|
+
</LiveStoreProvider>
|
|
226
|
+
<LiveStoreProvider
|
|
227
|
+
storeId={storeId}
|
|
228
|
+
debug={{ instanceId: 'store2' }}
|
|
229
|
+
schema={schema}
|
|
230
|
+
adapter={makeInMemoryAdapter()}
|
|
231
|
+
batchUpdates={batchUpdates}
|
|
232
|
+
>
|
|
233
|
+
<App />
|
|
234
|
+
</LiveStoreProvider>
|
|
235
|
+
</div>
|
|
236
|
+
)
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
const { container } = ReactTesting.render(<Root />)
|
|
240
|
+
|
|
241
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByRole('heading', { name: 'store1' }))
|
|
242
|
+
await ReactTesting.waitFor(() => ReactTesting.screen.getByRole('heading', { name: 'store2' }))
|
|
243
|
+
|
|
244
|
+
expect(appRenderCount.store1).toBe(1)
|
|
245
|
+
expect(appRenderCount.store2).toBe(1)
|
|
246
|
+
|
|
247
|
+
ReactTesting.fireEvent.click(ReactTesting.screen.getByText('create todo store1'))
|
|
248
|
+
|
|
249
|
+
expect(appRenderCount.store1).toBe(2)
|
|
250
|
+
|
|
251
|
+
expect(container.querySelector('#store1 > div[role="content"]')?.textContent).toBe(
|
|
252
|
+
'[{"id":"t1","text":"buy milk","completed":false}]',
|
|
253
|
+
)
|
|
254
|
+
|
|
255
|
+
expect(container.querySelector('#store2 > div[role="content"]')?.textContent).toBe('[]')
|
|
256
|
+
})
|
|
257
|
+
|
|
258
|
+
// TODO test that checks that there are no two exact same instances (i.e. same storeId, clientId, sessionId)
|