@estiva-app/interop 0.71.0 → 0.73.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 +47 -0
- package/README.md +1 -0
- package/dist/fields.d.ts +205 -0
- package/dist/fields.d.ts.map +1 -0
- package/dist/fields.js +250 -0
- package/dist/fields.js.map +1 -0
- package/dist/folders.d.ts +2 -0
- package/dist/folders.d.ts.map +1 -1
- package/dist/folders.js +6 -0
- package/dist/folders.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/projection.d.ts +11 -0
- package/dist/projection.d.ts.map +1 -1
- package/dist/projection.js +23 -1
- package/dist/projection.js.map +1 -1
- package/dist/topics.d.ts +12 -0
- package/dist/topics.d.ts.map +1 -1
- package/dist/topics.js +43 -15
- package/dist/topics.js.map +1 -1
- package/package.json +3 -3
- package/src/fields.ts +346 -0
- package/src/folders.ts +7 -0
- package/src/index.ts +22 -0
- package/src/projection.ts +33 -1
- package/src/topics.ts +45 -14
package/dist/topics.d.ts
CHANGED
|
@@ -128,4 +128,16 @@ export interface ListedFile {
|
|
|
128
128
|
export declare function topicList(query: QueryFn, topic: string, options?: {
|
|
129
129
|
fileKinds?: readonly number[];
|
|
130
130
|
}): Promise<ListedFile[]>;
|
|
131
|
+
/**
|
|
132
|
+
* Many topics' lists at once, by address (TOP-4, Peek's Topics screen): the
|
|
133
|
+
* rules of {@link topicList} for each, in three requests whatever the number
|
|
134
|
+
* of topics (one more per 100 listed files): the roots, every topic's changes
|
|
135
|
+
* (one `#O` filter per topic) and the batched `#d` resolve, where one
|
|
136
|
+
* `topicList` per topic would be three requests each and trips a relay's rate
|
|
137
|
+
* limit at a few dozen topics. Every address asked for is a key; one that
|
|
138
|
+
* lists nothing, or that the reader cannot read, maps to `[]`.
|
|
139
|
+
*/
|
|
140
|
+
export declare function topicLists(query: QueryFn, topics: readonly string[], options?: {
|
|
141
|
+
fileKinds?: readonly number[];
|
|
142
|
+
}): Promise<Map<string, ListedFile[]>>;
|
|
131
143
|
//# sourceMappingURL=topics.d.ts.map
|
package/dist/topics.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["../src/topics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAE3E,OAAO,EAAY,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAQxD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,SAAS,MAAM,EAAiC,CAAA;AAKhF,uDAAuD;AACvD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,+DAA+D;AAC/D,MAAM,WAAW,UAAU;IACzB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAA;IACf,+FAA+F;IAC/F,MAAM,EAAE,MAAM,CAAA;CACf;AAgCD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,aAAa,EAAE,CAEjB;AAED,2GAA2G;AAC3G,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,aAAa,EAAE,CAEjB;AAED,iGAAiG;AACjG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAExE;AAED,qGAAqG;AACrG,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGtE;AAED,kDAAkD;AAClD,MAAM,WAAW,SAAS;IACxB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAA;IACZ,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAA;IACd,mDAAmD;IACnD,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,WAAW,CAAA;CACnB;AAWD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,WAAW,CACzB,MAAM,EAAE,SAAS,WAAW,EAAE,EAC9B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,GACzD,SAAS,EAAE,CAsBb;AAyBD,iCAAiC;AACjC,MAAM,WAAW,SAAS;IACxB,2BAA2B;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,+CAA+C;IAC/C,IAAI,EAAE,WAAW,CAAA;IACjB,KAAK,EAAE,SAAS,CAAA;CACjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAarF;AAED,gCAAgC;AAChC,MAAM,WAAW,UAAU;IACzB,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,+GAA+G;IAC/G,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,EAAE,SAAS,CAAA;CACjB;AAED;;;;;;;;;GASG;AACH,wBAAsB,SAAS,CAC7B,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GAC9C,OAAO,CAAC,UAAU,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["../src/topics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAE3E,OAAO,EAAY,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAQxD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,SAAS,MAAM,EAAiC,CAAA;AAKhF,uDAAuD;AACvD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,+DAA+D;AAC/D,MAAM,WAAW,UAAU;IACzB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAA;IACf,+FAA+F;IAC/F,MAAM,EAAE,MAAM,CAAA;CACf;AAgCD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,aAAa,EAAE,CAEjB;AAED,2GAA2G;AAC3G,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,aAAa,EAAE,CAEjB;AAED,iGAAiG;AACjG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAExE;AAED,qGAAqG;AACrG,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGtE;AAED,kDAAkD;AAClD,MAAM,WAAW,SAAS;IACxB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAA;IACZ,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAA;IACd,mDAAmD;IACnD,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,WAAW,CAAA;CACnB;AAWD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,WAAW,CACzB,MAAM,EAAE,SAAS,WAAW,EAAE,EAC9B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,GACzD,SAAS,EAAE,CAsBb;AAyBD,iCAAiC;AACjC,MAAM,WAAW,SAAS;IACxB,2BAA2B;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,+CAA+C;IAC/C,IAAI,EAAE,WAAW,CAAA;IACjB,KAAK,EAAE,SAAS,CAAA;CACjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAarF;AAED,gCAAgC;AAChC,MAAM,WAAW,UAAU;IACzB,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,+GAA+G;IAC/G,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,EAAE,SAAS,CAAA;CACjB;AAED;;;;;;;;;GASG;AACH,wBAAsB,SAAS,CAC7B,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GAC9C,OAAO,CAAC,UAAU,EAAE,CAAC,CAEvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GAC9C,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAiBpC"}
|
package/dist/topics.js
CHANGED
|
@@ -205,27 +205,54 @@ export async function topicsOfFile(query, file) {
|
|
|
205
205
|
* is the disclosure).
|
|
206
206
|
*/
|
|
207
207
|
export async function topicList(query, topic, options = {}) {
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
208
|
+
return (await topicLists(query, [topic], options)).get(topic) ?? [];
|
|
209
|
+
}
|
|
210
|
+
/**
|
|
211
|
+
* Many topics' lists at once, by address (TOP-4, Peek's Topics screen): the
|
|
212
|
+
* rules of {@link topicList} for each, in three requests whatever the number
|
|
213
|
+
* of topics (one more per 100 listed files): the roots, every topic's changes
|
|
214
|
+
* (one `#O` filter per topic) and the batched `#d` resolve, where one
|
|
215
|
+
* `topicList` per topic would be three requests each and trips a relay's rate
|
|
216
|
+
* limit at a few dozen topics. Every address asked for is a key; one that
|
|
217
|
+
* lists nothing, or that the reader cannot read, maps to `[]`.
|
|
218
|
+
*/
|
|
219
|
+
export async function topicLists(query, topics, options = {}) {
|
|
220
|
+
const asked = [...new Set(topics)];
|
|
221
|
+
const out = new Map(asked.map((topic) => [topic, []]));
|
|
222
|
+
if (asked.length === 0)
|
|
223
|
+
return out;
|
|
224
|
+
// 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.
|
|
225
|
+
const [roots, events] = await Promise.all([rootsOf(query, asked), query(asked.map(topicListFilter))]);
|
|
226
|
+
const folderOfList = (list) => {
|
|
227
|
+
const root = out.has(list) ? roots.get(list) : undefined;
|
|
228
|
+
return root ? folderOf(root) : null;
|
|
229
|
+
};
|
|
230
|
+
const entries = listEntries(events, folderOfList)
|
|
214
231
|
.filter((entry) => entry.listed)
|
|
215
232
|
.sort((a, b) => byOrder(a.event, b.event));
|
|
216
233
|
if (entries.length === 0)
|
|
217
|
-
return
|
|
218
|
-
const
|
|
234
|
+
return out;
|
|
235
|
+
const resolved = await resolveIds(query, [...new Set(entries.map((entry) => entry.file))], options.fileKinds);
|
|
236
|
+
for (const entry of entries)
|
|
237
|
+
out.get(entry.list).push({ file: entry.file, address: resolved.get(entry.file) ?? null, entry });
|
|
238
|
+
return out;
|
|
239
|
+
}
|
|
240
|
+
/** Each id's address when exactly one file of `fileKinds` the reader can read holds it; an id held by none or by two is left out. */
|
|
241
|
+
async function resolveIds(query, ids, fileKinds) {
|
|
219
242
|
// Never a Folder's `39000`, which shares its uuid (§11.1): an id only a Folder holds resolves to nothing.
|
|
220
|
-
const kinds = (
|
|
243
|
+
const kinds = (fileKinds ?? LISTED_FILE_KINDS).filter((kind) => kind !== KIND_FOLDER);
|
|
221
244
|
// Room for a second holder of every id, so two holders are seen as two; in
|
|
222
245
|
// batches, so a relay's cap on `limit` cannot cut a long list short.
|
|
223
246
|
const batches = [];
|
|
224
247
|
for (let i = 0; i < ids.length; i += RESOLVE_BATCH)
|
|
225
248
|
batches.push(ids.slice(i, i + RESOLVE_BATCH));
|
|
226
|
-
const
|
|
249
|
+
const answers = await Promise.all(batches.map((batch) => query([{ kinds, '#d': batch, limit: batch.length * 2 }])));
|
|
250
|
+
// An answer that filled its limit may have cut a second holder (newest
|
|
251
|
+
// first), and one holder would then pass for the only one: every id of that
|
|
252
|
+
// batch stays unresolved rather than drawn as somebody else's file.
|
|
253
|
+
const unsure = new Set(batches.flatMap((batch, i) => (answers[i].length >= batch.length * 2 ? batch : [])));
|
|
227
254
|
const holders = new Map();
|
|
228
|
-
for (const event of
|
|
255
|
+
for (const event of answers.flat()) {
|
|
229
256
|
const d = tagOf(event, 'd');
|
|
230
257
|
if (!d || !kinds.includes(event.kind))
|
|
231
258
|
continue;
|
|
@@ -233,9 +260,10 @@ export async function topicList(query, topic, options = {}) {
|
|
|
233
260
|
set.add(`${event.kind}:${event.pubkey}`);
|
|
234
261
|
holders.set(d, set);
|
|
235
262
|
}
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
263
|
+
const out = new Map();
|
|
264
|
+
for (const [d, set] of holders)
|
|
265
|
+
if (set.size === 1 && !unsure.has(d))
|
|
266
|
+
out.set(d, `${[...set][0]}:${d}`);
|
|
267
|
+
return out;
|
|
240
268
|
}
|
|
241
269
|
//# sourceMappingURL=topics.js.map
|
package/dist/topics.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"topics.js","sourceRoot":"","sources":["../src/topics.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"topics.js","sourceRoot":"","sources":["../src/topics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EAAwC,MAAM,sBAAsB,CAAA;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAgB,MAAM,iBAAiB,CAAA;AAExD,MAAM,WAAW,GAAG,IAAI,CAAA;AACxB,sFAAsF;AACtF,MAAM,UAAU,GAAG,KAAK,CAAA;AACxB,MAAM,WAAW,GAAG,KAAK,CAAA;AACzB,yFAAyF;AACzF,MAAM,aAAa,GAAG,GAAG,CAAA;AACzB;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;AAEhF,MAAM,OAAO,GAAG,6BAA6B,CAAA;AAC7C,MAAM,YAAY,GAAG,QAAQ,CAAA;AAE7B,uDAAuD;AACvD,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,GAAG,YAAY,GAAG,IAAI,EAAE,CAAA;AACjC,CAAC;AAUD,SAAS,KAAK,CACZ,MAAc,EACd,WAAmB,EACnB,IAAwE;IAExE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC9C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACxF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAA;IACvG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACtG,mHAAmH;IACnH,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAC7E,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,WAAW,EAAE,CAAC,CAAA;IACpH,OAAO;QACL,MAAM;QACN,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1C,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE;YACJ,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACxB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;YAChB,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACzC,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YACvB,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;YAC3B,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC;SACjB;QACD,sGAAsG;QACtG,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;KACzB,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAc,EACd,WAAmB,EACnB,IAAwD;IAExD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;AAC3G,CAAC;AAED,2GAA2G;AAC3G,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,WAAmB,EACnB,IAAwD;IAExD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;AAC5G,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAA;AAC/C,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAClC,OAAO,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAA;AACrE,CAAC;AAeD,MAAM,KAAK,GAAG,CAAC,KAAgC,EAAE,IAAY,EAAsB,EAAE,CACnF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAEpD,mGAAmG;AACnG,MAAM,QAAQ,GAAG,CAAC,KAAgC,EAAiB,EAAE;IACnE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACnC,OAAO,KAAK,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;AAC1F,CAAC,CAAA;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,WAAW,CACzB,MAA8B,EAC9B,YAA0D;IAE1D,MAAM,MAAM,GAAG,IAAI,GAAG,EAAgD,CAAA;IACtE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;YAAE,SAAQ;QACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;YAAE,SAAQ;QAC7E,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAChC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAAE,SAAQ;QACzF,IAAI,YAAY,IAAI,YAAY,CAAC,IAAK,CAAC,KAAK,MAAM;YAAE,SAAQ;QAC5D,MAAM,GAAG,GAAG,GAAG,IAAI,KAAK,IAAI,EAAE,CAAA;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC5B,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAC/E,CAAC;IACD,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACpD,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,CAAE;QACxB,IAAI;QACJ,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,CAAE;QAC1B,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM;QAChE,KAAK;KACN,CAAC,CAAC,CAAA;AACL,CAAC;AAED,kFAAkF;AAClF,KAAK,UAAU,OAAO,CAAC,KAAc,EAAE,SAA4B;IACjE,MAAM,YAAY,GAAG,IAAI,GAAG,EAA0D,CAAA;IACtF,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;QAChC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QACvD,IAAI,CAAC,CAAC;YAAE,SAAQ;QAChB,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,MAAM,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAA;QAC7E,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAChB,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC9B,CAAC;IACD,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,GAAG,EAAE,CAAA;IAC7C,MAAM,OAAO,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAC5I,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC5C,KAAK,MAAM,IAAI,IAAI,MAAM,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,CAAA;QACvE,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC/B,mFAAmF;QACnF,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACxI,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAWD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAc,EAAE,IAAY;IAC7D,MAAM,OAAO,GAAG,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,CAAA;IACpG,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACtD,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC1F,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACjC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACzC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC5B,OAAO,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACrC,CAAC,CAAA;IACD,OAAO,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC;SACrC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;SACjD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AACnF,CAAC;AAWD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,KAAc,EACd,KAAa,EACb,UAA6C,EAAE;IAE/C,OAAO,CAAC,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;AACrE,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,KAAc,EACd,MAAyB,EACzB,UAA6C,EAAE;IAE/C,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAuB,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5E,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IAClC,sHAAsH;IACtH,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;IACrG,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACxD,OAAO,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACrC,CAAC,CAAA;IACD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC;SAC9C,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;SAC/B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;IAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC7G,KAAK,MAAM,KAAK,IAAI,OAAO;QAAE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IAC9H,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,qIAAqI;AACrI,KAAK,UAAU,UAAU,CAAC,KAAc,EAAE,GAAsB,EAAE,SAA6B;IAC7F,0GAA0G;IAC1G,MAAM,KAAK,GAAG,CAAC,SAAS,IAAI,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;IACrF,2EAA2E;IAC3E,qEAAqE;IACrE,MAAM,OAAO,GAAe,EAAE,CAAA;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,aAAa;QAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAA;IACjG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACnH,uEAAuE;IACvE,4EAA4E;IAC5E,oEAAoE;IACpE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC3G,MAAM,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC9C,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACnC,MAAM,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAC3B,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAQ;QAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,EAAU,CAAA;QAC/C,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;QACxC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IACrB,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAA;IACrC,KAAK,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,OAAO;QAAE,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACvG,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@estiva-app/interop",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.73.0",
|
|
4
4
|
"description": "Render and act on another app's objects from its published NIP-89 manifest. The owner defines the projection; the consumer decides how it looks.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -48,11 +48,11 @@
|
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
50
|
"@estiva-app/conversation": ">=0.20.0",
|
|
51
|
-
"@estiva-app/protocol": ">=0.
|
|
51
|
+
"@estiva-app/protocol": ">=0.48.0"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@estiva-app/conversation": ">=0.20.0",
|
|
55
|
-
"@estiva-app/protocol": ">=0.
|
|
55
|
+
"@estiva-app/protocol": ">=0.48.0",
|
|
56
56
|
"typescript": "~5.9.3"
|
|
57
57
|
}
|
|
58
58
|
}
|
package/src/fields.ts
ADDED
|
@@ -0,0 +1,346 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A file as its fields, each kept in order by the relay — SPEC §6.2, §6.13.
|
|
3
|
+
*
|
|
4
|
+
* Two halves, both for any type the relay keeps:
|
|
5
|
+
*
|
|
6
|
+
* - **Reading** a list or one file with the relay's list read
|
|
7
|
+
* (`"fields": "newest"`), which answers each file's first record and, for
|
|
8
|
+
* each field, only its current change: a list never carries the text, and
|
|
9
|
+
* opening one file (`"text": true` beside `#d`) carries its current text and
|
|
10
|
+
* none of its history. Each change's id is that field's next `prev`.
|
|
11
|
+
* - **Writing** a change that names the one it follows, and answering the
|
|
12
|
+
* relay's `conflict:` as §6.2 says: a field set again keeps the later, and a
|
|
13
|
+
* text merges by §13.3's rule, or stops and asks when a block was changed by
|
|
14
|
+
* both or edited against a delete. It never writes over someone's newer
|
|
15
|
+
* words.
|
|
16
|
+
*
|
|
17
|
+
* Only for a relay whose NIP-11 advertises `file_list` (`relayFileReadsOf` in
|
|
18
|
+
* `@estiva-app/protocol`), and `"text"` only where it says `text`: a relay
|
|
19
|
+
* without them answers these reads as if they were plain ones.
|
|
20
|
+
*
|
|
21
|
+
* why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-file-is-its-fields-each-kept-in-order-by-the-relay.md
|
|
22
|
+
* why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/opening-a-file-reads-its-current-text-not-its-history.md
|
|
23
|
+
* why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/merging-two-changes-to-one-text-never-loses-words.md
|
|
24
|
+
*/
|
|
25
|
+
import {
|
|
26
|
+
CONTENT_FORMAT_TAG,
|
|
27
|
+
mergeTexts,
|
|
28
|
+
type MergeAsk,
|
|
29
|
+
type MergeText,
|
|
30
|
+
type SignedEvent,
|
|
31
|
+
type UnsignedEvent,
|
|
32
|
+
} from '@estiva-app/protocol'
|
|
33
|
+
import { folderOf, type QueryFn } from './projection.js'
|
|
34
|
+
|
|
35
|
+
/** The change event every Estiva app writes (SPEC §6.2). */
|
|
36
|
+
const KIND_CHANGE = 1851
|
|
37
|
+
|
|
38
|
+
/** The field that holds a file's text (§6.10): the one field that merges rather than re-sets. */
|
|
39
|
+
export const TEXT_FIELD = 'description'
|
|
40
|
+
|
|
41
|
+
/** One field's current value, and the change that set it. */
|
|
42
|
+
export interface CurrentField {
|
|
43
|
+
value: string
|
|
44
|
+
/** The value's `content-format`, for the text; absent for marker text. */
|
|
45
|
+
format?: string
|
|
46
|
+
/** The change's id: the field's next `prev`. */
|
|
47
|
+
id: string
|
|
48
|
+
/** Who set it. */
|
|
49
|
+
pubkey: string
|
|
50
|
+
/** When, in ms: `ts` where it agrees with `created_at` to the second (§6.2), else `created_at`. */
|
|
51
|
+
at: number
|
|
52
|
+
event: SignedEvent
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** A file read by its fields. */
|
|
56
|
+
export interface FileFields {
|
|
57
|
+
root: SignedEvent
|
|
58
|
+
/** `<kind>:<pubkey>:<d>`. */
|
|
59
|
+
address: string
|
|
60
|
+
/** Each field's current change. The text is here only when the file was opened with it. */
|
|
61
|
+
fields: Record<string, CurrentField>
|
|
62
|
+
/** The root and each current change, as signed — what a fold of every change would read the same. */
|
|
63
|
+
events: SignedEvent[]
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
const tagValue = (event: { tags: string[][] }, name: string) => event.tags.find((t) => t[0] === name)?.[1]
|
|
67
|
+
|
|
68
|
+
/** When a change happened, in ms, by §6.3's order. */
|
|
69
|
+
export function changedAt(event: SignedEvent): number {
|
|
70
|
+
const ts = Number(tagValue(event, 'ts'))
|
|
71
|
+
return Number.isFinite(ts) && Math.floor(ts / 1000) === event.created_at ? ts : event.created_at * 1000
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/** Newer first by §6.3: time, then `created_at`, then id. */
|
|
75
|
+
function newer(a: SignedEvent, b: SignedEvent): boolean {
|
|
76
|
+
const at = changedAt(a) - changedAt(b)
|
|
77
|
+
if (at !== 0) return at > 0
|
|
78
|
+
if (a.created_at !== b.created_at) return a.created_at > b.created_at
|
|
79
|
+
return a.id > b.id
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/**
|
|
83
|
+
* The fields one change sets, with their values: one `field`/`value`, or one
|
|
84
|
+
* per `set` (§6.2). A change setting the text carries its `content-format`.
|
|
85
|
+
*/
|
|
86
|
+
export function fieldsSetBy(event: { tags: string[][] }): { field: string; value: string; format?: string }[] {
|
|
87
|
+
const format = tagValue(event, CONTENT_FORMAT_TAG)
|
|
88
|
+
const withFormat = (field: string, value: string) =>
|
|
89
|
+
field === TEXT_FIELD && format ? { field, value, format } : { field, value }
|
|
90
|
+
const sets = event.tags.filter((t) => t[0] === 'set' && typeof t[1] === 'string')
|
|
91
|
+
if (sets.length) return sets.map((t) => withFormat(t[1], t[2] ?? ''))
|
|
92
|
+
const field = tagValue(event, 'field')
|
|
93
|
+
return field === undefined ? [] : [withFormat(field, tagValue(event, 'value') ?? '')]
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
const addressOfRoot = (root: SignedEvent) => `${root.kind}:${root.pubkey}:${tagValue(root, 'd') ?? ''}`
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Each file the events hold, by its first record and the current change of each
|
|
100
|
+
* of its fields.
|
|
101
|
+
*
|
|
102
|
+
* A change counts only where §6.2 says a reader folds it: its `a` names the
|
|
103
|
+
* file, its `O` (if any) is the file's id, and its `h` is the file's home. The
|
|
104
|
+
* text counts only when `withText`: a list never takes the text from a change
|
|
105
|
+
* that set several fields, since a later text-only change may have replaced it
|
|
106
|
+
* (§6.13).
|
|
107
|
+
*/
|
|
108
|
+
export function filesOf(events: readonly SignedEvent[], options: { withText?: boolean } = {}): FileFields[] {
|
|
109
|
+
const roots = new Map<string, SignedEvent>()
|
|
110
|
+
for (const event of events) {
|
|
111
|
+
if (event.kind === KIND_CHANGE || tagValue(event, 'd') === undefined) continue
|
|
112
|
+
const address = addressOfRoot(event)
|
|
113
|
+
const held = roots.get(address)
|
|
114
|
+
if (!held || event.created_at > held.created_at) roots.set(address, event)
|
|
115
|
+
}
|
|
116
|
+
const files = new Map<string, FileFields>()
|
|
117
|
+
for (const [address, root] of roots) files.set(address, { root, address, fields: {}, events: [root] })
|
|
118
|
+
|
|
119
|
+
for (const event of events) {
|
|
120
|
+
if (event.kind !== KIND_CHANGE) continue
|
|
121
|
+
const file = files.get(tagValue(event, 'a') ?? '')
|
|
122
|
+
if (!file) continue
|
|
123
|
+
const O = tagValue(event, 'O')
|
|
124
|
+
if (O !== undefined && O !== tagValue(file.root, 'd')) continue
|
|
125
|
+
if (tagValue(event, 'h') !== (folderOf(file.root) ?? undefined)) continue
|
|
126
|
+
for (const set of fieldsSetBy(event)) {
|
|
127
|
+
if (set.field === TEXT_FIELD && !options.withText) continue
|
|
128
|
+
const held = file.fields[set.field]
|
|
129
|
+
if (held && !newer(event, held.event)) continue
|
|
130
|
+
file.fields[set.field] = { ...set, id: event.id, pubkey: event.pubkey, at: changedAt(event), event }
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
// The root and each change some field still points at, once.
|
|
134
|
+
for (const file of files.values()) {
|
|
135
|
+
const current = new Map(Object.values(file.fields).map((f) => [f.id, f.event]))
|
|
136
|
+
file.events = [file.root, ...current.values()]
|
|
137
|
+
}
|
|
138
|
+
return [...files.values()]
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* A list of files by the relay's list read: each first record the filter picks,
|
|
143
|
+
* with its fields' current changes and never its text (§6.13).
|
|
144
|
+
*
|
|
145
|
+
* `filter` picks first records, as §6.13 says: `#h` for a Folder's issues,
|
|
146
|
+
* `kinds` alone for the workspace's projects, `#d` for named ones, `search`
|
|
147
|
+
* for typing. Only for a relay advertising `file_list`.
|
|
148
|
+
*/
|
|
149
|
+
export async function listFiles(query: QueryFn, filter: Record<string, unknown>): Promise<FileFields[]> {
|
|
150
|
+
if ('text' in filter) throw new Error('A list never carries text; open one file to read it.')
|
|
151
|
+
const events = await query([{ ...filter, fields: 'newest' }])
|
|
152
|
+
return filesOf(events)
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* One file, opened: its first record, its fields' current changes and, where
|
|
157
|
+
* the relay says `file_list.text`, its current text — one text however long
|
|
158
|
+
* its history (§6.13, C40). Undefined when the relay holds no such file the
|
|
159
|
+
* reader may read.
|
|
160
|
+
*
|
|
161
|
+
* Without `text` the answer has no text field at all, which is not "the text
|
|
162
|
+
* was never changed": a caller that needs it reads it the old way.
|
|
163
|
+
*/
|
|
164
|
+
export async function openFile(
|
|
165
|
+
query: QueryFn,
|
|
166
|
+
file: { kind: number; pubkey: string; d: string },
|
|
167
|
+
options: { text: boolean },
|
|
168
|
+
): Promise<FileFields | undefined> {
|
|
169
|
+
// By `#d` alone, the shape §6.13 names; the author is checked below.
|
|
170
|
+
const filter: Record<string, unknown> = { fields: 'newest', kinds: [file.kind], '#d': [file.d] }
|
|
171
|
+
if (options.text) filter.text = true
|
|
172
|
+
const events = await query([filter])
|
|
173
|
+
const address = `${file.kind}:${file.pubkey}:${file.d}`
|
|
174
|
+
return filesOf(events, { withText: options.text }).find((f) => f.address === address)
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/**
|
|
178
|
+
* The text a change or first record holds: a change's `description`, or a
|
|
179
|
+
* first record's seed — a project's `description` tag, then its `content`
|
|
180
|
+
* (§6.2, §7.2).
|
|
181
|
+
*/
|
|
182
|
+
export function textOf(event: SignedEvent): MergeText | undefined {
|
|
183
|
+
if (event.kind === KIND_CHANGE) {
|
|
184
|
+
const set = fieldsSetBy(event).find((f) => f.field === TEXT_FIELD)
|
|
185
|
+
return set ? { value: set.value, ...(set.format ? { format: set.format } : {}) } : undefined
|
|
186
|
+
}
|
|
187
|
+
const format = tagValue(event, CONTENT_FORMAT_TAG)
|
|
188
|
+
const value = tagValue(event, TEXT_FIELD) ?? event.content
|
|
189
|
+
return { value, ...(format ? { format } : {}) }
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/** What a `conflict:` refusal says (§6.2), as the relay words it. */
|
|
193
|
+
export type Conflict =
|
|
194
|
+
| { kind: 'stale'; field: string; current?: string }
|
|
195
|
+
| { kind: 'sorts-before'; field: string }
|
|
196
|
+
| { kind: 'other' }
|
|
197
|
+
|
|
198
|
+
export function conflictOf(reason: string): Conflict | undefined {
|
|
199
|
+
if (!reason.startsWith('conflict:')) return undefined
|
|
200
|
+
const sorts = /^conflict: (\S+) does not sort after its prev\b/.exec(reason)
|
|
201
|
+
if (sorts) return { kind: 'sorts-before', field: sorts[1] }
|
|
202
|
+
const follows = /^conflict: (\S+) follows ([0-9a-f]{64})\s*$/.exec(reason)
|
|
203
|
+
if (follows) return { kind: 'stale', field: follows[1], current: follows[2] }
|
|
204
|
+
// A signer who cannot read the file's home is told only the field.
|
|
205
|
+
const bare = /^conflict: (\S+)\s*$/.exec(reason)
|
|
206
|
+
if (bare) return { kind: 'stale', field: bare[1] }
|
|
207
|
+
return { kind: 'other' }
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
/** What {@link writeChange} is handed. */
|
|
211
|
+
export interface WriteChangeArgs {
|
|
212
|
+
field: string
|
|
213
|
+
/** The value to set; for the text, mine. */
|
|
214
|
+
value: string
|
|
215
|
+
/** The text's `content-format`, when it is one. */
|
|
216
|
+
format?: string
|
|
217
|
+
/**
|
|
218
|
+
* The change this one follows, as the writer read it: the field's current
|
|
219
|
+
* change, or the first record's id for its first change. For the text it is
|
|
220
|
+
* also the base a merge starts from — the version the person, or the agent,
|
|
221
|
+
* last read.
|
|
222
|
+
*/
|
|
223
|
+
prev: string
|
|
224
|
+
/**
|
|
225
|
+
* The unsigned change for this value, `prev` and time — `buildActionEvent`
|
|
226
|
+
* bound to the field's action, so the manifest decides its shape and every
|
|
227
|
+
* attempt carries the same tags.
|
|
228
|
+
*/
|
|
229
|
+
build: (input: { value: string; format?: string; prev: string; createdAtMs: number }) => UnsignedEvent | string
|
|
230
|
+
sign: (event: UnsignedEvent) => Promise<SignedEvent>
|
|
231
|
+
publish: (event: SignedEvent) => Promise<{ ok: boolean; reason?: string; eventId?: string }>
|
|
232
|
+
/** Reads events by id, and the field's current change when a refusal names none. */
|
|
233
|
+
query: QueryFn
|
|
234
|
+
/** The field's current change, read again: {@link openFile}'s, for this field. */
|
|
235
|
+
current: (field: string) => Promise<SignedEvent | undefined>
|
|
236
|
+
/** The clock, in ms. */
|
|
237
|
+
now?: () => number
|
|
238
|
+
/** How many sends before giving up; 4 unless said. */
|
|
239
|
+
tries?: number
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
export type WriteChangeResult =
|
|
243
|
+
| {
|
|
244
|
+
ok: true
|
|
245
|
+
/** The id the relay accepted: the field's next `prev`. */
|
|
246
|
+
id: string
|
|
247
|
+
event: SignedEvent
|
|
248
|
+
/** Set when the text was merged onto someone's newer change, which it names. */
|
|
249
|
+
mergedOnto?: SignedEvent
|
|
250
|
+
}
|
|
251
|
+
| {
|
|
252
|
+
ok: true
|
|
253
|
+
/** Nothing was sent: mine, merged onto theirs, says nothing theirs does not. */
|
|
254
|
+
unchanged: true
|
|
255
|
+
id: string
|
|
256
|
+
mergedOnto: SignedEvent
|
|
257
|
+
}
|
|
258
|
+
| {
|
|
259
|
+
ok: false
|
|
260
|
+
/** Why nothing was saved, in the relay's words or the builder's. */
|
|
261
|
+
refused: string
|
|
262
|
+
}
|
|
263
|
+
| {
|
|
264
|
+
ok: false
|
|
265
|
+
/** The text asks: these blocks were changed by both, or edited against a delete. Nothing was saved. */
|
|
266
|
+
asks: MergeAsk[]
|
|
267
|
+
/** The change now current, whose words must be kept. */
|
|
268
|
+
theirs: SignedEvent
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
const byId = async (query: QueryFn, id: string) => (await query([{ ids: [id] }])).find((e) => e.id === id)
|
|
272
|
+
|
|
273
|
+
/**
|
|
274
|
+
* Write one field's change, naming the one it follows, and answer a
|
|
275
|
+
* `conflict:` as §6.2 says.
|
|
276
|
+
*
|
|
277
|
+
* - **Stale `prev`, a field other than the text**: read the current change
|
|
278
|
+
* (by the id the relay named, or {@link WriteChangeArgs.current} when it
|
|
279
|
+
* named none) and set the value again after it. Two setting one field is not
|
|
280
|
+
* a conflict to show: the later stands.
|
|
281
|
+
* - **Stale `prev`, the text**: merge mine onto the current text by §13.3,
|
|
282
|
+
* with the text `prev` named as the base, and send the merge after it. When
|
|
283
|
+
* a block asks, nothing is sent and the answer carries the blocks and
|
|
284
|
+
* theirs. Refused again, it merges again with what it last sent as mine and
|
|
285
|
+
* what it merged onto as the base.
|
|
286
|
+
* - **Does not sort after its `prev`**: the clock is behind; stamp it 1 ms
|
|
287
|
+
* after `prev`, `ts` and `created_at` agreeing.
|
|
288
|
+
* - **Anything else** (`invalid:` and the rest) is never sent again.
|
|
289
|
+
*
|
|
290
|
+
* A few tries, then it stops with the relay's last answer.
|
|
291
|
+
*/
|
|
292
|
+
export async function writeChange(args: WriteChangeArgs): Promise<WriteChangeResult> {
|
|
293
|
+
const now = args.now ?? Date.now
|
|
294
|
+
const tries = args.tries ?? 4
|
|
295
|
+
const isText = args.field === TEXT_FIELD
|
|
296
|
+
let prev = args.prev
|
|
297
|
+
let after = 0
|
|
298
|
+
let mine: MergeText = { value: args.value, ...(args.format ? { format: args.format } : {}) }
|
|
299
|
+
let base: MergeText | undefined
|
|
300
|
+
let mergedOnto: SignedEvent | undefined
|
|
301
|
+
let last = ''
|
|
302
|
+
|
|
303
|
+
for (let attempt = 0; attempt < tries; attempt++) {
|
|
304
|
+
const built = args.build({ value: mine.value, format: mine.format, prev, createdAtMs: Math.max(now(), after) })
|
|
305
|
+
if (typeof built === 'string') return { ok: false, refused: built }
|
|
306
|
+
const signed = await args.sign(built)
|
|
307
|
+
const answer = await args.publish(signed)
|
|
308
|
+
if (answer.ok) return { ok: true, id: answer.eventId ?? signed.id, event: signed, ...(mergedOnto ? { mergedOnto } : {}) }
|
|
309
|
+
last = answer.reason ?? 'refused with no reason'
|
|
310
|
+
const conflict = conflictOf(last)
|
|
311
|
+
if (!conflict || conflict.kind === 'other' || conflict.field !== args.field) return { ok: false, refused: last }
|
|
312
|
+
|
|
313
|
+
if (conflict.kind === 'sorts-before') {
|
|
314
|
+
const followed = await byId(args.query, prev)
|
|
315
|
+
if (!followed) return { ok: false, refused: last }
|
|
316
|
+
after = changedAt(followed) + 1
|
|
317
|
+
continue
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
const head = conflict.current ? await byId(args.query, conflict.current) : await args.current(args.field)
|
|
321
|
+
if (!head) return { ok: false, refused: last }
|
|
322
|
+
after = changedAt(head) + 1
|
|
323
|
+
if (!isText) {
|
|
324
|
+
prev = head.id
|
|
325
|
+
continue
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
if (!base) {
|
|
329
|
+
const followed = await byId(args.query, prev)
|
|
330
|
+
base = followed && textOf(followed)
|
|
331
|
+
if (!base) return { ok: false, refused: `${last} (the text it followed, ${prev}, could not be read to merge onto)` }
|
|
332
|
+
}
|
|
333
|
+
const theirs = textOf(head)
|
|
334
|
+
if (!theirs) return { ok: false, refused: last }
|
|
335
|
+
const merge = mergeTexts(base, theirs, mine)
|
|
336
|
+
if (merge.asks) return { ok: false, asks: merge.asks, theirs: head }
|
|
337
|
+
mergedOnto = head
|
|
338
|
+
if (merge.merged.value === theirs.value && (merge.merged.format ?? '') === (theirs.format ?? '')) {
|
|
339
|
+
return { ok: true, unchanged: true, id: head.id, mergedOnto: head }
|
|
340
|
+
}
|
|
341
|
+
base = theirs
|
|
342
|
+
mine = merge.merged
|
|
343
|
+
prev = head.id
|
|
344
|
+
}
|
|
345
|
+
return { ok: false, refused: `still refused after ${tries} tries: ${last}` }
|
|
346
|
+
}
|
package/src/folders.ts
CHANGED
|
@@ -206,6 +206,8 @@ export function planArchiveFolder(
|
|
|
206
206
|
// shape produce the same tags.
|
|
207
207
|
tags: [
|
|
208
208
|
['a', args.channel],
|
|
209
|
+
// The file it is about, by its id (§6.2).
|
|
210
|
+
...(identifierOf(args.channel) !== undefined ? [['O', identifierOf(args.channel)!]] : []),
|
|
209
211
|
['field', 'archived'],
|
|
210
212
|
['value', args.archived ? 'true' : ''],
|
|
211
213
|
['h', args.folder],
|
|
@@ -216,6 +218,11 @@ export function planArchiveFolder(
|
|
|
216
218
|
]
|
|
217
219
|
}
|
|
218
220
|
|
|
221
|
+
/** The file's id, the `d` of an address `<kind>:<pubkey>:<d>`; undefined for anything else. */
|
|
222
|
+
export function identifierOf(address: string): string | undefined {
|
|
223
|
+
return /^\d+:[0-9a-f]{64}:([^]*)$/.exec(address)?.[1]
|
|
224
|
+
}
|
|
225
|
+
|
|
219
226
|
/**
|
|
220
227
|
* A file as a move needs it. A `ForeignObject` from `resolveFolderContents` is
|
|
221
228
|
* one: `ref` is its identity, `parentRef` the file it is drawn beneath, and
|
package/src/index.ts
CHANGED
|
@@ -157,6 +157,7 @@ export {
|
|
|
157
157
|
planRemoveFromTopic,
|
|
158
158
|
topicsOfFile,
|
|
159
159
|
topicList,
|
|
160
|
+
topicLists,
|
|
160
161
|
topicsOfFileFilter,
|
|
161
162
|
topicListFilter,
|
|
162
163
|
listEntries,
|
|
@@ -168,6 +169,27 @@ export {
|
|
|
168
169
|
type ListedFile,
|
|
169
170
|
} from './topics.js'
|
|
170
171
|
|
|
172
|
+
/**
|
|
173
|
+
* A file as its fields, each kept in order by the relay (SPEC §6.2, §6.13):
|
|
174
|
+
* the list and open reads, and the change writer that answers `conflict:`.
|
|
175
|
+
*/
|
|
176
|
+
export {
|
|
177
|
+
TEXT_FIELD,
|
|
178
|
+
changedAt,
|
|
179
|
+
fieldsSetBy,
|
|
180
|
+
filesOf,
|
|
181
|
+
listFiles,
|
|
182
|
+
openFile,
|
|
183
|
+
textOf,
|
|
184
|
+
conflictOf,
|
|
185
|
+
writeChange,
|
|
186
|
+
type CurrentField,
|
|
187
|
+
type FileFields,
|
|
188
|
+
type Conflict,
|
|
189
|
+
type WriteChangeArgs,
|
|
190
|
+
type WriteChangeResult,
|
|
191
|
+
} from './fields.js'
|
|
192
|
+
|
|
171
193
|
/**
|
|
172
194
|
* What an app link names, and where a file is mentioned — once for every app
|
|
173
195
|
* (SPEC §7.7, §13.1, §6.8; PEEKM-7). Each app passes its relay read; none
|