@estiva-app/interop 0.92.0 → 0.94.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.
@@ -0,0 +1,314 @@
1
+ import { byOrder } from '@estiva-app/conversation';
2
+ import { changedAt, combineChanges, conflictOf, fieldsSetBy } from './fields.js';
3
+ const KIND_CHANGE = 1851;
4
+ const ADDRESS = /^(\d+):([0-9a-f]{64}):(.+)$/;
5
+ const ORDER = 'order:';
6
+ const LOOK = 'look:';
7
+ /** The field a file's place on a topic is kept in: `order:<d>`. */
8
+ export const orderField = (file) => `${ORDER}${file}`;
9
+ /** The field a file's look on a topic is kept in: `look:<d>`. */
10
+ export const lookField = (file) => `${LOOK}${file}`;
11
+ /** Digits in byte order: `0`–`9`, `A`–`Z`, `a`–`z`. */
12
+ const DIGITS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
13
+ const KEY = /^[0-9A-Za-z]*[1-9A-Za-z]$/;
14
+ /** The longest key a reader takes (§6.14); a planner whose key would pass it places every file afresh. */
15
+ export const MAX_PLACE_KEY = 64;
16
+ /** A place §6.14 reads: 1 to 64 of `0-9A-Za-z`, not ending in `0`. Anything else is no place. */
17
+ export const isPlaceKey = (key) => typeof key === 'string' && key.length <= MAX_PLACE_KEY && KEY.test(key);
18
+ /** `n` keys, evenly spread and as short as `n` allows, in order: every file placed afresh. */
19
+ function evenKeys(n) {
20
+ let width = 1;
21
+ while (DIGITS.length ** width < (n + 1) * 2)
22
+ width++;
23
+ const span = DIGITS.length ** width;
24
+ return Array.from({ length: n }, (_, i) => {
25
+ let value = Math.floor(((i + 1) * span) / (n + 1));
26
+ let key = '';
27
+ for (let w = 0; w < width; w++) {
28
+ key = DIGITS[value % DIGITS.length] + key;
29
+ value = Math.floor(value / DIGITS.length);
30
+ }
31
+ // Never ending in `0`: a trailing `1` still sorts after this key and before the next.
32
+ return key.endsWith('0') ? `${key}1` : key;
33
+ });
34
+ }
35
+ /** Byte-wise, as §6.14 compares keys (never `localeCompare`). */
36
+ const compareKeys = (a, b) => (a < b ? -1 : a > b ? 1 : 0);
37
+ /**
38
+ * A key that sorts strictly between `before` and `after`, either left out for
39
+ * an open end. Each must be a valid key and `before` sort before `after`.
40
+ * Pure, so two people dropping files between the same neighbours get the same
41
+ * key; the file's id breaks that tie.
42
+ */
43
+ export function keyBetween(before, after) {
44
+ if (before !== undefined && !isPlaceKey(before))
45
+ throw new Error(`not a place key: ${JSON.stringify(before)}`);
46
+ if (after !== undefined && !isPlaceKey(after))
47
+ throw new Error(`not a place key: ${JSON.stringify(after)}`);
48
+ if (before !== undefined && after !== undefined && compareKeys(before, after) >= 0) {
49
+ throw new Error(`${JSON.stringify(before)} does not sort before ${JSON.stringify(after)}`);
50
+ }
51
+ return midpoint(before ?? '', after);
52
+ }
53
+ /** Between `a` (possibly empty) and `b` (absent: no upper end), neither ending in `0`. */
54
+ function midpoint(a, b) {
55
+ if (b !== undefined) {
56
+ // A shared start stays; the rest is placed between what follows it.
57
+ let n = 0;
58
+ while ((a[n] ?? '0') === b[n])
59
+ n++;
60
+ if (n > 0)
61
+ return b.slice(0, n) + midpoint(a.slice(n), b.slice(n));
62
+ }
63
+ const low = a ? DIGITS.indexOf(a[0]) : 0;
64
+ const high = b !== undefined ? DIGITS.indexOf(b[0]) : DIGITS.length;
65
+ if (high - low > 1)
66
+ return DIGITS[Math.round((low + high) / 2)];
67
+ // Adjacent digits: a longer `b` has room under its first digit; otherwise go one digit deeper after `a`'s.
68
+ if (b !== undefined && b.length > 1)
69
+ return b.slice(0, 1);
70
+ return DIGITS[low] + midpoint(a.slice(1), undefined);
71
+ }
72
+ const tagOf = (event, name) => event.tags.find((t) => t[0] === name && t[1])?.[1];
73
+ const isArrangeField = (field) => field.startsWith(ORDER) || field.startsWith(LOOK);
74
+ /** The listed file a per-file field of a list names — `lists:`, `order:` or `look:` — or `null` for any other field. */
75
+ export const fileOfListField = (field) => /^(lists|order|look):./.test(field) ? field.slice(field.indexOf(':') + 1) : null;
76
+ const fileOfField = (field) => fileOfListField(field) ?? '';
77
+ /**
78
+ * Whether a change setting `field` on `list` is one a reader folds (§6.14's
79
+ * skip rules, for `lists:`, `order:` and `look:` alike): one of its `o` tags
80
+ * is the field's `<d>`, its `a` is the list, its `O` the list's id, the `<d>`
81
+ * is not the list itself, and its `h` is the list's team.
82
+ */
83
+ export function readsAs(event, field, list, team) {
84
+ const holder = ADDRESS.exec(list);
85
+ const file = fileOfField(field);
86
+ return (!!holder &&
87
+ !!file &&
88
+ event.tags.some((t) => t[0] === 'o' && t[1] === file) &&
89
+ tagOf(event, 'a') === list &&
90
+ tagOf(event, 'O') === holder[3] &&
91
+ file !== holder[3] &&
92
+ !!team &&
93
+ tagOf(event, 'h') === team);
94
+ }
95
+ /** The `order:` and `look:` changes per list, newest good and newest of any. */
96
+ export function arrangementHeads(events, teamOfList) {
97
+ const out = new Map();
98
+ for (const event of events) {
99
+ if (event.kind !== KIND_CHANGE)
100
+ continue;
101
+ const list = tagOf(event, 'a');
102
+ if (!list)
103
+ continue;
104
+ for (const { field } of fieldsSetBy(event)) {
105
+ if (!isArrangeField(field))
106
+ continue;
107
+ const heads = out.get(list) ?? { good: new Map(), any: new Map() };
108
+ out.set(list, heads);
109
+ const held = heads.any.get(field);
110
+ if (!held || byOrder(held, event) < 0)
111
+ heads.any.set(field, event);
112
+ if (!readsAs(event, field, list, teamOfList(list)))
113
+ continue;
114
+ const good = heads.good.get(field);
115
+ if (!good || byOrder(good, event) < 0)
116
+ heads.good.set(field, event);
117
+ }
118
+ }
119
+ return out;
120
+ }
121
+ const valueIn = (event, field) => fieldsSetBy(event).find((f) => f.field === field)?.value;
122
+ /**
123
+ * One file's arrangement on a list, from {@link arrangementHeads}: `listed`
124
+ * is the file's newest `lists:<d>` = `true` entry, `root` the list's first
125
+ * record (the first `prev`).
126
+ */
127
+ export function arrangementOf(heads, file, listed, root) {
128
+ const placed = heads?.good.get(orderField(file));
129
+ const key = placed && byOrder(placed, listed) >= 0 ? valueIn(placed, orderField(file)) : undefined;
130
+ const looked = heads?.good.get(lookField(file));
131
+ const look = looked ? valueIn(looked, lookField(file)) : undefined;
132
+ const orderHead = heads?.any.get(orderField(file));
133
+ const lookHead = heads?.any.get(lookField(file));
134
+ return {
135
+ ...(isPlaceKey(key) ? { order: key } : {}),
136
+ ...(look === 'row' || look === 'card' ? { look } : {}),
137
+ prev: { order: orderHead?.id ?? root.id, look: lookHead?.id ?? root.id },
138
+ prevAt: Math.max(changedAt(root), orderHead ? changedAt(orderHead) : 0, lookHead ? changedAt(lookHead) : 0),
139
+ };
140
+ }
141
+ /**
142
+ * §6.14's order, stable: placed files by key (equal keys by the lower id),
143
+ * then the rest in the order given, which is oldest listed first.
144
+ */
145
+ export function sortArranged(files) {
146
+ const placed = files.filter((f) => f.order !== undefined);
147
+ const rest = files.filter((f) => f.order === undefined);
148
+ placed.sort((a, b) => compareKeys(a.order, b.order) || compareKeys(a.file, b.file));
149
+ return [...placed, ...rest];
150
+ }
151
+ /** One field's change on the topic: §6.2's one-field tag order, then `o`. */
152
+ function fieldChange(pubkey, createdAtMs, topic, field, value, prev) {
153
+ const holder = ADDRESS.exec(topic.address);
154
+ if (!holder)
155
+ throw new Error(`not a file address: ${JSON.stringify(topic.address)}`);
156
+ if (!topic.folder)
157
+ throw new Error("a change names the team of the file it is on");
158
+ const file = fileOfField(field);
159
+ if (file === holder[3])
160
+ throw new Error('a file is not on its own list');
161
+ return {
162
+ pubkey,
163
+ created_at: Math.floor(createdAtMs / 1000),
164
+ kind: KIND_CHANGE,
165
+ tags: [
166
+ ['a', topic.address],
167
+ ['O', holder[3]],
168
+ ['field', field],
169
+ ['value', value],
170
+ ['h', topic.folder],
171
+ ['ts', String(createdAtMs)],
172
+ ['prev', prev],
173
+ ['o', file],
174
+ ],
175
+ content: '',
176
+ };
177
+ }
178
+ /** Stamped after every change it follows, so a clock that is behind is not refused. */
179
+ const stamp = (createdAtMs, files) => Math.max(createdAtMs, ...files.map((f) => f.prevAt + 1));
180
+ /**
181
+ * Move `file` to just after `after` (`null`: first) in `files`, which is the
182
+ * topic's files in the order drawn. One change: the moved file's place, and
183
+ * where it lands among files with no place, the places of those above it too,
184
+ * since unplaced files follow placed ones; files tied on one key with the one
185
+ * it lands before are placed again after it. Several places go in one change,
186
+ * taken whole or refused whole. `null` when the file is already there.
187
+ */
188
+ export function planMoveInTopic(pubkey, createdAtMs, args) {
189
+ // In the topic's own order, whatever order the app draws them in (Ship groups by kind).
190
+ const files = sortArranged(args.files);
191
+ const moved = files.find((f) => f.file === args.file);
192
+ if (!moved)
193
+ throw new Error(`${args.file} is not on the topic's list`);
194
+ const rest = files.filter((f) => f.file !== args.file);
195
+ const to = args.after === null ? 0 : rest.findIndex((f) => f.file === args.after) + 1;
196
+ if (args.after !== null && to === 0)
197
+ throw new Error(`${args.after} is not on the topic's list`);
198
+ // Already there: nothing to write.
199
+ if (files.indexOf(moved) === to)
200
+ return null;
201
+ const before = rest.slice(0, to);
202
+ const after = rest.slice(to);
203
+ const writes = [];
204
+ const unplaced = before.findIndex((f) => f.order === undefined);
205
+ let low = (unplaced < 0 ? before.at(-1) : before[unplaced - 1])?.order;
206
+ const place = (file, high) => {
207
+ const key = keyBetween(low, high);
208
+ writes.push({ file, key });
209
+ low = key;
210
+ };
211
+ if (unplaced >= 0) {
212
+ // Everything after an unplaced file is unplaced too: nothing bounds the keys above.
213
+ for (const f of before.slice(unplaced))
214
+ place(f);
215
+ place(moved);
216
+ }
217
+ else if (after[0]?.order !== undefined && after[0].order === low) {
218
+ // It lands between two files sharing one key: place it, and the tied ones after it, below the next key.
219
+ let j = 0;
220
+ while (after[j]?.order === low)
221
+ j++;
222
+ const high = after[j]?.order;
223
+ place(moved, high);
224
+ for (const f of after.slice(0, j))
225
+ place(f, high);
226
+ }
227
+ else {
228
+ place(moved, after[0]?.order);
229
+ }
230
+ if (writes.some((w) => w.key.length > MAX_PLACE_KEY)) {
231
+ // Keys grew too long (many moves to one spot): place every placed file, and the moved one, afresh.
232
+ const placed = [...before, moved, ...after].filter((f) => f === moved || f.order !== undefined || before.includes(f));
233
+ const keys = evenKeys(placed.length);
234
+ writes.splice(0, writes.length, ...placed.map((file, i) => ({ file, key: keys[i] })));
235
+ }
236
+ const at = stamp(createdAtMs, writes.map((w) => w.file));
237
+ const changes = writes.map((w) => fieldChange(pubkey, at, args.topic, orderField(w.file.file), w.key, w.file.prev.order));
238
+ if (changes.length === 1)
239
+ return changes[0];
240
+ const combined = combineChanges(changes);
241
+ if (typeof combined === 'string')
242
+ throw new Error(combined);
243
+ return combined;
244
+ }
245
+ /** Show `file` as a row or a card: one `look:<d>` change. */
246
+ export function planLookInTopic(pubkey, createdAtMs, args) {
247
+ return fieldChange(pubkey, stamp(createdAtMs, [args.file]), args.topic, lookField(args.file.file), args.look, args.file.prev.look);
248
+ }
249
+ /**
250
+ * Undo of Remove: put `file` back on the list, then back in the place it had
251
+ * — just after `after` (`null`: first). Its look stays: a listing never
252
+ * resets it. Publish `relist`, then send `move` with {@link writeArrangement}
253
+ * over the list read again, so a refusal plans the move again rather than
254
+ * leaving the file back but last. The move is stamped after the listing, so
255
+ * its place is not older than it.
256
+ */
257
+ export function planPutBackInTopic(pubkey, createdAtMs, args) {
258
+ const listedAt = stamp(createdAtMs, [args.file]);
259
+ const holder = ADDRESS.exec(args.topic.address);
260
+ if (!holder)
261
+ throw new Error(`not a file address: ${JSON.stringify(args.topic.address)}`);
262
+ const relist = {
263
+ pubkey,
264
+ created_at: Math.floor(listedAt / 1000),
265
+ kind: KIND_CHANGE,
266
+ tags: [
267
+ ['a', args.topic.address],
268
+ ['O', holder[3]],
269
+ ['field', `lists:${args.file.file}`],
270
+ ['value', 'true'],
271
+ ['h', args.topic.folder],
272
+ ['ts', String(listedAt)],
273
+ ['o', args.file.file],
274
+ ],
275
+ content: '',
276
+ };
277
+ const move = (files, ms) => {
278
+ // Back on the list it has no place yet; a list read before the listing landed does not hold it.
279
+ const held = files.find((f) => f.file === args.file.file);
280
+ const back = { ...(held ?? args.file), order: undefined, prevAt: Math.max((held ?? args.file).prevAt, listedAt) };
281
+ const rest = files.filter((f) => f.file !== back.file);
282
+ return planMoveInTopic(pubkey, Math.max(ms, listedAt + 1), { topic: args.topic, files: [...rest, back], file: back.file, after: args.after });
283
+ };
284
+ return { relist, move };
285
+ }
286
+ /**
287
+ * Send an arrangement change, and answer a `conflict:` by reading the topic
288
+ * again and planning the change again on what is there now — never by sending
289
+ * the same places again. A place the planner added for a file nobody had
290
+ * placed would otherwise write over a move someone made since; a look or a
291
+ * single move planned again is §6.2's "set it again after the current one".
292
+ */
293
+ export async function writeArrangement(args) {
294
+ const now = args.now ?? Date.now;
295
+ const tries = args.tries ?? 3;
296
+ let files = args.files;
297
+ let last = '';
298
+ for (let attempt = 0; attempt < tries; attempt++) {
299
+ const change = args.plan(files, now());
300
+ if (!change)
301
+ return { ok: true };
302
+ const signed = await args.sign(change);
303
+ const answer = await args.publish(signed);
304
+ if (answer.ok)
305
+ return { ok: true, event: signed };
306
+ last = answer.reason ?? 'refused with no reason';
307
+ const conflict = conflictOf(last);
308
+ if (!conflict || conflict.kind === 'other')
309
+ return { ok: false, refused: last };
310
+ files = await args.read();
311
+ }
312
+ return { ok: false, refused: `still refused after ${tries} tries: ${last}` };
313
+ }
314
+ //# sourceMappingURL=topicArrangement.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"topicArrangement.js","sourceRoot":"","sources":["../src/topicArrangement.ts"],"names":[],"mappings":"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"}
package/dist/topics.d.ts CHANGED
@@ -27,6 +27,7 @@
27
27
  import { type SignedEvent, type UnsignedEvent } from '@estiva-app/protocol';
