@agentshouse/mdruntime 0.1.0-c104334047dfe → 0.1.0-c14be9ac95f9d

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.
Files changed (197) hide show
  1. package/AGENTS.md +97 -83
  2. package/README.md +9 -8
  3. package/dist/adapter.d.ts +53 -23
  4. package/dist/adapter.d.ts.map +1 -1
  5. package/dist/attached-model.d.ts +4 -1
  6. package/dist/attached-model.d.ts.map +1 -1
  7. package/dist/attached-model.js +13 -3
  8. package/dist/bootstrap.d.ts +24 -6
  9. package/dist/bootstrap.d.ts.map +1 -1
  10. package/dist/bootstrap.js +167 -82
  11. package/dist/chain.d.ts +11 -0
  12. package/dist/chain.d.ts.map +1 -0
  13. package/dist/chain.js +64 -0
  14. package/dist/change-set.d.ts +9 -16
  15. package/dist/change-set.d.ts.map +1 -1
  16. package/dist/change-set.js +11 -89
  17. package/dist/change.d.ts +31 -1
  18. package/dist/change.d.ts.map +1 -1
  19. package/dist/change.js +10 -1
  20. package/dist/chat/house.d.ts +25 -0
  21. package/dist/chat/house.d.ts.map +1 -0
  22. package/dist/chat/house.js +38 -0
  23. package/dist/chat/input.d.ts +3 -1
  24. package/dist/chat/input.d.ts.map +1 -1
  25. package/dist/chat/input.js +11 -18
  26. package/dist/chat/list.d.ts +2 -1
  27. package/dist/chat/list.d.ts.map +1 -1
  28. package/dist/chat/list.js +7 -3
  29. package/dist/chat/markdown.d.ts +1 -0
  30. package/dist/chat/markdown.d.ts.map +1 -1
  31. package/dist/chat/markdown.js +78 -20
  32. package/dist/chat/message.d.ts +1 -0
  33. package/dist/chat/message.d.ts.map +1 -1
  34. package/dist/chat/message.js +73 -11
  35. package/dist/chat/messages.d.ts +14 -1
  36. package/dist/chat/messages.d.ts.map +1 -1
  37. package/dist/chat/messages.js +79 -24
  38. package/dist/chat/name.d.ts +1 -0
  39. package/dist/chat/name.d.ts.map +1 -1
  40. package/dist/chat/name.js +1 -1
  41. package/dist/chat/opened.d.ts +1 -0
  42. package/dist/chat/opened.d.ts.map +1 -1
  43. package/dist/chat/opened.js +2 -0
  44. package/dist/chat/overlay.d.ts +1 -0
  45. package/dist/chat/overlay.d.ts.map +1 -1
  46. package/dist/chat/overlay.js +11 -5
  47. package/dist/chat/parts.d.ts +1 -0
  48. package/dist/chat/parts.d.ts.map +1 -1
  49. package/dist/chat/parts.js +3 -2
  50. package/dist/chat/pieces.d.ts +62 -0
  51. package/dist/chat/pieces.d.ts.map +1 -0
  52. package/dist/chat/pieces.js +1110 -0
  53. package/dist/chat/provider.d.ts +8 -1
  54. package/dist/chat/provider.d.ts.map +1 -1
  55. package/dist/chat/provider.js +90 -83
  56. package/dist/chat/ready.d.ts +5 -2
  57. package/dist/chat/ready.d.ts.map +1 -1
  58. package/dist/chat/ready.js +7 -5
  59. package/dist/chat/room-file.d.ts +8 -0
  60. package/dist/chat/room-file.d.ts.map +1 -0
  61. package/dist/chat/room-file.js +72 -0
  62. package/dist/chat/steady.d.ts +3 -0
  63. package/dist/chat/steady.d.ts.map +1 -0
  64. package/dist/chat/steady.js +26 -0
  65. package/dist/chat/style.d.ts.map +1 -1
  66. package/dist/chat/style.js +5 -0
  67. package/dist/chat.d.ts +3 -2
  68. package/dist/chat.d.ts.map +1 -1
  69. package/dist/chat.js +2 -2
  70. package/dist/client.d.ts +6 -1
  71. package/dist/client.d.ts.map +1 -1
  72. package/dist/client.js +29 -2
  73. package/dist/collection.d.ts +6 -19
  74. package/dist/collection.d.ts.map +1 -1
  75. package/dist/collection.js +30 -287
  76. package/dist/compile.d.ts +16 -0
  77. package/dist/compile.d.ts.map +1 -0
  78. package/dist/compile.js +721 -0
  79. package/dist/connection.d.ts +12 -7
  80. package/dist/connection.d.ts.map +1 -1
  81. package/dist/connection.js +2180 -810
  82. package/dist/conversation.d.ts +9 -3
  83. package/dist/conversation.d.ts.map +1 -1
  84. package/dist/conversation.js +111 -65
  85. package/dist/digest.d.ts +7 -0
  86. package/dist/digest.d.ts.map +1 -0
  87. package/dist/digest.js +113 -0
  88. package/dist/durability.d.ts +3 -1
  89. package/dist/durability.d.ts.map +1 -1
  90. package/dist/entry.d.ts +3 -1
  91. package/dist/entry.d.ts.map +1 -1
  92. package/dist/entry.js +18 -23
  93. package/dist/file.d.ts +2 -10
  94. package/dist/file.d.ts.map +1 -1
  95. package/dist/file.js +3 -120
  96. package/dist/fulltext.d.ts +27 -0
  97. package/dist/fulltext.d.ts.map +1 -0
  98. package/dist/fulltext.js +368 -0
  99. package/dist/host.d.ts +1 -4
  100. package/dist/host.d.ts.map +1 -1
  101. package/dist/host.js +13 -6
  102. package/dist/identity.d.ts +0 -1
  103. package/dist/identity.d.ts.map +1 -1
  104. package/dist/identity.js +0 -3
  105. package/dist/index.d.ts +9 -6
  106. package/dist/index.d.ts.map +1 -1
  107. package/dist/index.js +3 -0
  108. package/dist/live.d.ts +22 -0
  109. package/dist/live.d.ts.map +1 -0
  110. package/dist/live.js +123 -0
  111. package/dist/memory.d.ts +2 -2
  112. package/dist/memory.d.ts.map +1 -1
  113. package/dist/memory.js +23 -12
  114. package/dist/messages.d.ts +28 -0
  115. package/dist/messages.d.ts.map +1 -0
  116. package/dist/messages.js +90 -0
  117. package/dist/name.d.ts +4 -0
  118. package/dist/name.d.ts.map +1 -0
  119. package/dist/name.js +122 -0
  120. package/dist/observation.d.ts +12 -0
  121. package/dist/observation.d.ts.map +1 -1
  122. package/dist/observation.js +84 -0
  123. package/dist/opened.d.ts +22 -0
  124. package/dist/opened.d.ts.map +1 -0
  125. package/dist/opened.js +107 -0
  126. package/dist/outcome.d.ts +29 -4
  127. package/dist/outcome.d.ts.map +1 -1
  128. package/dist/outcome.js +25 -0
  129. package/dist/overlay.d.ts +2 -5
  130. package/dist/overlay.d.ts.map +1 -1
  131. package/dist/overlay.js +86 -171
  132. package/dist/query.d.ts +5 -1
  133. package/dist/query.d.ts.map +1 -1
  134. package/dist/query.js +13 -1
  135. package/dist/reach.d.ts +5 -1
  136. package/dist/reach.d.ts.map +1 -1
  137. package/dist/reach.js +158 -52
  138. package/dist/readiness.d.ts +18 -3
  139. package/dist/readiness.d.ts.map +1 -1
  140. package/dist/readiness.js +1 -1
  141. package/dist/reads.d.ts.map +1 -1
  142. package/dist/reads.js +4 -2
  143. package/dist/recovery.d.ts +2 -2
  144. package/dist/recovery.d.ts.map +1 -1
  145. package/dist/recovery.js +8 -7
  146. package/dist/refresh.d.ts +11 -13
  147. package/dist/refresh.d.ts.map +1 -1
  148. package/dist/refresh.js +78 -51
  149. package/dist/replica.d.ts +56 -36
  150. package/dist/replica.d.ts.map +1 -1
  151. package/dist/replica.js +277 -184
  152. package/dist/room-draft.d.ts +3 -1
  153. package/dist/room-draft.d.ts.map +1 -1
  154. package/dist/room-draft.js +29 -22
  155. package/dist/rows.d.ts +29 -31
  156. package/dist/rows.d.ts.map +1 -1
  157. package/dist/rows.js +113 -69
  158. package/dist/save.d.ts +50 -14
  159. package/dist/save.d.ts.map +1 -1
  160. package/dist/save.js +502 -180
  161. package/dist/search.d.ts +11 -43
  162. package/dist/search.d.ts.map +1 -1
  163. package/dist/search.js +0 -213
  164. package/dist/shared.d.ts +8 -3
  165. package/dist/shared.d.ts.map +1 -1
  166. package/dist/shared.js +129 -66
  167. package/dist/store.d.ts +87 -92
  168. package/dist/store.d.ts.map +1 -1
  169. package/dist/store.js +329 -687
  170. package/dist/stored.d.ts +145 -0
  171. package/dist/stored.d.ts.map +1 -0
  172. package/dist/stored.js +567 -0
  173. package/dist/tables.d.ts +342 -0
  174. package/dist/tables.d.ts.map +1 -0
  175. package/dist/tables.js +576 -0
  176. package/dist/turn.d.ts +5 -3
  177. package/dist/turn.d.ts.map +1 -1
  178. package/dist/turn.js +51 -21
  179. package/dist/validation.d.ts +30 -0
  180. package/dist/validation.d.ts.map +1 -0
  181. package/dist/validation.js +162 -0
  182. package/dist/windows.d.ts +2 -6
  183. package/dist/windows.d.ts.map +1 -1
  184. package/dist/windows.js +30 -34
  185. package/dist/wire.d.ts +16 -0
  186. package/dist/wire.d.ts.map +1 -1
  187. package/dist/wire.js +4 -0
  188. package/dist/words.d.ts +19 -0
  189. package/dist/words.d.ts.map +1 -0
  190. package/dist/words.js +150 -0
  191. package/package.json +10 -4
  192. package/dist/acquisition.d.ts +0 -14
  193. package/dist/acquisition.d.ts.map +0 -1
  194. package/dist/acquisition.js +0 -24
  195. package/dist/read-side.d.ts +0 -25
  196. package/dist/read-side.d.ts.map +0 -1
  197. package/dist/read-side.js +0 -767
