@estiva-app/protocol 0.42.0 → 0.44.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/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.42.0";
49
+ export declare const PROTOCOL_VERSION = "0.44.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.42.0';
49
+ export const PROTOCOL_VERSION = '0.44.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/dist/media.d.ts CHANGED
@@ -82,6 +82,21 @@ export interface Imeta {
82
82
  thumb?: string;
83
83
  /** The name a person gave it. Display only — storage is content-addressed. */
84
84
  filename?: string;
85
+ /** NIP-94 blurhash placeholder. */
86
+ blurhash?: string;
87
+ /** Seconds, for audio and video. The relay checks it against the stored blob. */
88
+ duration?: string;
89
+ /** Bits per second, for audio and video. */
90
+ bitrate?: string;
91
+ /** A poster frame's `/media/` path; the relay checks that blob too. */
92
+ image?: string;
93
+ /**
94
+ * Other places the same blob can be fetched from — the one key that may
95
+ * repeat (NIP-94). **Unchecked**: the relay accepts any scheme and host here,
96
+ * so it is carried through on a re-list and never used as an `href` or `src`
97
+ * without an https and host check.
98
+ */
99
+ fallback?: string[];
85
100
  }
86
101
  /**
87
102
  * One `imeta` tag — NIP-92, as Buzz validates it.
@@ -90,7 +105,7 @@ export interface Imeta {
90
105
  * inside a single tag, not one tag per field.
91
106
  *
92
107
  * The relay's allowlist is `url m x size dim blurhash alt thumb fallback
93
- * duration bitrate image filename`, each at most once, and it checks two things
108
+ * duration bitrate image filename`, each at most once but `fallback`, and it checks two things
94
109
  * this cannot: that `url` is a **local** `/media/` path, and — through
95
110
  * `verify_imeta_blobs` — that **the blob is already stored**. So the upload has
96
111
  * to land before the message that names it, and a dangling reference cannot be
@@ -1 +1 @@
1
- {"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAOvE,gEAAgE;AAChE,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;AAE9D,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,MAAM,CAAA;AAExC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;IACJ,IAAI,EAAE,WAAW,CAAA;IACjB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,GACA,aAAa,CAoBf;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAE7D;AAED,mDAAmD;AACnD,MAAM,WAAW,KAAK;IACpB,wDAAwD;IACxD,GAAG,EAAE,MAAM,CAAA;IACX,iBAAiB;IACjB,CAAC,EAAE,MAAM,CAAA;IACT,mDAAmD;IACnD,CAAC,EAAE,MAAM,CAAA;IACT,aAAa;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,gBAAgB;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAA;IAQjB,mCAAmC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAOD;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,QAAQ,CAM9C;AAED;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;CAAE,GAAG,KAAK,EAAE,CAiC5D;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,CAmB5F;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE,CAuBpF;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKlE;AAED,oFAAoF;AACpF,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,CAAA;IACnC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAA;IACvB,OAAO,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAC9C;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,CAC1B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,KACtD,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAc9B,sCAAsC;AACtC,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,WAAW,CAAA;IAClB,gFAAgF;IAChF,WAAW,EAAE,MAAM,CAAA;CACpB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,mEAAmE;IACnE,QAAQ,EAAE,MAAM,CAAA;IAChB,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;IACvD,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,aAAa,CAAA;CAC1B,GAAG,OAAO,CAAC,WAAW,CAAC,CAyBvB;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,CAEhE;AAED,6EAA6E;AAC7E,MAAM,WAAW,YAAY;IAC3B,+FAA+F;IAC/F,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,8EAA8E;IAC9E,IAAI,EAAE,MAAM,CAAA;IACZ,2EAA2E;IAC3E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAChC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,KACzE,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC,CAAA;AAEzD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,+CAA+C;IAC/C,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,WAAW,CAAA;IAClB,qGAAqG;IACrG,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;IACvD,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,mBAAmB,CAAA;IAC/B,0EAA0E;IAC1E,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,OAAO,CAAC,YAAY,CAAC,CA6ExB;AAED;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,KAAK,CAW/F;AA0JD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,CAW7E"}
package/dist/media.js CHANGED
@@ -65,6 +65,10 @@ export function buildBlossomAuth(pubkey, createdAtMs, args) {
65
65
  export function blossomAuthHeader(signed) {
66
66
  return authorizationHeaderFor(signed);
67
67
  }
68
+ /** The optional {@link Imeta} fields, in the order {@link imetaTag} writes them. */
69
+ const OPTIONAL_FIELDS = ['dim', 'blurhash', 'alt', 'thumb', 'fallback', 'duration', 'bitrate', 'image', 'filename'];
70
+ /** The ones {@link imetaOf} adds only when present, so a file without them reads as it always did. */
71
+ const ADDED_FIELDS = ['blurhash', 'duration', 'bitrate', 'image'];
68
72
  /**
69
73
  * One `imeta` tag — NIP-92, as Buzz validates it.
70
74
  *
@@ -72,7 +76,7 @@ export function blossomAuthHeader(signed) {
72
76
  * inside a single tag, not one tag per field.
73
77
  *
74
78
  * The relay's allowlist is `url m x size dim blurhash alt thumb fallback
75
- * duration bitrate image filename`, each at most once, and it checks two things
79
+ * duration bitrate image filename`, each at most once but `fallback`, and it checks two things
76
80
  * this cannot: that `url` is a **local** `/media/` path, and — through
77
81
  * `verify_imeta_blobs` — that **the blob is already stored**. So the upload has
78
82
  * to land before the message that names it, and a dangling reference cannot be
@@ -80,14 +84,11 @@ export function blossomAuthHeader(signed) {
80
84
  */
