@estiva-app/conversation 0.14.0 → 0.15.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 +22 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/references.d.ts +18 -7
- package/dist/references.d.ts.map +1 -1
- package/dist/references.js +95 -28
- package/dist/references.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -1
- package/src/references.ts +97 -26
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,28 @@ 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.15.0 — 2026-10-19
|
|
10
|
+
|
|
11
|
+
**Search matches every typed word as the start of a word** (record
|
|
12
|
+
*search-matches-every-word-as-a-word-start*). `referenceMatch` now keeps a
|
|
13
|
+
text only when each typed word starts one of its words, in any order; `"…"`
|
|
14
|
+
needs those whole words next to each other, in order; `-word` drops a text with
|
|
15
|
+
a word starting that way; a quote with no closing partner is ignored; `or` and
|
|
16
|
+
`key:value` are ordinary words; punctuation at a typed word's ends is ignored.
|
|
17
|
+
A query that only leaves words out matches nothing. A match inside a word is
|
|
18
|
+
gone: "ssue" no longer finds "issue". A hit where every typed word is a whole
|
|
19
|
+
word now ranks above one where a word is only started, so "short" lists
|
|
20
|
+
*Remove Short summary* above *Shortcuts*: the scores are 8 the whole text, 7–5
|
|
21
|
+
whole words (its start, one run at a word start, every word somewhere) and 3–1
|
|
22
|
+
the same for word starts; only `> 0` was ever read outside this package.
|
|
23
|
+
`referenceSearch` no longer lets an empty answer for words that are only left
|
|
24
|
+
out (`-draft`), or for a query with a quote still open (`"x -y`), stop a longer
|
|
25
|
+
query.
|
|
26
|
+
|
|
27
|
+
SPEC: §5.2 changed — a relay matches every typed word as a word start on a REQ
|
|
28
|
+
and on `/query` alike, and a reader's check of a title uses the same rule, so
|
|
29
|
+
it never drops a hit the relay found.
|
|
30
|
+
|
|
9
31
|
## 0.14.0 — 2026-10-19
|
|
10
32
|
|
|
11
33
|
**A reply to a comment on part of a page copies that comment's place**
|
package/dist/index.d.ts
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 declare const CONVERSATION_VERSION = "0.
|
|
15
|
+
export declare const CONVERSATION_VERSION = "0.15.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, isCommentOn, referencesAddress, strengthOn, threadStrength, referenceTagsFor, mentionTagsFor, peopleNamedInBody, MAX_MENTIONED_PEOPLE, type Strength, } from './strength.js';
|
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.
|
|
15
|
+
export const CONVERSATION_VERSION = '0.15.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, isCommentOn, referencesAddress, strengthOn, threadStrength, referenceTagsFor, mentionTagsFor, peopleNamedInBody, MAX_MENTIONED_PEOPLE, } from './strength.js';
|
package/dist/references.d.ts
CHANGED
|
@@ -70,9 +70,21 @@ export interface RankReferencesInput {
|
|
|
70
70
|
exclude?: readonly string[];
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
73
|
-
* How well `text` holds `query
|
|
74
|
-
*
|
|
75
|
-
*
|
|
73
|
+
* How well `text` holds `query`, by the rule every Estiva search uses (SPEC
|
|
74
|
+
* §5.2): each typed word matches the start of a word, in any order; `"…"`
|
|
75
|
+
* matches those whole words next to each other; `-word` leaves out a text with
|
|
76
|
+
* a word starting that way. Punctuation at a typed word's ends is ignored, and
|
|
77
|
+
* so is case. A query with nothing to find but words left out matches nothing.
|
|
78
|
+
*
|
|
79
|
+
* Of the texts that match, a hit where every typed word is a whole word ranks
|
|
80
|
+
* above one where a word is only started (the record: "re" finds hundreds), and
|
|
81
|
+
* within each, by where it was found: the whole text, its start, what was typed
|
|
82
|
+
* as one run at the start of a word, every word somewhere. So 8 is the whole
|
|
83
|
+
* text, 7–5 whole words, 3–1 word starts, and 0 no match.
|
|
84
|
+
*
|
|
85
|
+
* Every text the rule finds, this finds, so a title the relay found by the rule
|
|
86
|
+
* is never dropped. A relay MAY find more (another may stem or fold accents;
|
|
87
|
+
* buzz caps a typed word at 4 pieces), and this drops what the rule does not.
|
|
76
88
|
*/
|
|
77
89
|
export declare function referenceMatch(text: string, query: string): number;
|
|
78
90
|
/**
|
|
@@ -121,9 +133,8 @@ export interface ReferenceSearch {
|
|
|
121
133
|
}
|
|
122
134
|
export interface ReferenceSearchOptions {
|
|
123
135
|
/**
|
|
124
|
-
* Must find no more for `q + " words"` than for `q` (every word
|
|
125
|
-
*
|
|
126
|
-
* is not asked.
|
|
136
|
+
* Must find no more for `q + " words"` than for `q` (every word must match,
|
|
137
|
+
* SPEC §5.2), since a longer query after an empty answer is not asked.
|
|
127
138
|
*/
|
|
128
139
|
search: ReferenceSearchFn;
|
|
129
140
|
/** The pause after a keystroke before asking. Default 200ms. */
|
|
@@ -149,7 +160,7 @@ export interface ReferenceSearchOptions {
|
|
|
149
160
|
* keeps its answer, which is still true of that query.
|
|
150
161
|
*
|
|
151
162
|
* Once a query found nothing, adding whole words to it is not asked (08d7f243):
|
|
152
|
-
* relay search
|
|
163
|
+
* relay search needs every word to match (SPEC §5.2), so `see [the fig` cannot
|
|
153
164
|
* find what `the` did not, and a sentence typed after an unmatched `[` would
|
|
154
165
|
* otherwise spend the rate limit on every longer version of itself. A failure
|
|
155
166
|
* is not "nothing", so it never stops a longer query.
|
package/dist/references.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AAuBA,+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,2EAA2E;IAC3E,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,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;
|
|
1
|
+
{"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"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"}
|
package/dist/references.js
CHANGED
|
@@ -28,38 +28,104 @@ export const FILE_TIER = { folder: 0, recent: 1, search: 2 };
|
|
|
28
28
|
export const REFERENCE_CAPS = { messages: 4, files: 6 };
|
|
29
29
|
const normalize = (text) => text.toLowerCase().replace(/\s+/g, ' ').trim();
|
|
30
30
|
const isWordStart = (text, at) => at === 0 || !/[\p{L}\p{N}]/u.test(text[at - 1]);
|
|
31
|
+
/** The words of `text`: its runs of letters and digits, so `SUM-7.` is `sum`, `7`. */
|
|
32
|
+
const wordsOf = (text) => text.toLowerCase().match(/[\p{L}\p{N}]+/gu) ?? [];
|
|
31
33
|
/**
|
|
32
|
-
*
|
|
33
|
-
* a word
|
|
34
|
-
*
|
|
34
|
+
* Splits typed text as the relay does (buzz's `parse_word_start`): `"…"` is a
|
|
35
|
+
* phrase, a word opening with `-` is left out, anything else is a word, `or`
|
|
36
|
+
* and `key:value` included. A quote with no closing partner is ignored, so
|
|
37
|
+
* `"short summ` finds by word starts while it is typed.
|
|
35
38
|
*/
|
|
39
|
+
function searchTerms(query) {
|
|
40
|
+
const terms = [];
|
|
41
|
+
let rest = query;
|
|
42
|
+
while ((rest = rest.trimStart())) {
|
|
43
|
+
if (rest.startsWith('"')) {
|
|
44
|
+
const end = rest.indexOf('"', 1);
|
|
45
|
+
if (end > 0) {
|
|
46
|
+
const phrase = rest.slice(1, end).trim();
|
|
47
|
+
if (phrase)
|
|
48
|
+
terms.push({ kind: 'phrase', text: phrase });
|
|
49
|
+
rest = rest.slice(end + 1);
|
|
50
|
+
}
|
|
51
|
+
else
|
|
52
|
+
rest = rest.slice(1);
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
const end = rest.search(/[\s"]/u);
|
|
56
|
+
const token = end < 0 ? rest : rest.slice(0, end);
|
|
57
|
+
rest = end < 0 ? '' : rest.slice(end);
|
|
58
|
+
if (token.startsWith('-')) {
|
|
59
|
+
if (token.length > 1)
|
|
60
|
+
terms.push({ kind: 'not', text: token.slice(1) });
|
|
61
|
+
}
|
|
62
|
+
else
|
|
63
|
+
terms.push({ kind: 'word', text: token });
|
|
64
|
+
}
|
|
65
|
+
return terms;
|
|
66
|
+
}
|
|
67
|
+
/** Whether `words` holds every word of `typed` at the start of one of its words. */
|
|
68
|
+
const startsWords = (words, typed) => {
|
|
69
|
+
const wanted = wordsOf(typed);
|
|
70
|
+
return wanted.length > 0 && wanted.every((w) => words.some((word) => word.startsWith(w)));
|
|
71
|
+
};
|
|
72
|
+
/** Whether `words` holds the whole words of `phrase`, next to each other and in order. */
|
|
73
|
+
const holdsPhrase = (words, phrase) => {
|
|
74
|
+
const wanted = wordsOf(phrase);
|
|
75
|
+
if (wanted.length === 0)
|
|
76
|
+
return false;
|
|
77
|
+
for (let at = 0; at + wanted.length <= words.length; at++)
|
|
78
|
+
if (wanted.every((w, i) => words[at + i] === w))
|
|
79
|
+
return true;
|
|
80
|
+
return false;
|
|
81
|
+
};
|
|
82
|
+
/**
|
|
83
|
+
* How well `text` holds `query`, by the rule every Estiva search uses (SPEC
|
|
84
|
+
* §5.2): each typed word matches the start of a word, in any order; `"…"`
|
|
85
|
+
* matches those whole words next to each other; `-word` leaves out a text with
|
|
86
|
+
* a word starting that way. Punctuation at a typed word's ends is ignored, and
|
|
87
|
+
* so is case. A query with nothing to find but words left out matches nothing.
|
|
88
|
+
*
|
|
89
|
+
* Of the texts that match, a hit where every typed word is a whole word ranks
|
|
90
|
+
* above one where a word is only started (the record: "re" finds hundreds), and
|
|
91
|
+
* within each, by where it was found: the whole text, its start, what was typed
|
|
92
|
+
* as one run at the start of a word, every word somewhere. So 8 is the whole
|
|
93
|
+
* text, 7–5 whole words, 3–1 word starts, and 0 no match.
|
|
94
|
+
*
|
|
95
|
+
* Every text the rule finds, this finds, so a title the relay found by the rule
|
|
96
|
+
* is never dropped. A relay MAY find more (another may stem or fold accents;
|
|
97
|
+
* buzz caps a typed word at 4 pieces), and this drops what the rule does not.
|
|
98
|
+
*/
|
|
99
|
+
// why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/search-matches-every-word-as-a-word-start.md
|
|
36
100
|
export function referenceMatch(text, query) {
|
|
37
|
-
const
|
|
38
|
-
const
|
|
39
|
-
if (
|
|
101
|
+
const terms = searchTerms(query);
|
|
102
|
+
const wanted = wantedOf(terms);
|
|
103
|
+
if (wanted.length === 0)
|
|
104
|
+
return 0;
|
|
105
|
+
const words = wordsOf(text);
|
|
106
|
+
const holds = (t) => (t.kind === 'phrase' ? holdsPhrase(words, t.text) : startsWords(words, t.text));
|
|
107
|
+
if (!wanted.every(holds) || terms.some((t) => t.kind === 'not' && startsWords(words, t.text)))
|
|
40
108
|
return 0;
|
|
109
|
+
const whole = wanted.every((w) => w.kind === 'phrase' || wordsOf(w.text).every((piece) => words.includes(piece))) ? 4 : 0;
|
|
110
|
+
const t = normalize(text);
|
|
111
|
+
const q = normalize(wanted.map((w) => w.text.replace(/^[^\p{L}\p{N}]+|[^\p{L}\p{N}]+$/gu, '')).join(' '));
|
|
41
112
|
if (t === q)
|
|
42
|
-
return
|
|
113
|
+
return 8;
|
|
43
114
|
if (t.startsWith(q))
|
|
44
|
-
return 3;
|
|
45
|
-
let at = t.indexOf(q);
|
|
46
|
-
if (at < 0) {
|
|
47
|
-
const words = q.split(' ');
|
|
48
|
-
if (words.length < 2)
|
|
49
|
-
return 0;
|
|
50
|
-
const starts = (w) => {
|
|
51
|
-
for (let i = t.indexOf(w); i >= 0; i = t.indexOf(w, i + 1))
|
|
52
|
-
if (isWordStart(t, i))
|
|
53
|
-
return true;
|
|
54
|
-
return false;
|
|
55
|
-
};
|
|
56
|
-
return words.every(starts) ? 1 : 0;
|
|
57
|
-
}
|
|
58
|
-
for (; at >= 0; at = t.indexOf(q, at + 1))
|
|
115
|
+
return whole + 3;
|
|
116
|
+
for (let at = t.indexOf(q); at >= 0; at = t.indexOf(q, at + 1))
|
|
59
117
|
if (isWordStart(t, at))
|
|
60
|
-
return 2;
|
|
61
|
-
return 1;
|
|
118
|
+
return whole + 2;
|
|
119
|
+
return whole + 1;
|
|
62
120
|
}
|
|
121
|
+
/** The terms that ask for something: words and phrases with a letter or digit, not words left out. */
|
|
122
|
+
const wantedOf = (terms) => terms.filter((t) => t.kind !== 'not' && wordsOf(t.text).length > 0);
|
|
123
|
+
/**
|
|
124
|
+
* Whether a longer query's answer is within `query`'s: it asks for a word and
|
|
125
|
+
* no quote is still open, since closing it can turn `"x -y` (y left out) into
|
|
126
|
+
* `"x -y z"` (a phrase that needs y).
|
|
127
|
+
*/
|
|
128
|
+
const narrowsBy = (query) => wantedOf(searchTerms(query)).length > 0 && (query.split('"').length - 1) % 2 === 0;
|
|
63
129
|
/**
|
|
64
130
|
* How well an issue's ref (`CON-33`) holds `query`: only from its start, and
|
|
65
131
|
* only once what was typed has a digit or a hyphen (Miky, 2026-10-05) — so
|
|
@@ -69,7 +135,8 @@ export function referenceMatch(text, query) {
|
|
|
69
135
|
*/
|
|
70
136
|
export function refMatch(ref, query) {
|
|
71
137
|
const score = ref && /[\d-]/.test(query) ? referenceMatch(ref, query) : 0;
|
|
72
|
-
|
|
138
|
+
// 8, 7 and 3: the whole ref or its start.
|
|
139
|
+
return score === 8 || score % 4 === 3 ? score : 0;
|
|
73
140
|
}
|
|
74
141
|
/** Keeps each id once, at its closest tier. */
|
|
75
142
|
function closest(candidates) {
|
|
@@ -146,7 +213,7 @@ const timers = globalThis;
|
|
|
146
213
|
* keeps its answer, which is still true of that query.
|
|
147
214
|
*
|
|
148
215
|
* Once a query found nothing, adding whole words to it is not asked (08d7f243):
|
|
149
|
-
* relay search
|
|
216
|
+
* relay search needs every word to match (SPEC §5.2), so `see [the fig` cannot
|
|
150
217
|
* find what `the` did not, and a sentence typed after an unmatched `[` would
|
|
151
218
|
* otherwise spend the rate limit on every longer version of itself. A failure
|
|
152
219
|
* is not "nothing", so it never stops a longer query.
|
|
@@ -157,8 +224,8 @@ export function referenceSearch({ search, delayMs = 200, retryMs = 5000, minLeng
|
|
|
157
224
|
const foundNothing = (query) => {
|
|
158
225
|
for (let at = query.indexOf(' '); at >= 0; at = query.indexOf(' ', at + 1)) {
|
|
159
226
|
const prefix = query.slice(0, at);
|
|
160
|
-
// `--`
|
|
161
|
-
if (
|
|
227
|
+
// `--` or `-draft` asks for no word at all, so its empty answer says nothing of `-draft budget`.
|
|
228
|
+
if (!narrowsBy(prefix))
|
|
162
229
|
continue;
|
|
163
230
|
const shorter = answered.get(prefix);
|
|
164
231
|
if (shorter && shorter.length === 0 && !failures.has(shorter))
|
package/dist/references.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"references.js","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"references.js","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@estiva-app/conversation",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.15.0",
|
|
4
4
|
"description": "The conversation rules of the Estiva SPEC (§6.2–§6.8, §11): comment and mention strengths, threading, the edit, reaction and attachment folds, NIP-22 comment and reply builders, drafts, NIP-RS read state, membership and unread. A convenience an app adopts, never a requirement.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
package/src/index.ts
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.
|
|
15
|
+
export const CONVERSATION_VERSION = '0.15.0'
|
|
16
16
|
|
|
17
17
|
export {
|
|
18
18
|
KIND_MESSAGE,
|
package/src/references.ts
CHANGED
|
@@ -90,31 +90,102 @@ const normalize = (text: string) => text.toLowerCase().replace(/\s+/g, ' ').trim
|
|
|
90
90
|
|
|
91
91
|
const isWordStart = (text: string, at: number) => at === 0 || !/[\p{L}\p{N}]/u.test(text[at - 1]!)
|
|
92
92
|
|
|
93
|
+
/** The words of `text`: its runs of letters and digits, so `SUM-7.` is `sum`, `7`. */
|
|
94
|
+
const wordsOf = (text: string): string[] => text.toLowerCase().match(/[\p{L}\p{N}]+/gu) ?? []
|
|
95
|
+
|
|
96
|
+
/** One piece of a typed query: a word, `"a phrase"`, or `-a word` left out. */
|
|
97
|
+
interface SearchTerm {
|
|
98
|
+
kind: 'word' | 'phrase' | 'not'
|
|
99
|
+
text: string
|
|
100
|
+
}
|
|
101
|
+
|
|
93
102
|
/**
|
|
94
|
-
*
|
|
95
|
-
* a word
|
|
96
|
-
*
|
|
103
|
+
* Splits typed text as the relay does (buzz's `parse_word_start`): `"…"` is a
|
|
104
|
+
* phrase, a word opening with `-` is left out, anything else is a word, `or`
|
|
105
|
+
* and `key:value` included. A quote with no closing partner is ignored, so
|
|
106
|
+
* `"short summ` finds by word starts while it is typed.
|
|
97
107
|
*/
|
|
98
|
-
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
return false
|
|
108
|
+
function searchTerms(query: string): SearchTerm[] {
|
|
109
|
+
const terms: SearchTerm[] = []
|
|
110
|
+
let rest = query
|
|
111
|
+
while ((rest = rest.trimStart())) {
|
|
112
|
+
if (rest.startsWith('"')) {
|
|
113
|
+
const end = rest.indexOf('"', 1)
|
|
114
|
+
if (end > 0) {
|
|
115
|
+
const phrase = rest.slice(1, end).trim()
|
|
116
|
+
if (phrase) terms.push({ kind: 'phrase', text: phrase })
|
|
117
|
+
rest = rest.slice(end + 1)
|
|
118
|
+
} else rest = rest.slice(1)
|
|
119
|
+
continue
|
|
111
120
|
}
|
|
112
|
-
|
|
121
|
+
const end = rest.search(/[\s"]/u)
|
|
122
|
+
const token = end < 0 ? rest : rest.slice(0, end)
|
|
123
|
+
rest = end < 0 ? '' : rest.slice(end)
|
|
124
|
+
if (token.startsWith('-')) {
|
|
125
|
+
if (token.length > 1) terms.push({ kind: 'not', text: token.slice(1) })
|
|
126
|
+
} else terms.push({ kind: 'word', text: token })
|
|
113
127
|
}
|
|
114
|
-
|
|
115
|
-
return 1
|
|
128
|
+
return terms
|
|
116
129
|
}
|
|
117
130
|
|
|
131
|
+
/** Whether `words` holds every word of `typed` at the start of one of its words. */
|
|
132
|
+
const startsWords = (words: readonly string[], typed: string) => {
|
|
133
|
+
const wanted = wordsOf(typed)
|
|
134
|
+
return wanted.length > 0 && wanted.every((w) => words.some((word) => word.startsWith(w)))
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
/** Whether `words` holds the whole words of `phrase`, next to each other and in order. */
|
|
138
|
+
const holdsPhrase = (words: readonly string[], phrase: string) => {
|
|
139
|
+
const wanted = wordsOf(phrase)
|
|
140
|
+
if (wanted.length === 0) return false
|
|
141
|
+
for (let at = 0; at + wanted.length <= words.length; at++) if (wanted.every((w, i) => words[at + i] === w)) return true
|
|
142
|
+
return false
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/**
|
|
146
|
+
* How well `text` holds `query`, by the rule every Estiva search uses (SPEC
|
|
147
|
+
* §5.2): each typed word matches the start of a word, in any order; `"…"`
|
|
148
|
+
* matches those whole words next to each other; `-word` leaves out a text with
|
|
149
|
+
* a word starting that way. Punctuation at a typed word's ends is ignored, and
|
|
150
|
+
* so is case. A query with nothing to find but words left out matches nothing.
|
|
151
|
+
*
|
|
152
|
+
* Of the texts that match, a hit where every typed word is a whole word ranks
|
|
153
|
+
* above one where a word is only started (the record: "re" finds hundreds), and
|
|
154
|
+
* within each, by where it was found: the whole text, its start, what was typed
|
|
155
|
+
* as one run at the start of a word, every word somewhere. So 8 is the whole
|
|
156
|
+
* text, 7–5 whole words, 3–1 word starts, and 0 no match.
|
|
157
|
+
*
|
|
158
|
+
* Every text the rule finds, this finds, so a title the relay found by the rule
|
|
159
|
+
* is never dropped. A relay MAY find more (another may stem or fold accents;
|
|
160
|
+
* buzz caps a typed word at 4 pieces), and this drops what the rule does not.
|
|
161
|
+
*/
|
|
162
|
+
// why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/search-matches-every-word-as-a-word-start.md
|
|
163
|
+
export function referenceMatch(text: string, query: string): number {
|
|
164
|
+
const terms = searchTerms(query)
|
|
165
|
+
const wanted = wantedOf(terms)
|
|
166
|
+
if (wanted.length === 0) return 0
|
|
167
|
+
const words = wordsOf(text)
|
|
168
|
+
const holds = (t: SearchTerm) => (t.kind === 'phrase' ? holdsPhrase(words, t.text) : startsWords(words, t.text))
|
|
169
|
+
if (!wanted.every(holds) || terms.some((t) => t.kind === 'not' && startsWords(words, t.text))) return 0
|
|
170
|
+
const whole = wanted.every((w) => w.kind === 'phrase' || wordsOf(w.text).every((piece) => words.includes(piece))) ? 4 : 0
|
|
171
|
+
const t = normalize(text)
|
|
172
|
+
const q = normalize(wanted.map((w) => w.text.replace(/^[^\p{L}\p{N}]+|[^\p{L}\p{N}]+$/gu, '')).join(' '))
|
|
173
|
+
if (t === q) return 8
|
|
174
|
+
if (t.startsWith(q)) return whole + 3
|
|
175
|
+
for (let at = t.indexOf(q); at >= 0; at = t.indexOf(q, at + 1)) if (isWordStart(t, at)) return whole + 2
|
|
176
|
+
return whole + 1
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
/** The terms that ask for something: words and phrases with a letter or digit, not words left out. */
|
|
180
|
+
const wantedOf = (terms: readonly SearchTerm[]) => terms.filter((t) => t.kind !== 'not' && wordsOf(t.text).length > 0)
|
|
181
|
+
|
|
182
|
+
/**
|
|
183
|
+
* Whether a longer query's answer is within `query`'s: it asks for a word and
|
|
184
|
+
* no quote is still open, since closing it can turn `"x -y` (y left out) into
|
|
185
|
+
* `"x -y z"` (a phrase that needs y).
|
|
186
|
+
*/
|
|
187
|
+
const narrowsBy = (query: string) => wantedOf(searchTerms(query)).length > 0 && (query.split('"').length - 1) % 2 === 0
|
|
188
|
+
|
|
118
189
|
/**
|
|
119
190
|
* How well an issue's ref (`CON-33`) holds `query`: only from its start, and
|
|
120
191
|
* only once what was typed has a digit or a hyphen (Miky, 2026-10-05) — so
|
|
@@ -124,7 +195,8 @@ export function referenceMatch(text: string, query: string): number {
|
|
|
124
195
|
*/
|
|
125
196
|
export function refMatch(ref: string | undefined, query: string): number {
|
|
126
197
|
const score = ref && /[\d-]/.test(query) ? referenceMatch(ref, query) : 0
|
|
127
|
-
|
|
198
|
+
// 8, 7 and 3: the whole ref or its start.
|
|
199
|
+
return score === 8 || score % 4 === 3 ? score : 0
|
|
128
200
|
}
|
|
129
201
|
|
|
130
202
|
/** Keeps each id once, at its closest tier. */
|
|
@@ -218,9 +290,8 @@ export interface ReferenceSearch {
|
|
|
218
290
|
|
|
219
291
|
export interface ReferenceSearchOptions {
|
|
220
292
|
/**
|
|
221
|
-
* Must find no more for `q + " words"` than for `q` (every word
|
|
222
|
-
*
|
|
223
|
-
* is not asked.
|
|
293
|
+
* Must find no more for `q + " words"` than for `q` (every word must match,
|
|
294
|
+
* SPEC §5.2), since a longer query after an empty answer is not asked.
|
|
224
295
|
*/
|
|
225
296
|
search: ReferenceSearchFn
|
|
226
297
|
/** The pause after a keystroke before asking. Default 200ms. */
|
|
@@ -247,7 +318,7 @@ export interface ReferenceSearchOptions {
|
|
|
247
318
|
* keeps its answer, which is still true of that query.
|
|
248
319
|
*
|
|
249
320
|
* Once a query found nothing, adding whole words to it is not asked (08d7f243):
|
|
250
|
-
* relay search
|
|
321
|
+
* relay search needs every word to match (SPEC §5.2), so `see [the fig` cannot
|
|
251
322
|
* find what `the` did not, and a sentence typed after an unmatched `[` would
|
|
252
323
|
* otherwise spend the rate limit on every longer version of itself. A failure
|
|
253
324
|
* is not "nothing", so it never stops a longer query.
|
|
@@ -258,8 +329,8 @@ export function referenceSearch({ search, delayMs = 200, retryMs = 5000, minLeng
|
|
|
258
329
|
const foundNothing = (query: string) => {
|
|
259
330
|
for (let at = query.indexOf(' '); at >= 0; at = query.indexOf(' ', at + 1)) {
|
|
260
331
|
const prefix = query.slice(0, at)
|
|
261
|
-
// `--`
|
|
262
|
-
if (
|
|
332
|
+
// `--` or `-draft` asks for no word at all, so its empty answer says nothing of `-draft budget`.
|
|
333
|
+
if (!narrowsBy(prefix)) continue
|
|
263
334
|
const shorter = answered.get(prefix)
|
|
264
335
|
if (shorter && shorter.length === 0 && !failures.has(shorter)) return true
|
|
265
336
|
}
|