@@ -1 +1 @@
1
- {"version":3,"file":"attached-model.d.ts","sourceRoot":"","sources":["../src/attached-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAI1E,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACvE,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,GAAG,aAAa,CA4CtF"}
1
+ {"version":3,"file":"attached-model.d.ts","sourceRoot":"","sources":["../src/attached-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1F,OAAO,EAAa,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAE1E,eAAO,MAAM,aAAa,EAAE,aAA2D,CAAC;AAExF,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAMrE;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACvE,CAAC;AAEF,wBAAgB,aAAa,CAC3B,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,UAAU,EACpB,SAAS,EAAE,aAAa,GACvB,aAAa,CA+Cf"}
@@ -1,8 +1,16 @@
1
1
  import { verify } from '@agentshouse/mdmodel';
2
2
  import { MD_MODEL } from './collection.js';
3
3
  import { sameModel } from './model.js';
4
- const EMPTY_SCHEMA = { verdict: 'accept', model: { types: {} } };
5
- export function attachedModel(answer, previous) {
4
+ export const NO_ROOM_TYPES = Object.freeze({ types: Object.freeze({}) });
5
+ export function roomTypesOf(schema) {
6
+ if (schema === undefined)
7
+ return NO_ROOM_TYPES;
8
+ const verified = verify(schema);
9
+ if (verified.verdict === 'refuse')
10
+ throw new Error(`the Adapter's Room types refuse ${verified.rule}`);
11
+ return verified.model;
12
+ }
13
+ export function attachedModel(answer, previous, roomTypes) {
6
14
  if (answer.kind === 'model-unavailable') {
7
15
  return { state: { status: 'unavailable', reason: answer.reason }, refused: null };
8
16
  }
@@ -19,7 +27,9 @@ export function attachedModel(answer, previous) {
19
27
  refused: null,
20
28
  };
21
29
  }
22
- const verified = answer.snapshot.schema === null ? EMPTY_SCHEMA : verify(answer.snapshot.schema);
30
+ const verified = answer.snapshot.schema === null
31
+ ? { verdict: 'accept', model: roomTypes }
32
+ : verify(answer.snapshot.schema, roomTypes);
23
33
  if (verified.verdict === 'refuse') {
24
34
  return {
25
35
  state: {
@@ -1,12 +1,16 @@
1
1
  import type { ModelState } from './model.js';
2
2
  import type { Adapter, AdapterFailure, Authorization, DiscoveredRoom, HeldContent, RetryableRefusal, RoomModels } from './adapter.js';
3
- import { type ConfirmedLayer } from './replica.js';
4
- import type { StagedLayer, TransferRecord } from './store.js';
3
+ import type { Composition } from './collection.js';
4
+ import type { InstallationStep } from './readiness.js';
5
+ import { type Refreshing } from './refresh.js';
6
+ import type { ReplicaRecord } from './replica.js';
7
+ import type { StagedPage, TransferRecord } from './store.js';
8
+ import type { View } from './tables.js';
5
9
  import { type Refused, type Unconfirmed } from './transfer.js';
6
10
  export type Bootstrapped = {
7
11
  kind: 'staged';
8
- confirmed: ConfirmedLayer;
9
- stored: StagedLayer;
12
+ record: ReplicaRecord;
13
+ refreshed: boolean;
10
14
  };
11
15
  export type BootstrapOutcome = Bootstrapped | Refused | Unconfirmed | RetryableRefusal | AdapterFailure;
12
16
  export type HeldModels = {
@@ -15,11 +19,25 @@ export type HeldModels = {
15
19
  };
16
20
  export type Remodel = (models: RoomModels | undefined, held: HeldModels) => HeldModels;
17
21
  export type Reads = Pick<Adapter, 'bootstrap' | 'refresh' | 'reached'>;
22
+ export type Arriving = {
23
+ at(token: string, bytes: number): void;
24
+ end(): void;
25
+ };
18
26
  export type Staging = {
19
27
  held(locator: string): TransferRecord | null;
20
- staged(record: TransferRecord): Promise<StagedLayer>;
21
- stage(record: TransferRecord, page: StagedLayer): Promise<boolean>;
28
+ turn(locator: string, step: InstallationStep): Promise<() => void>;
29
+ spare(): (() => void) | null;
30
+ arriving(locator: string): Arriving;
31
+ received(locator: string, token: string): Promise<Uint8Array | null>;
32
+ keep(locator: string, token: string, received: Uint8Array): Promise<void>;
33
+ announced(locator: string): readonly string[];
34
+ stage(record: TransferRecord, page: StagedPage, composition: Composition, received: Uint8Array | null): Promise<TransferRecord | null>;
35
+ refreshing(locator: string, key: number): Promise<Refreshing>;
22
36
  abandon(locator: string): Promise<void>;
37
+ setAside(locator: string): Promise<void>;
38
+ release(key: number): Promise<void>;
39
+ content(key: number): HeldContent;
40
+ validate(record: ReplicaRecord, view: View): Promise<Refused | null>;
23
41
  };
24
42
  export declare function bootstrapRoom(adapter: Reads, authorization: Authorization, room: DiscoveredRoom, held: HeldModels, remodel: Remodel, continuing: () => boolean, staging: Staging, reuse: HeldContent | null): Promise<BootstrapOutcome>;
25
43
  //# sourceMappingURL=bootstrap.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,aAAa,EAEb,cAAc,EAEd,WAAW,EACX,gBAAgB,EAChB,UAAU,EACX,MAAM,cAAc,CAAC;AAItB,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAiB,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,CAAC;AAE9F,MAAM,MAAM,gBAAgB,GACxB,YAAY,GACZ,OAAO,GACP,WAAW,GACX,gBAAgB,GAChB,cAAc,CAAC;AAEnB,MAAM,MAAM,UAAU,GAAG;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,KAAK,UAAU,CAAC;AAEvF,MAAM,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC,CAAC;AAEvE,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAAC;IAC7C,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACrD,KAAK,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC,CAAC;AA0CF,wBAAsB,aAAa,CACjC,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,EACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,WAAW,GAAG,IAAI,GACxB,OAAO,CAAC,gBAAgB,CAAC,CA4B3B"}
1
+ {"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}
package/dist/bootstrap.js CHANGED
@@ -1,99 +1,184 @@
1
1
  import { transferIdentity } from './identity.js';
2
2
  import { advancement } from './refresh.js';
3
- import { acceptedBinaries } from './overlay.js';
4
- import { readStaged } from './replica.js';
5
3
  import { unconfirmed } from './transfer.js';
4
+ const NOTHING_DONE = { parts: 0, bytes: 0 };
6
5
  const RESUMABLE = new Set([
7
6
  'transport-uncertainty',
8
7
  'retryable-refusal',
9
8
  'unconfirmed',
10
9
  ]);
11
- function pageLayer(page) {
12
- return {
13
- documents: page.documents,
14
- revisions: page.revisions,
15
- fileIds: page.fileIds ?? {},
16
- changes: page.changes,
17
- written: Object.fromEntries(Object.keys(page.documents).map((path) => [path, page.roomVersion])),
18
- binaries: acceptedBinaries(page.binaryFiles),
19
- };
20
- }
21
- async function heldTransfer(staging, room) {
22
- const record = staging.held(room.locator);
23
- if (record === null)
24
- return null;
25
- if (record.selection === room.replica.selection) {
26
- return { record, layer: await staging.staged(record) };
10
+ function pageOf(page) {
11
+ const entries = [];
12
+ for (const [path, content] of Object.entries(page.documents)) {
13
+ entries.push({
14
+ path,
15
+ content,
16
+ binary: null,
17
+ revision: page.revisions[path] ?? null,
18
+ fileId: page.fileIds?.[path] ?? null,
19
+ change: page.changes[path] ?? null,
20
+ written: page.roomVersion,
21
+ });
27
22
  }
28
- await staging.abandon(room.locator);
29
- return null;
23
+ for (const [path, file] of Object.entries(page.binaryFiles)) {
24
+ entries.push({
25
+ path,
26
+ content: null,
27
+ binary: { state: 'accepted', ...file },
28
+ revision: page.revisions[path] ?? null,
29
+ fileId: page.fileIds?.[path] ?? null,
30
+ change: page.changes[path] ?? null,
31
+ written: null,
32
+ });
33
+ }
34
+ return { entries, folders: page.folders ?? [] };
30
35
  }
31
- function pooled(pool, layer) {
36
+ function heldTogether(first, second) {
37
+ if (first === null)
38
+ return second;
32
39
  return {
33
- documents: { ...pool?.documents, ...layer.documents },
34
- revisions: { ...pool?.revisions, ...layer.revisions },
40
+ async files(after, limit) {
41
+ const [left, right] = await Promise.all([
42
+ first.files(after, limit),
43
+ second.files(after, limit),
44
+ ]);
45
+ const merged = new Map([...left, ...right].map((file) => [file.path, file]));
46
+ return [...merged.values()]
47
+ .sort((one, other) => (one.path < other.path ? -1 : one.path > other.path ? 1 : 0))
48
+ .slice(0, limit);
49
+ },
50
+ async contents(paths) {
51
+ const [left, right] = await Promise.all([first.contents(paths), second.contents(paths)]);
52
+ return new Map([...left, ...right]);
53
+ },
35
54
  };
36
55
  }
56
+ const NO_CONTENT = {
57
+ files: () => Promise.resolve([]),
58
+ contents: () => Promise.resolve(new Map()),
59
+ };
37
60
  export async function bootstrapRoom(adapter, authorization, room, held, remodel, continuing, staging, reuse) {
38
- const first = await bundle(adapter, authorization, room, held, remodel, continuing, staging, await heldTransfer(staging, room), reuse);
61
+ const kept = staging.held(room.locator);
62
+ const resumed = kept !== null && kept.selection === room.replica.selection ? kept : null;
63
+ if (kept !== null && resumed === null)
64
+ await staging.abandon(room.locator);
65
+ const first = await bundle(adapter, authorization, room, held, remodel, continuing, staging, resumed, reuse);
39
66
  if (first.kind !== 'expired')
40
67
  return first;
41
- await staging.abandon(room.locator);
42
- const replacement = await bundle(adapter, authorization, room, held, remodel, continuing, staging, null, pooled(reuse, first.held));
43
- if (replacement.kind !== 'expired')
44
- return replacement;
45
- await staging.abandon(room.locator);
46
- return unconfirmed;
68
+ await staging.setAside(room.locator);
69
+ try {
70
+ const replacement = await bundle(adapter, authorization, room, held, remodel, continuing, staging, null, heldTogether(reuse, first.held));
71
+ if (replacement.kind !== 'expired')
72
+ return replacement;
73
+ await staging.abandon(room.locator);
74
+ return unconfirmed;
75
+ }
76
+ finally {
77
+ if (first.key !== null)
78
+ await staging.release(first.key);
79
+ }
80
+ }
81
+ const RESUMED_LOOKUPS = 2;
82
+ function compositionFor(room, models) {
83
+ return {
84
+ model: models.collection,
85
+ selection: room.typedSelection === undefined
86
+ ? null
87
+ : { roots: room.typedSelection.roots, model: models.selection },
88
+ };
47
89
  }
48
90
  async function bundle(adapter, authorization, room, held, remodel, continuing, staging, kept, pool) {
49
91
  const locator = room.locator;
50
92
  const selection = room.replica.selection;
51
- const documents = { ...kept?.layer.documents };
52
- const revisions = { ...kept?.layer.revisions };
53
- const fileIds = { ...kept?.layer.fileIds };
54
- const changes = { ...kept?.layer.changes };
55
- const written = { ...kept?.layer.written };
56
- const binaries = { ...kept?.layer.binaries };
57
- let transfer = kept?.record ?? null;
58
- while (transfer === null || transfer.pageToken !== null) {
59
- if (!continuing())
60
- return unconfirmed;
93
+ let transfer = kept;
94
+ let lookups = kept === null ? 0 : RESUMED_LOOKUPS;
95
+ let ahead = null;
96
+ const arriving = staging.arriving(locator);
97
+ const asking = async (token) => {
98
+ const looked = token !== null && lookups > 0;
99
+ if (looked)
100
+ lookups -= 1;
101
+ const received = looked ? await staging.received(locator, token) : null;
61
102
  const page = await adapter.bootstrap(authorization, {
62
103
  locator,
63
104
  selection,
64
- ...(transfer?.pageToken == null ? {} : { pageToken: transfer.pageToken }),
105
+ ...(token === null
106
+ ? {}
107
+ : { pageToken: token, arriving: (bytes) => arriving.at(token, bytes) }),
65
108
  ...(pool === null ? {} : { held: pool }),
109
+ ...(received === null ? {} : { received }),
66
110
  });
67
- if (page.kind === 'beyond-horizon')
68
- return { kind: 'expired', held: { documents, revisions } };
69
- if (page.kind !== 'bootstrap') {
70
- if (!RESUMABLE.has(page.kind))
71
- await staging.abandon(locator);
72
- return page;
111
+ if (token !== null && page.kind === 'bootstrap' && page.received !== undefined) {
112
+ await staging.keep(locator, token, page.received);
73
113
  }
74
- transfer = {
75
- locator,
76
- transfer: transfer?.transfer ?? transferIdentity(),
77
- selection,
78
- from: transfer !== null && adapter.reached(locator, page.roomVersion, transfer.from)
79
- ? transfer.from
80
- : page.roomVersion,
81
- last: transfer !== null && !adapter.reached(locator, page.roomVersion, transfer.last)
82
- ? transfer.last
83
- : page.roomVersion,
84
- pageToken: page.pageToken ?? null,
85
- models: remodel(page.models, transfer?.models ?? held),
86
- };
87
- const staged = pageLayer(page);
88
- if (!(await staging.stage(transfer, staged)))
89
- return unconfirmed;
90
- Object.assign(documents, staged.documents);
91
- Object.assign(revisions, staged.revisions);
92
- Object.assign(fileIds, staged.fileIds);
93
- Object.assign(changes, staged.changes);
94
- Object.assign(written, staged.written);
95
- Object.assign(binaries, staged.binaries);
114
+ return page;
115
+ };
116
+ try {
117
+ while (transfer === null || transfer.writing !== null || transfer.pageToken !== null) {
118
+ if (!continuing())
119
+ return unconfirmed;
120
+ const writing = transfer?.writing ?? null;
121
+ const asked = writing === null ? (transfer?.pageToken ?? null) : writing.token;
122
+ const fetched = ahead !== null && ahead.token === asked ? ahead : null;
123
+ if (ahead !== fetched)
124
+ ahead?.release();
125
+ ahead = null;
126
+ const turned = fetched?.release ??
127
+ (await staging.turn(locator, transfer === null ? 'listing' : 'downloading'));
128
+ try {
129
+ if (!continuing())
130
+ return unconfirmed;
131
+ const page = await (fetched?.page ?? asking(asked));
132
+ if (page.kind === 'beyond-horizon') {
133
+ const key = transfer?.key ?? null;
134
+ return { kind: 'expired', held: key === null ? NO_CONTENT : staging.content(key), key };
135
+ }
136
+ if (page.kind !== 'bootstrap') {
137
+ if (!RESUMABLE.has(page.kind))
138
+ await staging.abandon(locator);
139
+ return page;
140
+ }
141
+ const later = page.pageToken;
142
+ const spare = later === undefined || !continuing() ? null : staging.spare();
143
+ if (later !== undefined && spare !== null) {
144
+ const answer = asking(later);
145
+ answer.catch(() => { });
146
+ ahead = { token: later, page: answer, release: spare };
147
+ }
148
+ const next = {
149
+ locator,
150
+ transfer: transfer?.transfer ?? transferIdentity(),
151
+ selection,
152
+ from: transfer !== null && adapter.reached(locator, page.roomVersion, transfer.from)
153
+ ? transfer.from
154
+ : page.roomVersion,
155
+ last: transfer !== null && !adapter.reached(locator, page.roomVersion, transfer.last)
156
+ ? transfer.last
157
+ : page.roomVersion,
158
+ pageToken: later ?? null,
159
+ writing: { token: asked, written: asked === null ? 0 : (writing?.written ?? 0) },
160
+ inventory: page.inventory ?? transfer?.inventory ?? null,
161
+ done: transfer?.done ?? NOTHING_DONE,
162
+ models: remodel(page.models, transfer?.models ?? held),
163
+ key: transfer?.key ?? null,
164
+ };
165
+ const staged = await staging.stage(next, pageOf(page), compositionFor(room, next.models), page.received ?? null);
166
+ if (staged === null)
167
+ return unconfirmed;
168
+ transfer = staged;
169
+ }
170
+ finally {
171
+ turned();
172
+ }
173
+ }
174
+ }
175
+ finally {
176
+ ahead?.release();
177
+ arriving.end();
96
178
  }
179
+ await staging.turn(locator, 'replaying');
180
+ if (!continuing())
181
+ return unconfirmed;
97
182
  const record = {
98
183
  locator,
99
184
  name: room.name,
@@ -106,26 +191,26 @@ async function bundle(adapter, authorization, room, held, remodel, continuing, s
106
191
  providerOwnedPaths: room.providerOwnedPaths,
107
192
  roomVersion: transfer.from,
108
193
  transfer: transfer.transfer,
109
- documents,
110
- binaries,
111
- revisions,
112
- fileIds,
113
- changes,
114
- written,
194
+ inventory: transfer.inventory,
195
+ key: transfer.key,
115
196
  };
116
- const reconciled = transfer.last === transfer.from
197
+ const due = [room.roomVersion, ...staging.announced(locator)];
198
+ const last = transfer.last;
199
+ const reconciled = last === transfer.from && due.every((version) => adapter.reached(locator, last, version))
117
200
  ? { kind: 'still-current' }
118
- : await advancement(adapter, authorization, record, remodel, continuing);
201
+ : await advancement(adapter, authorization, record, remodel, continuing, await staging.refreshing(locator, record.key));
119
202
  if (reconciled.kind === 'advanced' || reconciled.kind === 'still-current') {
120
- const read = readStaged(reconciled.kind === 'advanced' ? reconciled.record : record);
121
- if (read.kind === 'refused') {
203
+ const refreshed = reconciled.kind === 'advanced';
204
+ const result = refreshed ? reconciled.record : record;
205
+ const refused = await staging.validate(result, refreshed ? 'refreshed' : 'confirmed');
206
+ if (refused !== null) {
122
207
  await staging.abandon(locator);
123
- return read;
208
+ return refused;
124
209
  }
125
- return { kind: 'staged', confirmed: read.confirmed, stored: record };
210
+ return { kind: 'staged', record: result, refreshed };
126
211
  }
127
212
  if (reconciled.kind === 'beyond-horizon') {
128
- return { kind: 'expired', held: { documents, revisions } };
213
+ return { kind: 'expired', held: staging.content(record.key), key: record.key };
129
214
  }
130
215
  if (!RESUMABLE.has(reconciled.kind))
131
216
  await staging.abandon(locator);
@@ -0,0 +1,11 @@
1
+ import type { MdRuntimeClient } from './client.js';
2
+ import type { DocumentQuery, DocumentResult, GroupQuery, GroupResult, PendingResult } from './query.js';
3
+ type Rows = DocumentResult | GroupResult;
4
+ export type WindowAnswer = Rows | PendingResult;
5
+ export type WindowChain = {
6
+ want(count: number): void;
7
+ close(): void;
8
+ };
9
+ export declare function chainedWindows(runtime: MdRuntimeClient, query: DocumentQuery | GroupQuery, count: number, publish: (answers: readonly (WindowAnswer | null)[], settled: boolean) => void): WindowChain;
10
+ export {};
11
+ //# sourceMappingURL=chain.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"chain.d.ts","sourceRoot":"","sources":["../src/chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,UAAU,EACV,WAAW,EACX,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,KAAK,IAAI,GAAG,cAAc,GAAG,WAAW,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,aAAa,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAaF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,aAAa,GAAG,UAAU,EACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAC7E,WAAW,CAkEb"}
package/dist/chain.js ADDED
@@ -0,0 +1,64 @@
1
+ function answered(answer) {
2
+ return answer !== null && !('pending' in answer);
3
+ }
4
+ export function chainedWindows(runtime, query, count, publish) {
5
+ let links = [];
6
+ let wanted = count;
7
+ let closed = false;
8
+ const observe = runtime.observe;
9
+ const open = (after, shown) => {
10
+ const link = { after, observation: null, value: shown, fresh: false };
11
+ void observe('query', after === undefined ? query : { ...query, after }).then((observation) => {
12
+ if (closed || !links.includes(link)) {
13
+ observation.close();
14
+ return;
15
+ }
16
+ link.observation = observation;
17
+ const take = (value) => {
18
+ link.value = value;
19
+ link.fresh = true;
20
+ settle();
21
+ };
22
+ observation.subscribe(take);
23
+ take(observation.current());
24
+ }, () => { });
25
+ return link;
26
+ };
27
+ const settle = () => {
28
+ if (closed)
29
+ return;
30
+ const next = [];
31
+ for (let at = 0; at < wanted; at += 1) {
32
+ const before = next[at - 1];
33
+ if (before !== undefined && !before.fresh) {
34
+ next.push(...links.slice(at, wanted));
35
+ break;
36
+ }
37
+ if (before !== undefined && (!answered(before.value) || before.value.next === undefined)) {
38
+ break;
39
+ }
40
+ const after = before === undefined ? undefined : before.value.next;
41
+ const held = links[at];
42
+ next.push(held !== undefined && held.after === after ? held : open(after, held?.value ?? null));
43
+ }
44
+ for (const link of links)
45
+ if (!next.includes(link))
46
+ link.observation?.close();
47
+ links = next;
48
+ publish(links.map((link) => link.value), links.every((link) => link.fresh));
49
+ };
50
+ settle();
51
+ return {
52
+ want(count) {
53
+ if (count === wanted)
54
+ return;
55
+ wanted = count;
56
+ settle();
57
+ },
58
+ close() {
59
+ closed = true;
60
+ for (const link of links)
61
+ link.observation?.close();
62
+ },
63
+ };
64
+ }
@@ -1,15 +1,6 @@
1
- import { type Replica } from './replica.js';
2
- import { type Row } from './rows.js';
3
1
  export type DocumentChange = {
4
- locator: string;
5
- path: string;
6
- before: readonly Row[];
7
- after: readonly Row[];
8
- };
9
- export type MessageChange = {
10
- conversation: string;
11
- identity: string;
12
- text: string | null;
2
+ readonly locator: string;
3
+ readonly path: string | null;
13
4
  };
14
5
  export type ChangeSet = {
15
6
  documents: readonly DocumentChange[];
@@ -20,16 +11,18 @@ export type ChangeSet = {
20
11
  rooms: readonly string[];
21
12
  queues: readonly string[];
22
13
  presentations: readonly string[];
23
- messages: readonly MessageChange[];
24
14
  conversations: readonly string[];
25
15
  };
26
- export declare function changeSet(locator: string, before: Replica | null, after: Replica | null, changed?: {
16
+ type Changed = {
17
+ documents?: readonly string[] | null;
27
18
  drafts?: readonly string[];
28
19
  room?: boolean;
29
20
  queue?: boolean;
30
21
  presentation?: string;
31
- }): ChangeSet;
32
- export declare function entering(locator: string, replica: Replica, paths: readonly string[]): ChangeSet;
33
- export declare function conversationChangeSet(messages: readonly MessageChange[], conversations: readonly string[]): ChangeSet;
22
+ };
23
+ export declare function changeSet(locator: string, changed?: Changed): ChangeSet;
24
+ export declare function conversationChangeSet(conversations: readonly string[]): ChangeSet;
34
25
  export declare function mergeChangeSets(sets: readonly ChangeSet[]): ChangeSet;
26
+ export declare function touches(set: ChangeSet, locator: string, path: string): boolean;
27
+ export {};
35
28
  //# sourceMappingURL=change-set.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"change-set.d.ts","sourceRoot":"","sources":["../src/change-set.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAwB,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AAE3D,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,GAAG,EAAE,CAAC;IACvB,KAAK,EAAE,SAAS,GAAG,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAE5F,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;IACrC,MAAM,EAAE,SAAS;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;IACnC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAwBF,wBAAgB,SAAS,CACvB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,OAAO,GAAG,IAAI,EACtB,KAAK,EAAE,OAAO,GAAG,IAAI,EACrB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CAClB,GACL,SAAS,CA+DX;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAiB/F;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,SAAS,aAAa,EAAE,EAClC,aAAa,EAAE,SAAS,MAAM,EAAE,GAC/B,SAAS,CAUX;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,SAAS,EAAE,GAAG,SAAS,CAUrE"}
1
+ {"version":3,"file":"change-set.d.ts","sourceRoot":"","sources":["../src/change-set.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAExF,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;IACrC,MAAM,EAAE,SAAS;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAY,GAAG,SAAS,CAe3E;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CASjF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,SAAS,EAAE,GAAG,SAAS,CASrE;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAI9E"}
@@ -1,105 +1,25 @@
1
- import { passingFrontmatter } from './collection.js';
2
- import { binaryRecord } from './binary.js';
3
- import { changedPaths, sameBinary, sameChange } from './overlay.js';
4
- import { beneath } from './paths.js';
5
- import { compositionOf, sameMembership } from './replica.js';
6
- import { markdownPath, rowsOf } from './rows.js';
7
- function rowsAt(locator, replica, path) {
8
- if (replica === null)
9
- return [];
10
- const visible = replica.visible;
11
- const document = markdownPath(path) ? passingFrontmatter(visible.collection, path) : null;
12
- const held = visible.documents[path] !== undefined && document !== undefined;
13
- const binary = visible.binaries[path];
14
- if (!held && binary === undefined)
15
- return [];
16
- return rowsOf(locator, path, document ?? null, compositionOf(replica.confirmed.record), visible.changes[path] ?? null, visible.fileIds[path] ?? null, binary === undefined ? null : binaryRecord(path, binary, visible.revisions[path]));
17
- }
18
- function modelShape(model) {
19
- return model.status === 'unavailable' ? 'unavailable' : JSON.stringify(model.types);
20
- }
21
- export function changeSet(locator, before, after, changed = {}) {
22
- const documents = [];
23
- const oldRoom = before?.confirmed.record;
24
- const newRoom = after?.confirmed.record;
25
- const collectionChanged = oldRoom !== undefined &&
26
- newRoom !== undefined &&
27
- modelShape(oldRoom.model) !== modelShape(newRoom.model);
28
- const selectionChanged = oldRoom !== undefined &&
29
- newRoom !== undefined &&
30
- modelShape(oldRoom.selectionModel) !== modelShape(newRoom.selectionModel);
31
- const reclassified = oldRoom !== undefined && newRoom !== undefined && !sameMembership(oldRoom, newRoom);
32
- const paths = before === null || after === null || collectionChanged || selectionChanged || reclassified
33
- ? new Set([
34
- ...Object.keys(before?.visible.documents ?? {}),
35
- ...Object.keys(after?.visible.documents ?? {}),
36
- ...Object.keys(before?.visible.binaries ?? {}),
37
- ...Object.keys(after?.visible.binaries ?? {}),
38
- ])
39
- : changedPaths(before.visible, after.visible);
40
- for (const path of paths) {
41
- if (after?.visible.documents[path] === undefined &&
42
- after?.visible.binaries[path] === undefined &&
43
- before?.visible.documents[path] === undefined &&
44
- before?.visible.binaries[path] === undefined)
45
- continue;
46
- const selected = newRoom?.typedSelection?.roots.some((root) => beneath(root, path)) ?? false;
47
- const retyped = selected ? selectionChanged : collectionChanged;
48
- if (before?.visible.documents[path] === after?.visible.documents[path] &&
49
- sameBinary(before?.visible.binaries[path], after?.visible.binaries[path]) &&
50
- before?.visible.revisions[path] === after?.visible.revisions[path] &&
51
- before?.visible.fileIds[path] === after?.visible.fileIds[path] &&
52
- sameChange(before?.visible.changes[path], after?.visible.changes[path]) &&
53
- !retyped &&
54
- !reclassified)
55
- continue;
56
- documents.push({
57
- locator,
58
- path,
59
- get before() {
60
- return rowsAt(locator, before, path);
61
- },
62
- get after() {
63
- return rowsAt(locator, after, path);
64
- },
65
- });
66
- }
1
+ export function changeSet(locator, changed = {}) {
2
+ const documents = changed.documents;
67
3
  return {
68
- documents,
4
+ documents: documents === undefined
5
+ ? []
6
+ : documents === null
7
+ ? [{ locator, path: null }]
8
+ : documents.map((path) => ({ locator, path })),
69
9
  drafts: (changed.drafts ?? []).map((path) => ({ locator, path })),
70
10
  rooms: changed.room ? [locator] : [],
71
11
  queues: changed.queue ? [locator] : [],
72
12
  presentations: changed.presentation === undefined ? [] : [changed.presentation],
73
- messages: [],
74
13
  conversations: [],
75
14
  };
76
15
  }
77
- export function entering(locator, replica, paths) {
78
- return {
79
- documents: paths.map((path) => ({
80
- locator,
81
- path,
82
- before: [],
83
- get after() {
84
- return rowsAt(locator, replica, path);
85
- },
86
- })),
87
- drafts: [],
88
- rooms: [],
89
- queues: [],
90
- presentations: [],
91
- messages: [],
92
- conversations: [],
93
- };
94
- }
95
- export function conversationChangeSet(messages, conversations) {
16
+ export function conversationChangeSet(conversations) {
96
17
  return {
97
18
  documents: [],
98
19
  drafts: [],
99
20
  rooms: [],
100
21
  queues: [],
101
22
  presentations: [],
102
- messages,
103
23
  conversations: [...new Set(conversations)],
104
24
  };
105
25
  }
@@ -110,7 +30,9 @@ export function mergeChangeSets(sets) {
110
30
  rooms: [...new Set(sets.flatMap((set) => set.rooms))],
111
31
  queues: [...new Set(sets.flatMap((set) => set.queues))],
112
32
  presentations: [...new Set(sets.flatMap((set) => set.presentations))],
113
- messages: sets.flatMap((set) => set.messages),
114
33
  conversations: [...new Set(sets.flatMap((set) => set.conversations))],
115
34
  };
116
35
  }
36
+ export function touches(set, locator, path) {
37
+ return set.documents.some((change) => change.locator === locator && (change.path === null || change.path === path));
38
+ }