28
28
  import { type Following, type MembershipRead } from '@estiva-app/conversation';
29
29
  import { type ForeignObject, type ProjectionCache, type QueryFn } from './projection.js';
30
+ import { type FileArrangement } from './topicArrangement.js';
30
31
  /**
31
32
  * The file kinds a listed id is looked for under by default: topic, document,
32
33
  * project, issue. Never a bare `#d`, since a Folder's `kind:39000` shares its
@@ -108,8 +109,8 @@ export interface FileTopic {
108
109
  * topics' roots.
109
110
  */
110
111
  export declare function topicsOfFile(query: QueryFn, file: string): Promise<FileTopic[]>;
111
- /** A file on a topic's list. */
112
- export interface ListedFile {
112
+ /** A file on a topic's list, with its place and look there (§6.14). */
113
+ export interface ListedFile extends FileArrangement {
113
114
  /** The listed file's id. */
114
115
  file: string;
115
116
  /** Its address when exactly one file the reader can read holds the id, else `null`: not drawn, not counted. */
@@ -118,19 +119,30 @@ export interface ListedFile {
118
119
  folder: string | null;
119
120
  entry: ListEntry;
120
121
  }
122
+ /** How a topic's list is read. */
123
+ export interface ListReadOptions {
124
+ /** The file kinds a listed id resolves over (§6.14 "A listed id resolves"). */
125
+ fileKinds?: readonly number[];
126
+ /**
127
+ * The relay offers the list read (NIP-11 `file_list.newest`): read each
128
+ * topic's fields as their current changes, at most three per file however
129
+ * often its files were moved, not every change ever made (§6.13). Without
130
+ * it, every change by `#O`, which grows with each move.
131
+ */
132
+ listRead?: boolean;
133
+ }
121
134
  /**
122
135
  * A topic's list, by the topic's address: its entries whose newest value
123
136
  * lists the file, filed in the Folder the topic's root names (§6.2; read here,
124
- * never taken from the caller), in no promised order (sort as the design
125
- * says; `entry.event` carries the time), each id resolved over `fileKinds` by
137
+ * never taken from the caller), in the topic's order (§6.14: placed files by
138
+ * key, then the rest oldest listed first), each with its look and the `prev`
139
+ * its next arrangement follows, each id resolved over `fileKinds` by
126
140
  * `#d`. A topic the reader cannot read, or whose root names no Folder, lists
127
141
  * nothing. An id held by none the reader can read, or by two, resolves to
128
142
  * `null`: a consumer draws and counts only the resolved ones (§3.2, the count
129
143
  * is the disclosure).
130
144
  */
131
- export declare function topicList(query: QueryFn, topic: string, options?: {
132
- fileKinds?: readonly number[];
133
- }): Promise<ListedFile[]>;
145
+ export declare function topicList(query: QueryFn, topic: string, options?: ListReadOptions): Promise<ListedFile[]>;
134
146
  /**
135
147
  * Many topics' lists at once, by address (TOP-4, Peek's Topics screen): the
136
148
  * rules of {@link topicList} for each, in three requests whatever the number
@@ -140,9 +152,7 @@ export declare function topicList(query: QueryFn, topic: string, options?: {
140
152
  * limit at a few dozen topics. Every address asked for is a key; one that
141
153
  * lists nothing, or that the reader cannot read, maps to `[]`.
142
154
  */
143
- export declare function topicLists(query: QueryFn, topics: readonly string[], options?: {
144
- fileKinds?: readonly number[];
145
- }): Promise<Map<string, ListedFile[]>>;
155
+ export declare function topicLists(query: QueryFn, topics: readonly string[], options?: ListReadOptions): Promise<Map<string, ListedFile[]>>;
146
156
  /** A topic as {@link readTopics} reads it. */
147
157
  export interface ReadTopic {
148
158
  address: string;
@@ -228,9 +238,8 @@ export declare function readAll(query: QueryFn, filters: readonly Record<string,
228
238
  *
229
239
  * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-topic-keeps-its-own-list-of-files.md
230
240
  */
231
- export declare function readTopics(query: QueryFn, me: string, options?: {
241
+ export declare function readTopics(query: QueryFn, me: string, options?: ListReadOptions & {
232
242
  cache?: ProjectionCache;
233
- fileKinds?: readonly number[];
234
243
  nowSeconds?: number;
235
244
  parentsListRead?: boolean;
236
245
  }): Promise<TopicsRead>;
@@ -1 +1 @@
1
- {"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["../src/topics.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["../src/topics.ts"],"names":[],"mappings":"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"}
package/dist/topics.js CHANGED
@@ -28,6 +28,8 @@ import { encodeNpub } from '@estiva-app/protocol';
28
28
  import { RELAY_PAGE_CEILING } from '@estiva-app/protocol';
29
29
  import { byOrder, candidateFilesOf, fileContext, foldMemberships, followingOf, HORIZON_SECONDS, isUnreadOnPlace, mentions, REPLY_FLOOR_CONTEXT, THREAD_RULE_FROM, } from '@estiva-app/conversation';
30
30
  import { conversationsOf, folderOf, isArchived, KIND_FOLDER_STATE, resolveForeignRoots, rootOf, } from './projection.js';
31
+ import { fieldsSetBy } from './fields.js';
32
+ import { arrangementHeads, arrangementOf, fileOfListField, readsAs, sortArranged } from './topicArrangement.js';
31
33
  const KIND_CHANGE = 1851;
32
34
  /** The topic (bare file) kind: the only lists this stage reads (Miky, 2026-10-30). */
33
35
  const KIND_TOPIC = 30840;
@@ -183,7 +185,8 @@ async function rootsOf(query, addresses) {
183
185
  */
184
186
  export async function topicsOfFile(query, file) {
185
187
  const isTopic = (entry) => entry.file === file && entry.list.startsWith(`${KIND_TOPIC}:`);
186
- const events = await query([topicsOfFileFilter(file)]);
188
+ // Paged: `#o` also returns every `order:` and `look:` change on the file (§6.14), one per move.
189
+ const events = await readAll(query, [topicsOfFileFilter(file)]);
187
190
  const lists = [...new Set(listEntries(events).filter(isTopic).map((entry) => entry.list))];
188
191
  if (lists.length === 0)
189
192
  return [];
@@ -199,8 +202,9 @@ export async function topicsOfFile(query, file) {
199
202
  /**
200
203
  * A topic's list, by the topic's address: its entries whose newest value
201
204
  * lists the file, filed in the Folder the topic's root names (§6.2; read here,
202
- * never taken from the caller), in no promised order (sort as the design
203
- * says; `entry.event` carries the time), each id resolved over `fileKinds` by
205
+ * never taken from the caller), in the topic's order (§6.14: placed files by
206
+ * key, then the rest oldest listed first), each with its look and the `prev`
207
+ * its next arrangement follows, each id resolved over `fileKinds` by
204
208
  * `#d`. A topic the reader cannot read, or whose root names no Folder, lists
205
209
  * nothing. An id held by none the reader can read, or by two, resolves to
206
210
  * `null`: a consumer draws and counts only the resolved ones (§3.2, the count
@@ -227,24 +231,79 @@ export async function topicLists(query, topics, options = {}) {
227
231
  /** {@link topicLists} with the roots already asked for: {@link readTopics} reads them once for everything. */
228
232
  async function listsOf(query, asked, rootsRead, options) {
229
233
  const out = new Map(asked.map((topic) => [topic, []]));
230
- // One filter per topic in one request, so a relay's cap on an answer cuts no more than it would for that topic alone.
231
- const [roots, events] = await Promise.all([rootsRead, query(asked.map(topicListFilter))]);
234
+ // Paged without the list read: every move adds a change to a topic's `#O`, and an unpaged read would lose its oldest entries.
235
+ const [roots, events] = await Promise.all([rootsRead, options.listRead ? newestChanges(query, asked) : readAll(query, asked.map(topicListFilter))]);
232
236
  const folderOfList = (list) => {
233
237
  const root = out.has(list) ? roots.get(list) : undefined;
234
238
  return root ? folderOf(root) : null;
235
239
  };
240
+ if (options.listRead)
241
+ events.push(...(await skippedAgain(query, events, folderOfList)));
236
242
  const entries = listEntries(events, folderOfList)
237
243
  .filter((entry) => entry.listed)
238
244
  .sort((a, b) => byOrder(a.event, b.event));
239
245
  if (entries.length === 0)
240
246
  return out;
247
+ const heads = arrangementHeads(events, folderOfList);
241
248
  const resolved = await resolveIds(query, [...new Set(entries.map((entry) => entry.file))], options.fileKinds);
242
249
  for (const entry of entries) {
243
250
  const held = resolved.get(entry.file);
244
- out.get(entry.list).push({ file: entry.file, address: held?.address ?? null, folder: held?.folder ?? null, entry });
251
+ const arranged = arrangementOf(heads.get(entry.list), entry.file, entry.event, roots.get(entry.list));
252
+ out.get(entry.list).push({ file: entry.file, address: held?.address ?? null, folder: held?.folder ?? null, entry, ...arranged });
245
253
  }
254
+ for (const [list, files] of out)
255
+ out.set(list, sortArranged(files));
246
256
  return out;
247
257
  }
258
+ /**
259
+ * Each topic's fields as their current changes, by the list read (§6.13):
260
+ * one filter per topic, all in one request, so a relay's cap on an answer
261
+ * cuts no more than it would for that topic alone, as the `#O` read does.
262
+ */
263
+ async function newestChanges(query, topics) {
264
+ const filters = topics.flatMap((topic) => {
265
+ const [, kind, , d] = ADDRESS.exec(topic) ?? [];
266
+ return d ? [{ fields: 'newest', kinds: [Number(kind)], '#d': [d] }] : [];
267
+ });
268
+ return filters.length ? query(filters) : [];
269
+ }
270
+ /** The most files per topic the list read asks about again. */
271
+ const SKIPPED_READ_CAP = 100;
272
+ /**
273
+ * The list read answers each field's newest change, a malformed one too (a
274
+ * wrong `o` the relay takes), so the good change before it is not in the
275
+ * answer. For each file where that happened, read its changes on that topic
276
+ * again (`#O` and `#o`), so it folds as a whole `#O` read would.
277
+ */
278
+ async function skippedAgain(query, events, folderOfList) {
279
+ const skipped = new Map();
280
+ for (const event of events) {
281
+ if (event.kind !== KIND_CHANGE)
282
+ continue;
283
+ const list = tagOf(event, 'a');
284
+ // Only a list asked for and readable: a change on another author's same-id topic folds nowhere anyway.
285
+ if (!list || !folderOfList(list))
286
+ continue;
287
+ for (const { field } of fieldsSetBy(event)) {
288
+ const file = fileOfListField(field);
289
+ // A list entry is read only in the one-field form (§6.14): one set in a `set` is skipped too.
290
+ const entryInSet = field.startsWith('lists:') && tagOf(event, 'field') === undefined;
291
+ if (!file || (!entryInSet && readsAs(event, field, list, folderOfList(list))))
292
+ continue;
293
+ const holder = ADDRESS.exec(list);
294
+ if (!holder)
295
+ continue;
296
+ const files = skipped.get(holder[3]) ?? new Set();
297
+ // Bounded: a change setting hundreds of junk fields asks again about the first few only.
298
+ if (files.size < SKIPPED_READ_CAP)
299
+ files.add(file);
300
+ skipped.set(holder[3], files);
301
+ }
302
+ }
303
+ if (skipped.size === 0)
304
+ return [];
305
+ return readAll(query, [...skipped].map(([topic, files]) => ({ kinds: [KIND_CHANGE], '#O': [topic], '#o': [...files] })));
306
+ }
248
307
  /** The role on a team list's entry that marks a topic one of the team's spaces (§3.3). */
249
308
  const SPACE_ROLE = 'space';
250
309
  /**
@@ -377,7 +436,8 @@ export async function readTopics(query, me, options = {}) {
377
436
  return { me, topics: [], membership: foldMemberships(me, [], nowSeconds), mentionedIn: new Set(), inConversations: new Map() };
378
437
  const [objects, lists, part, states] = await Promise.all([
379
438
  resolveForeignRoots(addresses, query, options.cache, { archivedWith: true, parentsListRead: options.parentsListRead }),
380
- listsOf(query, addresses, Promise.resolve(roots), options),
439
+ // The relay that offers the list read for the parents offers it for the topics' own lists.
440
+ listsOf(query, addresses, Promise.resolve(roots), { ...options, listRead: options.listRead ?? options.parentsListRead }),
381
441
  // Held once each, though one comment can answer two of the filters: the folds count events.
382
442
  readAll(query, personInFilesFilters(me, addresses)),
383
443
  // The team lists naming a topic, for which of them are spaces.