81
85
  export function imetaTag(meta) {
82
86
  const parts = [`url ${meta.url}`, `m ${meta.m}`, `x ${meta.x}`, `size ${meta.size}`];
83
- if (meta.dim)
84
- parts.push(`dim ${meta.dim}`);
85
- if (meta.alt)
86
- parts.push(`alt ${meta.alt}`);
87
- if (meta.thumb)
88
- parts.push(`thumb ${meta.thumb}`);
89
- if (meta.filename)
90
- parts.push(`filename ${meta.filename}`);
87
+ for (const key of OPTIONAL_FIELDS) {
88
+ for (const value of [meta[key]].flat())
89
+ if (value)
90
+ parts.push(`${key} ${value}`);
91
+ }
91
92
  return ['imeta', ...parts];
92
93
  }
93
94
  /**
@@ -104,20 +105,24 @@ export function imetaOf(event) {
104
105
  if (tag[0] !== 'imeta')
105
106
  continue;
106
107
  const fields = {};
108
+ const fallback = [];
107
109
  for (const part of tag.slice(1)) {
108
110
  const space = part.indexOf(' ');
109
111
  if (space <= 0)
110
112
  continue;
111
113
  const key = part.slice(0, space);
112
- // First wins: the relay rejects duplicates, so a second is a malformed
113
- // event rather than an override.
114
- if (!(key in fields))
115
- fields[key] = part.slice(space + 1);
114
+ const value = part.slice(space + 1);
115
+ // First wins: the relay rejects duplicates of every key but `fallback`,
116
+ // so a second is a malformed event rather than an override.
117
+ if (key === 'fallback')
118
+ fallback.push(value);
119
+ else if (!(key in fields))
120
+ fields[key] = value;
116
121
  }
117
122
  const size = Number.parseInt(fields.size ?? '', 10);
118
123
  if (!fields.url || !fields.m || !fields.x || !Number.isFinite(size))
119
124
  continue;
120
- out.push({
125
+ const meta = {
121
126
  url: fields.url,
122
127
  m: fields.m,
123
128
  x: fields.x,
@@ -126,7 +131,13 @@ export function imetaOf(event) {
126
131
  alt: fields.alt,
127
132
  thumb: fields.thumb,
128
133
  filename: fields.filename,
129
- });
134
+ };
135
+ for (const key of ADDED_FIELDS)
136
+ if (fields[key])
137
+ meta[key] = fields[key];
138
+ if (fallback.length)
139
+ meta.fallback = fallback;
140
+ out.push(meta);
130
141
  }
131
142
  return out;
132
143
  }
@@ -141,7 +152,7 @@ export function imetaOf(event) {
141
152
  export function imetaFromAttrs(attrs) {
142
153
  if (!attrs)
143
154
  return undefined;
144
- const { url, m, x, size, dim, thumb, alt, filename } = attrs;
155
+ const { url, m, x, size } = attrs;
145
156
  if (typeof url !== 'string' || !url)
146
157
  return undefined;
147
158
  if (typeof m !== 'string' || !m)
@@ -150,16 +161,19 @@ export function imetaFromAttrs(attrs) {
150
161
  return undefined;
151
162
  if (typeof size !== 'number' || !Number.isFinite(size))
152
163
  return undefined;
153
- return {
154
- url,
155
- m,
156
- x,
157
- size,
158
- ...(typeof dim === 'string' && dim ? { dim } : {}),
159
- ...(typeof thumb === 'string' && thumb ? { thumb } : {}),
160
- ...(typeof alt === 'string' && alt ? { alt } : {}),
161
- ...(typeof filename === 'string' && filename ? { filename } : {}),
162
- };
164
+ const meta = { url, m, x, size };
165
+ /*
166
+ Only the fields the editor's attachment block holds. A description is
167
+ re-saved under whoever saves it, and attrs nothing in the editor wrote
168
+ (a hand-published `fallback` URL, an `image` not stored) would become
169
+ their signed tag, or a save the relay refuses.
170
+ */
171
+ for (const key of ['dim', 'thumb', 'alt', 'filename']) {
172
+ const value = attrs[key];
173
+ if (typeof value === 'string' && value)
174
+ meta[key] = value;
175
+ }
176
+ return meta;
163
177
  }
