@estiva-app/conversation 0.30.0 → 0.32.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 CHANGED
@@ -6,6 +6,51 @@ none. A change to how an event is read is a MINOR in `0.x` even when no
6
6
  signature moved, because two apps on different versions would then disagree
7
7
  about a conversation.
8
8
 
9
+ ## 0.32.0 — 2026-11-04
10
+
11
+ **SPEC: §6.4's new "Resolving a thread", §6.5's three states of a top-level
12
+ message, and C51 — read differently; nothing written** (ONE-2; record
13
+ anyone-who-may-comment-resolves-or-reopens-a-thread-and-the-newest-counts).
14
+
15
+ - `foldThreads` (new): one shape for a message, a reply and a thread, folded
16
+ from a conversation's events — its messages, and the edits, reactions,
17
+ deletions and resolutions read by `#e` on them. A `Message` carries its
18
+ author, time, folded body and edited mark, files, cards, parts, links, a
19
+ comment's block run and quoted words, and its reactions by key. A `Thread`'s
20
+ top-level message is `present`, `deleted` (its author's `kind:5` came back)
21
+ or `missing` (only replies were read), and a deleted one keeps its replies
22
+ and its last state and is not `resolvable`. A reply or reaction its author
23
+ deleted is left out; a `kind:5` by anyone else hides nothing.
24
+ - `resolutionOf` (new): a thread's state is its newest `kind:9101` in §6.3's
25
+ order (`ts`, then `created_at`, then the higher id), whoever wrote it. One
26
+ filed outside the message's Folder, or with no `h`, changes nothing, and a
27
+ `support` outside the thread is dropped. **Read differently:** a resolve and
28
+ a reopen in one second now fold by `ts`, where `decorationsOf` sorted by
29
+ `created_at` then id.
30
+ - `decorationsOf`: a resolution's target is its **first unmarked `e`** and no
31
+ later one (it skipped to the first `e` naming a target). `Resolution` gains
32
+ `orderMs` and `folder`; its last entry is no longer the state on its own.
33
+ - `placeLines`, `writtenUrlOf`, `urlNames` (moved in): the one line rule for a
34
+ link alone on its line (§13.2, §13.6.2, C21), replacing Peek's and Ship's
35
+ `messageLines.ts`, Leaf's `commentLines.ts` and Peek's `urlNames`. A row's
36
+ `url` is the URL as written only when it names the row's own file.
37
+ - The conformance fixture folds real events read back off production, written
38
+ by QA-1 and QA-2: a deleted comment with a reply, a resolve carried by a
39
+ reply, a resolve and a reopen in one second, an edit and a comment on quoted
40
+ words.
41
+
42
+ ## 0.31.0 — 2026-11-04
43
+
44
+ **SPEC: §6.13's `matches` is read for `[`; nothing written** (ALO-5; record
45
+ search-finds-a-file-by-the-words-of-its-current-fields).
46
+
47
+ - A `ReferenceCandidate` may carry `matched`, the fields a relay's search found
48
+ the typed words in, best first. `rankReferences` offers such a file though
49
+ its title does not hold the words: after every title match, a summary or key
50
+ match before a text-only one.
51
+ - A file offered from a nearer tier keeps what a search found it by and the
52
+ words shown for it.
53
+
9
54
  ## 0.30.0 — 2026-11-04
10
55
 
11
56
  **Wire: nothing written or read differently** (TEA-8; SPEC §3.2). A team is
package/README.md CHANGED
@@ -24,6 +24,9 @@ pass, the clock is a `createdAtMs` you pass, and drafts take their storage.
24
24
  | --- | --- | --- |
25
25
  | comment or mention | §6.4 | `isCommentOn`, `strengthOn`, `threadStrength`, `anchorsOf`, `isReply`, `namedInBody` |
26
26
  | threading | §6.4 *Replies* | `parentOf`, `groupThreads` |
27
+ | one shape for a message, a reply and a thread, every app's: a top-level message present, deleted or not returned | §6.3–§6.8 | `foldThreads`, `Message`, `Thread` |
28
+ | resolving a thread: the newest counts, in its message's Folder | §6.4 *Resolving a thread*, C51 | `resolutionOf`, `resolutionsByTarget`, `resolutionTargetOf` |
29
+ | where a message's lines draw: a link alone on its line is its file's row | §13.2, §13.6.2, C21 | `placeLines`, `writtenUrlOf`, `urlNames` |
27
30
  | writing | §6.4, §13.6 | `buildComment`, `buildReply`, `placeOf`, `referenceTagsFor`, `mentionTagsFor` |
