@estiva-app/protocol 0.26.0 → 0.26.1
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 +17 -0
- package/dist/editor.d.ts +15 -1
- package/dist/editor.d.ts.map +1 -1
- package/dist/editor.js +54 -11
- package/dist/editor.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/package.json +1 -1
- package/src/editor.ts +81 -11
- package/src/index.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,23 @@ 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.26.1 — 2026-10-01
|
|
8
|
+
|
|
9
|
+
**Wire behaviour: unchanged.** Same document shape; a different block keeps a
|
|
10
|
+
repeated id (MAN-10).
|
|
11
|
+
|
|
12
|
+
- **Fixed: Enter at the start of an anchored block moved its id to the new
|
|
13
|
+
empty block.** Tiptap copies a split node's attrs to both halves, and
|
|
14
|
+
`fromEditorDocument` kept a repeated id on the first in document order — the
|
|
15
|
+
empty line above — so the comment anchored there (§13.6) pointed at nothing.
|
|
16
|
+
A repeated id now stays on the first copy that holds text (a line break
|
|
17
|
+
counts), and falls back to the first only when none does. A split in the
|
|
18
|
+
middle or at the end keeps the id where it did; so does a pasted copy,
|
|
19
|
+
unless the original has since been emptied, when the id follows the text.
|
|
20
|
+
- **Fixed: an ordinary block before an unknown block with the same id** kept
|
|
21
|
+
it too, and the document went out with the id twice. An unknown block's id
|
|
22
|
+
is now reserved wherever it sits, and the ordinary block is re-minted.
|
|
23
|
+
|
|
7
24
|
## 0.26.0 — 2026-09-30
|
|
8
25
|
|
|
9
26
|
**Wire behaviour: unchanged.** A block document's translation to and from an
|
package/dist/editor.d.ts
CHANGED
|
@@ -43,7 +43,21 @@ import { BLOCK_DOCUMENT_FORMAT, type ContentFormat } from './render.js';
|
|
|
43
43
|
*
|
|
44
44
|
* **A duplicate id.** Copy a block, paste it, and both copies carry the same
|
|
45
45
|
* id — a document `validateBlockDocument` rejects and an anchor that points at
|
|
46
|
-
* two places.
|
|
46
|
+
* two places. One keeps the id and the other gets a fresh one on the way out.
|
|
47
|
+
*
|
|
48
|
+
* Which one keeps it is decided by text, not by order (MAN-10). Enter inside a
|
|
49
|
+
* block is the other way to get a repeat — Tiptap copies a split node's attrs
|
|
50
|
+
* to both halves, whatever `keepOnSplit` says — and Enter at the very start of
|
|
51
|
+
* a paragraph puts an empty copy *above* it. Keeping the first would move the
|
|
52
|
+
* id, and every comment anchored to it, onto that empty line. So the id stays
|
|
53
|
+
* with the first copy that holds text, and only an all-empty set falls back to
|
|
54
|
+
* the first.
|
|
55
|
+
*
|
|
56
|
+
* This is the backstop. `@estiva-app/ui/editor`'s `BlockId` settles a repeat
|
|
57
|
+
* inside the editor as it happens, where the change itself says which copy
|
|
58
|
+
* the original carried on into — the only place Enter-then-type above a
|
|
59
|
+
* paragraph can be told from the paragraph. It falls back to this rule, so a
|
|
60
|
+
* change to `holdsText` here belongs there too.
|
|
47
61
|
*/
|
|
48
62
|
/** A ProseMirror/Tiptap node, as JSON. */
|
|
49
63
|
export interface EditorNode {
|
package/dist/editor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoF,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;AAGlI,OAAO,EAAE,qBAAqB,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;AAEvE
|
|
1
|
+
{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoF,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;AAGlI,OAAO,EAAE,qBAAqB,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;AAEvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AAEH,0CAA0C;AAC1C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,OAAO,CAAC,EAAE,UAAU,EAAE,CAAA;IACtB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EAAE,CAAA;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,KAAK,CAAA;IACX,OAAO,EAAE,UAAU,EAAE,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAcjD,CAAA;AAYF,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,iBAAiB,CAAA;AAChD,kGAAkG;AAClG,eAAO,MAAM,cAAc,cAAc,CAAA;AA6FzC;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,aAAa,CAetF;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,cAAc,CAExE;AAuKD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,aAAa,CAO1E;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,GAAG;IAC/D,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,OAAO,qBAAqB,CAAA;CAC7C,CAOA"}
|
package/dist/editor.js
CHANGED
|
@@ -160,12 +160,54 @@ export function documentForEditing(value, format) {
|
|
|
160
160
|
export function toEditorDocument(document) {
|
|
161
161
|
return { type: 'doc', content: document.content.map(blockToEditor) };
|
|
162
162
|
}
|
|
163
|
-
|
|
164
|
-
/** Mints on a missing id and on a repeat — see the header on duplicates. */
|
|
165
|
-
function idFor(node, seen) {
|
|
163
|
+
const claimOf = (node) => {
|
|
166
164
|
const claimed = node.attrs?.blockId;
|
|
167
|
-
|
|
168
|
-
|
|
165
|
+
return typeof claimed === 'string' && claimed !== '' ? claimed : undefined;
|
|
166
|
+
};
|
|
167
|
+
/**
|
|
168
|
+
* Whether anything a person typed or inserted is inside — an empty paragraph
|
|
169
|
+
* is not, and a line break on its own is.
|
|
170
|
+
*/
|
|
171
|
+
function holdsText(node) {
|
|
172
|
+
if (node.type === 'text')
|
|
173
|
+
return (node.text ?? '') !== '';
|
|
174
|
+
if (node.type === REFERENCE_NODE || node.type === 'hardBreak')
|
|
175
|
+
return true;
|
|
176
|
+
return (node.content ?? []).some(holdsText);
|
|
177
|
+
}
|
|
178
|
+
/**
|
|
179
|
+
* Picks the node that keeps each claimed id, before any is handed out — see
|
|
180
|
+
* the header on duplicates. Walks exactly the nodes {@link blockFromEditor}
|
|
181
|
+
* turns into blocks, in the same order.
|
|
182
|
+
*
|
|
183
|
+
* An unknown block's id is reserved wherever it sits: it cannot be re-minted,
|
|
184
|
+
* so an ordinary block claiming the same id loses even when it comes first.
|
|
185
|
+
*/
|
|
186
|
+
function claimIds(nodes, owners) {
|
|
187
|
+
for (const node of nodes) {
|
|
188
|
+
if (node.type === UNKNOWN_BLOCK_NODE) {
|
|
189
|
+
const id = node.attrs?.source?.id;
|
|
190
|
+
if (id && !owners.get(id)?.fixed)
|
|
191
|
+
owners.set(id, { node, holdsText: true, fixed: true });
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
const claimed = claimOf(node);
|
|
195
|
+
if (claimed !== undefined) {
|
|
196
|
+
const owner = owners.get(claimed);
|
|
197
|
+
const holds = holdsText(node);
|
|
198
|
+
if (!owner || (!owner.fixed && !owner.holdsText && holds))
|
|
199
|
+
owners.set(claimed, { node, holdsText: holds, fixed: false });
|
|
200
|
+
}
|
|
201
|
+
if (BLOCK_CONTAINERS.has(node.type))
|
|
202
|
+
claimIds(node.content ?? [], owners);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
/** Mints on a missing id and on a repeat that lost — see the header on duplicates. */
|
|
206
|
+
function idFor(node, claims) {
|
|
207
|
+
const claimed = claimOf(node);
|
|
208
|
+
const keeps = claimed !== undefined && claims.owners.get(claimed)?.node === node && !claims.seen.has(claimed);
|
|
209
|
+
const id = keeps ? claimed : newBlockId();
|
|
210
|
+
claims.seen.add(id);
|
|
169
211
|
return id;
|
|
170
212
|
}
|
|
171
213
|
function inlineFromEditor(nodes) {
|
|
@@ -215,7 +257,7 @@ function sameMarks(a, b) {
|
|
|
215
257
|
return false;
|
|
216
258
|
return a.every((m, i) => m.type === b[i].type);
|
|
217
259
|
}
|
|
218
|
-
function blockFromEditor(node,
|
|
260
|
+
function blockFromEditor(node, claims) {
|
|
219
261
|
if (node.type === UNKNOWN_BLOCK_NODE) {
|
|
220
262
|
/*
|
|
221
263
|
Handed back exactly as it arrived, id included. Re-minting it here would
|
|
@@ -225,7 +267,7 @@ function blockFromEditor(node, seen) {
|
|
|
225
267
|
const source = node.attrs?.source;
|
|
226
268
|
if (!source)
|
|
227
269
|
return null;
|
|
228
|
-
seen.add(source.id);
|
|
270
|
+
claims.seen.add(source.id);
|
|
229
271
|
return source;
|
|
230
272
|
}
|
|
231
273
|
const { blockId: _drop, ...rest } = node.attrs ?? {};
|
|
@@ -237,7 +279,7 @@ function blockFromEditor(node, seen) {
|
|
|
237
279
|
than in the one place that noticed.
|
|
238
280
|
*/
|
|
239
281
|
const attrs = Object.fromEntries(Object.entries(rest).filter(([, v]) => v !== null && v !== undefined));
|
|
240
|
-
const id = idFor(node,
|
|
282
|
+
const id = idFor(node, claims);
|
|
241
283
|
const base = { type: node.type, id, ...(Object.keys(attrs).length ? { attrs } : {}) };
|
|
242
284
|
if (node.type === 'codeBlock') {
|
|
243
285
|
const text = (node.content ?? []).map((n) => n.text ?? '').join('');
|
|
@@ -261,7 +303,7 @@ function blockFromEditor(node, seen) {
|
|
|
261
303
|
}
|
|
262
304
|
if (BLOCK_CONTAINERS.has(node.type)) {
|
|
263
305
|
const children = (node.content ?? [])
|
|
264
|
-
.map((child) => blockFromEditor(child,
|
|
306
|
+
.map((child) => blockFromEditor(child, claims))
|
|
265
307
|
.filter((b) => b !== null);
|
|
266
308
|
return { ...base, content: children };
|
|
267
309
|
}
|
|
@@ -269,10 +311,11 @@ function blockFromEditor(node, seen) {
|
|
|
269
311
|
return { ...base, ...(content.length ? { content } : {}) };
|
|
270
312
|
}
|
|
271
313
|
export function fromEditorDocument(document) {
|
|
272
|
-
const
|
|
314
|
+
const claims = { owners: new Map(), seen: new Set() };
|
|
315
|
+
claimIds(document.content, claims.owners);
|
|
273
316
|
return {
|
|
274
317
|
type: 'doc',
|
|
275
|
-
content: document.content.map((node) => blockFromEditor(node,
|
|
318
|
+
content: document.content.map((node) => blockFromEditor(node, claims)).filter((b) => b !== null),
|
|
276
319
|
};
|
|
277
320
|
}
|
|
278
321
|
/**
|
package/dist/editor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.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.26.
|
|
49
|
+
export declare const PROTOCOL_VERSION = "0.26.1";
|
|
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, buildComponent, 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.26.
|
|
49
|
+
export const PROTOCOL_VERSION = '0.26.1';
|
|
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.26.
|
|
3
|
+
"version": "0.26.1",
|
|
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/editor.ts
CHANGED
|
@@ -46,7 +46,21 @@ import { BLOCK_DOCUMENT_FORMAT, type ContentFormat } from './render.js'
|
|
|
46
46
|
*
|
|
47
47
|
* **A duplicate id.** Copy a block, paste it, and both copies carry the same
|
|
48
48
|
* id — a document `validateBlockDocument` rejects and an anchor that points at
|
|
49
|
-
* two places.
|
|
49
|
+
* two places. One keeps the id and the other gets a fresh one on the way out.
|
|
50
|
+
*
|
|
51
|
+
* Which one keeps it is decided by text, not by order (MAN-10). Enter inside a
|
|
52
|
+
* block is the other way to get a repeat — Tiptap copies a split node's attrs
|
|
53
|
+
* to both halves, whatever `keepOnSplit` says — and Enter at the very start of
|
|
54
|
+
* a paragraph puts an empty copy *above* it. Keeping the first would move the
|
|
55
|
+
* id, and every comment anchored to it, onto that empty line. So the id stays
|
|
56
|
+
* with the first copy that holds text, and only an all-empty set falls back to
|
|
57
|
+
* the first.
|
|
58
|
+
*
|
|
59
|
+
* This is the backstop. `@estiva-app/ui/editor`'s `BlockId` settles a repeat
|
|
60
|
+
* inside the editor as it happens, where the change itself says which copy
|
|
61
|
+
* the original carried on into — the only place Enter-then-type above a
|
|
62
|
+
* paragraph can be told from the paragraph. It falls back to this rule, so a
|
|
63
|
+
* change to `holdsText` here belongs there too.
|
|
50
64
|
*/
|
|
51
65
|
|
|
52
66
|
/** A ProseMirror/Tiptap node, as JSON. */
|
|
@@ -233,11 +247,66 @@ export function toEditorDocument(document: BlockDocument): EditorDocument {
|
|
|
233
247
|
|
|
234
248
|
// ── Editor → document ────────────────────────────────────────────────────────
|
|
235
249
|
|
|
236
|
-
/**
|
|
237
|
-
|
|
250
|
+
/** The node that keeps a claimed id, and why it would give it up. */
|
|
251
|
+
interface Owner {
|
|
252
|
+
node: EditorNode
|
|
253
|
+
holdsText: boolean
|
|
254
|
+
/** An unknown block, which hands its id back untouched and so never loses it. */
|
|
255
|
+
fixed: boolean
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
/** What one save has decided about ids: which node keeps each, and which are taken. */
|
|
259
|
+
interface IdClaims {
|
|
260
|
+
owners: Map<string, Owner>
|
|
261
|
+
seen: Set<string>
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
const claimOf = (node: EditorNode): string | undefined => {
|
|
238
265
|
const claimed = node.attrs?.blockId
|
|
239
|
-
|
|
240
|
-
|
|
266
|
+
return typeof claimed === 'string' && claimed !== '' ? claimed : undefined
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
/**
|
|
270
|
+
* Whether anything a person typed or inserted is inside — an empty paragraph
|
|
271
|
+
* is not, and a line break on its own is.
|
|
272
|
+
*/
|
|
273
|
+
function holdsText(node: EditorNode): boolean {
|
|
274
|
+
if (node.type === 'text') return (node.text ?? '') !== ''
|
|
275
|
+
if (node.type === REFERENCE_NODE || node.type === 'hardBreak') return true
|
|
276
|
+
return (node.content ?? []).some(holdsText)
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
/**
|
|
280
|
+
* Picks the node that keeps each claimed id, before any is handed out — see
|
|
281
|
+
* the header on duplicates. Walks exactly the nodes {@link blockFromEditor}
|
|
282
|
+
* turns into blocks, in the same order.
|
|
283
|
+
*
|
|
284
|
+
* An unknown block's id is reserved wherever it sits: it cannot be re-minted,
|
|
285
|
+
* so an ordinary block claiming the same id loses even when it comes first.
|
|
286
|
+
*/
|
|
287
|
+
function claimIds(nodes: readonly EditorNode[], owners: Map<string, Owner>): void {
|
|
288
|
+
for (const node of nodes) {
|
|
289
|
+
if (node.type === UNKNOWN_BLOCK_NODE) {
|
|
290
|
+
const id = (node.attrs?.source as Block | undefined)?.id
|
|
291
|
+
if (id && !owners.get(id)?.fixed) owners.set(id, { node, holdsText: true, fixed: true })
|
|
292
|
+
continue
|
|
293
|
+
}
|
|
294
|
+
const claimed = claimOf(node)
|
|
295
|
+
if (claimed !== undefined) {
|
|
296
|
+
const owner = owners.get(claimed)
|
|
297
|
+
const holds = holdsText(node)
|
|
298
|
+
if (!owner || (!owner.fixed && !owner.holdsText && holds)) owners.set(claimed, { node, holdsText: holds, fixed: false })
|
|
299
|
+
}
|
|
300
|
+
if (BLOCK_CONTAINERS.has(node.type)) claimIds(node.content ?? [], owners)
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
/** Mints on a missing id and on a repeat that lost — see the header on duplicates. */
|
|
305
|
+
function idFor(node: EditorNode, claims: IdClaims): string {
|
|
306
|
+
const claimed = claimOf(node)
|
|
307
|
+
const keeps = claimed !== undefined && claims.owners.get(claimed)?.node === node && !claims.seen.has(claimed)
|
|
308
|
+
const id = keeps ? claimed : newBlockId()
|
|
309
|
+
claims.seen.add(id)
|
|
241
310
|
return id
|
|
242
311
|
}
|
|
243
312
|
|
|
@@ -283,7 +352,7 @@ function sameMarks(a: readonly InlineMarkNode[], b: readonly InlineMarkNode[]):
|
|
|
283
352
|
return a.every((m, i) => m.type === b[i].type)
|
|
284
353
|
}
|
|
285
354
|
|
|
286
|
-
function blockFromEditor(node: EditorNode,
|
|
355
|
+
function blockFromEditor(node: EditorNode, claims: IdClaims): Block | null {
|
|
287
356
|
if (node.type === UNKNOWN_BLOCK_NODE) {
|
|
288
357
|
/*
|
|
289
358
|
Handed back exactly as it arrived, id included. Re-minting it here would
|
|
@@ -292,7 +361,7 @@ function blockFromEditor(node: EditorNode, seen: Set<string>): Block | null {
|
|
|
292
361
|
*/
|
|
293
362
|
const source = node.attrs?.source as Block | undefined
|
|
294
363
|
if (!source) return null
|
|
295
|
-
seen.add(source.id)
|
|
364
|
+
claims.seen.add(source.id)
|
|
296
365
|
return source
|
|
297
366
|
}
|
|
298
367
|
|
|
@@ -305,7 +374,7 @@ function blockFromEditor(node: EditorNode, seen: Set<string>): Block | null {
|
|
|
305
374
|
than in the one place that noticed.
|
|
306
375
|
*/
|
|
307
376
|
const attrs = Object.fromEntries(Object.entries(rest).filter(([, v]) => v !== null && v !== undefined))
|
|
308
|
-
const id = idFor(node,
|
|
377
|
+
const id = idFor(node, claims)
|
|
309
378
|
const base = { type: node.type, id, ...(Object.keys(attrs).length ? { attrs } : {}) }
|
|
310
379
|
|
|
311
380
|
if (node.type === 'codeBlock') {
|
|
@@ -332,7 +401,7 @@ function blockFromEditor(node: EditorNode, seen: Set<string>): Block | null {
|
|
|
332
401
|
|
|
333
402
|
if (BLOCK_CONTAINERS.has(node.type)) {
|
|
334
403
|
const children = (node.content ?? [])
|
|
335
|
-
.map((child) => blockFromEditor(child,
|
|
404
|
+
.map((child) => blockFromEditor(child, claims))
|
|
336
405
|
.filter((b): b is Block => b !== null)
|
|
337
406
|
return { ...base, content: children }
|
|
338
407
|
}
|
|
@@ -342,10 +411,11 @@ function blockFromEditor(node: EditorNode, seen: Set<string>): Block | null {
|
|
|
342
411
|
}
|
|
343
412
|
|
|
344
413
|
export function fromEditorDocument(document: EditorDocument): BlockDocument {
|
|
345
|
-
const
|
|
414
|
+
const claims: IdClaims = { owners: new Map(), seen: new Set() }
|
|
415
|
+
claimIds(document.content, claims.owners)
|
|
346
416
|
return {
|
|
347
417
|
type: 'doc',
|
|
348
|
-
content: document.content.map((node) => blockFromEditor(node,
|
|
418
|
+
content: document.content.map((node) => blockFromEditor(node, claims)).filter((b): b is Block => b !== null),
|
|
349
419
|
}
|
|
350
420
|
}
|
|
351
421
|
|
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.26.
|
|
50
|
+
export const PROTOCOL_VERSION = '0.26.1'
|
|
51
51
|
|
|
52
52
|
export {
|
|
53
53
|
// types
|