164
178
  /**
165
179
  * Every file a block document places inline, as the `imeta` set the event
package/dist/media.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"media.js","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"media.js","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@estiva-app/protocol",
3
- "version": "0.42.0",
3
+ "version": "0.44.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",
@@ -75,6 +75,11 @@ const keyOf = (block: Block) => `${block.type}\u0000${textOf(block)}`
75
75
  * is a plain item whose text is `[ ] brackets`. An indented item
76
76
  * (`attrs.indent`), two spaces a level and read relative to the item above, is
77
77
  * §13.2's own, so a message keeps it too (Miky, 2026-10-20).
78
+ *
79
+ * And a link on words, `[words](url)`, is read as the words marked
80
+ * `{"type":"link","attrs":{"href":url}}` and printed back so (e0e3e907): an
81
+ * editor saves a link on words that way, while a message keeps the text and
82
+ * its readers find the link in it.
78
83
  */
79
84
  export interface DescriptionTextOptions {
80
85
  description?: boolean
@@ -106,13 +111,13 @@ function itemFromText(item: string, description: boolean, depth = 0): Block {
106
111
  const task = description ? TASK.exec(item) : null
107
112
  if (!task) {
108
113
  const text = description ? unescaped(item, ESCAPED_TASK) : item
109
- return { type: 'listItem', id: '', ...(indent ? { attrs: indent } : {}), content: markersToInlineNodes(text) }
114
+ return { type: 'listItem', id: '', ...(indent ? { attrs: indent } : {}), content: markersToInlineNodes(text, { links: description }) }
110
115
  }
111
116
  return {
112
117
  type: 'listItem',
113
118
  id: '',
114
119
  attrs: { ...indent, checked: task[1] !== ' ' },
115
- content: markersToInlineNodes(item.slice(task[0].length)),
120
+ content: markersToInlineNodes(item.slice(task[0].length), { links: description }),
116
121
  }
117
122
  }
118
123
 
@@ -120,19 +125,19 @@ function quoteFromLines(lines: string[], description: boolean): Block {
120
125
  const alert = description && lines.length > 0 ? ALERT.exec(lines[0].trim()) : null
121
126
  if (!alert) {
122
127
  const text = description && lines.length > 0 ? [unescaped(lines[0], ESCAPED_ALERT), ...lines.slice(1)] : lines
123
- return { type: 'blockquote', id: '', content: markersToInlineNodes(text.join('\n')) }
128
+ return { type: 'blockquote', id: '', content: markersToInlineNodes(text.join('\n'), { links: description }) }
124
129
  }
125
130
  /*
126
131
  The kind is kept as written, lowercased: a tone this version does not know
127
132
  is still a callout, and the next save must not turn it into a `note`.
128
133
  */
129
- return { type: 'blockquote', id: '', attrs: { tone: alert[1].toLowerCase() }, content: markersToInlineNodes(lines.slice(1).join('\n')) }
134
+ return { type: 'blockquote', id: '', attrs: { tone: alert[1].toLowerCase() }, content: markersToInlineNodes(lines.slice(1).join('\n'), { links: description }) }
130
135
  }
131
136
 
132
137
  function blockFromSegment(seg: BodySegment, description: boolean): Block {
133
138
  switch (seg.type) {
134
139
  case 'heading':
135
- return { type: 'heading', id: '', attrs: { level: seg.level }, content: markersToInlineNodes(seg.text) }
140
+ return { type: 'heading', id: '', attrs: { level: seg.level }, content: markersToInlineNodes(seg.text, { links: description }) }
136
141
  case 'bullet':
137
142
  return {
138
143
  type: 'bulletList',
@@ -157,7 +162,7 @@ function blockFromSegment(seg: BodySegment, description: boolean): Block {
157
162
  content: [{ type: 'text' as const, text: seg.lines.join('\n') }],
158
163
  }
159
164
  case 'text':
160
- return { type: 'paragraph', id: '', content: markersToInlineNodes(seg.lines.join('\n')) }
165
+ return { type: 'paragraph', id: '', content: markersToInlineNodes(seg.lines.join('\n'), { links: description }) }
161
166
  }
162
167
  }
163
168
 
@@ -225,8 +230,8 @@ export function markerTextToBlockDocument(text: string, previous?: BlockDocument
225
230
  return { type: 'doc', content: fresh.map((block, i) => fill(block, ids[i] || undefined)) }
226
231
  }
227
232
 
228
- const itemText = (item: Block): string =>
229
- isInlineRun(item.content) ? inlineNodesToMarkers(item.content) : ''
233
+ const itemText = (item: Block, description: boolean): string =>
234
+ isInlineRun(item.content) ? inlineNodesToMarkers(item.content, { links: description }) : ''
230
235
 
231
236
  /**
232
237
  * A block document back as marker text, for an editor that edits text.
@@ -245,7 +250,7 @@ export function blockDocumentToMarkerText(doc: BlockDocument, options: Descripti
245
250
  const description = options.description === true
246
251
  const lines: string[] = []
247
252
  for (const block of doc.content) {
248
- const inline = isInlineRun(block.content) ? inlineNodesToMarkers(block.content) : ''
253
+ const inline = isInlineRun(block.content) ? inlineNodesToMarkers(block.content, { links: description }) : ''
249
254
  switch (block.type) {
250
255
  case 'heading': {
251
256
  const level = block.attrs?.level === 2 ? 2 : 1
@@ -271,7 +276,7 @@ export function blockDocumentToMarkerText(doc: BlockDocument, options: Descripti
271
276
  const marker = block.type === 'bulletList' ? '-' : `${next[depth]++}.`
272
277
  const checked = description ? listItemChecked(item) : undefined
273
278
  const task = checked === undefined ? '' : checked ? '[x] ' : '[ ] '
274
- const text = description && checked === undefined ? escaped(itemText(item), ESCAPED_TASK) : itemText(item)
279
+ const text = description && checked === undefined ? escaped(itemText(item, description), ESCAPED_TASK) : itemText(item, description)
275
280
  lines.push(`${' '.repeat(depth)}${marker} ${task}${text}`)
276
281
  })
277
282
  break
package/src/content.ts CHANGED
@@ -47,6 +47,8 @@ export interface InlineMarkSpan {
47
47
  * form, never blank").
48
48
  */
49
49
  reference?: string
50
+ /** The URL a link on words goes to — §13.1's `link`, read only from a description's text ({@link parseInlineMarksAndLinks}). */
51
+ href?: string
50
52
  }
51
53
 
52
54
  /** A block-level run, parsed from line prefixes. */
@@ -168,6 +170,92 @@ export function parseInlineMarks(text: string): InlineMarkSpan[] {
168
170
  return scanMarks(text, []).flatMap(splitReferences)
169
171
  }
170
172
 
173
+ /**
174
+ * A link on words as text spells it, `[words](url)`, or a bare URL: the
175
+ * alternation protocol's `embeds.ts` and the ui package's `RichText` find links
176
+ * by, so what reads as a link here is what a reader draws as one. The bare-URL
177
+ * alternative keeps it linear: it swallows a URL, so a `[` inside one starts
178
+ * no new match.
179
+ */
180
+ const LINK_ON_WORDS = /(\[[^[\]\n]+\]\(((?:https?:\/\/|mailto:)[^\s)]+)\))|(?:https?:\/\/|mailto:)[^\s)]+/g
181
+
182
+ /**
183
+ * One run of a description's text, marks and links on words both (SPEC §13.3
184
+ * "A description as text", which reads §13.2's markers, `[label](url)`
185
+ * included). A message keeps `[words](url)` as text: its readers find the link
186
+ * in the text ({@link parseInlineMarks}).
187
+ *
188
+ * Each link's URL is swapped for a mark the text does not hold before the marks
189
+ * are read, so a `*` or `__` in a URL is never read as a marker; the k-th mark
190
+ * left is the k-th URL, since reading marks only drops markers. A link inside
191
+ * `code` stays its text (§13.1: code is literal).
192
+ */
193
+ export function parseInlineMarksAndLinks(text: string): InlineMarkSpan[] {
194
+ if (!text.includes('](')) return parseInlineMarks(text)
195
+ const mark = unusedCharacter(text)
196
+ if (!mark) return parseInlineMarks(text)
197
+ const urls: string[] = []
198
+ const masked = text.replace(LINK_ON_WORDS, (whole, link: string | undefined, url: string | undefined, at: number) => {
199
+ // `![alt](url)` is a picture's syntax, which a description's text does not read: it stays as written. So does a
200
+ // URL with an unclosed `(` (`…/Foo_(bar)`): the grammar ends a URL at `)`, and the cut one would be a wrong link.
201
+ if (!link || !url || text[at - 1] === '!' || url.split('(').length > url.split(')').length) return whole
202
+ urls.push(url)
203
+ return `${link.slice(0, link.length - url.length - 1)}${mark})`
204
+ })
205
+ if (!urls.length) return parseInlineMarks(text)
206
+
207
+ // One entry per UTF-16 unit, as the match offsets below count, so a link whose words carry marks (split across spans) is found over the joined text.
208
+ const chars: { ch: string; span: InlineMarkSpan; url?: string }[] = []
209
+ let k = 0
210
+ for (const span of parseInlineMarks(masked)) {
211
+ for (let i = 0; i < span.text.length; i++) {
212
+ const ch = span.text[i]
213
+ chars.push(ch === mark ? { ch, span, url: urls[k++] } : { ch, span })
214
+ }
215
+ }
216
+ const joined = chars.map((c) => c.ch).join('')
217
+ const out: { text: string; span: InlineMarkSpan; href?: string }[] = []
218
+ const push = (text: string, span: InlineMarkSpan, href?: string) => {
219
+ const last = out[out.length - 1]
220
+ if (last && last.span === span && last.href === href) last.text += text
221
+ else out.push({ text, span, href })
222
+ }
223
+ let at = 0
224
+ const keep = (to: number) => {
225
+ for (; at < to; at++) push(chars[at].url ?? chars[at].ch, chars[at].span)
226
+ }
227
+ for (const m of joined.matchAll(new RegExp(`\\[([^[\\]\\n]+)\\]\\(${mark}\\)`, 'g'))) {
228
+ const end = m.index + m[0].length
229
+ // A link written inside `code` is its text (§13.1); `code` inside a link's words is not, and is dropped below.
230
+ if (m[1].includes(mark) || chars[m.index].span.code || chars[end - 2].span.code) continue
231
+ keep(m.index)
232
+ const href = chars[end - 2].url
233
+ for (let i = m.index + 1; i <= m.index + m[1].length; i++) push(chars[i].ch, chars[i].span, href)
234
+ at = end
235
+ }
236
+ keep(chars.length)
237
+ // §13.1: `code` combines with no other mark, so a link's words in backticks are the link, as an editor holds them.
238
+ const spans = out.map(({ text, span: { code, ...span }, href }): InlineMarkSpan => (href ? { ...span, text, href } : { ...span, ...(code ? { code } : {}), text }))
239
+ // A link's words that were split only by a dropped `code` are one run again.
240
+ return spans.reduce<InlineMarkSpan[]>((merged, span) => {
241
+ const last = merged[merged.length - 1]
242
+ const { text: _a, ...lastMarks } = last ?? { text: '' }
243
+ const { text: _b, ...marks } = span
244
+ if (last?.href && JSON.stringify(lastMarks) === JSON.stringify(marks)) last.text += span.text
245
+ else merged.push(span)
246
+ return merged
247
+ }, [])
248
+ }
249
+
250
+ /** A private-use character `text` does not hold, or undefined in text that holds them all. */
251
+ export function unusedCharacter(text: string): string | undefined {
252
+ for (let code = 0xe000; code <= 0xf8ff; code++) {
253
+ const ch = String.fromCharCode(code)
254
+ if (!text.includes(ch)) return ch
255
+ }
256
+ return undefined
257
+ }
258
+
171
259
  /**
172
260
  * Split a run on its `nostr:` URIs — SPEC §13.1's `reference` mark.
173
261
  *
@@ -470,10 +558,10 @@ export type InlineMarkNode =
470
558
  */