28
31
  | what a composer's pick writes | §13.1 | `mentionText`, `messageReference`, `urgentTagsFor`, `URGENT_TAG` |
29
32
  | what the shared comment box holds, as the message it writes, and back | §13.1 | `composerText`, `composerDocument`, `withoutNewUrgency`, `composerDraft` |
@@ -10,6 +10,8 @@
10
10
  */
11
11
  import { type SignedEvent } from '@estiva-app/protocol';
12
12
  import { type EditFold } from './edits.js';
13
+ import { type Resolution } from './resolution.js';
14
+ export type { Resolution };
13
15
  import { type ReactionEvent } from './reactions.js';
14
16
  /**
15
17
  * How a caller reads the relay: filters in, events out. The environment's
@@ -17,24 +19,17 @@ import { type ReactionEvent } from './reactions.js';
17
19
  * Structurally the same as `@estiva-app/interop`'s `QueryFn`.
18
20
  */
19
21
  export type QueryFn = (filters: Record<string, unknown>[]) => Promise<SignedEvent[]>;
20
- /** A `kind:9101` resolution assertion on a message (PEEK-128). */
21
- export interface Resolution {
22
- id: string;
23
- action: 'resolved' | 'reopened';
24
- by: string;
25
- at: number;
26
- /** The assertion's free text, when it carried one. */
27
- message?: string;
28
- /** The reply that carried the resolution, when the writer named one. */
29
- supportingEventId?: string;
30
- }
31
22
  /** What has been done to one message since it was written. */
32
23
  export interface Decoration {
33
24
  /** Its edits, folded (§6.8). Absent when nobody edited it. */
34
25
  edit?: EditFold;
35
26
  /** Its reactions, one per `(pubkey, emoji)`, oldest first. Empty inside the horizon means none. */
36
27
  reactions: ReactionEvent[];
37
- /** Oldest first; the last one is the current state. Empty means never resolved. */
28
+ /**
29
+ * Every resolve and reopen naming it, oldest first by §6.3. Which one counts
30
+ * — `h` checked, a `support` outside the thread dropped — is
31
+ * `resolutionOf`'s: the last one here is not the state on its own.
32
+ */
38
33
  resolutions: Resolution[];
39
34
  }
40
35
  /** The answer of {@link decorationsOf}. */
