@estiva-app/protocol 0.38.0 → 0.40.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
@@ -4,6 +4,32 @@ Every entry answers the wire question explicitly, including when the answer is
4
4
  nothing (ADR 0002 §4b). A change to the bytes an app publishes is a MAJOR — in
5
5
  `0.x`, a MINOR — even when no TypeScript signature moved.
6
6
 
7
+ ## 0.40.0 — 2026-10-17
8
+
9
+ **Wire behaviour: reading changed, nothing new written** (SPEC §13.6.2, C20,
10
+ C25, C26, C27; WBM-10; record a-link-on-words-counts-toward-the-card). A link
11
+ on words, `[these words](<app URL>)`, now names its file: `valuesIn` counts its
12
+ target, so `cardsIn` draws the card a message chose for it and `defaultCardOf`
13
+ gives it the default when it is the message's only file. Its words stay a link
14
+ (`linksAsReferences` and `lineDrawOf` unchanged), a URL in its words still
15
+ names nothing, and a web link that resolves to nothing still does not count.
16
+ A link on words whose words carry a mark (`[**words**](url)`, split across
17
+ runs) counts too, and a URL in such words now names nothing, as in plain words.
18
+ `[](url)` is not a link on words and names nothing. A block document's link run
19
+ counts its `href` whatever its words, code-styled words included. Old messages that chose a card on words draw it again (Miky, 17 Oct).
20
+
21
+ ## 0.39.0 — 2026-10-16
22
+
23
+ **Wire behaviour: changed, on edits only** (SPEC §13.6.2; Widgets 2). An edit
24
+ now carries an `embed` layout this writer does not know as it was written
25
+ (`Embed.written`, from `embedsOf`), where 0.38.0 rewrote it as `compact`.
26
+ `defaultCardOf` loses the `embeds` option: a link taken out of a message and
27
+ put back gets its default card again, whichever ✕ removed it (Miky, 16 Oct).
28
+ Reading: `lineDrawOf`'s `row` and `nothing` carry `url` when the line is a URL,
29
+ so a reader that cannot read the file draws the URL, not an empty row. A URL
30
+ right after a letter outside the BMP (`𝑎https://…`) is stuck to that word, as
31
+ after any other Unicode letter or number.
32
+
7
33
  ## 0.38.0 — 2026-10-16
8
34
 
9
35
  **Wire behaviour: changed — where a link sits decides how it draws in a
package/dist/embeds.d.ts CHANGED
@@ -8,14 +8,21 @@ export interface Embed {
8
8
  /** An address (`kind:pubkey:d`) or a 64-hex event id, lowercase hex. */
9
9
  value: string;
10
10
  layout: EmbedLayout;
11
+ /**
12
+ * The layout as its tag wrote it, when this reader does not know it (and
13
+ * draws it as `compact`). An edit carries it as written ({@link embedTagsOf}),
14
+ * so a density added later is not rewritten by an older writer.
15
+ */
16
+ written?: string;
11
17
  }
12
18
  /** The `embed` tag for one reference. */
13
19
  export declare function embedTag(value: string, layout: EmbedLayout): string[];
14
20
  /**
15
21
  * A whole `embed` set as tags, as a send or an edit writes it: each value
16
- * normalised as {@link embedsOf} reads it, the first entry per value kept.
22
+ * normalised as {@link embedsOf} reads it, the first entry per value kept, and
23
+ * a layout this writer does not know carried as it was written (`written`).
17
24
  * Throws on a value that is neither an address nor an event id, or on a
18
- * layout this writer does not know, rather than write a tag readers skip.
25
+ * layout that is neither known nor carried, rather than write a tag readers skip.
19
26
  */
20
27
  export declare function embedTagsOf(set: readonly Embed[]): string[][];
21
28
  /**
@@ -52,7 +59,8 @@ export declare function valueOfReference(reference: string): string | undefined;
52
59
  * `embeds` is the message's folded set; `blocks` its folded body as a render
53
60
  * tree; `parts` its `part` pointers (§13.6.1). A value appears here only while
54
61
  * the body names it — by a `nostr:` reference, or by an app link that
55
- * `resolveLink` resolves to it (§7.7) — and only when no `part` names the
62
+ * `resolveLink` resolves to it (§7.7), bare or as a link on words' target —
63
+ * and only when no `part` names the
56
64
  * same address, because the live block already stands for that object. Text in
57
65
  * a code span names nothing (§13.1). Without `resolveLink` a link names nothing:
58
66
  * resolving one needs the manifests and the relay, which this package does not hold.
@@ -64,8 +72,12 @@ export declare function cardsIn(embeds: readonly Embed[], blocks: readonly Rende
64
72
  /**
65
73
  * Every address and event id a message's body names, once each, in the order
66
74
  * it first names them: by a `nostr:` reference, or by an app link that
67
- * `resolveLink` resolves (§7.7). A person names no value. Text in a code span
68
- * names nothing (§13.1). What {@link cardsIn} and {@link defaultCardOf} count.
75
+ * `resolveLink` resolves (§7.7), written bare or as the target of a link on
76
+ * words. A link on words keeps its words where it draws, but names its file;
77
+ * a URL in its words names nothing. A person names no value. Text in a code
78
+ * span names nothing (§13.1). What {@link cardsIn} and {@link defaultCardOf} count.
79
+ *
80
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-link-on-words-counts-toward-the-card.md
69
81
  */