471
559
  | { type: 'reference'; attrs: { uri: string; embed?: unknown; [key: string]: unknown } }
472
560
  /**
473
- * §13.3's `link`, block documents only: a run that links to `href`. Estiva
474
- * writes it on a run whose text is the URL itself, and only to carry the card
475
- * its writer chose for the link (`embed`, §13.3 "A reference's card"); a URL
476
- * with no card is plain text.
561
+ * §13.3's `link`, block documents only: a run that links to `href`. On a run
562
+ * whose text is the URL itself it carries the card its writer chose (`embed`,
563
+ * §13.3 "A reference's card"), and a URL with no card is plain text; on other
564
+ * words it is a link on words, `[words](url)` in a description's text.
477
565
  */
478
566
  | { type: 'link'; attrs: { href: string; embed?: unknown; [key: string]: unknown } }
479
567
 
@@ -525,15 +613,30 @@ export interface InlineTextNode {
525
613
  * downstream — a diff, a dedupe, a cache key — would be wrong about it. */
526
614
  const MARK_ORDER: InlineMark[] = ['bold', 'italic', 'underline', 'code']
527
615
 
528
- /** Marker text → inline JSON nodes. */
529
- export function markersToInlineNodes(text: string): InlineTextNode[] {
530
- return parseInlineMarks(text).map((span) => {
616
+ /** Whether a run's links are read and spelled: in a description's text yes, in a message's no (§13.3 "A description as text"). */
617
+ export interface InlineLinkOptions {
618
+ links?: boolean
619
+ }
620
+
621
+ /** Marker text → inline JSON nodes. With `{ links: true }`, `[words](url)` is the words marked `{"type":"link","attrs":{"href":url}}`. */
622
+ export function markersToInlineNodes(text: string, options: InlineLinkOptions = {}): InlineTextNode[] {
623
+ return (options.links ? parseInlineMarksAndLinks(text) : parseInlineMarks(text)).map((span) => {
531
624
  const marks: InlineMarkNode[] = MARK_ORDER.filter((m) => span[m]).map((type) => ({ type }))
532
625
  if (span.reference) marks.push({ type: 'reference', attrs: { uri: span.reference } })
626
+ if (span.href) marks.push({ type: 'link', attrs: { href: span.href } })
533
627
  return marks.length ? { type: 'text' as const, text: span.text, marks } : { type: 'text' as const, text: span.text }
534
628
  })
535
629
  }
536
630
 
631
+ /** The URL a link on words spells, `[words](url)`: a `link` whose only attr is an `href` text can carry. A card's link (`embed`) has no spelling. */
632
+ function spelledHref(node: InlineTextNode): string | undefined {
633
+ const link = node.marks?.find((m) => m.type === 'link') as { attrs?: Record<string, unknown> } | undefined
634
+ const href = link?.attrs?.href
635
+ if (typeof href !== 'string' || Object.keys(link?.attrs ?? {}).length !== 1) return undefined
636
+ if (!/^(?:https?:\/\/|mailto:)[^\s)]+$/.test(href) || node.marks?.some((m) => m.type === 'code')) return undefined
637
+ return href
638
+ }
639
+
537
640
  /**
538
641
  * Inline JSON nodes → marker text.
539
642
  *
@@ -542,11 +645,24 @@ export function markersToInlineNodes(text: string): InlineTextNode[] {
542
645
  * outside the markers by `wrapInlineMarks`, because §13.2 rule 1 would not
543
646
  * parse it back otherwise — so this round-trips the *marks on each character*
544
647
  * rather than the span boundaries. See the corpus tests.
648
+ *
649
+ * With `{ links: true }` a link on words is spelled `[words](url)` around its
650
+ * runs' markers, when its words can sit in brackets; any other link prints as
651
+ * its text, as without it.
545
652
  */
546
- export function inlineNodesToMarkers(nodes: readonly InlineTextNode[]): string {
547
- return nodes
548
- .map((node) => wrapInlineMarks(node.text, new Set((node.marks ?? []).map((m) => m.type))))
549
- .join('')
653
+ export function inlineNodesToMarkers(nodes: readonly InlineTextNode[], options: InlineLinkOptions = {}): string {
654
+ const wrap = (node: InlineTextNode) => wrapInlineMarks(node.text, new Set((node.marks ?? []).map((m) => m.type)))
655
+ if (!options.links) return nodes.map(wrap).join('')
656
+ let out = ''
657
+ for (let i = 0; i < nodes.length; ) {
658
+ const href = spelledHref(nodes[i])
659
+ let end = i + 1
660
+ while (href && end < nodes.length && spelledHref(nodes[end]) === href) end++
661
+ const words = nodes.slice(i, end)
662
+ out += href && /^[^[\]\n]+$/.test(inlineNodesToText(words)) ? `[${words.map(wrap).join('')}](${href})` : words.map(wrap).join('')
663
+ i = end
664
+ }
665
+ return out
550
666
  }
551
667
 
552
668
  /** The plain text of a run of inline nodes, marks discarded. */
@@ -15,7 +15,7 @@
15
15
  */
16
16
  import { type Block, type BlockDocument, inlineTextOf, newBlockId } from './blocks.js'
17
17
  import { blockDocumentToMarkerText, markerTextToBlockDocument } from './bridge-content.js'
18
- import { fenceCloses } from './content.js'
18
+ import { fenceCloses, unusedCharacter } from './content.js'
19
19
 
20
20
  const DESCRIPTION = { description: true }
21
21
 
@@ -99,10 +99,8 @@ export function descriptionTextToBlockDocument(text: string, previous?: BlockDoc
99
99
  * holds every one of them, one followed by a counter.
100
100
  */
101
101
  function placeholderFor(text: string): string {
102
- for (let code = 0xe000; code <= 0xf8ff; code++) {
103
- const mark = String.fromCharCode(code)
104
- if (!text.includes(mark)) return mark
105
- }
102
+ const mark = unusedCharacter(text)
103
+ if (mark) return mark
106
104
  let n = 0
107
105
  while (text.includes(`${n}x`)) n++
108
106
  return `${n}x`
@@ -145,7 +143,7 @@ function tableBlock(rows: string[][], old: Block | undefined): Block {
145
143
 
146
144
  /** A cell as an editor saves one: one paragraph, the text's inline marks kept. */
147
145
  function tableCell(type: string, text: string, old: Block | undefined): Block {
148
- const [parsed, ...more] = text ? markerTextToBlockDocument(text).content : []
146
+ const [parsed, ...more] = text ? markerTextToBlockDocument(text, undefined, DESCRIPTION).content : []
149
147
  const paragraph: Block =
150
148
  parsed?.type === 'paragraph' && !more.length ? parsed : text ? { type: 'paragraph', id: '', content: [{ type: 'text', text }] } : { type: 'paragraph', id: '' }
151
149
  const oldParagraph = old ? childBlocks(old)?.[0] : undefined
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.42.0'
50
+ export const PROTOCOL_VERSION = '0.44.0'
51
51
 
52
52
  export {
53
53
  // types