@terreno/syncdb 58.0.0-beta.3 → 58.0.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/CHANGELOG.md +166 -0
- package/dist/api/client.d.ts +6 -0
- package/dist/api/client.d.ts.map +1 -1
- package/dist/api/client.js +8 -0
- package/dist/api/client.js.map +1 -1
- package/dist/api/client.test.js +52 -0
- package/dist/api/client.test.js.map +1 -1
- package/dist/app/app.d.ts +6 -5
- package/dist/app/app.d.ts.map +1 -1
- package/dist/app/app.js +6 -5
- package/dist/app/app.js.map +1 -1
- package/dist/auth/session.d.ts +6 -0
- package/dist/auth/session.d.ts.map +1 -1
- package/dist/auth/session.js +21 -1
- package/dist/auth/session.js.map +1 -1
- package/dist/auth/session.test.js +148 -0
- package/dist/auth/session.test.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +2 -0
- package/dist/client.js.map +1 -1
- package/dist/client.test.js +1 -0
- package/dist/client.test.js.map +1 -1
- package/dist/isolated/appEntryWithoutMcp.isolated.d.ts +2 -0
- package/dist/isolated/appEntryWithoutMcp.isolated.d.ts.map +1 -0
- package/dist/isolated/appEntryWithoutMcp.isolated.js +21 -0
- package/dist/isolated/appEntryWithoutMcp.isolated.js.map +1 -0
- package/dist/storage/schema.d.ts.map +1 -1
- package/dist/storage/schema.js +6 -0
- package/dist/storage/schema.js.map +1 -1
- package/dist/storage/store.d.ts +6 -0
- package/dist/storage/store.d.ts.map +1 -1
- package/dist/storage/store.js +25 -10
- package/dist/storage/store.js.map +1 -1
- package/dist/storage/store.test.js +18 -0
- package/dist/storage/store.test.js.map +1 -1
- package/dist/storage/types.d.ts +11 -0
- package/dist/storage/types.d.ts.map +1 -1
- package/dist/sync/deltaApplier.d.ts +3 -2
- package/dist/sync/deltaApplier.d.ts.map +1 -1
- package/dist/sync/deltaApplier.js +13 -3
- package/dist/sync/deltaApplier.js.map +1 -1
- package/dist/sync/deltaApplier.test.js +52 -0
- package/dist/sync/deltaApplier.test.js.map +1 -1
- package/dist/sync/replayCoordinator.d.ts.map +1 -1
- package/dist/sync/replayCoordinator.js +4 -0
- package/dist/sync/replayCoordinator.js.map +1 -1
- package/dist/sync/replayCoordinator.test.js +1 -0
- package/dist/sync/replayCoordinator.test.js.map +1 -1
- package/dist/sync/windowHydrate.d.ts +9 -7
- package/dist/sync/windowHydrate.d.ts.map +1 -1
- package/dist/sync/windowHydrate.js +20 -10
- package/dist/sync/windowHydrate.js.map +1 -1
- package/dist/sync/windowHydrate.test.js +189 -2
- package/dist/sync/windowHydrate.test.js.map +1 -1
- package/package.json +8 -4
- package/src/api/client.test.ts +73 -0
- package/src/api/client.ts +15 -0
- package/src/app/app.ts +6 -10
- package/src/auth/session.test.ts +177 -0
- package/src/auth/session.ts +26 -1
- package/src/client.test.ts +1 -0
- package/src/client.ts +2 -0
- package/src/isolated/appEntryWithoutMcp.isolated.ts +23 -0
- package/src/storage/schema.ts +6 -0
- package/src/storage/store.test.ts +19 -0
- package/src/storage/store.ts +33 -10
- package/src/storage/types.ts +11 -0
- package/src/sync/deltaApplier.test.ts +55 -0
- package/src/sync/deltaApplier.ts +15 -3
- package/src/sync/replayCoordinator.test.ts +1 -0
- package/src/sync/replayCoordinator.ts +4 -0
- package/src/sync/windowHydrate.test.ts +225 -3
- package/src/sync/windowHydrate.ts +23 -13
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windowHydrate.d.ts","sourceRoot":"","sources":["../../src/sync/windowHydrate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAEhD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAK/C,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,SAAS,CAAC;IACjB,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,EAAE,CAAC;IACd;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED
|
|
1
|
+
{"version":3,"file":"windowHydrate.d.ts","sourceRoot":"","sources":["../../src/sync/windowHydrate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAEhD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAK/C,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,SAAS,CAAC;IACjB,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,EAAE,CAAC;IACd;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,GAAU,gDAMzC,yBAAyB,KAAG,OAAO,CAAC,2BAA2B,CAoEjE,CAAC"}
|
|
@@ -2,10 +2,12 @@ import { MAX_REPAIR_FETCH_IDS } from "./entityRepair";
|
|
|
2
2
|
/** Stream key window subscribers join (`{collection}|admin`). */
|
|
3
3
|
const adminWindowStream = (collection) => `${collection}|admin`;
|
|
4
4
|
/**
|
|
5
|
-
* Upsert a window of known ids into TinyBase. REST rows render immediately
|
|
6
|
-
* canonical seq
|
|
7
|
-
*
|
|
8
|
-
*
|
|
5
|
+
* Upsert a window of known ids into TinyBase. REST rows render immediately for ids the store
|
|
6
|
+
* lacks; the canonical entity (data, seq, deleted) from `GET /sync/entities` then replaces any
|
|
7
|
+
* stored version older than it, and never a version at least as new (a live delta that landed
|
|
8
|
+
* first). Overlapping calls stay safe: a stale REST page can never be stored under a newer seq.
|
|
9
|
+
* Server ids that `/sync/entities` does not return are ignored (no empty rows) unless a REST
|
|
10
|
+
* row already landed.
|
|
9
11
|
*/
|
|
10
12
|
export const hydrateWindowEntities = async ({ store, channel, collection, ids, restRows, }) => {
|
|
11
13
|
const uniqueIds = [...new Set(ids.filter((id) => id.length > 0))];
|
|
@@ -23,6 +25,11 @@ export const hydrateWindowEntities = async ({ store, channel, collection, ids, r
|
|
|
23
25
|
if (existing?.pendingMutationId) {
|
|
24
26
|
continue;
|
|
25
27
|
}
|
|
28
|
+
// REST rows only fill ids the store lacks. An entity with a server seq (from a live delta or
|
|
29
|
+
// an earlier hydrate) is at least as new as a REST page read before it, so it is kept.
|
|
30
|
+
if (existing && existing.seq > 0) {
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
26
33
|
store.upsertEntity({
|
|
27
34
|
collection,
|
|
28
35
|
data: restData,
|
|
@@ -42,17 +49,20 @@ export const hydrateWindowEntities = async ({ store, channel, collection, ids, r
|
|
|
42
49
|
if (existing?.pendingMutationId) {
|
|
43
50
|
continue;
|
|
44
51
|
}
|
|
45
|
-
// A live `{collection}|admin` delta can land while this fetch is in flight
|
|
46
|
-
//
|
|
47
|
-
// seq
|
|
48
|
-
|
|
52
|
+
// A live `{collection}|admin` delta can land while this fetch is in flight, and an entity
|
|
53
|
+
// the store already holds at this seq is the same version. Writing the fetched snapshot
|
|
54
|
+
// back would rewind data, seq or deleted and make the next mutate conflict against a stale
|
|
55
|
+
// baseline.
|
|
56
|
+
if (existing && existing.seq > 0 && existing.seq >= entity.seq) {
|
|
49
57
|
hydrated.add(entity.id);
|
|
50
58
|
continue;
|
|
51
59
|
}
|
|
52
|
-
const restData = restRows?.[entity.id];
|
|
53
60
|
store.upsertEntity({
|
|
54
61
|
collection,
|
|
55
|
-
|
|
62
|
+
// `/sync/entities` is read after the REST page, so a newer fetched entity is never older
|
|
63
|
+
// than a REST row; keeping REST data here could store a pre-update title under the new
|
|
64
|
+
// seq, and the live delta for that seq would then be skipped as already applied.
|
|
65
|
+
data: entity.data,
|
|
56
66
|
deleted: entity.deleted,
|
|
57
67
|
id: entity.id,
|
|
58
68
|
pendingMutationId: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windowHydrate.js","sourceRoot":"","sources":["../../src/sync/windowHydrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAC,MAAM,gBAAgB,CAAC;AAGpD,iEAAiE;AACjE,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,GAAG,UAAU,QAAQ,CAAC;AAmBhF
|
|
1
|
+
{"version":3,"file":"windowHydrate.js","sourceRoot":"","sources":["../../src/sync/windowHydrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,51 @@ import { describe, it } from "bun:test";
|
|
|
2
2
|
import { assert } from "chai";
|
|
3
3
|
import { DateTime } from "luxon";
|
|
4
4
|
import { createSyncStore } from "../storage/store";
|
|
5
|
+
import { applyDelta } from "./deltaApplier";
|
|
5
6
|
import { hydrateWindowEntities } from "./windowHydrate";
|
|
6
7
|
const STREAM = "todos|admin";
|
|
8
|
+
const holdFetch = () => {
|
|
9
|
+
let resolve = () => { };
|
|
10
|
+
const promise = new Promise((res) => {
|
|
11
|
+
resolve = res;
|
|
12
|
+
});
|
|
13
|
+
return { promise, resolve };
|
|
14
|
+
};
|
|
15
|
+
// Two overlapping window hydrates (e.g. a re-query while the first is in flight), both holding a
|
|
16
|
+
// REST page read before a PATCH; the second /sync/entities read lands after the server committed it.
|
|
17
|
+
const runOverlappingHydrates = async (store) => {
|
|
18
|
+
const first = holdFetch();
|
|
19
|
+
const second = holdFetch();
|
|
20
|
+
const call1 = hydrateWindowEntities({
|
|
21
|
+
channel: { fetchEntities: () => first.promise },
|
|
22
|
+
collection: "todos",
|
|
23
|
+
ids: ["t1"],
|
|
24
|
+
restRows: { t1: { title: "old" } },
|
|
25
|
+
store,
|
|
26
|
+
});
|
|
27
|
+
const call2 = hydrateWindowEntities({
|
|
28
|
+
channel: { fetchEntities: () => second.promise },
|
|
29
|
+
collection: "todos",
|
|
30
|
+
ids: ["t1"],
|
|
31
|
+
restRows: { t1: { title: "old" } },
|
|
32
|
+
store,
|
|
33
|
+
});
|
|
34
|
+
first.resolve({ entities: [{ data: { title: "old" }, deleted: false, id: "t1", seq: 263 }] });
|
|
35
|
+
await call1;
|
|
36
|
+
second.resolve({ entities: [{ data: { title: "new" }, deleted: false, id: "t1", seq: 264 }] });
|
|
37
|
+
await call2;
|
|
38
|
+
applyDelta({
|
|
39
|
+
delta: {
|
|
40
|
+
collection: "todos",
|
|
41
|
+
data: { title: "new" },
|
|
42
|
+
id: "t1",
|
|
43
|
+
method: "update",
|
|
44
|
+
seq: 264,
|
|
45
|
+
stream: STREAM,
|
|
46
|
+
},
|
|
47
|
+
store,
|
|
48
|
+
});
|
|
49
|
+
};
|
|
7
50
|
describe("hydrateWindowEntities", () => {
|
|
8
51
|
it("hydrates 2 of 3 ids and ignores the unknown id", async () => {
|
|
9
52
|
const store = createSyncStore({ collections: ["todos"] });
|
|
@@ -56,7 +99,8 @@ describe("hydrateWindowEntities", () => {
|
|
|
56
99
|
assert.deepEqual(fetched, [["a", "b"]]);
|
|
57
100
|
const restRow = store.getEntity({ collection: "todos", id: "a" });
|
|
58
101
|
const entityRow = store.getEntity({ collection: "todos", id: "b" });
|
|
59
|
-
|
|
102
|
+
// The fetched entity replaces the REST row: `/sync/entities` is read after the REST page.
|
|
103
|
+
assert.equal(restRow?.data.title, "canonical-a");
|
|
60
104
|
assert.equal(restRow?.seq, 7);
|
|
61
105
|
assert.equal(entityRow?.data.title, "from-entities");
|
|
62
106
|
assert.equal(entityRow?.seq, 9);
|
|
@@ -102,7 +146,7 @@ describe("hydrateWindowEntities", () => {
|
|
|
102
146
|
store,
|
|
103
147
|
});
|
|
104
148
|
const row = store.getEntity({ collection: "todos", id: "a" });
|
|
105
|
-
assert.equal(row?.data.title, "
|
|
149
|
+
assert.equal(row?.data.title, "gone");
|
|
106
150
|
assert.equal(row?.seq, 12);
|
|
107
151
|
assert.isTrue(row?.deleted);
|
|
108
152
|
});
|
|
@@ -160,5 +204,148 @@ describe("hydrateWindowEntities", () => {
|
|
|
160
204
|
assert.equal(row?.seq, 3);
|
|
161
205
|
assert.equal(row?.pendingMutationId, "m-pending");
|
|
162
206
|
});
|
|
207
|
+
describe("when the store already holds a server-seq entity", () => {
|
|
208
|
+
const seed = (store, seq, title) => {
|
|
209
|
+
store.upsertEntity({ collection: "todos", data: { title }, id: "t1", seq, stream: STREAM });
|
|
210
|
+
};
|
|
211
|
+
it("never overwrites a stored seq>0 entity with a stale REST row, and keeps it on equal fetched seq", async () => {
|
|
212
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
213
|
+
seed(store, 5, "new");
|
|
214
|
+
let titleDuringFetch;
|
|
215
|
+
await hydrateWindowEntities({
|
|
216
|
+
channel: {
|
|
217
|
+
fetchEntities: async () => {
|
|
218
|
+
titleDuringFetch = store.getEntity({ collection: "todos", id: "t1" })
|
|
219
|
+
?.data.title;
|
|
220
|
+
return { entities: [{ data: { title: "new" }, deleted: false, id: "t1", seq: 5 }] };
|
|
221
|
+
},
|
|
222
|
+
},
|
|
223
|
+
collection: "todos",
|
|
224
|
+
ids: ["t1"],
|
|
225
|
+
restRows: { t1: { title: "old" } },
|
|
226
|
+
store,
|
|
227
|
+
});
|
|
228
|
+
assert.equal(titleDuringFetch, "new");
|
|
229
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
230
|
+
assert.equal(row?.data.title, "new");
|
|
231
|
+
assert.equal(row?.seq, 5);
|
|
232
|
+
});
|
|
233
|
+
it("keeps stored canonical data when the fetched seq equals the stored seq", async () => {
|
|
234
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
235
|
+
seed(store, 5, "new");
|
|
236
|
+
await hydrateWindowEntities({
|
|
237
|
+
channel: {
|
|
238
|
+
fetchEntities: async () => ({
|
|
239
|
+
entities: [{ data: { title: "same-seq-other" }, deleted: false, id: "t1", seq: 5 }],
|
|
240
|
+
}),
|
|
241
|
+
},
|
|
242
|
+
collection: "todos",
|
|
243
|
+
ids: ["t1"],
|
|
244
|
+
restRows: { t1: { title: "old" } },
|
|
245
|
+
store,
|
|
246
|
+
});
|
|
247
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
248
|
+
assert.equal(row?.data.title, "new");
|
|
249
|
+
assert.equal(row?.seq, 5);
|
|
250
|
+
});
|
|
251
|
+
it("keeps the stored entity when the fetched seq is older", async () => {
|
|
252
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
253
|
+
seed(store, 5, "new");
|
|
254
|
+
await hydrateWindowEntities({
|
|
255
|
+
channel: {
|
|
256
|
+
fetchEntities: async () => ({
|
|
257
|
+
entities: [{ data: { title: "stale" }, deleted: false, id: "t1", seq: 4 }],
|
|
258
|
+
}),
|
|
259
|
+
},
|
|
260
|
+
collection: "todos",
|
|
261
|
+
ids: ["t1"],
|
|
262
|
+
restRows: { t1: { title: "old" } },
|
|
263
|
+
store,
|
|
264
|
+
});
|
|
265
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
266
|
+
assert.equal(row?.data.title, "new");
|
|
267
|
+
assert.equal(row?.seq, 5);
|
|
268
|
+
});
|
|
269
|
+
it("takes fetched data and seq when the fetched seq is newer than the stored seq", async () => {
|
|
270
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
271
|
+
seed(store, 2, "older");
|
|
272
|
+
await hydrateWindowEntities({
|
|
273
|
+
channel: {
|
|
274
|
+
fetchEntities: async () => ({
|
|
275
|
+
entities: [{ data: { title: "canon-new" }, deleted: false, id: "t1", seq: 6 }],
|
|
276
|
+
}),
|
|
277
|
+
},
|
|
278
|
+
collection: "todos",
|
|
279
|
+
ids: ["t1"],
|
|
280
|
+
restRows: { t1: { title: "rest-new" } },
|
|
281
|
+
store,
|
|
282
|
+
});
|
|
283
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
284
|
+
assert.equal(row?.seq, 6);
|
|
285
|
+
assert.equal(row?.data.title, "canon-new");
|
|
286
|
+
});
|
|
287
|
+
});
|
|
288
|
+
// Replaces "keeps REST data once the fetched seq lands": /sync/entities is always read after the
|
|
289
|
+
// REST page, so a fetched seq newer than the stored one carries data at least as new as REST.
|
|
290
|
+
it("fills an id the store lacks from REST, then takes the fetched data once a newer seq lands", async () => {
|
|
291
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
292
|
+
await hydrateWindowEntities({
|
|
293
|
+
channel: {
|
|
294
|
+
fetchEntities: async () => ({
|
|
295
|
+
entities: [{ data: { title: "canon" }, deleted: false, id: "t1", seq: 3 }],
|
|
296
|
+
}),
|
|
297
|
+
},
|
|
298
|
+
collection: "todos",
|
|
299
|
+
ids: ["t1"],
|
|
300
|
+
restRows: { t1: { title: "rest" } },
|
|
301
|
+
store,
|
|
302
|
+
});
|
|
303
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
304
|
+
assert.equal(row?.seq, 3);
|
|
305
|
+
assert.equal(row?.data.title, "canon");
|
|
306
|
+
});
|
|
307
|
+
describe("two overlapping hydrates race a PATCH", () => {
|
|
308
|
+
it("ends at the fetched seq 264 data when the store started without the entity", async () => {
|
|
309
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
310
|
+
await runOverlappingHydrates(store);
|
|
311
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
312
|
+
assert.equal(row?.data.title, "new");
|
|
313
|
+
assert.equal(row?.seq, 264);
|
|
314
|
+
});
|
|
315
|
+
it("ends at the fetched seq 264 data when the store held a REST-only fill at seq 0", async () => {
|
|
316
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
317
|
+
store.upsertEntity({ collection: "todos", data: { title: "old" }, id: "t1", stream: STREAM });
|
|
318
|
+
await runOverlappingHydrates(store);
|
|
319
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
320
|
+
assert.equal(row?.data.title, "new");
|
|
321
|
+
assert.equal(row?.seq, 264);
|
|
322
|
+
});
|
|
323
|
+
});
|
|
324
|
+
it("leaves a pending-mutation row untouched even when REST and a newer fetched seq differ", async () => {
|
|
325
|
+
const store = createSyncStore({ collections: ["todos"] });
|
|
326
|
+
store.upsertEntity({
|
|
327
|
+
collection: "todos",
|
|
328
|
+
data: { title: "local" },
|
|
329
|
+
id: "t1",
|
|
330
|
+
pendingMutationId: "m1",
|
|
331
|
+
seq: 5,
|
|
332
|
+
stream: STREAM,
|
|
333
|
+
});
|
|
334
|
+
await hydrateWindowEntities({
|
|
335
|
+
channel: {
|
|
336
|
+
fetchEntities: async () => ({
|
|
337
|
+
entities: [{ data: { title: "canon-new" }, deleted: false, id: "t1", seq: 9 }],
|
|
338
|
+
}),
|
|
339
|
+
},
|
|
340
|
+
collection: "todos",
|
|
341
|
+
ids: ["t1"],
|
|
342
|
+
restRows: { t1: { title: "rest" } },
|
|
343
|
+
store,
|
|
344
|
+
});
|
|
345
|
+
const row = store.getEntity({ collection: "todos", id: "t1" });
|
|
346
|
+
assert.equal(row?.data.title, "local");
|
|
347
|
+
assert.equal(row?.seq, 5);
|
|
348
|
+
assert.equal(row?.pendingMutationId, "m1");
|
|
349
|
+
});
|
|
163
350
|
});
|
|
164
351
|
//# sourceMappingURL=windowHydrate.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windowHydrate.test.js","sourceRoot":"","sources":["../../src/sync/windowHydrate.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"windowHydrate.test.js","sourceRoot":"","sources":["../../src/sync/windowHydrate.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"@openfeature/react-sdk": "^1.4.0",
|
|
22
22
|
"@openfeature/web-sdk": "^1.9.0",
|
|
23
23
|
"@react-native-async-storage/async-storage": "2.2.0",
|
|
24
|
-
"@terreno/test": "58.0.0
|
|
25
|
-
"@terreno/ui": "58.0.0
|
|
24
|
+
"@terreno/test": "58.0.0",
|
|
25
|
+
"@terreno/ui": "58.0.0",
|
|
26
26
|
"@testing-library/react-native": "^13.2.0",
|
|
27
27
|
"@types/bun": "^1.4.0",
|
|
28
28
|
"@types/luxon": "^3.7.1",
|
|
@@ -78,6 +78,10 @@
|
|
|
78
78
|
"default": "./dist/flags/useFeatureFlags.js",
|
|
79
79
|
"types": "./dist/flags/useFeatureFlags.d.ts"
|
|
80
80
|
},
|
|
81
|
+
"./mcp": {
|
|
82
|
+
"default": "./dist/app/mcpTools.js",
|
|
83
|
+
"types": "./dist/app/mcpTools.d.ts"
|
|
84
|
+
},
|
|
81
85
|
"./react": {
|
|
82
86
|
"default": "./dist/react/index.js",
|
|
83
87
|
"types": "./dist/react/index.d.ts"
|
|
@@ -110,7 +114,7 @@
|
|
|
110
114
|
"@openfeature/react-sdk": "^1.4.0",
|
|
111
115
|
"@openfeature/web-sdk": "^1.9.0",
|
|
112
116
|
"@react-native-async-storage/async-storage": "2.2.0",
|
|
113
|
-
"@terreno/ui": "58.0.0
|
|
117
|
+
"@terreno/ui": "58.0.0",
|
|
114
118
|
"better-auth": "^1.6.25",
|
|
115
119
|
"expo-constants": "*",
|
|
116
120
|
"expo-network": "~58.0.3",
|
|
@@ -186,5 +190,5 @@
|
|
|
186
190
|
"typecheck": "tsc -p tsconfig.typecheck.json"
|
|
187
191
|
},
|
|
188
192
|
"types": "dist/index.d.ts",
|
|
189
|
-
"version": "58.0.0
|
|
193
|
+
"version": "58.0.0"
|
|
190
194
|
}
|
package/src/api/client.test.ts
CHANGED
|
@@ -709,3 +709,76 @@ describe("tag invalidation failures", () => {
|
|
|
709
709
|
client.reset();
|
|
710
710
|
});
|
|
711
711
|
});
|
|
712
|
+
|
|
713
|
+
describe("createApiClient.primeQuery (server-rendered first state)", () => {
|
|
714
|
+
const ME = {_id: "u1", roles: ["admin"]};
|
|
715
|
+
const ARGS = {method: "GET" as const, url: "/auth/me"};
|
|
716
|
+
|
|
717
|
+
it("makes getQueryState fulfilled with the data and never calls fetch", () => {
|
|
718
|
+
const {calls, fetchImpl} = scriptedFetch([]);
|
|
719
|
+
const client = createApiClient({fetchImpl});
|
|
720
|
+
|
|
721
|
+
client.primeQuery(ARGS, ME);
|
|
722
|
+
|
|
723
|
+
expect(client.getQueryState(ARGS)).toMatchObject({
|
|
724
|
+
data: ME,
|
|
725
|
+
isFetching: false,
|
|
726
|
+
status: "fulfilled",
|
|
727
|
+
});
|
|
728
|
+
expect(calls).toEqual([]);
|
|
729
|
+
});
|
|
730
|
+
|
|
731
|
+
it("fetchQuery for a primed entry returns the data without a request", async () => {
|
|
732
|
+
const {calls, fetchImpl} = scriptedFetch([]);
|
|
733
|
+
const client = createApiClient({fetchImpl});
|
|
734
|
+
client.primeQuery(ARGS, ME);
|
|
735
|
+
|
|
736
|
+
const data = await client.fetchQuery(ARGS);
|
|
737
|
+
|
|
738
|
+
expect(data).toEqual(ME);
|
|
739
|
+
expect(calls).toEqual([]);
|
|
740
|
+
});
|
|
741
|
+
|
|
742
|
+
it("invalidateTags refetches a primed entry a subscriber tagged", async () => {
|
|
743
|
+
const {calls, fetchImpl} = scriptedFetch([() => jsonResponse({data: {_id: "u1", roles: []}})]);
|
|
744
|
+
const client = createApiClient({baseUrl: "http://api.test", fetchImpl});
|
|
745
|
+
client.primeQuery(ARGS, ME);
|
|
746
|
+
const unsubscribe = client.subscribeQuery(ARGS, () => {}, {providesTags: ["profile"]});
|
|
747
|
+
|
|
748
|
+
client.invalidateTags(["profile"]);
|
|
749
|
+
await client.fetchQuery(ARGS);
|
|
750
|
+
|
|
751
|
+
expect(calls).toHaveLength(1);
|
|
752
|
+
expect(client.getQueryState(ARGS).data).toEqual({_id: "u1", roles: []});
|
|
753
|
+
unsubscribe();
|
|
754
|
+
});
|
|
755
|
+
|
|
756
|
+
it("reset() drops a primed entry", () => {
|
|
757
|
+
const client = createApiClient({fetchImpl: scriptedFetch([]).fetchImpl});
|
|
758
|
+
client.primeQuery(ARGS, ME);
|
|
759
|
+
|
|
760
|
+
client.reset();
|
|
761
|
+
|
|
762
|
+
expect(client.getQueryState(ARGS).status).toBe("uninitialized");
|
|
763
|
+
});
|
|
764
|
+
|
|
765
|
+
it("primes only the args given: a different URL or org header stays uninitialized", () => {
|
|
766
|
+
const client = createApiClient({fetchImpl: scriptedFetch([]).fetchImpl});
|
|
767
|
+
|
|
768
|
+
client.primeQuery(ARGS, ME);
|
|
769
|
+
|
|
770
|
+
expect(client.getQueryState({url: "/auth/other"}).status).toBe("uninitialized");
|
|
771
|
+
expect(
|
|
772
|
+
client.getQueryState({headers: {"X-Organization-Id": "o1"}, url: "/auth/me"}).status
|
|
773
|
+
).toBe("uninitialized");
|
|
774
|
+
});
|
|
775
|
+
|
|
776
|
+
it("two clients built for two server requests share no state", () => {
|
|
777
|
+
const first = createApiClient({fetchImpl: scriptedFetch([]).fetchImpl});
|
|
778
|
+
const second = createApiClient({fetchImpl: scriptedFetch([]).fetchImpl});
|
|
779
|
+
|
|
780
|
+
first.primeQuery(ARGS, ME);
|
|
781
|
+
|
|
782
|
+
expect(second.getQueryState(ARGS).status).toBe("uninitialized");
|
|
783
|
+
});
|
|
784
|
+
});
|
package/src/api/client.ts
CHANGED
|
@@ -87,6 +87,12 @@ export interface ApiClient {
|
|
|
87
87
|
invalidateTags: (tags: readonly string[]) => void;
|
|
88
88
|
/** Drop every cache entry (call on logout / user switch). */
|
|
89
89
|
reset: () => void;
|
|
90
|
+
/**
|
|
91
|
+
* Store `data` as the fulfilled result for `args` without a request, for example a response
|
|
92
|
+
* a server render already fetched. Hooks for the same args render it on their first render;
|
|
93
|
+
* tag invalidation and `reset()` treat it like any fetched entry.
|
|
94
|
+
*/
|
|
95
|
+
primeQuery: (args: ApiRequestArgs, data: unknown) => void;
|
|
90
96
|
}
|
|
91
97
|
|
|
92
98
|
interface CacheEntry {
|
|
@@ -294,6 +300,14 @@ export const createApiClient = (config: ApiClientConfig = {}): ApiClient => {
|
|
|
294
300
|
return runQuery(key, entry) as Promise<T>;
|
|
295
301
|
};
|
|
296
302
|
|
|
303
|
+
const primeQuery = (args: ApiRequestArgs, data: unknown): void => {
|
|
304
|
+
const [key, entry] = ensureEntry(args);
|
|
305
|
+
entry.generation += 1;
|
|
306
|
+
entry.inFlight = undefined;
|
|
307
|
+
setState(entry, {data, error: undefined, isFetching: false, status: "fulfilled"});
|
|
308
|
+
scheduleGc(key, entry);
|
|
309
|
+
};
|
|
310
|
+
|
|
297
311
|
const getQueryState = <T = unknown>(args: ApiRequestArgs): ApiQueryState<T> =>
|
|
298
312
|
(entries.get(apiQueryKey(args))?.state ?? UNINITIALIZED) as ApiQueryState<T>;
|
|
299
313
|
|
|
@@ -360,6 +374,7 @@ export const createApiClient = (config: ApiClientConfig = {}): ApiClient => {
|
|
|
360
374
|
fetchQuery,
|
|
361
375
|
getQueryState,
|
|
362
376
|
invalidateTags,
|
|
377
|
+
primeQuery,
|
|
363
378
|
request,
|
|
364
379
|
reset,
|
|
365
380
|
subscribeQuery,
|
package/src/app/app.ts
CHANGED
|
@@ -1,18 +1,14 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `@terreno/syncdb/app` — app-shell utilities that sit beside the data layer:
|
|
3
|
-
* the upgrade check (on the request client), RBAC helpers, the dev console log
|
|
4
|
-
* bridge
|
|
3
|
+
* the upgrade check (on the request client), RBAC helpers, and the dev console log
|
|
4
|
+
* bridge.
|
|
5
5
|
*
|
|
6
|
-
* Needs `react`, `react-native`, and `expo-constants
|
|
7
|
-
* `@
|
|
6
|
+
* Needs `react`, `react-native`, and `expo-constants` (optional peer dependencies).
|
|
7
|
+
* MCP tool discovery (`useMCPTools`) lives in `@terreno/syncdb/mcp`, because it imports
|
|
8
|
+
* the optional `@modelcontextprotocol/client` peer at the top level: exporting it here
|
|
9
|
+
* would break every app that imports this entry point without that package installed.
|
|
8
10
|
*/
|
|
9
11
|
export {type InstallDevConsoleLoggerOptions, installDevConsoleLogger} from "./devConsoleLogger";
|
|
10
|
-
export {
|
|
11
|
-
type MCPToolInfo,
|
|
12
|
-
type UseMCPToolsOptions,
|
|
13
|
-
type UseMCPToolsResult,
|
|
14
|
-
useMCPTools,
|
|
15
|
-
} from "./mcpTools";
|
|
16
12
|
export {
|
|
17
13
|
ADMIN_PAGE_ACTION,
|
|
18
14
|
ADMIN_PAGE_PERMISSION,
|