70
82
  export declare function valuesIn(blocks: readonly RenderBlock[], resolveLink?: LinkResolver): string[];
71
83
  /**
@@ -108,6 +120,7 @@ export type LineDraw = {
108
120
  } | {
109
121
  draw: 'row' | 'nothing';
110
122
  value: string;
123
+ url?: string;
111
124
  } | {
112
125
  draw: 'url';
113
126
  url: string;
@@ -121,7 +134,9 @@ export type LineDraw = {
121
134
  * stands for it. `cards` is {@link cardsIn}'s answer (its `none` entries draw
122
135
  * no card), `parts` the message's `part` pointers. A Folder alone on its line
123
136
  * stays a chip, so its line is a sentence. Whether the reader can read a
124
- * `row`'s object is its own business: one it cannot draws the unreadable row.
137
+ * `row`'s object is its own business. One it cannot read draws the unreadable
138
+ * row when the line is a `nostr:` reference; when the line is a URL (`url` is
139
+ * set) it stays the URL as written, never an empty row (§13.6.2).
125
140
  */
126
141
  export declare function lineDrawOf(line: readonly RenderInline[], block: Pick<RenderBlock, 'type'>, context?: {
127
142
  cards?: readonly Embed[];
@@ -140,18 +155,17 @@ export declare function lineDrawOf(line: readonly RenderInline[], block: Pick<Re
140
155
  * counts, it gets the card, unless a part names it (the part wins, and draws
141
156
  * under the message already).
142
157
  *
143
- * On an edit, pass the values the previous folded body named as `previous`,
144
- * and the folded `embed` set as `embeds`: the default is only for a file the
145
- * edit names first, so a card its author removed with ✕ before sending, which
146
- * left no tag, does not come back, and a value that has an entry keeps it, so
147
- * a ✕ after sending (`none`) holds even when the link is removed and named
148
- * again. The edit then carries the whole folded set plus this one
158
+ * On an edit, pass the values the previous folded body named as `previous`:
159
+ * the default is only for a file the edit names first, so a card its author
160
+ * removed with ✕, which left no tag before sending or `none` after, does not
161
+ * come back while the link stays. A link taken out and put back is named
162
+ * first again and gets its card, whichever ✕ removed it (Miky, 2026-10-16).
163
+ * The edit then carries the whole folded set with this one set to `detailed`
149
164
  * ({@link withCard}).
150
165
  */
151
166
  export declare function defaultCardOf(values: readonly string[], parts?: readonly PartPointer[], options?: {
152
167
  here?: string;
153
168
  previous?: readonly string[];
154
- embeds?: readonly Embed[];
155
169
  }): string | undefined;
156
170
  /**
157
171
  * A folded `embed` set with `value` set to `layout`, the rest kept as they
@@ -1 +1 @@
1
- {"version":3,"file":"embeds.d.ts","sourceRoot":"","sources":["../src/embeds.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"embeds.d.ts","sourceRoot":"","sources":["../src/embeds.ts"],"names":[],"mappings":"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"}
package/dist/embeds.js CHANGED
@@ -20,7 +20,7 @@
20
20
  * in an edit can still carry a card (Miky, 2026-10-13, OPT-16 kickoff).
21
21
  * {@link cardsIn} applies that rule; {@link embedsOf} reads the tags alone.
22
22
  *
23
- * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/where-a-link-sits-decides-how-it-draws.md
23
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-link-on-words-counts-toward-the-card.md
24
24
  */
25
25
  import { addrToNaddr, bech32Decode, convertBits, decodeNevent, encodeNevent, naddrToAddr } from './nip19.js';
26
26
  export const EMBED_TAG = 'embed';
@@ -30,9 +30,10 @@ export function embedTag(value, layout) {
30
30
  }
31
31
  /**
32
32
  * A whole `embed` set as tags, as a send or an edit writes it: each value
33
- * normalised as {@link embedsOf} reads it, the first entry per value kept.
33
+ * normalised as {@link embedsOf} reads it, the first entry per value kept, and
34
+ * a layout this writer does not know carried as it was written (`written`).
34
35
  * Throws on a value that is neither an address nor an event id, or on a
35
- * layout this writer does not know, rather than write a tag readers skip.
36
+ * layout that is neither known nor carried, rather than write a tag readers skip.
36
37
  */
37
38
  export function embedTagsOf(set) {
38
39
  const seen = new Set();
@@ -45,7 +46,7 @@ export function embedTagsOf(set) {
45
46
  if (seen.has(value))
46
47
  return [];
47
48
  seen.add(value);
48
- return [embedTag(value, e.layout)];
49
+ return [[EMBED_TAG, value, (e.layout === 'compact' && e.written) || e.layout]];
49
50
  });
50
51
  }
51
52
  // `partsOf`'s shape: an empty `d` is a valid address (NIP-01).
@@ -73,7 +74,8 @@ export function embedsOf(event) {
73
74
  if (!value || seen.has(value))
74
75
  continue;
75
76
  seen.add(value);
76
- out.push({ value, layout: layoutOf(tag[2]) });
77
+ const layout = layoutOf(tag[2]);
78
+ out.push(tag[2] && tag[2] !== layout ? { value, layout, written: tag[2] } : { value, layout });
77
79
  }
78
80
  return out;
79
81
  }
@@ -99,7 +101,12 @@ function trimUrl(url) {
99
101
  }
100
102
  /** A URL stuck to the end of a word (`seehttps://…`) is the word's, not a link. */
101
103
  function stuckToWord(text, start) {
102
- return start > 0 && /[\p{L}\p{N}]/u.test(text[start - 1]);
104
+ if (start === 0)
105
+ return false;
106
+ // The code point before it, so a letter outside the BMP (a surrogate pair) counts too.
107
+ const pair = start >= 2 && /[\uDC00-\uDFFF]/.test(text[start - 1]) && /[\uD800-\uDBFF]/.test(text[start - 2]);
108
+ const at = pair ? start - 2 : start - 1;
109
+ return /[\p{L}\p{N}]/u.test(String.fromCodePoint(text.codePointAt(at)));
103
110
  }
104
111
  /**
105
112
  * The address or event id a `nostr:` reference names — what an `a`, `q` or
@@ -131,7 +138,8 @@ export function valueOfReference(reference) {
131
138
  * `embeds` is the message's folded set; `blocks` its folded body as a render
132
139
  * tree; `parts` its `part` pointers (§13.6.1). A value appears here only while
133
140
  * the body names it — by a `nostr:` reference, or by an app link that
134
- * `resolveLink` resolves to it (§7.7) — and only when no `part` names the
141
+ * `resolveLink` resolves to it (§7.7), bare or as a link on words' target —
142
+ * and only when no `part` names the
135
143
  * same address, because the live block already stands for that object. Text in
136
144
  * a code span names nothing (§13.1). Without `resolveLink` a link names nothing:
137
145
  * resolving one needs the manifests and the relay, which this package does not hold.
@@ -152,8 +160,12 @@ export function cardsIn(embeds, blocks, parts = [], resolveLink) {
152
160
  /**
153
161
  * Every address and event id a message's body names, once each, in the order
154
162
  * it first names them: by a `nostr:` reference, or by an app link that
155
- * `resolveLink` resolves (§7.7). A person names no value. Text in a code span
156
- * names nothing (§13.1). What {@link cardsIn} and {@link defaultCardOf} count.
163
+ * `resolveLink` resolves (§7.7), written bare or as the target of a link on
164
+ * words. A link on words keeps its words where it draws, but names its file;
165
+ * a URL in its words names nothing. A person names no value. Text in a code
166
+ * span names nothing (§13.1). What {@link cardsIn} and {@link defaultCardOf} count.
167
+ *
168
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-link-on-words-counts-toward-the-card.md
157
169
  */
158
170
  export function valuesIn(blocks, resolveLink) {
159
171
  const out = [];
@@ -165,23 +177,47 @@ export function valuesIn(blocks, resolveLink) {
165
177
  out.push(value);
166
178
  };
167
179
  const resolve = (url) => resolveLink && take(normalise(resolveLink(url) ?? ''));
168
- // Run by run, by the rules {@link linksAsReferences} turns links by, so a URL names a value exactly where it draws as a reference.
180
+ // A bare URL names a value exactly where {@link linksAsReferences} draws it as a reference;
181
+ // a link on words names its target, never a URL in its words. Each is taken where it starts.
169
182
  const walk = (bs) => {
170
183
  for (const block of bs) {
171
184
  if (block.type !== 'codeBlock') {
172
- for (const run of block.inline ?? []) {
185
+ const runs = block.inline ?? [];
186
+ const links = linksOnWordsIn(runs);
187
+ const named = [];
188
+ // `links` is in text order and its spans do not overlap, so two cursors keep this linear.
189
+ let inWords = 0;
190
+ let byTarget = 0;
191
+ let at = 0;
192
+ for (const run of runs) {
193
+ const end = at + run.text.length;
173
194
  if (run.reference)
174
- take(valueOfReference(run.reference));
175
- else if (run.marks.includes('code'))
176
- continue;
177
- else if (run.href !== undefined) {
178
- if (run.text === run.href)
179
- resolve(run.href);
195
+ named.push({ at, reference: run.reference });
196
+ else if (run.href !== undefined)
197
+ named.push({ at, url: run.href });
198
+ else if (!run.marks.includes('code')) {
199
+ for (const { url, from } of urlRunsIn(run.text)) {
200
+ const pos = at + from;
201
+ while (inWords < links.length && links[inWords].wordsEnd <= pos)
202
+ inWords++;
203
+ const link = links[inWords];
204
+ if (!link || pos < link.from)
205
+ named.push({ at: pos, url });
206
+ }
207
+ while (byTarget < links.length && links[byTarget].target < at)
208
+ byTarget++;
209
+ for (; byTarget < links.length && links[byTarget].target < end; byTarget++) {
210
+ const link = links[byTarget];
211
+ // Only a target written whole in this run, `)` included, is the URL a reader draws.
212
+ if (link.target + link.url.length + 1 <= end)
213
+ named.push({ at: link.from, url: link.url });
214
+ }
180
215
  }
181
- else
182
- for (const { url } of urlRunsIn(run.text))
183
- resolve(url);
216
+ at = end;
184
217
  }
218
+ named.sort((a, b) => a.at - b.at);
219
+ for (const n of named)
220
+ n.reference ? take(valueOfReference(n.reference)) : resolve(n.url);
185
221
  }
186
222
  if (block.children)
187
223
  walk(block.children);
@@ -247,7 +283,9 @@ export function isFolderValue(value) {
247
283
  * stands for it. `cards` is {@link cardsIn}'s answer (its `none` entries draw
248
284
  * no card), `parts` the message's `part` pointers. A Folder alone on its line
249
285
  * stays a chip, so its line is a sentence. Whether the reader can read a
250
- * `row`'s object is its own business: one it cannot draws the unreadable row.
286
+ * `row`'s object is its own business. One it cannot read draws the unreadable
287
+ * row when the line is a `nostr:` reference; when the line is a URL (`url` is
288
+ * set) it stays the URL as written, never an empty row (§13.6.2).
251
289
  */
252
290
  export function lineDrawOf(line, block, context = {}) {
253
291
  const only = isOnlyReferenceLine(line, block);
@@ -261,7 +299,7 @@ export function lineDrawOf(line, block, context = {}) {
261
299
  return { draw: 'sentence' };
262
300
  const carded = (context.cards ?? []).some((e) => e.value === value && e.layout !== 'none') ||
263
301
  (context.parts ?? []).some((p) => normalise(p.address) === value);
264
- return { draw: carded ? 'nothing' : 'row', value };
302
+ return { draw: carded ? 'nothing' : 'row', value, ...(isReference ? {} : { url: only }) };
265
303
  }
266
304
  /**
267
305
  * The value a writer gives the default card, `["embed", V, "detailed"]`, as
@@ -275,12 +313,12 @@ export function lineDrawOf(line, block, context = {}) {
275
313
  * counts, it gets the card, unless a part names it (the part wins, and draws
276
314
  * under the message already).
277
315
  *
278
- * On an edit, pass the values the previous folded body named as `previous`,
279
- * and the folded `embed` set as `embeds`: the default is only for a file the
280
- * edit names first, so a card its author removed with ✕ before sending, which
281
- * left no tag, does not come back, and a value that has an entry keeps it, so
282
- * a ✕ after sending (`none`) holds even when the link is removed and named
283
- * again. The edit then carries the whole folded set plus this one
316
+ * On an edit, pass the values the previous folded body named as `previous`:
317
+ * the default is only for a file the edit names first, so a card its author
318
+ * removed with ✕, which left no tag before sending or `none` after, does not
319
+ * come back while the link stays. A link taken out and put back is named
320
+ * first again and gets its card, whichever ✕ removed it (Miky, 2026-10-16).
321
+ * The edit then carries the whole folded set with this one set to `detailed`
284
322
  * ({@link withCard}).
285
323
  */
286
324
  export function defaultCardOf(values, parts = [], options = {}) {
@@ -295,8 +333,6 @@ export function defaultCardOf(values, parts = [], options = {}) {
295
333
  return undefined;
296
334
  if (options.previous?.some((v) => normalise(v) === file))
297
335
  return undefined;
298
- if (options.embeds?.some((e) => normalise(e.value) === file))
299
- return undefined;
300
336
  return file;
301
337
  }
302
338
  /**
@@ -353,6 +389,25 @@ export function urlRunsIn(text) {
353
389
  }
354
390
  return out;
355
391
  }
392
+ /**
393
+ * Each link on words in a block of marker text, `[words](https://…)`, found
394
+ * over the block's runs joined, so one whose words carry a mark (split across
395
+ * runs) is found too. Offsets are into that joined text: `from` the `[`,
396
+ * `wordsEnd` the `]`, `target` where the URL starts (SPEC §13.6.2).
397
+ */
398
+ function linksOnWordsIn(runs) {
399
+ const text = runs.map((r) => r.text).join('');
400
+ if (!text.includes(']('))
401
+ return [];
402
+ const out = [];
403
+ for (const m of text.matchAll(LINK_OR_URL)) {
404
+ if (!m[1])
405
+ continue;
406
+ const close = m[1].indexOf('](');
407
+ out.push({ from: m.index, wordsEnd: m.index + close, target: m.index + close + 2, url: m[1].slice(close + 2, -1) });
408
+ }
409
+ return out;
410
+ }
356
411
  /**
357
412
  * One pass over a run: a link on words, `[words](https://…)` as the marker
358
413
  * format writes it (group 1 — its URL is the target of words the author chose),
@@ -1 +1 @@
1
- {"version":3,"file":"embeds.js","sourceRoot":"","sources":["../src/embeds.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"embeds.js","sourceRoot":"","sources":["../src/embeds.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -46,7 +46,7 @@
46
46
  /** Bumped by hand with the version in package.json — `test/version.test.ts`
47
47
  * pins the two together. It exists so "the upgrade reached the app" can be
48
48
  * checked by grepping a built bundle rather than by trusting a lockfile. */
49
- export declare const PROTOCOL_VERSION = "0.38.0";
49
+ export declare const PROTOCOL_VERSION = "0.40.0";
50
50
  export { type NostrTag, type UnsignedEvent, type SignedEvent, type Profile, type ThreadRef, type ChannelVisibility, type ChannelKind, type MemberRole, type FolderOp, type Label, type ResolutionAction, KIND, MAX_EMOJI_CHARS, MAX_MESSAGE_BYTES, MAX_MENTIONS, MAX_DM_OTHERS, MAX_RATIONALE_BYTES, RELAY_AUTH_TOLERANCE_SECS, ASSERTION_SUBTYPE, computeEventId, toNostrSeconds, canonicalChannelName, threadTags, addr, relayAuthUrl, buildProfile, parseProfile, buildCreateChannel, buildDeleteChannel, buildEditChannelMetadata, buildFolderCommand, buildAddMember, buildDmOpen, buildDmHide, buildReaction, buildDeletion, buildEdit, buildMessage, buildResolution, buildBareFile, buildDocument, buildHighlight, buildUnsignedRelayAuthEvent, } from './events.js';
51
51
  export { type AddressPointer, type EventPointer, encodeNevent, decodeNevent, convertBits, bech32Encode, bech32Decode, encodeNaddr, decodeNaddr, pointerToAddress, addressToPointer, addrToNaddr, naddrToAddr, referenceToPointer, NADDR_RE, findNaddrs, stripNaddrs, encodeNpub, decodeNpub, NOSTR_URI_RE, findNostrUris, } from './nip19.js';
52
52
  export { type AuthEventArgs, TIMESTAMP_TOLERANCE_SECS, normalizeUrl, buildUnsignedAuthEvent, base64, authorizationHeaderFor, authorizationHeader, } from './nip98.js';
package/dist/index.js CHANGED
@@ -46,7 +46,7 @@
46
46
  /** Bumped by hand with the version in package.json — `test/version.test.ts`
47
47
  * pins the two together. It exists so "the upgrade reached the app" can be
48
48
  * checked by grepping a built bundle rather than by trusting a lockfile. */
49
- export const PROTOCOL_VERSION = '0.38.0';
49
+ export const PROTOCOL_VERSION = '0.40.0';
50
50
  export {
51
51
  // constants
52
52
  KIND, MAX_EMOJI_CHARS, MAX_MESSAGE_BYTES, MAX_MENTIONS, MAX_DM_OTHERS, MAX_RATIONALE_BYTES, RELAY_AUTH_TOLERANCE_SECS, ASSERTION_SUBTYPE,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@estiva-app/protocol",
3
- "version": "0.38.0",
3
+ "version": "0.40.0",
4
4
  "description": "The Estiva wire format: Buzz-shaped Nostr event builders, NIP-01 ids, NIP-19 naddr, NIP-98 HTTP auth, and the relay clients. Speaks the protocol; interprets nothing.",
5
5
  "license": "MIT",
6
6
  "type": "module",
package/src/embeds.ts CHANGED
@@ -20,7 +20,7 @@
20
20
  * in an edit can still carry a card (Miky, 2026-10-13, OPT-16 kickoff).
21
21
  * {@link cardsIn} applies that rule; {@link embedsOf} reads the tags alone.
22
22
  *
23
- * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/where-a-link-sits-decides-how-it-draws.md
23
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-link-on-words-counts-toward-the-card.md
24
24
  */
25
25
  import { addrToNaddr, bech32Decode, convertBits, decodeNevent, encodeNevent, naddrToAddr } from './nip19.js'
26
26
  import type { PartPointer } from './anchors.js'
@@ -36,6 +36,12 @@ export interface Embed {
36
36
  /** An address (`kind:pubkey:d`) or a 64-hex event id, lowercase hex. */
37
37
  value: string
38
38
  layout: EmbedLayout
39
+ /**
40
+ * The layout as its tag wrote it, when this reader does not know it (and
41
+ * draws it as `compact`). An edit carries it as written ({@link embedTagsOf}),
42
+ * so a density added later is not rewritten by an older writer.
43
+ */
44
+ written?: string
39
45
  }
40
46
 
41
47
  /** The `embed` tag for one reference. */
@@ -45,9 +51,10 @@ export function embedTag(value: string, layout: EmbedLayout): string[] {
45
51
 
46
52
  /**
47
53
  * A whole `embed` set as tags, as a send or an edit writes it: each value
48
- * normalised as {@link embedsOf} reads it, the first entry per value kept.
54
+ * normalised as {@link embedsOf} reads it, the first entry per value kept, and
55
+ * a layout this writer does not know carried as it was written (`written`).
49
56
  * Throws on a value that is neither an address nor an event id, or on a
50
- * layout this writer does not know, rather than write a tag readers skip.
57
+ * layout that is neither known nor carried, rather than write a tag readers skip.
51
58
  */
52
59
  export function embedTagsOf(set: readonly Embed[]): string[][] {
53
60
  const seen = new Set<string>()
@@ -57,7 +64,7 @@ export function embedTagsOf(set: readonly Embed[]): string[][] {
57
64
  if (e.layout !== 'compact' && e.layout !== 'detailed' && e.layout !== 'none') throw new Error(`not an embed layout: ${String(e.layout)}`)
58
65
  if (seen.has(value)) return []
59
66
  seen.add(value)
60
- return [embedTag(value, e.layout)]
67
+ return [[EMBED_TAG, value, (e.layout === 'compact' && e.written) || e.layout]]
61
68
  })
62
69
  }
63
70
 
@@ -85,7 +92,8 @@ export function embedsOf(event: { tags: readonly (readonly string[])[] }): Embed
85
92
  const value = normalise(tag[1])
86
93
  if (!value || seen.has(value)) continue
87
94
  seen.add(value)
88
- out.push({ value, layout: layoutOf(tag[2]) })
95
+ const layout = layoutOf(tag[2])
96
+ out.push(tag[2] && tag[2] !== layout ? { value, layout, written: tag[2] } : { value, layout })
89
97
  }
90
98
  return out
91
99
  }
@@ -122,7 +130,11 @@ function trimUrl(url: string): string {
122
130
 
123
131
  /** A URL stuck to the end of a word (`seehttps://…`) is the word's, not a link. */
124
132
  function stuckToWord(text: string, start: number): boolean {
125
- return start > 0 && /[\p{L}\p{N}]/u.test(text[start - 1])
133
+ if (start === 0) return false
134
+ // The code point before it, so a letter outside the BMP (a surrogate pair) counts too.
135
+ const pair = start >= 2 && /[\uDC00-\uDFFF]/.test(text[start - 1]) && /[\uD800-\uDBFF]/.test(text[start - 2])
136
+ const at = pair ? start - 2 : start - 1
137
+ return /[\p{L}\p{N}]/u.test(String.fromCodePoint(text.codePointAt(at)!))
126
138
  }
127
139
 
128
140
  /**
@@ -152,7 +164,8 @@ export function valueOfReference(reference: string): string | undefined {
152
164
  * `embeds` is the message's folded set; `blocks` its folded body as a render
153
165
  * tree; `parts` its `part` pointers (§13.6.1). A value appears here only while
154
166
  * the body names it — by a `nostr:` reference, or by an app link that
155
- * `resolveLink` resolves to it (§7.7) — and only when no `part` names the
167
+ * `resolveLink` resolves to it (§7.7), bare or as a link on words' target —
168
+ * and only when no `part` names the
156
169
  * same address, because the live block already stands for that object. Text in
157
170
  * a code span names nothing (§13.1). Without `resolveLink` a link names nothing:
158
171
  * resolving one needs the manifests and the relay, which this package does not hold.
@@ -173,8 +186,12 @@ export function cardsIn(embeds: readonly Embed[], blocks: readonly RenderBlock[]
173
186
  /**
174
187
  * Every address and event id a message's body names, once each, in the order
175
188
  * it first names them: by a `nostr:` reference, or by an app link that
176
- * `resolveLink` resolves (§7.7). A person names no value. Text in a code span
177
- * names nothing (§13.1). What {@link cardsIn} and {@link defaultCardOf} count.
189
+ * `resolveLink` resolves (§7.7), written bare or as the target of a link on
190
+ * words. A link on words keeps its words where it draws, but names its file;
191
+ * a URL in its words names nothing. A person names no value. Text in a code
192
+ * span names nothing (§13.1). What {@link cardsIn} and {@link defaultCardOf} count.
193
+ *
194
+ * why: https://github.com/estiva-app/estiva-docs/blob/main/decisions/a-link-on-words-counts-toward-the-card.md
178
195
  */
179
196
  export function valuesIn(blocks: readonly RenderBlock[], resolveLink?: LinkResolver): string[] {
180
197
  const out: string[] = []
@@ -185,17 +202,40 @@ export function valuesIn(blocks: readonly RenderBlock[], resolveLink?: LinkResol
185
202
  out.push(value)
186
203
  }
187
204
  const resolve = (url: string) => resolveLink && take(normalise(resolveLink(url) ?? ''))
188
- // Run by run, by the rules {@link linksAsReferences} turns links by, so a URL names a value exactly where it draws as a reference.
205
+ // A bare URL names a value exactly where {@link linksAsReferences} draws it as a reference;
206
+ // a link on words names its target, never a URL in its words. Each is taken where it starts.
189
207
  const walk = (bs: readonly RenderBlock[]) => {
190
208
  for (const block of bs) {
191
209
  if (block.type !== 'codeBlock') {
192
- for (const run of block.inline ?? []) {
193
- if (run.reference) take(valueOfReference(run.reference))
194
- else if (run.marks.includes('code')) continue
195
- else if (run.href !== undefined) {
196
- if (run.text === run.href) resolve(run.href)
197
- } else for (const { url } of urlRunsIn(run.text)) resolve(url)
210
+ const runs = block.inline ?? []
211
+ const links = linksOnWordsIn(runs)
212
+ const named: { at: number; reference?: string; url?: string }[] = []
213
+ // `links` is in text order and its spans do not overlap, so two cursors keep this linear.
214
+ let inWords = 0
215
+ let byTarget = 0
216
+ let at = 0
217
+ for (const run of runs) {
218
+ const end = at + run.text.length
219
+ if (run.reference) named.push({ at, reference: run.reference })
220
+ else if (run.href !== undefined) named.push({ at, url: run.href })
221
+ else if (!run.marks.includes('code')) {
222
+ for (const { url, from } of urlRunsIn(run.text)) {
223
+ const pos = at + from
224
+ while (inWords < links.length && links[inWords].wordsEnd <= pos) inWords++
225
+ const link = links[inWords]
226
+ if (!link || pos < link.from) named.push({ at: pos, url })
227
+ }
228
+ while (byTarget < links.length && links[byTarget].target < at) byTarget++
229
+ for (; byTarget < links.length && links[byTarget].target < end; byTarget++) {
230
+ const link = links[byTarget]
231
+ // Only a target written whole in this run, `)` included, is the URL a reader draws.
232
+ if (link.target + link.url.length + 1 <= end) named.push({ at: link.from, url: link.url })
233
+ }
234
+ }
235
+ at = end
198
236
  }
237
+ named.sort((a, b) => a.at - b.at)
238
+ for (const n of named) n.reference ? take(valueOfReference(n.reference)) : resolve(n.url!)
199
239
  }
200
240
  if (block.children) walk(block.children)
201
241
  }
@@ -267,7 +307,7 @@ export function isFolderValue(value: string): boolean {
267
307
  */
268
308
  export type LineDraw =
269
309
  | { draw: 'sentence' }
270
- | { draw: 'row' | 'nothing'; value: string }
310
+ | { draw: 'row' | 'nothing'; value: string; url?: string }
271
311
  | { draw: 'url'; url: string }
272
312
  | { draw: 'unreadable'; reference: string }
273
313
 
@@ -277,7 +317,9 @@ export type LineDraw =
277
317
  * stands for it. `cards` is {@link cardsIn}'s answer (its `none` entries draw
278
318
  * no card), `parts` the message's `part` pointers. A Folder alone on its line
279
319
  * stays a chip, so its line is a sentence. Whether the reader can read a
280
- * `row`'s object is its own business: one it cannot draws the unreadable row.
320
+ * `row`'s object is its own business. One it cannot read draws the unreadable
321
+ * row when the line is a `nostr:` reference; when the line is a URL (`url` is
322
+ * set) it stays the URL as written, never an empty row (§13.6.2).
281
323
  */
282
324
  export function lineDrawOf(
283
325
  line: readonly RenderInline[],
@@ -293,7 +335,7 @@ export function lineDrawOf(
293
335
  const carded =
294
336
  (context.cards ?? []).some((e) => e.value === value && e.layout !== 'none') ||
295
337
  (context.parts ?? []).some((p) => normalise(p.address) === value)
296
- return { draw: carded ? 'nothing' : 'row', value }
338
+ return { draw: carded ? 'nothing' : 'row', value, ...(isReference ? {} : { url: only }) }
297
339
  }
298
340
 
299
341
  /**
@@ -308,18 +350,18 @@ export function lineDrawOf(
308
350
  * counts, it gets the card, unless a part names it (the part wins, and draws
309
351
  * under the message already).
310
352
  *
311
- * On an edit, pass the values the previous folded body named as `previous`,
312
- * and the folded `embed` set as `embeds`: the default is only for a file the
313
- * edit names first, so a card its author removed with ✕ before sending, which
314
- * left no tag, does not come back, and a value that has an entry keeps it, so
315
- * a ✕ after sending (`none`) holds even when the link is removed and named
316
- * again. The edit then carries the whole folded set plus this one
353
+ * On an edit, pass the values the previous folded body named as `previous`:
354
+ * the default is only for a file the edit names first, so a card its author
355
+ * removed with ✕, which left no tag before sending or `none` after, does not
356
+ * come back while the link stays. A link taken out and put back is named
357
+ * first again and gets its card, whichever ✕ removed it (Miky, 2026-10-16).
358
+ * The edit then carries the whole folded set with this one set to `detailed`
317
359
  * ({@link withCard}).
318
360
  */
319
361
  export function defaultCardOf(
320
362
  values: readonly string[],
321
363
  parts: readonly PartPointer[] = [],
322
- options: { here?: string; previous?: readonly string[]; embeds?: readonly Embed[] } = {},
364
+ options: { here?: string; previous?: readonly string[] } = {},
323
365
  ): string | undefined {
324
366
  const here = normalise(options.here ?? '')
325
367
  const withPart = new Set(parts.map((p) => normalise(p.address)).filter((v): v is string => !!v))
@@ -329,7 +371,6 @@ export function defaultCardOf(
329
371
  const [file] = files
330
372
  if (withPart.has(file)) return undefined
331
373
  if (options.previous?.some((v) => normalise(v) === file)) return undefined
332
- if (options.embeds?.some((e) => normalise(e.value) === file)) return undefined
333
374
  return file
334
375
  }
335
376
 
@@ -384,6 +425,24 @@ export function urlRunsIn(text: string): { url: string; from: number; to: number
384
425
  return out
385
426
  }
386
427
 
428
+ /**
429
+ * Each link on words in a block of marker text, `[words](https://…)`, found
430
+ * over the block's runs joined, so one whose words carry a mark (split across
431
+ * runs) is found too. Offsets are into that joined text: `from` the `[`,
432
+ * `wordsEnd` the `]`, `target` where the URL starts (SPEC §13.6.2).
433
+ */
434
+ function linksOnWordsIn(runs: readonly RenderInline[]): { from: number; wordsEnd: number; target: number; url: string }[] {
435
+ const text = runs.map((r) => r.text).join('')
436
+ if (!text.includes('](')) return []
437
+ const out: { from: number; wordsEnd: number; target: number; url: string }[] = []
438
+ for (const m of text.matchAll(LINK_OR_URL)) {
439
+ if (!m[1]) continue
440
+ const close = m[1].indexOf('](')
441
+ out.push({ from: m.index, wordsEnd: m.index + close, target: m.index + close + 2, url: m[1].slice(close + 2, -1) })
442
+ }
443
+ return out
444
+ }
445
+
387
446
  /**
388
447
  * One pass over a run: a link on words, `[words](https://…)` as the marker
389
448
  * format writes it (group 1 — its URL is the target of words the author chose),
package/src/index.ts CHANGED
@@ -47,7 +47,7 @@
47
47
  /** Bumped by hand with the version in package.json — `test/version.test.ts`
48
48
  * pins the two together. It exists so "the upgrade reached the app" can be
49
49
  * checked by grepping a built bundle rather than by trusting a lockfile. */
50
- export const PROTOCOL_VERSION = '0.38.0'
50
+ export const PROTOCOL_VERSION = '0.40.0'
51
51
 
52
52
  export {
53
53
  // types