@@ -72,8 +67,8 @@ export interface Decorations {
72
67
  * one per `(target, pubkey, emoji)`.
73
68
  * - **Resolutions** are `kind:9101` carrying `t=resolution`; the `action` tag
74
69
  * is the state, the content the rationale, and an `e` marked `support` names
75
- * the reply that carried it. The target is the first unmarked `e` naming a
76
- * target.
70
+ * the reply that carried it. The target is the first unmarked `e`
71
+ * ({@link resolutionTargetOf}), and a thread's state is `resolutionOf`'s.
77
72
  *
78
73
  * Edits and resolutions have no horizon: they are one event per change, not
79
74
  * one per reader. A refused read is whatever `query` does with one.
@@ -1 +1 @@
1
- {"version":3,"file":"decorations.d.ts","sourceRoot":"","sources":["../src/decorations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAA6C,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClG,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAA;AAEnE,OAAO,EAAuD,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAExG;;;;GAIG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;AAEpF,kEAAkE;AAClE,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,UAAU,GAAG,UAAU,CAAA;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;IACV,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,wEAAwE;IACxE,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,mGAAmG;IACnG,SAAS,EAAE,aAAa,EAAE,CAAA;IAC1B,mFAAmF;IACnF,WAAW,EAAE,UAAU,EAAE,CAAA;CAC1B;AAED,2CAA2C;AAC3C,MAAM,WAAW,WAAW;IAC1B,wFAAwF;IACxF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAChC;;;;OAIG;IACH,sBAAsB,EAAE,MAAM,CAAA;IAC9B;;;;OAIG;IACH,iBAAiB,EAAE,OAAO,CAAA;IAC1B;;;OAGG;IACH,aAAa,EAAE,OAAO,CAAA;CACvB;AAaD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,aAAa;AACjC,kDAAkD;AAClD,OAAO,EAAE,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EAC7D,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,CAqFtB"}
1
+ {"version":3,"file":"decorations.d.ts","sourceRoot":"","sources":["../src/decorations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAA6C,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClG,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAA;AAEnE,OAAO,EAA2C,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE1F,YAAY,EAAE,UAAU,EAAE,CAAA;AAC1B,OAAO,EAAuD,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAExG;;;;GAIG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;AAEpF,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,mGAAmG;IACnG,SAAS,EAAE,aAAa,EAAE,CAAA;IAC1B;;;;OAIG;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;CAC1B;AAED,2CAA2C;AAC3C,MAAM,WAAW,WAAW;IAC1B,wFAAwF;IACxF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAChC;;;;OAIG;IACH,sBAAsB,EAAE,MAAM,CAAA;IAC9B;;;;OAIG;IACH,iBAAiB,EAAE,OAAO,CAAA;IAC1B;;;OAGG;IACH,aAAa,EAAE,OAAO,CAAA;CACvB;AAYD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,aAAa;AACjC,kDAAkD;AAClD,OAAO,EAAE,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EAC7D,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,CAsEtB"}
@@ -11,6 +11,7 @@
11
11
  import { MAX_FILTERS_PER_QUERY, RELAY_PAGE_CEILING } from '@estiva-app/protocol';
12
12
  import { editTargetOf, foldEdits } from './edits.js';
13
13
  import { KIND_ASSERTION, KIND_EDIT, KIND_REACTION } from './kinds.js';
14
+ import { resolutionsByTarget, resolutionTargetOf } from './resolution.js';
14
15
  import { reactionEventsOf, reactionHorizon, reactionTargetOf } from './reactions.js';
15
16
  /** Ids per `#e` filter. A comfortable fraction of the relay's page, so one filter's answer is rarely cut. */
16
17
  const TARGETS_PER_FILTER = 100;
@@ -20,7 +21,6 @@ const chunked = (list) => {
20
21
  out.push(list.slice(i, i + TARGETS_PER_FILTER));
21
22
  return out;
22
23
  };
23
- const tagValue = (event, name) => event.tags.find((t) => t[0] === name)?.[1];
24
24
  /**
25
25
  * Edits, reactions and resolutions for `targets`, in as few requests as the
26
26
  * relay allows.
@@ -34,8 +34,8 @@ const tagValue = (event, name) => event.tags.find((t) => t[0] === name)?.[1];
34
34
  * one per `(target, pubkey, emoji)`.
35
35
  * - **Resolutions** are `kind:9101` carrying `t=resolution`; the `action` tag
36
36
  * is the state, the content the rationale, and an `e` marked `support` names
37
- * the reply that carried it. The target is the first unmarked `e` naming a
38
- * target.
37
+ * the reply that carried it. The target is the first unmarked `e`
38
+ * ({@link resolutionTargetOf}), and a thread's state is `resolutionOf`'s.
39
39
  *
40
40
  * Edits and resolutions have no horizon: they are one event per change, not
41
41
  * one per reader. A refused read is whatever `query` does with one.
@@ -99,35 +99,17 @@ targets, query) {
99
99
  return answered.some((n) => n >= RELAY_PAGE_CEILING);
100
100
  };
101
101
  const reactionEventsCut = cut(reactionChunks, [KIND_REACTION], reactionTargetOf);
102
- const editEventsCut = cut(editChunks, [KIND_EDIT, KIND_ASSERTION], (e) => e.kind === KIND_EDIT ? editTargetOf(e) : e.tags.find((t) => t[0] === 'e' && ours(t[1]) && !t[3])?.[1]);
102
+ const editEventsCut = cut(editChunks, [KIND_EDIT, KIND_ASSERTION], (e) => e.kind === KIND_EDIT ? editTargetOf(e) : resolutionTargetOf(e));
103
103
  const inHorizon = new Set(asked);
104
104
  const reactions = events.filter((e) => e.kind === KIND_REACTION);
105
105
  for (const reaction of reactionEventsOf(reactions)) {
106
106
  if (ours(reaction.target) && inHorizon.has(reaction.target))
107
107
  byId[reaction.target].reactions.push(reaction);
108
108
  }
109
- for (const event of events) {
110
- if (event.kind !== KIND_ASSERTION || tagValue(event, 't') !== 'resolution')
111
- continue;
112
- const action = tagValue(event, 'action');
113
- if (action !== 'resolved' && action !== 'reopened')
114
- continue;
115
- const target = event.tags.find((t) => t[0] === 'e' && ours(t[1]) && !t[3])?.[1];
116
- if (!ours(target))
117
- continue;
118
- const support = event.tags.find((t) => t[0] === 'e' && t[3] === 'support')?.[1];
119
- byId[target].resolutions.push({
120
- id: event.id,
121
- action,
122
- by: event.pubkey,
123
- at: event.created_at,
124
- ...(event.content ? { message: event.content } : {}),
125
- ...(support ? { supportingEventId: support } : {}),
126
- });
109
+ for (const [target, list] of Object.entries(resolutionsByTarget(events))) {
110
+ if (ours(target))
111
+ byId[target].resolutions = list;
127
112
  }
128
- const oldestFirst = (a, b) => a.at - b.at || (a.id < b.id ? -1 : 1);
129
- for (const decoration of Object.values(byId))
130
- decoration.resolutions.sort(oldestFirst);
131
113
  return { byId, reactionTargetsOmitted: omitted, reactionEventsCut, editEventsCut };
132
114
  }
133
115
  //# sourceMappingURL=decorations.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"decorations.js","sourceRoot":"","sources":["../src/decorations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"decorations.js","sourceRoot":"","sources":["../src/decorations.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -12,14 +12,17 @@
12
12
  * apps: it imports no app's data layer, opens no socket, and takes every
13
13
  * environment touch — the relay read, the clock, storage — as a parameter.
14
14
  */
15
- export declare const CONVERSATION_VERSION = "0.30.0";
15
+ export declare const CONVERSATION_VERSION = "0.32.0";
16
16
  export { KIND_MESSAGE, KIND_COMMENT, KIND_EDIT, KIND_REACTION, KIND_DELETION, KIND_ASSERTION, isConversationKind, isEventId, } from './kinds.js';
17
17
  export { trustedTs, orderingMs, byOrder } from './order.js';
18
18
  export { namedInBody, isReply, anchorsOf, anchorIdsOf, isAbout, isCrossedComment, isCrossedCommentOn, isCommentOn, referencesAddress, strengthOn, threadStrength, referenceTagsFor, mentionTagsFor, peopleNamedInBody, MAX_MENTIONED_PEOPLE, type Strength, } from './strength.js';
19
19
  export { parentOf, groupThreads, type Threaded } from './threads.js';
20
20
  export { editTargetOf, editsByTarget, foldEdits, foldAttachments, foldEmbeds, type EditFold } from './edits.js';
21
21
  export { REACTION_HORIZON, REACTION_EMOJI, reactionTargetOf, reactionEmojiOf, reactionHorizon, reactionEventsOf, foldReactions, groupReactions, type ReactionHorizon, type ReactionEvent, type Reaction, } from './reactions.js';
22
- export { decorationsOf, type Decoration, type Decorations, type Resolution, type QueryFn } from './decorations.js';
22
+ export { decorationsOf, type Decoration, type Decorations, type QueryFn } from './decorations.js';
23
+ export { resolutionOf, resolutionOfEvent, resolutionTargetOf, resolutionsByTarget, byResolutionOrder, type Resolution, } from './resolution.js';
24
+ export { foldThreads, type Message, type Thread, type RootState } from './shape.js';
25
+ export { placeLines, writtenUrlOf, urlNames, ROW_BLOCK, type RowLine, type PlacedLines, type LineContext } from './lines.js';
23
26
  export { buildComment, buildReply, offersEditAndDelete, placeOf, type CommentRef } from './builders.js';
24
27
  export { eventsNamedInBody, mentionText, messageReference, quoteTagsFor, URGENT_TAG, urgentTagsFor } from './compose.js';
25
28
  export { composerDocument, composerDraft, composerText, withoutNewUrgency, type ComposerDraft, type ComposerLabels, type ComposerText, } from './composer.js';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -12,7 +12,7 @@
12
12
  * apps: it imports no app's data layer, opens no socket, and takes every
13
13
  * environment touch — the relay read, the clock, storage — as a parameter.
14
14
  */
15
- export const CONVERSATION_VERSION = '0.30.0';
15
+ export const CONVERSATION_VERSION = '0.32.0';
16
16
  export { KIND_MESSAGE, KIND_COMMENT, KIND_EDIT, KIND_REACTION, KIND_DELETION, KIND_ASSERTION, isConversationKind, isEventId, } from './kinds.js';
17
17
  export { trustedTs, orderingMs, byOrder } from './order.js';
18
18
  export { namedInBody, isReply, anchorsOf, anchorIdsOf, isAbout, isCrossedComment, isCrossedCommentOn, isCommentOn, referencesAddress, strengthOn, threadStrength, referenceTagsFor, mentionTagsFor, peopleNamedInBody, MAX_MENTIONED_PEOPLE, } from './strength.js';
@@ -20,6 +20,9 @@ export { parentOf, groupThreads } from './threads.js';
20
20
  export { editTargetOf, editsByTarget, foldEdits, foldAttachments, foldEmbeds } from './edits.js';
21
21
  export { REACTION_HORIZON, REACTION_EMOJI, reactionTargetOf, reactionEmojiOf, reactionHorizon, reactionEventsOf, foldReactions, groupReactions, } from './reactions.js';
22
22
  export { decorationsOf } from './decorations.js';
23
+ export { resolutionOf, resolutionOfEvent, resolutionTargetOf, resolutionsByTarget, byResolutionOrder, } from './resolution.js';
24
+ export { foldThreads } from './shape.js';
25
+ export { placeLines, writtenUrlOf, urlNames, ROW_BLOCK } from './lines.js';
23
26
  export { buildComment, buildReply, offersEditAndDelete, placeOf } from './builders.js';
24
27
  export { eventsNamedInBody, mentionText, messageReference, quoteTagsFor, URGENT_TAG, urgentTagsFor } from './compose.js';
25
28
  export { composerDocument, composerDraft, composerText, withoutNewUrgency, } from './composer.js';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,76 @@
1
+ /**
2
+ * Where a message's lines draw — the one line rule (SPEC §13.2, §13.6.2, C21),
3
+ * shared since ONE-2. It replaces Peek's and Ship's `messageLines.ts`, Leaf's
4
+ * `commentLines.ts` and Peek's `urlNames`, three copies that had drifted.
5
+ *
6
+ * A sentence keeps its chips; a line that is only a link to a file or a
7
+ * message is that file's row; and one whose file has a card or a part under
8
+ * the message draws nothing, since the card stands for it (C26). A person or a
9
+ * Folder alone on its line stays a chip, and a quote's or a heading's line is a
10
+ * sentence (protocol `lineDrawOf`).
11
+ *
12
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-link-on-words-counts-toward-the-card.md
13
+ */
14
+ import { type Embed, type LinkResolver, type PartPointer, type RenderBlock, type RenderInline } from '@estiva-app/protocol';
15
+ /**
16
+ * A line of a message that is only a link to a file or a message, drawn as
17
+ * that file's row in place. `reference` is the `nostr:` reference the line
18
+ * names; `unreadable` is one that names no address or event id, drawn as the
19
+ * not-available row.
20
+ */
21
+ export interface RowLine {
22
+ reference: string;
23
+ /** The file's value (an address or an id), when the line names one. */
24
+ value?: string;
25
+ unreadable?: true;
26
+ /** The URL the line was written as, when it names that same file: the row opens it as written (LTX-6). */
27
+ url?: string;
28
+ }
29
+ /** A paragraph's line that is a row, lifted out as a block of its own, so the row is not drawn inside a `<p>`. */
30
+ export declare const ROW_BLOCK = "linkRow";
31
+ /** The answer of {@link placeLines}. */
32
+ export interface PlacedLines {
33
+ blocks: RenderBlock[];
34
+ /** The row a block of type {@link ROW_BLOCK} draws. */
35
+ rowOf: (block: {
36
+ type: string;
37
+ attrs?: Record<string, unknown>;
38
+ }) => RowLine | undefined;
39
+ /** The row a list item's only run draws, by that run: a bullet that is only a link keeps its bullet. */
40
+ rowRuns: ReadonlyMap<object, RowLine>;
41
+ }
42
+ /** What a line's drawing reads beyond the line. */
43
+ export interface LineContext {
44
+ /** The message's cards (`foldEmbeds`, `cardsIn`): a line whose file has one draws nothing. */
45
+ cards?: readonly Embed[];
46
+ /** The `part`s drawn under the message: a line whose file has one draws nothing. */
47
+ parts?: readonly PartPointer[];
48
+ /** What an app link names (§7.7), as answered so far. */
49
+ resolveLink?: LinkResolver;
50
+ /**
51
+ * Values whose lines stay sentences, their chip only: the file the message
52
+ * is shown on draws no row of itself there (Miky, WID-3).
53
+ */
54
+ stayChip?: (value: string) => boolean;
55
+ }
56
+ /**
57
+ * The URL a run wrote for its reference, when the URL names that same file:
58
+ * what its chip or row opens (LTX-6). A marker or a block comment can set any
59
+ * URL's text on a reference to another file, so the text must itself read as
60
+ * it; without `resolveLink` nothing can be checked and there is none.
61
+ */
62
+ export declare function writtenUrlOf(run: Pick<RenderInline, 'text' | 'reference'>, resolveLink: LinkResolver | undefined): string | undefined;
63
+ /**
64
+ * Whether a pasted app link names this address: its path ends in the
65
+ * address's `d` (§7.2 puts the identity last, `…/<slug>-<d>`), and that `d` is
66
+ * long enough to be one. A `d` comes from somebody's tag, so a short one would
67
+ * otherwise match half the links in a body.
68
+ */
69
+ export declare function urlNames(url: string, address: string): boolean;
70
+ /**
71
+ * Where each of a message's lines draws. `blocks` is its tree after
72
+ * `linksAsReferences`, so a lone app URL this reader can read is already its
73
+ * reference, and one it cannot stays the URL as written.
74
+ */
75
+ export declare function placeLines(blocks: readonly RenderBlock[], context?: LineContext): PlacedLines;
76
+ //# sourceMappingURL=lines.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lines.d.ts","sourceRoot":"","sources":["../src/lines.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAIL,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAA;AAE7B;;;;;GAKG;AACH,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,IAAI,CAAA;IACjB,0GAA0G;IAC1G,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,kHAAkH;AAClH,eAAO,MAAM,SAAS,YAAY,CAAA;AAElC,wCAAwC;AACxC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,uDAAuD;IACvD,KAAK,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,OAAO,GAAG,SAAS,CAAA;IACxF,wGAAwG;IACxG,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACtC;AAED,mDAAmD;AACnD,MAAM,WAAW,WAAW;IAC1B,8FAA8F;IAC9F,KAAK,CAAC,EAAE,SAAS,KAAK,EAAE,CAAA;IACxB,oFAAoF;IACpF,KAAK,CAAC,EAAE,SAAS,WAAW,EAAE,CAAA;IAC9B,yDAAyD;IACzD,WAAW,CAAC,EAAE,YAAY,CAAA;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;CACtC;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,CAAC,EAAE,WAAW,EAAE,YAAY,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAGrI;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAK9D;AAiBD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,EAAE,OAAO,GAAE,WAAgB,GAAG,WAAW,CAuDjG"}
package/dist/lines.js ADDED
@@ -0,0 +1,126 @@
1
+ /**
2
+ * Where a message's lines draw — the one line rule (SPEC §13.2, §13.6.2, C21),
3
+ * shared since ONE-2. It replaces Peek's and Ship's `messageLines.ts`, Leaf's
4
+ * `commentLines.ts` and Peek's `urlNames`, three copies that had drifted.
5
+ *
6
+ * A sentence keeps its chips; a line that is only a link to a file or a
7
+ * message is that file's row; and one whose file has a card or a part under
8
+ * the message draws nothing, since the card stands for it (C26). A person or a
9
+ * Folder alone on its line stays a chip, and a quote's or a heading's line is a
10
+ * sentence (protocol `lineDrawOf`).
11
+ *
12
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-link-on-words-counts-toward-the-card.md
13
+ */
14
+ import { lineDrawOf, linesOf, referenceOfLink, } from '@estiva-app/protocol';
15
+ /** A paragraph's line that is a row, lifted out as a block of its own, so the row is not drawn inside a `<p>`. */
16
+ export const ROW_BLOCK = 'linkRow';
17
+ /**
18
+ * The URL a run wrote for its reference, when the URL names that same file:
19
+ * what its chip or row opens (LTX-6). A marker or a block comment can set any
20
+ * URL's text on a reference to another file, so the text must itself read as
21
+ * it; without `resolveLink` nothing can be checked and there is none.
22
+ */
23
+ export function writtenUrlOf(run, resolveLink) {
24
+ if (!run.reference || !resolveLink || !/^https?:\/\//i.test(run.text))
25
+ return undefined;
26
+ return referenceOfLink(run.text, resolveLink) === run.reference ? run.text : undefined;
27
+ }
28
+ /**
29
+ * Whether a pasted app link names this address: its path ends in the
30
+ * address's `d` (§7.2 puts the identity last, `…/<slug>-<d>`), and that `d` is
31
+ * long enough to be one. A `d` comes from somebody's tag, so a short one would
32
+ * otherwise match half the links in a body.
33
+ */
34
+ export function urlNames(url, address) {
35
+ const d = address.split(':')[2] ?? '';
36
+ if (d.length < 8)
37
+ return false;
38
+ const path = url.split(/[?#]/)[0].replace(/\/+$/, '');
39
+ return path.endsWith(`-${d}`) || path.endsWith(`/${d}`);
40
+ }
41
+ const BREAK = { text: '\n', marks: [] };
42
+ function rowLineOf(line, block, context) {
43
+ const drawn = lineDrawOf(line, block, context);
44
+ if ((drawn.draw === 'row' || drawn.draw === 'nothing') && context.stayChip?.(drawn.value))
45
+ return undefined;
46
+ if (drawn.draw === 'nothing')
47
+ return 'nothing';
48
+ if (drawn.draw === 'unreadable')
49
+ return { reference: drawn.reference, unreadable: true };
50
+ // A URL whose file is not read yet stays the link it was; once read, `linksAsReferences` made it a reference.
51
+ if (drawn.draw !== 'row' || drawn.url)
52
+ return undefined;
53
+ const run = line.find((r) => r.reference);
54
+ if (!run?.reference)
55
+ return undefined;
56
+ const url = writtenUrlOf(run, context.resolveLink);
57
+ return { reference: run.reference, value: drawn.value, ...(url ? { url } : {}) };
58
+ }
59
+ /**
60
+ * Where each of a message's lines draws. `blocks` is its tree after
61
+ * `linksAsReferences`, so a lone app URL this reader can read is already its
62
+ * reference, and one it cannot stays the URL as written.
63
+ */
64
+ export function placeLines(blocks, context = {}) {
65
+ const rows = new Map();
66
+ const rowRuns = new Map();
67
+ const out = [];
68
+ for (const block of blocks) {
69
+ if (block.type === 'paragraph') {
70
+ const lines = linesOf(block);
71
+ const drawn = lines.map((line) => rowLineOf(line, block, context));
72
+ if (drawn.every((d) => d === undefined)) {
73
+ out.push(block);
74
+ continue;
75
+ }
76
+ let sentence = [];
77
+ let first = true;
78
+ const flush = () => {
79
+ if (!sentence.length)
80
+ return;
81
+ const inline = sentence.flatMap((line, i) => (i > 0 ? [BREAK, ...line] : line));
82
+ out.push({ ...block, inline, ...(first ? {} : { id: undefined }) });
83
+ first = false;
84
+ sentence = [];
85
+ };
86
+ lines.forEach((line, i) => {
87
+ const d = drawn[i];
88
+ if (d === undefined) {
89
+ sentence.push(line);
90
+ return;
91
+ }
92
+ flush();
93
+ if (d === 'nothing')
94
+ return;
95
+ // Not a protocol block: a drawer hands a type it has no design for to its own renderer.
96
+ const row = { type: ROW_BLOCK, attrs: {} };
97
+ rows.set(row, d);
98
+ out.push(row);
99
+ });
100
+ flush();
101
+ continue;
102
+ }
103
+ if (block.type === 'bulletList' || block.type === 'orderedList') {
104
+ const items = (block.children ?? []).flatMap((item) => {
105
+ const lines = linesOf(item);
106
+ if (lines.length !== 1)
107
+ return [item];
108
+ const d = rowLineOf(lines[0], item, context);
109
+ if (d === undefined)
110
+ return [item];
111
+ if (d === 'nothing')
112
+ return [];
113
+ // A fresh run, so the map names this line and no other drawing of the same body.
114
+ const run = { ...lines[0].find((r) => r.reference || r.text.trim()) };
115
+ rowRuns.set(run, d);
116
+ return [{ ...item, inline: [run] }];
117
+ });
118
+ if (items.length)
119
+ out.push({ ...block, children: items });
120
+ continue;
121
+ }
122
+ out.push(block);
123
+ }
124
+ return { blocks: out, rowOf: (block) => rows.get(block), rowRuns };
125
+ }
126
+ //# sourceMappingURL=lines.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lines.js","sourceRoot":"","sources":["../src/lines.ts"],"names":[],"mappings":"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"}
@@ -16,9 +16,16 @@ export interface ReferenceCandidate {
16
16
  /**
17
17
  * A file's summary (SPEC §6.12), plain text on one line: the row's second
18
18
  * line, with `caption` moving up beside the title. Absent when the file has
19
- * none, and on a message. Not matched: search keeps to titles.
19
+ * none, and on a message. For a file the relay found only by its text, the
20
+ * words around the match instead.
20
21
  */
21
22
  summary?: string;
23
+ /**
24
+ * The fields a relay's search found the typed words in, best first (SPEC
25
+ * §6.13 `matches`): a file found by its summary, key or text is offered
26
+ * though its title does not hold them, after every title match.
27
+ */
28
+ matched?: readonly string[];
22
29
  /**
23
30
  * Matched beside `title`: a message's own words ({@link messageWords}), an
24
31
  * issue's ref (`CON-33`). A message without it is matched on `caption`.
@@ -1 +1 @@
1
- {"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AA2BA,OAAO,EAA8B,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAExF,+FAA+F;AAC/F,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,CAAA;AAElF,+BAA+B;AAC/B,MAAM,WAAW,kBAAkB;IACjC,gGAAgG;IAChG,EAAE,EAAE,MAAM,CAAA;IACV,iGAAiG;IACjG,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,aAAa,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAA;IACb,oFAAoF;IACpF,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,+DAA+D;IAC/D,IAAI,EAAE,MAAM,CAAA;IACZ,+EAA+E;IAC/E,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,gFAAgF;IAChF,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,mEAAmE;AACnE,eAAO,MAAM,YAAY;;;CAAkC,CAAA;AAE3D,+EAA+E;AAC/E,eAAO,MAAM,SAAS;;;;CAA+C,CAAA;AAErE,mGAAmG;AACnG,eAAO,MAAM,cAAc;;;CAAqC,CAAA;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,kBAAkB,EAAE,CAAA;IAC9B,KAAK,EAAE,kBAAkB,EAAE,CAAA;CAC5B;AAED,oEAAoE;AACpE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,OAAO,GAAG,UAAU,CAAA;IAC1B,KAAK,EAAE,kBAAkB,EAAE,CAAA;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,aAAa,EAAE,CAK7E;AAED,oDAAoD;AACpD,MAAM,WAAW,gBAAgB;IAC/B,oBAAoB;IACpB,EAAE,EAAE,MAAM,CAAA;IACV,8GAA8G;IAC9G,IAAI,EAAE,MAAM,CAAA;IACZ,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,qFAAqF;IACrF,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,EAC9C,OAAO,GAAE,mBAAwB,GAChC,kBAAkB,CAYpB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACvC,KAAK,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACpC,gCAAgC;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,IAAI,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC1C;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC5B;AAoED;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAgBlE;AAaD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAIvE;AAcD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,QAAa,EAAE,IAAqB,EAAE,OAAY,EAAE,EAAE,mBAAmB,GAAG,gBAAgB,CAgCpJ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,8FAA8F;AAC9F,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAAA;AAKzF,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,kBAAkB,EAAE,CAAA;IAClD,4DAA4D;IAC5D,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;IAC3C;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,MAAM,EAAE,iBAAiB,CAAA;IACzB,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,OAAa,EAAE,OAAc,EAAE,SAAa,EAAE,EAAE,sBAAsB,GAAG,eAAe,CAgFjI"}
1
+ {"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"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"}
@@ -189,13 +189,33 @@ export function refMatch(ref, query) {
189
189
  // 8, 7 and 3: the whole ref or its start.
190
190
  return score === 8 || score % 4 === 3 ? score : 0;
191
191
  }
192
- /** Keeps each id once, at its closest tier. */
192
+ /**
193
+ * How well a relay's search says a file matched, below any title match (1 and
194
+ * up): its summary or key, then only its text. Title first, then summary and
195
+ * key, then text, as the relay ranks them.
196
+ *
197
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/search-finds-a-file-by-the-words-of-its-current-fields.md
198
+ */
199
+ function relayMatch(matched) {
200
+ const best = matched?.[0];
201
+ if (!best)
202
+ return 0;
203
+ return best === 'title' ? 1 : best === 'text' ? 0.25 : 0.5;
204
+ }
205
+ /**
206
+ * Keeps each id once, at its closest tier, with what a search found it by: a
207
+ * file in your Folder found only by its text still shows the words around them.
208
+ */
193
209
  function closest(candidates) {
194
210
  const best = new Map();
195
211
  for (const c of candidates) {
196
212
  const known = best.get(c.id);
197
- if (!known || c.tier < known.tier)
213
+ if (!known) {
198
214
  best.set(c.id, c);
215
+ continue;
216
+ }
217
+ const [near, far] = c.tier < known.tier ? [c, known] : [known, c];
218
+ best.set(c.id, far.matched && !near.matched ? { ...near, matched: far.matched, ...(far.summary !== undefined ? { summary: far.summary } : {}) } : near);
199
219
  }
200
220
  return [...best.values()];
201
221
  }
@@ -222,7 +242,7 @@ export function rankReferences({ messages, files, query, ownKinds = [], caps = R
222
242
  .map(({ m }) => m);
223
243
  const shownFiles = closest(files)
224
244
  .filter((f) => !excluded.has(f.id) && (typed || f.tier !== FILE_TIER.search))
225
- .map((f) => ({ f, score: typed ? Math.max(referenceMatch(f.title, query), refMatch(f.search, query)) : 0 }))
245
+ .map((f) => ({ f, score: typed ? Math.max(referenceMatch(f.title, query), refMatch(f.search, query), relayMatch(f.matched)) : 0 }))
226
246
  .filter(({ score }) => !typed || score > 0)
227
247
  .sort((a, b) => b.score - a.score ||
228
248
  Number(!!a.f.archived) - Number(!!b.f.archived) ||