From b155ae362ad38cb75c954f2df6f10605566de112 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 15 Nov 2024 08:42:38 +0100
Subject: [PATCH 01/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20add=20more=20block=20elements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/slice/constants.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/slice/constants.ts b/src/json-crdt-extensions/peritext/slice/constants.ts
index 8c1ec8f98d..9c0edf5a61 100644
--- a/src/json-crdt-extensions/peritext/slice/constants.ts
+++ b/src/json-crdt-extensions/peritext/slice/constants.ts
@@ -37,8 +37,12 @@ export enum CommonSliceType {
   embed = 20, // <embed>, <iframe>, <object>, <video>, <audio>, etc.
   column = 21, // <div style="column-count: ..."> (represents 2 and 3 column layouts)
   contents = 22, // Table of contents
-  row = 23, // Table row
-  cell = 24, // Table cell
+  table = 23, // <table>
+  row = 24, // Table row
+  cell = 25, // Table cell
+  CollapseList = 26, // Collapsible list - > List item
+  Collapse = 27, // Collapsible block
+  Note = 28, // Note block
 
   // ------------------------------------------------ inline slices (-64 to -1)
   Cursor = -1,

From 7bf4f9384d76554604d725fed936b2e060b265fb Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 15 Nov 2024 09:07:48 +0100
Subject: [PATCH 02/19] =?UTF-8?q?perf(json-crdt-extensions):=20=E2=9A=A1?=
 =?UTF-8?q?=EF=B8=8F=20do=20not=20pre-compute=20chunk=20slices?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peritext/block/Block.ts                   |  4 +-
 .../peritext/block/Inline.ts                  | 50 ++++++++-----------
 .../block/__tests__/Block.iteration.spec.ts   |  4 +-
 .../block/__tests__/Inline.key.spec.ts        |  2 +-
 .../peritext/block/__tests__/Inline.spec.ts   | 12 ++---
 .../peritext/overlay/Overlay.ts               |  7 ++-
 src/json-crdt/nodes/rga/AbstractRga.ts        | 11 ++--
 7 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/block/Block.ts b/src/json-crdt-extensions/peritext/block/Block.ts
index af226922f9..59eafc44cf 100644
--- a/src/json-crdt-extensions/peritext/block/Block.ts
+++ b/src/json-crdt-extensions/peritext/block/Block.ts
@@ -1,10 +1,10 @@
 import {printTree} from 'tree-dump/lib/printTree';
 import {CONST, updateJson, updateNum} from '../../../json-hash';
 import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
-import type {OverlayPoint} from '../overlay/OverlayPoint';
 import {UndefEndIter, type UndefIterator} from '../../../util/iterator';
 import {Inline} from './Inline';
 import {formatType} from '../slice/util';
+import type {OverlayPoint} from '../overlay/OverlayPoint';
 import type {Path} from '@jsonjoy.com/json-pointer';
 import type {Printable} from 'tree-dump';
 import type {Peritext} from '../Peritext';
@@ -100,7 +100,7 @@ export class Block<Attr = unknown> implements IBlock, Printable, Stateful {
     const iterator = this.tuples0();
     return () => {
       const pair = iterator();
-      return pair && Inline.create(txt, pair[0], pair[1]);
+      return pair && new Inline(txt, pair[0], pair[1]);
     };
   }
 
diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index a9e2b6f77e..83d18bc08b 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -1,5 +1,4 @@
 import {printTree} from 'tree-dump/lib/printTree';
-import type {OverlayPoint} from '../overlay/OverlayPoint';
 import {stringify} from '../../../json-text/stringify';
 import {SliceBehavior, CommonSliceType} from '../slice/constants';
 import {Range} from '../rga/Range';
@@ -8,17 +7,12 @@ import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import {Cursor} from '../editor/Cursor';
 import {hashId} from '../../../json-crdt/hash';
 import {formatType} from '../slice/util';
-import type {AbstractRga} from '../../../json-crdt/nodes/rga';
+import type {OverlayPoint} from '../overlay/OverlayPoint';
 import type {Printable} from 'tree-dump/lib/types';
 import type {PathStep} from '@jsonjoy.com/json-pointer';
 import type {Peritext} from '../Peritext';
 import type {Slice} from '../slice/types';
 
-/**
- * @todo Make sure these inline attributes can handle the cursor which ends
- *     with attaching to the start of the next character.
- */
-
 /** The attribute started before this inline and ends after this inline. */
 export class InlineAttrPassing {
   constructor(public slice: Slice) {}
@@ -68,29 +62,12 @@ export type InlineAttrs = Record<string | number, InlineAttrStack>;
  * full text content of the inline.
  */
 export class Inline extends Range implements Printable {
-  public static create(txt: Peritext, start: OverlayPoint, end: OverlayPoint) {
-    const texts: ChunkSlice[] = [];
-    txt.overlay.chunkSlices0(undefined, start, end, (chunk, off, len) => {
-      if (txt.overlay.isMarker(chunk.id)) return;
-      texts.push(new ChunkSlice(chunk, off, len));
-    });
-    return new Inline(txt.str, start, end, texts);
-  }
-
   constructor(
-    rga: AbstractRga<string>,
+    public readonly txt: Peritext,
     public start: OverlayPoint,
     public end: OverlayPoint,
-
-    /**
-     * @todo PERF: for performance reasons, we should consider not passing in
-     * this array. Maybe pass in just the initial chunk and the offset. However,
-     * maybe even that is not necessary, as the `.start` point should have
-     * its chunk cached, or will have it cached after the first access.
-     */
-    public readonly texts: ChunkSlice[],
   ) {
-    super(rga, start, end);
+    super(txt.str, start, end);
   }
 
   /**
@@ -107,7 +84,7 @@ export class Inline extends Range implements Printable {
    * @returns The position of the inline within the text.
    */
   public pos(): number {
-    const chunkSlice = this.texts[0];
+    const chunkSlice = this.texts(1)[0];
     if (!chunkSlice) return -1;
     const chunk = chunkSlice.chunk;
     const pos = this.rga.pos(chunk);
@@ -240,6 +217,20 @@ export class Inline extends Range implements Printable {
     return;
   }
 
+  public texts(limit: number = 1e6): ChunkSlice[] {
+    const texts: ChunkSlice[] = [];
+    const txt = this.txt;
+    const overlay = txt.overlay;
+    let cnt = 0;
+    overlay.chunkSlices0(this.start.chunk(), this.start, this.end, (chunk, off, len): boolean | void => {
+      if (overlay.isMarker(chunk.id)) return;
+      cnt++;
+      texts.push(new ChunkSlice(chunk, off, len));
+      if (cnt === limit) return true;
+    });
+    return texts;
+  }
+
   public text(): string {
     const str = super.text();
     return this.start instanceof MarkerOverlayPoint ? str.slice(1) : str;
@@ -261,6 +252,7 @@ export class Inline extends Range implements Printable {
     const header = `Inline ${range} ${text}`;
     const attr = this.attr();
     const attrKeys = Object.keys(attr);
+    const texts = this.texts();
     return (
       header +
       printTree(tab, [
@@ -282,13 +274,13 @@ export class Inline extends Range implements Printable {
                   );
                 }),
               ),
-        !this.texts.length
+        !texts.length
           ? null
           : (tab) =>
               'texts' +
               printTree(
                 tab,
-                this.texts.map((text) => (tab) => text.toString(tab)),
+                this.texts().map((text) => (tab) => text.toString(tab)),
               ),
       ])
     );
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts
index e742adf581..c99fe5386a 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts
@@ -112,8 +112,8 @@ describe('tuples', () => {
     const tuples1 = [...block1.tuples()];
     const tuples2 = [...block2.tuples()];
     expect(tuples1.length).toBe(3);
-    const text1 = tuples1.map(([p1, p2]) => Inline.create(peritext, p1, p2).text()).join('');
-    const text2 = tuples2.map(([p1, p2]) => Inline.create(peritext, p1, p2).text()).join('');
+    const text1 = tuples1.map(([p1, p2]) => new Inline(peritext, p1, p2).text()).join('');
+    const text2 = tuples2.map(([p1, p2]) => new Inline(peritext, p1, p2).text()).join('');
     expect(text1).toBe('hello ');
     expect(text2).toBe('world');
   });
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
index 5d1f632997..2307e8023a 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
@@ -68,7 +68,7 @@ const runKeyTests = (setup: () => Kit) => {
         peritext.editor.cursor.setAt(i, j);
         overlay.refresh();
         const [start, end] = [...overlay.points()];
-        const inline = Inline.create(peritext, start, end);
+        const inline = new Inline(peritext, start, end);
         if (keys.has(inline.key())) {
           const inline2 = keys.get(inline.key())!;
           // tslint:disable-next-line:no-console
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
index 51afb975aa..3ea3c4026b 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
@@ -20,7 +20,7 @@ const runStrTests = (setup: () => Kit) => {
           peritext.editor.cursor.setAt(i, j);
           overlay.refresh();
           const [start, end] = [...overlay.points()];
-          const inline = Inline.create(peritext, start, end);
+          const inline = new Inline(peritext, start, end);
           const str = inline.text();
           expect(str).toBe(
             peritext
@@ -43,7 +43,7 @@ const runStrTests = (setup: () => Kit) => {
           peritext.editor.cursor.setAt(i, j);
           overlay.refresh();
           const [start, end] = [...overlay.points()];
-          const inline = Inline.create(peritext, start, end);
+          const inline = new Inline(peritext, start, end);
           const pos = inline.pos();
           expect(pos).toBe(i);
         }
@@ -61,7 +61,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insStack('em', 1);
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = Inline.create(peritext, start, end);
+      const inline = new Inline(peritext, start, end);
       const attr = inline.attr();
       expect(attr.bold[0].slice.data()).toEqual(1);
       expect(attr.bold[1].slice.data()).toEqual(2);
@@ -77,7 +77,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insOverwrite('em', 1);
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = Inline.create(peritext, start, end);
+      const inline = new Inline(peritext, start, end);
       const attr = inline.attr();
       expect(attr.bold[0].slice.data()).toEqual(2);
       expect(attr.em[0].slice.data()).toEqual(1);
@@ -92,7 +92,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insOverwrite('em');
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = Inline.create(peritext, start, end);
+      const inline = new Inline(peritext, start, end);
       const attr = inline.attr();
       expect(attr.bold).toBe(undefined);
       expect(attr.em[0]).toBeInstanceOf(InlineAttrContained);
@@ -107,7 +107,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insStack(['bold', 'normal'], 2);
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = Inline.create(peritext, start, end);
+      const inline = new Inline(peritext, start, end);
       const attr = inline.attr();
       expect(attr['bold,very'][0].slice.data()).toEqual(1);
       expect(attr['bold,normal'][0].slice.data()).toEqual(2);
diff --git a/src/json-crdt-extensions/peritext/overlay/Overlay.ts b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
index 57fc717b32..24ba464ddc 100644
--- a/src/json-crdt-extensions/peritext/overlay/Overlay.ts
+++ b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
@@ -152,12 +152,11 @@ export class Overlay<T = string> implements Printable, Stateful {
   }
 
   /** @todo Rename to `chunks()`. */
-  /** @todo Rewrite this as `UndefIterator`. */
   public chunkSlices0(
     chunk: Chunk<T> | undefined,
     p1: Point<T>,
     p2: Point<T>,
-    callback: (chunk: Chunk<T>, off: number, len: number) => void,
+    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | void,
   ): Chunk<T> | undefined {
     const rga = this.txt.str;
     const strId = rga.id;
@@ -179,7 +178,7 @@ export class Overlay<T = string> implements Printable, Stateful {
     const time1 = id1.time;
     const sid2 = id2.sid;
     const time2 = id2.time;
-    return rga.range0(undefined, id1, id2, (chunk: Chunk<T>, off: number, len: number) => {
+    return rga.range0(undefined, id1, id2, (chunk: Chunk<T>, off: number, len: number): boolean | void => {
       if (checkFirstAnchor) {
         checkFirstAnchor = false;
         const chunkId = chunk.id;
@@ -196,7 +195,7 @@ export class Overlay<T = string> implements Printable, Stateful {
           len -= 1;
         }
       }
-      callback(chunk, off, len);
+      if (callback(chunk, off, len)) return true;
     }) as Chunk<T>;
   }
 
diff --git a/src/json-crdt/nodes/rga/AbstractRga.ts b/src/json-crdt/nodes/rga/AbstractRga.ts
index 758a0167ca..03d3d55477 100644
--- a/src/json-crdt/nodes/rga/AbstractRga.ts
+++ b/src/json-crdt/nodes/rga/AbstractRga.ts
@@ -401,14 +401,15 @@ export abstract class AbstractRga<T> {
    *                   to avoid a lookup.
    * @param from ID of the first element in the range.
    * @param to ID of the last element in the range.
-   * @param callback Function to call for each chunk slice in the range.
+   * @param callback Function to call for each chunk slice in the range. If it
+   *     returns truthy value, the iteration will stop.
    * @returns Reference to the last chunk in the range.
    */
   public range0(
     startChunk: Chunk<T> | undefined,
     from: ITimestampStruct,
     to: ITimestampStruct,
-    callback: (chunk: Chunk<T>, off: number, len: number) => void,
+    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | void,
   ): Chunk<T> | undefined {
     let chunk: Chunk<T> | undefined = startChunk ? startChunk : this.findById(from);
     if (startChunk) while (chunk && !containsId(chunk.id, chunk.span, from)) chunk = next(chunk);
@@ -422,7 +423,7 @@ export abstract class AbstractRga<T> {
         return chunk;
       }
       const len = chunk.span - off;
-      callback(chunk, off, len);
+      if (callback(chunk, off, len)) return chunk;
     } else {
       if (containsId(chunk.id, chunk.span, to)) return;
     }
@@ -431,10 +432,10 @@ export abstract class AbstractRga<T> {
       const toContainedInChunk = containsId(chunk.id, chunk.span, to);
       // TODO: fast path for chunk.del
       if (toContainedInChunk) {
-        if (!chunk.del) callback(chunk, 0, to.time - chunk.id.time + 1);
+        if (!chunk.del) if (callback(chunk, 0, to.time - chunk.id.time + 1)) return chunk;
         return chunk;
       }
-      if (!chunk.del) callback(chunk, 0, chunk.span);
+      if (!chunk.del) if (callback(chunk, 0, chunk.span)) return chunk;
       chunk = next(chunk);
     }
     return chunk;

From 340919a9c6f5d63c2d62af8a6f08b246468cc935 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 15 Nov 2024 10:41:54 +0100
Subject: [PATCH 03/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20add=20first=20implementation=20of=20Fragment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/Peritext.ts |  6 ++--
 .../peritext/block/Blocks.ts                  | 16 +++++++----
 .../peritext/overlay/Overlay.ts               | 28 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/Peritext.ts b/src/json-crdt-extensions/peritext/Peritext.ts
index f57f72b979..767f435384 100644
--- a/src/json-crdt-extensions/peritext/Peritext.ts
+++ b/src/json-crdt-extensions/peritext/Peritext.ts
@@ -14,7 +14,7 @@ import {CONST, updateNum} from '../../json-hash';
 import {SESSION} from '../../json-crdt-patch/constants';
 import {s} from '../../json-crdt-patch';
 import {ExtraSlices} from './slice/ExtraSlices';
-import {Blocks} from './block/Blocks';
+import {Fragment} from './block/Blocks';
 import {updateRga} from '../../json-crdt/hash';
 import type {ITimestampStruct} from '../../json-crdt-patch/clock';
 import type {Printable} from 'tree-dump/lib/types';
@@ -54,7 +54,7 @@ export class Peritext<T = string> implements Printable {
 
   public readonly editor: Editor<T>;
   public readonly overlay = new Overlay<T>(this);
-  public readonly blocks: Blocks;
+  public readonly blocks: Fragment;
 
   /**
    * Creates a new Peritext context.
@@ -86,7 +86,7 @@ export class Peritext<T = string> implements Printable {
     });
     this.localSlices = new LocalSlices(this, localSlicesModel.root.node().get(0)!);
     this.editor = new Editor<T>(this);
-    this.blocks = new Blocks(this as Peritext);
+    this.blocks = new Fragment(this as Peritext);
   }
 
   public strApi(): StrApi {
diff --git a/src/json-crdt-extensions/peritext/block/Blocks.ts b/src/json-crdt-extensions/peritext/block/Blocks.ts
index c4a8880c38..e9dc11ff02 100644
--- a/src/json-crdt-extensions/peritext/block/Blocks.ts
+++ b/src/json-crdt-extensions/peritext/block/Blocks.ts
@@ -7,8 +7,9 @@ import type {Path} from '@jsonjoy.com/json-pointer';
 import type {Stateful} from '../types';
 import type {Printable} from 'tree-dump/lib/types';
 import type {Peritext} from '../Peritext';
+import type {Point} from '../rga/Point';
 
-export class Blocks implements Printable, Stateful {
+export class Fragment implements Printable, Stateful {
   public readonly root: Block;
 
   constructor(public readonly txt: Peritext) {
@@ -18,7 +19,7 @@ export class Blocks implements Printable, Stateful {
   // ---------------------------------------------------------------- Printable
 
   public toString(tab: string = ''): string {
-    return 'Blocks' + printTree(tab, [(tab) => this.root.toString(tab)]);
+    return 'Fragment' + printTree(tab, [(tab) => this.root.toString(tab)]);
   }
 
   // ----------------------------------------------------------------- Stateful
@@ -26,7 +27,7 @@ export class Blocks implements Printable, Stateful {
   public hash: number = 0;
 
   public refresh(): number {
-    this.refreshBlocks();
+    this.build(this.txt.pointStart(), void 0);
     return (this.hash = this.root.refresh());
   }
 
@@ -46,15 +47,20 @@ export class Blocks implements Printable, Stateful {
     return block;
   }
 
-  protected refreshBlocks(): void {
+  protected build(start: Point | undefined, end: Point | undefined): void {
     this.root.children = [];
     let parent = this.root;
     let markerPoint: undefined | MarkerOverlayPoint;
     const txt = this.txt;
     const overlay = txt.overlay;
+    /**
+     * @todo This line always inserts a markerless block at the beginning of
+     * the fragment. But what happens if one actually exists?
+     */
     this.insertBlock(parent, [0], undefined);
-    const iterator = overlay.markers0(undefined);
+    const iterator = start ? overlay.markers1(start) : overlay.markers0(undefined);
     while ((markerPoint = iterator())) {
+      if (end && markerPoint.cmpSpatial(end) > 0) break;
       const type = markerPoint.type();
       const path = type instanceof Array ? type : [type];
       const block = this.insertBlock(parent, path, markerPoint);
diff --git a/src/json-crdt-extensions/peritext/overlay/Overlay.ts b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
index 24ba464ddc..de7a2ad700 100644
--- a/src/json-crdt-extensions/peritext/overlay/Overlay.ts
+++ b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
@@ -1,7 +1,7 @@
 import {printTree} from 'tree-dump/lib/printTree';
 import {printBinary} from 'tree-dump/lib/printBinary';
 import {first, insertLeft, insertRight, last, next, prev, remove} from 'sonic-forest/lib/util';
-import {first2, insert2, last2, next2, remove2} from 'sonic-forest/lib/util2';
+import {first2, insert2, last2, next2, prev2, remove2} from 'sonic-forest/lib/util2';
 import {splay} from 'sonic-forest/lib/splay/util';
 import {Anchor} from '../rga/constants';
 import {OverlayPoint} from './OverlayPoint';
@@ -212,6 +212,17 @@ export class Overlay<T = string> implements Printable, Stateful {
     return new UndefEndIter(this.points0(after, inclusive));
   }
 
+  /**
+   * Returns all {@link MarkerOverlayPoint} instances in the overlay, starting
+   * from the given marker point, not including the marker point itself.
+   *
+   * If the `after` parameter is not provided, the iteration starts from the
+   * first marker point in the overlay.
+   *
+   * @param after The marker point after which to start the iteration.
+   * @returns All marker points in the overlay, starting from the given marker
+   *     point.
+   */
   public markers0(after: undefined | MarkerOverlayPoint<T>): UndefIterator<MarkerOverlayPoint<T>> {
     let curr = after ? next2(after) : first2(this.root2);
     return () => {
@@ -221,6 +232,21 @@ export class Overlay<T = string> implements Printable, Stateful {
     };
   }
 
+  /**
+   * Returns all {@link MarkerOverlayPoint} instances in the overlay, starting
+   * from a give {@link Point}, including any marker overlay points that are
+   * at the same position as the given point.
+   *
+   * @param point Point (inclusive) from which to return all markers.
+   * @returns All marker points in the overlay, starting from the given marker
+   *     point.
+   */
+  public markers1(point: Point<T>): UndefIterator<MarkerOverlayPoint<T>> {
+    let after = this.getOrNextLowerMarker(point);
+    if (after && after.cmp(point) === 0) after = prev2(after);
+    return this.markers0(after);
+  }
+
   public markers(): UndefEndIter<MarkerOverlayPoint<T>> {
     return new UndefEndIter(this.markers0(undefined));
   }

From 5d908765d9d049e8eeda908b197e720ed878b848 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 15 Nov 2024 10:42:07 +0100
Subject: [PATCH 04/19] =?UTF-8?q?fix(json-crdt-peritext-ui):=20?=
 =?UTF-8?q?=F0=9F=90=9B=20correct=20React=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BasicButton/index.tsx          | 32 +++++++++----------
 .../plugins/toolbar/CaretToolbar/index.tsx    | 12 +++----
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/json-crdt-peritext-ui/components/BasicButton/index.tsx b/src/json-crdt-peritext-ui/components/BasicButton/index.tsx
index 2fcde05780..c60017850d 100644
--- a/src/json-crdt-peritext-ui/components/BasicButton/index.tsx
+++ b/src/json-crdt-peritext-ui/components/BasicButton/index.tsx
@@ -130,22 +130,20 @@ export const BasicButton: React.FC<BasicButtonProps> = ({
   }
 
   return (
-    <Ripple ms={1_500} color={positive ? theme.color.sem.positive[0] : theme.g(0, 0.08)}>
-      <Link
-        {...rest}
-        a={!!to}
-        className={
-          className + blockClass + dynamicBlockClass + (border ? borderClass : '') + (fill ? fillBlockClass : '')
-        }
-        style={style}
-        title={title}
-        onClick={to ? undefined : onClick}
-        onDragStart={handleDragStart}
-        to={to}
-        data-testid="BasicButton"
-      >
-        {children}
-      </Link>
-    </Ripple>
+    <Link
+      {...rest}
+      a={!!to}
+      className={
+        className + blockClass + dynamicBlockClass + (border ? borderClass : '') + (fill ? fillBlockClass : '')
+      }
+      style={style}
+      title={title}
+      onClick={to ? undefined : onClick}
+      onDragStart={handleDragStart}
+      to={to}
+      data-testid="BasicButton"
+    >
+      {children}
+    </Link>
   );
 };
diff --git a/src/json-crdt-peritext-ui/plugins/toolbar/CaretToolbar/index.tsx b/src/json-crdt-peritext-ui/plugins/toolbar/CaretToolbar/index.tsx
index 0c348af3bd..86570c6118 100644
--- a/src/json-crdt-peritext-ui/plugins/toolbar/CaretToolbar/index.tsx
+++ b/src/json-crdt-peritext-ui/plugins/toolbar/CaretToolbar/index.tsx
@@ -38,8 +38,8 @@ export const CaretToolbar: React.FC<CaretToolbarProps> = () => {
             <path
               d="M5.67494 3.50017C5.67494 3.25164 5.87641 3.05017 6.12494 3.05017H10.6249C10.8735 3.05017 11.0749 3.25164 11.0749 3.50017C11.0749 3.7487 10.8735 3.95017 10.6249 3.95017H9.00587L7.2309 11.05H8.87493C9.12345 11.05 9.32493 11.2515 9.32493 11.5C9.32493 11.7486 9.12345 11.95 8.87493 11.95H4.37493C4.1264 11.95 3.92493 11.7486 3.92493 11.5C3.92493 11.2515 4.1264 11.05 4.37493 11.05H5.99397L7.76894 3.95017H6.12494C5.87641 3.95017 5.67494 3.7487 5.67494 3.50017Z"
               fill="currentColor"
-              fill-rule="evenodd"
-              clip-rule="evenodd"
+              fillRule="evenodd"
+              clipRule="evenodd"
             />
           </svg>
         </BasicButton>
@@ -48,8 +48,8 @@ export const CaretToolbar: React.FC<CaretToolbarProps> = () => {
             <path
               d="M5.00001 2.75C5.00001 2.47386 4.77615 2.25 4.50001 2.25C4.22387 2.25 4.00001 2.47386 4.00001 2.75V8.05C4.00001 9.983 5.56702 11.55 7.50001 11.55C9.43301 11.55 11 9.983 11 8.05V2.75C11 2.47386 10.7762 2.25 10.5 2.25C10.2239 2.25 10 2.47386 10 2.75V8.05C10 9.43071 8.88072 10.55 7.50001 10.55C6.1193 10.55 5.00001 9.43071 5.00001 8.05V2.75ZM3.49998 13.1001C3.27906 13.1001 3.09998 13.2791 3.09998 13.5001C3.09998 13.721 3.27906 13.9001 3.49998 13.9001H11.5C11.7209 13.9001 11.9 13.721 11.9 13.5001C11.9 13.2791 11.7209 13.1001 11.5 13.1001H3.49998Z"
               fill="currentColor"
-              fill-rule="evenodd"
-              clip-rule="evenodd"
+              fillRule="evenodd"
+              clipRule="evenodd"
             />
           </svg>
         </BasicButton>
@@ -58,8 +58,8 @@ export const CaretToolbar: React.FC<CaretToolbarProps> = () => {
             <path
               d="M1.03791 9.98075C0.934777 9.6583 1.11603 9.37719 1.40005 9.24871C1.68408 9.12022 2.09463 9.13412 2.27071 9.45426C2.85393 10.5147 3.64599 10.7282 4.48665 10.7282C5.52721 10.7282 6.29659 10.2615 6.29659 9.45426C6.29659 8.8047 5.9119 8.46416 4.87134 8.14253L4.15872 7.92181C2.64518 7.44883 1.88842 6.69206 1.88842 5.45601C1.88842 3.79743 3.27583 2.6875 5.24342 2.6875C6.91733 2.6875 7.97409 3.33536 8.43833 4.31065C8.57087 4.58909 8.57614 4.91294 8.22794 5.19114C7.87974 5.46934 7.52351 5.34799 7.23327 5.03839C6.47215 4.22653 5.99545 4.04968 5.25604 4.04968C4.1398 4.04968 3.547 4.63618 3.547 5.27943C3.547 5.86592 3.96322 6.23169 4.94702 6.5344L5.67856 6.76143C7.22994 7.23441 7.97409 7.95964 7.97409 9.17047C7.97409 10.7723 6.69389 12.0903 4.46143 12.0903C2.86612 12.0903 1.40005 11.1131 1.03791 9.98075ZM11.8491 8.77985C10.661 8.39543 10.1649 7.86114 10.1649 6.98805C10.1649 5.86736 11.1636 5.04639 12.6128 5.04639C13.8546 5.04639 14.6629 5.63345 14.9778 6.6346C15.0443 6.84599 14.9593 6.98006 14.7475 7.0491C14.5394 7.11697 14.3176 7.09974 14.238 6.89611C13.9356 6.12273 13.352 5.76311 12.5998 5.76311C11.6467 5.76311 11.0135 6.25178 11.0135 6.91638C11.0135 7.45066 11.3464 7.75038 12.2473 8.04358L12.8348 8.23254C14.062 8.62999 14.5516 9.13821 14.5516 10.0178C14.5516 11.1972 13.481 12.0442 11.9927 12.0442C10.6439 12.0442 9.65644 11.2809 9.41979 10.3361C9.36535 10.1188 9.41192 10.0287 9.70039 9.96184C9.98886 9.89499 10.0714 9.89918 10.1715 10.1369C10.4555 10.8114 11.1531 11.3275 12.0318 11.3275C12.9914 11.3275 13.6834 10.7802 13.6834 10.0634C13.6834 9.53567 13.3961 9.28807 12.4366 8.97532L11.8491 8.77985Z"
               fill="currentColor"
-              fill-rule="evenodd"
-              clip-rule="evenodd"
+              fillRule="evenodd"
+              clipRule="evenodd"
             />
           </svg>
         </BasicButton>

From 3d2ef7734598395a7550cf8f1d23c4064d3cb8f1 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 15 Nov 2024 11:42:56 +0100
Subject: [PATCH 05/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20improve=20Fragment=20code=20setup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/Peritext.ts               | 2 +-
 .../peritext/block/{Blocks.ts => Fragment.ts}               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename src/json-crdt-extensions/peritext/block/{Blocks.ts => Fragment.ts} (90%)

diff --git a/src/json-crdt-extensions/peritext/Peritext.ts b/src/json-crdt-extensions/peritext/Peritext.ts
index 767f435384..c88d5aacd1 100644
--- a/src/json-crdt-extensions/peritext/Peritext.ts
+++ b/src/json-crdt-extensions/peritext/Peritext.ts
@@ -14,7 +14,7 @@ import {CONST, updateNum} from '../../json-hash';
 import {SESSION} from '../../json-crdt-patch/constants';
 import {s} from '../../json-crdt-patch';
 import {ExtraSlices} from './slice/ExtraSlices';
-import {Fragment} from './block/Blocks';
+import {Fragment} from './block/Fragment';
 import {updateRga} from '../../json-crdt/hash';
 import type {ITimestampStruct} from '../../json-crdt-patch/clock';
 import type {Printable} from 'tree-dump/lib/types';
diff --git a/src/json-crdt-extensions/peritext/block/Blocks.ts b/src/json-crdt-extensions/peritext/block/Fragment.ts
similarity index 90%
rename from src/json-crdt-extensions/peritext/block/Blocks.ts
rename to src/json-crdt-extensions/peritext/block/Fragment.ts
index e9dc11ff02..282221ee3c 100644
--- a/src/json-crdt-extensions/peritext/block/Blocks.ts
+++ b/src/json-crdt-extensions/peritext/block/Fragment.ts
@@ -9,6 +9,12 @@ import type {Printable} from 'tree-dump/lib/types';
 import type {Peritext} from '../Peritext';
 import type {Point} from '../rga/Point';
 
+/**
+ * A *fragment* represents a structural slice of a rich-text document. A
+ * fragment can be bound to a specific range of text contents, however it
+ * always constructs a tree of {@link Block}s, which represent the nested
+ * structure of the text contents.
+ */
 export class Fragment implements Printable, Stateful {
   public readonly root: Block;
 

From efd088ad33d4b9ce246b4c9cb3e68ec2575ebf6a Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 15 Nov 2024 13:25:38 +0100
Subject: [PATCH 06/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20cap=20all=20blocks=20to=20their=20range?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/Peritext.ts |  6 ++-
 .../peritext/block/Block.ts                   | 12 ++++--
 .../peritext/block/Fragment.ts                | 42 +++++++++++--------
 .../peritext/block/LeafBlock.ts               |  2 +-
 .../block/__tests__/Fragment-range.spec.ts    | 21 ++++++++++
 ...fresh.spec.ts => Fragment.refresh.spec.ts} |  0
 .../{Blocks.spec.ts => Fragment.spec.ts}      |  0
 .../peritext/overlay/Overlay.ts               | 21 ++++++++--
 .../peritext/overlay/types.ts                 |  3 ++
 9 files changed, 82 insertions(+), 25 deletions(-)
 create mode 100644 src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
 rename src/json-crdt-extensions/peritext/block/__tests__/{Blocks.refresh.spec.ts => Fragment.refresh.spec.ts} (100%)
 rename src/json-crdt-extensions/peritext/block/__tests__/{Blocks.spec.ts => Fragment.spec.ts} (100%)

diff --git a/src/json-crdt-extensions/peritext/Peritext.ts b/src/json-crdt-extensions/peritext/Peritext.ts
index c88d5aacd1..5bf9d86a5a 100644
--- a/src/json-crdt-extensions/peritext/Peritext.ts
+++ b/src/json-crdt-extensions/peritext/Peritext.ts
@@ -86,7 +86,7 @@ export class Peritext<T = string> implements Printable {
     });
     this.localSlices = new LocalSlices(this, localSlicesModel.root.node().get(0)!);
     this.editor = new Editor<T>(this);
-    this.blocks = new Fragment(this as Peritext);
+    this.blocks = new Fragment(this as Peritext, this.pointAbsStart() as Point, this.pointAbsEnd() as Point);
   }
 
   public strApi(): StrApi {
@@ -219,6 +219,10 @@ export class Peritext<T = string> implements Printable {
     return this.range(start, end);
   }
 
+  public fragment(range: Range): Fragment {
+    return new Fragment(this as Peritext, range.start, range.end);
+  }
+
   // ---------------------------------------------------------- text (& slices)
 
   /**
diff --git a/src/json-crdt-extensions/peritext/block/Block.ts b/src/json-crdt-extensions/peritext/block/Block.ts
index 59eafc44cf..c93628b653 100644
--- a/src/json-crdt-extensions/peritext/block/Block.ts
+++ b/src/json-crdt-extensions/peritext/block/Block.ts
@@ -4,6 +4,8 @@ import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import {UndefEndIter, type UndefIterator} from '../../../util/iterator';
 import {Inline} from './Inline';
 import {formatType} from '../slice/util';
+import {Range} from '../rga/Range';
+import type {Point} from '../rga/Point';
 import type {OverlayPoint} from '../overlay/OverlayPoint';
 import type {Path} from '@jsonjoy.com/json-pointer';
 import type {Printable} from 'tree-dump';
@@ -18,7 +20,7 @@ export interface IBlock {
 
 type T = string;
 
-export class Block<Attr = unknown> implements IBlock, Printable, Stateful {
+export class Block<Attr = unknown> extends Range implements IBlock, Printable, Stateful {
   public parent: Block | null = null;
 
   public children: Block[] = [];
@@ -27,7 +29,11 @@ export class Block<Attr = unknown> implements IBlock, Printable, Stateful {
     public readonly txt: Peritext,
     public readonly path: Path,
     public readonly marker: MarkerOverlayPoint | undefined,
-  ) {}
+    public start: Point,
+    public end: Point,
+  ) {
+    super(txt.str, start, end);
+  }
 
   /**
    * @returns Stable unique identifier within a list of blocks. Used for React
@@ -140,7 +146,7 @@ export class Block<Attr = unknown> implements IBlock, Printable, Stateful {
 
   // ---------------------------------------------------------------- Printable
 
-  protected toStringName(): string {
+  public toStringName(): string {
     return 'Block';
   }
   protected toStringHeader(): string {
diff --git a/src/json-crdt-extensions/peritext/block/Fragment.ts b/src/json-crdt-extensions/peritext/block/Fragment.ts
index 282221ee3c..7ff4f2987d 100644
--- a/src/json-crdt-extensions/peritext/block/Fragment.ts
+++ b/src/json-crdt-extensions/peritext/block/Fragment.ts
@@ -1,8 +1,10 @@
 import {Block} from './Block';
-import type {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import {commonLength} from '../util/commonLength';
 import {printTree} from 'tree-dump/lib/printTree';
 import {LeafBlock} from './LeafBlock';
+import {Range} from '../rga/Range';
+import {CommonSliceType} from '../slice';
+import type {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import type {Path} from '@jsonjoy.com/json-pointer';
 import type {Stateful} from '../types';
 import type {Printable} from 'tree-dump/lib/types';
@@ -15,11 +17,12 @@ import type {Point} from '../rga/Point';
  * always constructs a tree of {@link Block}s, which represent the nested
  * structure of the text contents.
  */
-export class Fragment implements Printable, Stateful {
+export class Fragment extends Range implements Printable, Stateful {
   public readonly root: Block;
 
-  constructor(public readonly txt: Peritext) {
-    this.root = new Block(txt, [], undefined);
+  constructor(public readonly txt: Peritext, start: Point, end: Point) {
+    super(txt.str, start, end);
+    this.root = new Block(txt, [], void 0, start, end);
   }
 
   // ---------------------------------------------------------------- Printable
@@ -33,43 +36,48 @@ export class Fragment implements Printable, Stateful {
   public hash: number = 0;
 
   public refresh(): number {
-    this.build(this.txt.pointStart(), void 0);
+    this.build();
     return (this.hash = this.root.refresh());
   }
 
-  private insertBlock(parent: Block, path: Path, marker: undefined | MarkerOverlayPoint): Block {
+  private insertBlock(parent: Block, path: Path, marker: undefined | MarkerOverlayPoint, end: Point = this.end): Block {
     const txt = this.txt;
     const common = commonLength(path, parent.path);
+    const start: Point = marker ? marker : this.start;
     while (parent.path.length > common && parent.parent) parent = parent.parent as Block;
     while (parent.path.length + 1 < path.length) {
-      const block = new Block(txt, path.slice(0, parent.path.length + 1), undefined);
+      const block = new Block(txt, path.slice(0, parent.path.length + 1), void 0, start, end);
       block.parent = parent;
       parent.children.push(block);
       parent = block;
     }
-    const block = new LeafBlock(txt, path, marker);
+    const block = new LeafBlock(txt, path, marker, start, end);
     block.parent = parent;
     parent.children.push(block);
     return block;
   }
 
-  protected build(start: Point | undefined, end: Point | undefined): void {
-    this.root.children = [];
+  protected build(): void {
+    const {end, root} = this;
+    root.children = [];
     let parent = this.root;
-    let markerPoint: undefined | MarkerOverlayPoint;
     const txt = this.txt;
     const overlay = txt.overlay;
     /**
      * @todo This line always inserts a markerless block at the beginning of
      * the fragment. But what happens if one actually exists?
      */
-    this.insertBlock(parent, [0], undefined);
-    const iterator = start ? overlay.markers1(start) : overlay.markers0(undefined);
-    while ((markerPoint = iterator())) {
-      if (end && markerPoint.cmpSpatial(end) > 0) break;
-      const type = markerPoint.type();
+    this.insertBlock(parent, [CommonSliceType.p], void 0, void 0);
+    const iterator = overlay.markerPairs0(this.start, this.end);
+    const checkEnd = !end.isAbsEnd();
+    let pair: ReturnType<typeof iterator>;
+    while ((pair = iterator())) {
+      const [p1, p2] = pair;
+      if (!p1) break;
+      if (checkEnd && p1.cmpSpatial(end) > 0) break;
+      const type = p1.type();
       const path = type instanceof Array ? type : [type];
-      const block = this.insertBlock(parent, path, markerPoint);
+      const block = this.insertBlock(parent, path, p1, p2);
       if (block.parent) parent = block.parent;
     }
   }
diff --git a/src/json-crdt-extensions/peritext/block/LeafBlock.ts b/src/json-crdt-extensions/peritext/block/LeafBlock.ts
index ce9b8d23b4..df49083600 100644
--- a/src/json-crdt-extensions/peritext/block/LeafBlock.ts
+++ b/src/json-crdt-extensions/peritext/block/LeafBlock.ts
@@ -10,7 +10,7 @@ export interface IBlock<Attr = unknown> {
 
 export class LeafBlock<Attr = unknown> extends Block<Attr> {
   // ---------------------------------------------------------------- Printable
-  protected toStringName(): string {
+  public toStringName(): string {
     return 'LeafBlock';
   }
 
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
new file mode 100644
index 0000000000..5b85fafb57
--- /dev/null
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
@@ -0,0 +1,21 @@
+import {Kit, runAlphabetKitTestSuite, setupHelloWorldKit} from '../../__tests__/setup';
+import {MarkerOverlayPoint} from '../../overlay/MarkerOverlayPoint';
+import {Block} from '../Block';
+import {LeafBlock} from '../LeafBlock';
+
+const testSuite = (setup: (() => Kit)): void => {
+  describe('when no markers', () => {
+    test('can create a fragment', () => {
+      const kit = setup();
+      const range = kit.peritext.rangeAt(3, 10);
+      const fragment = kit.peritext.fragment(range);
+      expect(fragment.text()).toBe('defghijklm');
+      fragment.refresh();
+      expect(fragment.root.children[0]).toBeInstanceOf(LeafBlock);
+      // expect(fragment.root.children[0]).toBeInstanceOf(LeafBlock);
+      console.log(fragment + '');
+    });
+  });
+};
+
+runAlphabetKitTestSuite(testSuite);
\ No newline at end of file
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Blocks.refresh.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Fragment.refresh.spec.ts
similarity index 100%
rename from src/json-crdt-extensions/peritext/block/__tests__/Blocks.refresh.spec.ts
rename to src/json-crdt-extensions/peritext/block/__tests__/Fragment.refresh.spec.ts
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Blocks.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Fragment.spec.ts
similarity index 100%
rename from src/json-crdt-extensions/peritext/block/__tests__/Blocks.spec.ts
rename to src/json-crdt-extensions/peritext/block/__tests__/Fragment.spec.ts
diff --git a/src/json-crdt-extensions/peritext/overlay/Overlay.ts b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
index de7a2ad700..7ef2db8710 100644
--- a/src/json-crdt-extensions/peritext/overlay/Overlay.ts
+++ b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
@@ -20,7 +20,7 @@ import type {Stateful} from '../types';
 import type {Printable} from 'tree-dump/lib/types';
 import type {MutableSlice, Slice, SliceType} from '../slice/types';
 import type {Slices} from '../slice/Slices';
-import type {OverlayPair, OverlayTuple} from './types';
+import type {MarkerOverlayPair, OverlayPair, OverlayTuple} from './types';
 import type {Comparator} from 'sonic-forest/lib/types';
 
 const spatialComparator: Comparator<OverlayPoint> = (a: OverlayPoint, b: OverlayPoint) => a.cmpSpatial(b);
@@ -232,6 +232,10 @@ export class Overlay<T = string> implements Printable, Stateful {
     };
   }
 
+  public markers(): UndefEndIter<MarkerOverlayPoint<T>> {
+    return new UndefEndIter(this.markers0(undefined));
+  }
+
   /**
    * Returns all {@link MarkerOverlayPoint} instances in the overlay, starting
    * from a give {@link Point}, including any marker overlay points that are
@@ -242,13 +246,24 @@ export class Overlay<T = string> implements Printable, Stateful {
    *     point.
    */
   public markers1(point: Point<T>): UndefIterator<MarkerOverlayPoint<T>> {
+    if (point.isAbsStart()) return this.markers0(undefined);
     let after = this.getOrNextLowerMarker(point);
     if (after && after.cmp(point) === 0) after = prev2(after);
     return this.markers0(after);
   }
 
-  public markers(): UndefEndIter<MarkerOverlayPoint<T>> {
-    return new UndefEndIter(this.markers0(undefined));
+  public markerPairs0(start: Point<T>, end?: Point<T>): UndefIterator<MarkerOverlayPair<T>> {
+    const i = this.markers1(start);
+    let one: MarkerOverlayPoint<T> | undefined = i();
+    let two: MarkerOverlayPoint<T> | undefined = i();
+    return () => {
+      if (!one) return;
+      if (end && end.cmpSpatial(one) <= 0) return one = void 0;
+      const ret: MarkerOverlayPair<T> = [one, two];
+      one = two;
+      two = i();
+      return ret;
+    };
   }
 
   public pairs0(after: undefined | OverlayPoint<T>): UndefIterator<OverlayPair<T>> {
diff --git a/src/json-crdt-extensions/peritext/overlay/types.ts b/src/json-crdt-extensions/peritext/overlay/types.ts
index 618631170f..0ed3b06782 100644
--- a/src/json-crdt-extensions/peritext/overlay/types.ts
+++ b/src/json-crdt-extensions/peritext/overlay/types.ts
@@ -1,3 +1,4 @@
+import type {MarkerOverlayPoint} from './MarkerOverlayPoint';
 import type {OverlayPoint} from './OverlayPoint';
 
 /**
@@ -15,3 +16,5 @@ export type OverlayPair<T> = [p1: OverlayPoint<T> | undefined, p2: OverlayPoint<
  * by virtual points.
  */
 export type OverlayTuple<T> = [p1: OverlayPoint<T>, p2: OverlayPoint<T>];
+
+export type MarkerOverlayPair<T> = [p1: MarkerOverlayPoint<T> | undefined, p2: MarkerOverlayPoint<T> | undefined];

From e8ee319f70bc86fa1195338596ebc6eda73229dc Mon Sep 17 00:00:00 2001
From: streamich <streamich@gmail.com>
Date: Fri, 15 Nov 2024 16:37:39 +0100
Subject: [PATCH 07/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20clamp=20Inline=20elements=20inside=20a=20Fragmen?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peritext/block/Block.ts                   | 29 ++++++++++++----
 .../peritext/block/Inline.ts                  | 33 +++++++++++--------
 .../peritext/block/LeafBlock.ts               |  8 -----
 .../block/__tests__/Inline.key.spec.ts        |  4 +--
 .../peritext/block/__tests__/Inline.spec.ts   |  8 ++---
 5 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/block/Block.ts b/src/json-crdt-extensions/peritext/block/Block.ts
index c93628b653..36be93868b 100644
--- a/src/json-crdt-extensions/peritext/block/Block.ts
+++ b/src/json-crdt-extensions/peritext/block/Block.ts
@@ -104,9 +104,24 @@ export class Block<Attr = unknown> extends Range implements IBlock, Printable, S
   public texts0(): UndefIterator<Inline> {
     const txt = this.txt;
     const iterator = this.tuples0();
+    const blockStart = this.start;
+    const blockEnd = this.end;
+    let isFirst = true;
+    let next = iterator();
     return () => {
-      const pair = iterator();
-      return pair && new Inline(txt, pair[0], pair[1]);
+      const pair = next;
+      next = iterator();
+      if (!pair) return;
+      const [p1, p2] = pair;
+      let start: Point = p1;
+      let end: Point = p2;
+      if (isFirst) {
+        isFirst = false;
+        if (blockStart.cmpSpatial(p1) > 0) start = blockStart;
+      }
+      const isLast = !next;
+      if (isLast) if (blockEnd.cmpSpatial(p2) < 0) end = blockEnd;
+      return new Inline(txt, p1, p2, start, end);
     };
   }
 
@@ -117,10 +132,10 @@ export class Block<Attr = unknown> extends Range implements IBlock, Printable, S
   public text(): string {
     let str = '';
     const iterator = this.texts0();
-    let text = iterator();
-    while (text) {
-      str += text.text();
-      text = iterator();
+    let inline = iterator();
+    while (inline) {
+      str += inline.text();
+      inline = iterator();
     }
     return str;
   }
@@ -152,7 +167,7 @@ export class Block<Attr = unknown> extends Range implements IBlock, Printable, S
   protected toStringHeader(): string {
     const hash = `#${this.hash.toString(36).slice(-4)}`;
     const tag = this.path.map((step) => formatType(step)).join('.');
-    const header = `${this.toStringName()} ${hash} ${tag}`;
+    const header = `${super.toString('', true)} ${hash} ${tag} `;
     return header;
   }
 
diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index 83d18bc08b..35d2955c4e 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -12,6 +12,7 @@ import type {Printable} from 'tree-dump/lib/types';
 import type {PathStep} from '@jsonjoy.com/json-pointer';
 import type {Peritext} from '../Peritext';
 import type {Slice} from '../slice/types';
+import {Point} from '../rga/Point';
 
 /** The attribute started before this inline and ends after this inline. */
 export class InlineAttrPassing {
@@ -64,8 +65,10 @@ export type InlineAttrs = Record<string | number, InlineAttrStack>;
 export class Inline extends Range implements Printable {
   constructor(
     public readonly txt: Peritext,
-    public start: OverlayPoint,
-    public end: OverlayPoint,
+    public readonly p1: OverlayPoint,
+    public readonly p2: OverlayPoint,
+    start: Point,
+    end: Point,
   ) {
     super(txt.str, start, end);
   }
@@ -92,15 +95,17 @@ export class Inline extends Range implements Printable {
   }
 
   protected createAttr(slice: Slice): InlineAttr {
+    const p1 = this.p1;
+    const p2 = this.p2;
     return !slice.start.cmp(slice.end)
-      ? !slice.start.cmp(this.start)
+      ? !slice.start.cmp(p1)
         ? new InlineAttrStartPoint(slice)
         : new InlineAttrEndPoint(slice)
-      : !this.start.cmp(slice.start)
-        ? !this.end.cmp(slice.end)
+      : !p1.cmp(slice.start)
+        ? !p2.cmp(slice.end)
           ? new InlineAttrContained(slice)
           : new InlineAttrStart(slice)
-        : !this.end.cmp(slice.end)
+        : !p2.cmp(slice.end)
           ? new InlineAttrEnd(slice)
           : new InlineAttrPassing(slice);
   }
@@ -118,11 +123,11 @@ export class Inline extends Range implements Printable {
   public attr(): InlineAttrs {
     if (this._attr) return this._attr;
     const attr: InlineAttrs = (this._attr = {});
-    const point1 = this.start as OverlayPoint;
-    const point2 = this.end as OverlayPoint;
-    const slices1 = point1.layers;
-    const slices2 = point1.markers;
-    const slices3 = point2.isAbsEnd() ? point2.markers : [];
+    const p1 = this.p1 as OverlayPoint;
+    const p2 = this.p2 as OverlayPoint;
+    const slices1 = p1.layers;
+    const slices2 = p1.markers;
+    const slices3 = p2.isAbsEnd() ? p2.markers : [];
     const length1 = slices1.length;
     const length2 = slices2.length;
     const length3 = slices3.length;
@@ -233,7 +238,7 @@ export class Inline extends Range implements Printable {
 
   public text(): string {
     const str = super.text();
-    return this.start instanceof MarkerOverlayPoint ? str.slice(1) : str;
+    return this.p1 instanceof MarkerOverlayPoint ? str.slice(1) : str;
   }
 
   // ---------------------------------------------------------------- Printable
@@ -246,9 +251,9 @@ export class Inline extends Range implements Printable {
     const str = this.text();
     const truncate = str.length > 32;
     const text = JSON.stringify(truncate ? str.slice(0, 32) : str) + (truncate ? ' …' : '');
-    const startFormatted = this.start.toString(tab, true);
+    const startFormatted = this.p1.toString(tab, true);
     const range =
-      this.start.cmp(this.end) === 0 ? startFormatted : `${startFormatted} ↔ ${this.end.toString(tab, true)}`;
+      this.p1.cmp(this.end) === 0 ? startFormatted : `${startFormatted} ↔ ${this.end.toString(tab, true)}`;
     const header = `Inline ${range} ${text}`;
     const attr = this.attr();
     const attrKeys = Object.keys(attr);
diff --git a/src/json-crdt-extensions/peritext/block/LeafBlock.ts b/src/json-crdt-extensions/peritext/block/LeafBlock.ts
index df49083600..07e5ed02ae 100644
--- a/src/json-crdt-extensions/peritext/block/LeafBlock.ts
+++ b/src/json-crdt-extensions/peritext/block/LeafBlock.ts
@@ -14,14 +14,6 @@ export class LeafBlock<Attr = unknown> extends Block<Attr> {
     return 'LeafBlock';
   }
 
-  protected toStringHeader(): string {
-    const str = this.text();
-    const truncate = str.length > 32;
-    const text = JSON.stringify(truncate ? str.slice(0, 32) : str) + (truncate ? ' …' : '');
-    const header = `${super.toStringHeader()} ${text}`;
-    return header;
-  }
-
   public toString(tab: string = ''): string {
     const header = this.toStringHeader();
     const texts = [...this.texts()];
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
index 2307e8023a..f29ac3a67a 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
@@ -74,9 +74,9 @@ const runKeyTests = (setup: () => Kit) => {
           // tslint:disable-next-line:no-console
           console.error('DUPLICATE KEY:', inline.key());
           // tslint:disable-next-line:no-console
-          console.log('INLINE 1:', inline.start.id, inline.start.anchor, inline.end.id, inline.end.anchor);
+          console.log('INLINE 1:', inline.p1.id, inline.p1.anchor, inline.end.id, inline.end.anchor);
           // tslint:disable-next-line:no-console
-          console.log('INLINE 2:', inline2.start.id, inline2.start.anchor, inline2.end.id, inline2.end.anchor);
+          console.log('INLINE 2:', inline2.p1.id, inline2.p1.anchor, inline2.end.id, inline2.end.anchor);
           throw new Error('Duplicate key');
         }
         keys.set(inline.key(), inline);
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
index 3ea3c4026b..796934249d 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
@@ -117,7 +117,7 @@ const runStrTests = (setup: () => Kit) => {
       const {peritext} = setup();
       peritext.editor.cursor.setAt(3);
       const [paragraph] = peritext.editor.saved.insMarker('p');
-      peritext.editor.cursor.set(paragraph.start);
+      peritext.editor.cursor.set(paragraph.p1);
       peritext.refresh();
       const block = peritext.blocks.root.children[1]!;
       const inline = [...block.texts()][0];
@@ -129,7 +129,7 @@ const runStrTests = (setup: () => Kit) => {
       const {peritext} = setup();
       peritext.editor.cursor.setAt(2, 2);
       const [slice] = peritext.editor.saved.insStack('bold', 123);
-      peritext.editor.cursor.set(slice.start);
+      peritext.editor.cursor.set(slice.p1);
       peritext.refresh();
       const block = peritext.blocks.root.children[0]!;
       const inline = [...block.texts()][1];
@@ -207,7 +207,7 @@ const runStrTests = (setup: () => Kit) => {
         const {peritext} = setup();
         peritext.editor.cursor.setAt(2, 6);
         const [slice] = peritext.editor.saved.insStack(['a', 1, 'b', 2]);
-        peritext.editor.cursor.set(slice.start);
+        peritext.editor.cursor.set(slice.p1);
         peritext.refresh();
         const str = peritext.strApi().view();
         const [inline1, inline2, inline3] = peritext.blocks.root.children[0]!.texts();
@@ -233,7 +233,7 @@ const runStrTests = (setup: () => Kit) => {
         const {peritext} = setup();
         peritext.editor.cursor.setAt(5);
         const [paragraph] = peritext.editor.extra.insMarker('p');
-        peritext.editor.cursor.set(paragraph.start);
+        peritext.editor.cursor.set(paragraph.p1);
         peritext.refresh();
         const str = peritext.strApi().view();
         const [block1, block2] = peritext.blocks.root.children;

From 1b57de29ca5089c75b80d6c45195d3704a8ebba5 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 01:22:06 +0100
Subject: [PATCH 08/19] =?UTF-8?q?test(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=92=8D=20improve=20fragment=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peritext/block/Inline.ts                  |  2 +-
 .../block/__tests__/Fragment-range.spec.ts    | 29 +++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index 35d2955c4e..98219797b3 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -7,12 +7,12 @@ import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import {Cursor} from '../editor/Cursor';
 import {hashId} from '../../../json-crdt/hash';
 import {formatType} from '../slice/util';
+import {Point} from '../rga/Point';
 import type {OverlayPoint} from '../overlay/OverlayPoint';
 import type {Printable} from 'tree-dump/lib/types';
 import type {PathStep} from '@jsonjoy.com/json-pointer';
 import type {Peritext} from '../Peritext';
 import type {Slice} from '../slice/types';
-import {Point} from '../rga/Point';
 
 /** The attribute started before this inline and ends after this inline. */
 export class InlineAttrPassing {
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
index 5b85fafb57..67a37ce8e7 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
@@ -1,6 +1,6 @@
-import {Kit, runAlphabetKitTestSuite, setupHelloWorldKit} from '../../__tests__/setup';
-import {MarkerOverlayPoint} from '../../overlay/MarkerOverlayPoint';
-import {Block} from '../Block';
+import {Kit, runAlphabetKitTestSuite} from '../../__tests__/setup';
+import {CommonSliceType} from '../../slice';
+import {Inline} from '../Inline';
 import {LeafBlock} from '../LeafBlock';
 
 const testSuite = (setup: (() => Kit)): void => {
@@ -12,10 +12,27 @@ const testSuite = (setup: (() => Kit)): void => {
       expect(fragment.text()).toBe('defghijklm');
       fragment.refresh();
       expect(fragment.root.children[0]).toBeInstanceOf(LeafBlock);
-      // expect(fragment.root.children[0]).toBeInstanceOf(LeafBlock);
-      console.log(fragment + '');
+      expect(fragment.root.children[0].text()).toBe('defghijklm');
+      expect([...fragment.root.children[0].texts()][0]).toBeInstanceOf(Inline);
+      expect([...fragment.root.children[0].texts()][0].text()).toBe('defghijklm');
+    });
+  });
+
+  describe('with markers', () => {
+    test('around a marker', () => {
+      const kit = setup();
+      kit.peritext.editor.cursor.setAt(5);
+      kit.peritext.editor.saved.insMarker(CommonSliceType.p);
+      kit.peritext.refresh();
+      const range = kit.peritext.rangeAt(3, 10);
+      const fragment = kit.peritext.fragment(range);
+      fragment.refresh();
+      expect(fragment.root.children[0]).toBeInstanceOf(LeafBlock);
+      expect(fragment.root.children[0].text()).toBe('de');
+      expect(fragment.root.children[1]).toBeInstanceOf(LeafBlock);
+      expect(fragment.root.children[1].text()).toBe('fghijkl');
     });
   });
 };
 
-runAlphabetKitTestSuite(testSuite);
\ No newline at end of file
+runAlphabetKitTestSuite(testSuite);

From 6530aaff09cf6c05ba09fe0668bac137dc3531c3 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 01:35:00 +0100
Subject: [PATCH 09/19] =?UTF-8?q?test:=20=F0=9F=92=8D=20fix=20up=20all=20t?=
 =?UTF-8?q?ests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../block/__tests__/Block.iteration.spec.ts   |  4 ++--
 .../peritext/block/__tests__/Block.spec.ts    |  2 +-
 .../block/__tests__/Inline.key.spec.ts        |  2 +-
 .../peritext/block/__tests__/Inline.spec.ts   | 20 +++++++++----------
 .../events/__tests__/inline.spec.ts           |  5 +++--
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts
index c99fe5386a..f1f7a9c01f 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Block.iteration.spec.ts
@@ -112,8 +112,8 @@ describe('tuples', () => {
     const tuples1 = [...block1.tuples()];
     const tuples2 = [...block2.tuples()];
     expect(tuples1.length).toBe(3);
-    const text1 = tuples1.map(([p1, p2]) => new Inline(peritext, p1, p2).text()).join('');
-    const text2 = tuples2.map(([p1, p2]) => new Inline(peritext, p1, p2).text()).join('');
+    const text1 = tuples1.map(([p1, p2]) => new Inline(peritext, p1, p2, p1, p2).text()).join('');
+    const text2 = tuples2.map(([p1, p2]) => new Inline(peritext, p1, p2, p1, p2).text()).join('');
     expect(text1).toBe('hello ');
     expect(text2).toBe('world');
   });
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Block.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Block.spec.ts
index b754ea2345..40617ad1c6 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Block.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Block.spec.ts
@@ -12,7 +12,7 @@ const setup = () => {
   const marker = kit.peritext.overlay.markers().next().value!;
   const type = marker.type();
   const path = type instanceof Array ? type : [type];
-  const block = new Block(kit.peritext, path, marker);
+  const block = new Block(kit.peritext, path, marker, kit.peritext.pointAbsStart(), kit.peritext.pointAbsEnd());
   return {
     ...kit,
     block,
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
index f29ac3a67a..57cef694af 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Inline.key.spec.ts
@@ -68,7 +68,7 @@ const runKeyTests = (setup: () => Kit) => {
         peritext.editor.cursor.setAt(i, j);
         overlay.refresh();
         const [start, end] = [...overlay.points()];
-        const inline = new Inline(peritext, start, end);
+        const inline = new Inline(peritext, start, end, start, end);
         if (keys.has(inline.key())) {
           const inline2 = keys.get(inline.key())!;
           // tslint:disable-next-line:no-console
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
index 796934249d..5e5af14a57 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
@@ -20,7 +20,7 @@ const runStrTests = (setup: () => Kit) => {
           peritext.editor.cursor.setAt(i, j);
           overlay.refresh();
           const [start, end] = [...overlay.points()];
-          const inline = new Inline(peritext, start, end);
+          const inline = new Inline(peritext, start, end, start, end);
           const str = inline.text();
           expect(str).toBe(
             peritext
@@ -43,7 +43,7 @@ const runStrTests = (setup: () => Kit) => {
           peritext.editor.cursor.setAt(i, j);
           overlay.refresh();
           const [start, end] = [...overlay.points()];
-          const inline = new Inline(peritext, start, end);
+          const inline = new Inline(peritext, start, end, start, end);
           const pos = inline.pos();
           expect(pos).toBe(i);
         }
@@ -61,7 +61,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insStack('em', 1);
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = new Inline(peritext, start, end);
+      const inline = new Inline(peritext, start, end, start, end);
       const attr = inline.attr();
       expect(attr.bold[0].slice.data()).toEqual(1);
       expect(attr.bold[1].slice.data()).toEqual(2);
@@ -77,7 +77,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insOverwrite('em', 1);
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = new Inline(peritext, start, end);
+      const inline = new Inline(peritext, start, end, start, end);
       const attr = inline.attr();
       expect(attr.bold[0].slice.data()).toEqual(2);
       expect(attr.em[0].slice.data()).toEqual(1);
@@ -92,7 +92,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insOverwrite('em');
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = new Inline(peritext, start, end);
+      const inline = new Inline(peritext, start, end, start, end);
       const attr = inline.attr();
       expect(attr.bold).toBe(undefined);
       expect(attr.em[0]).toBeInstanceOf(InlineAttrContained);
@@ -107,7 +107,7 @@ const runStrTests = (setup: () => Kit) => {
       peritext.editor.saved.insStack(['bold', 'normal'], 2);
       overlay.refresh();
       const [start, end] = [...overlay.points()];
-      const inline = new Inline(peritext, start, end);
+      const inline = new Inline(peritext, start, end, start, end);
       const attr = inline.attr();
       expect(attr['bold,very'][0].slice.data()).toEqual(1);
       expect(attr['bold,normal'][0].slice.data()).toEqual(2);
@@ -117,7 +117,7 @@ const runStrTests = (setup: () => Kit) => {
       const {peritext} = setup();
       peritext.editor.cursor.setAt(3);
       const [paragraph] = peritext.editor.saved.insMarker('p');
-      peritext.editor.cursor.set(paragraph.p1);
+      peritext.editor.cursor.set(paragraph.start);
       peritext.refresh();
       const block = peritext.blocks.root.children[1]!;
       const inline = [...block.texts()][0];
@@ -129,7 +129,7 @@ const runStrTests = (setup: () => Kit) => {
       const {peritext} = setup();
       peritext.editor.cursor.setAt(2, 2);
       const [slice] = peritext.editor.saved.insStack('bold', 123);
-      peritext.editor.cursor.set(slice.p1);
+      peritext.editor.cursor.set(slice.start);
       peritext.refresh();
       const block = peritext.blocks.root.children[0]!;
       const inline = [...block.texts()][1];
@@ -207,7 +207,7 @@ const runStrTests = (setup: () => Kit) => {
         const {peritext} = setup();
         peritext.editor.cursor.setAt(2, 6);
         const [slice] = peritext.editor.saved.insStack(['a', 1, 'b', 2]);
-        peritext.editor.cursor.set(slice.p1);
+        peritext.editor.cursor.set(slice.start);
         peritext.refresh();
         const str = peritext.strApi().view();
         const [inline1, inline2, inline3] = peritext.blocks.root.children[0]!.texts();
@@ -233,7 +233,7 @@ const runStrTests = (setup: () => Kit) => {
         const {peritext} = setup();
         peritext.editor.cursor.setAt(5);
         const [paragraph] = peritext.editor.extra.insMarker('p');
-        peritext.editor.cursor.set(paragraph.p1);
+        peritext.editor.cursor.set(paragraph.start);
         peritext.refresh();
         const str = peritext.strApi().view();
         const [block1, block2] = peritext.blocks.root.children;
diff --git a/src/json-crdt-peritext-ui/events/__tests__/inline.spec.ts b/src/json-crdt-peritext-ui/events/__tests__/inline.spec.ts
index b569f4b076..24f9401c19 100644
--- a/src/json-crdt-peritext-ui/events/__tests__/inline.spec.ts
+++ b/src/json-crdt-peritext-ui/events/__tests__/inline.spec.ts
@@ -15,10 +15,11 @@ const testSuite = (getKit: () => Kit) => {
     const kit = setup();
     kit.et.cursor({at: 3, len: 3});
     kit.et.format({type: 'bold'});
+    kit.editor.delCursors();
     kit.peritext.refresh();
     const slices = kit.peritext.overlay.findOverlapping(kit.peritext.rangeAt(5));
-    console.log([...slices]);
-    console.log(kit.peritext + '');
+    const [slice] = slices;
+    expect(slice.type).toBe('bold');
   });
 };
 

From 02b958130471ff4e6334f3140378e1f77114b002 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 01:47:50 +0100
Subject: [PATCH 10/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20create=20constant=20enum=20for=20slice=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__tests__/Peritext.cursor.spec.ts         | 16 ++---
 .../peritext/__tests__/Peritext.tree.spec.ts  | 22 +++----
 .../peritext/__tests__/setup.ts               | 30 ++++-----
 .../peritext/block/Inline.ts                  | 12 ++--
 .../peritext/block/__tests__/Inline.spec.ts   | 26 ++++----
 .../peritext/slice/PersistedSlice.ts          |  6 +-
 .../peritext/slice/constants.ts               | 63 +++++++++++++++++--
 .../peritext/slice/index.ts                   |  2 +-
 .../peritext/slice/util.ts                    |  6 +-
 9 files changed, 119 insertions(+), 64 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/__tests__/Peritext.cursor.spec.ts b/src/json-crdt-extensions/peritext/__tests__/Peritext.cursor.spec.ts
index a2b12a9e1b..b8e6644acd 100644
--- a/src/json-crdt-extensions/peritext/__tests__/Peritext.cursor.spec.ts
+++ b/src/json-crdt-extensions/peritext/__tests__/Peritext.cursor.spec.ts
@@ -1,5 +1,5 @@
 import {InlineAttrStartPoint, InlineAttrContained} from '../block/Inline';
-import {CommonSliceType} from '../slice/constants';
+import {SliceTypeName} from '../slice/constants';
 import {setupKit} from './setup';
 
 const setup = () => {
@@ -24,7 +24,7 @@ test('cursor at the start of string and slice annotation at the start of string'
   expect(inline1.text()).toBe('');
   expect(inline2.text()).toBe('a');
   expect(inline3.text()).toBe('b');
-  expect(inline1.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+  expect(inline1.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
   expect(inline2.attr().bold[0]).toBeInstanceOf(InlineAttrContained);
   expect(inline3.attr()).toEqual({});
 });
@@ -48,7 +48,7 @@ test('cursor walking over character marked as bold', () => {
   expect(inline2.text()).toBe('a');
   expect(inline3.text()).toBe('b');
   expect(inline2.attr().bold[0]).toBeInstanceOf(InlineAttrContained);
-  expect(inline3.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+  expect(inline3.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
   // expect(inline2.attr()).toEqual({bold: [[void 0], InlineAttrPos.Contained]});
   // expect(inline3.attr()).toEqual({
   //   [SliceTypes.Cursor]: [[[CursorAnchor.Start, void 0]], InlineAttrPos.Collapsed],
@@ -78,7 +78,7 @@ test('cursor walking over character marked as bold and one more', () => {
   expect(inline2.attr().bold[0]).toBeInstanceOf(InlineAttrContained);
   // expect(inline2.attr()).toEqual({bold: [1, InlineAttrPos.Contained]});
   expect(inline3.attr()).toEqual({});
-  expect(inline4.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+  expect(inline4.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
   // expect(inline4.attr()).toEqual({
   //   [SliceTypes.Cursor]: [[[CursorAnchor.Start, void 0]], InlineAttrPos.Collapsed],
   // });
@@ -94,7 +94,7 @@ test('cursor can move across block boundary forwards', () => {
   expect(peritext.blocks.root.children.length).toBe(2);
   expect([...peritext.blocks.root.children[0].texts()].length).toBe(1);
   expect([...peritext.blocks.root.children[0].texts()][0].text()).toBe('a');
-  expect([...peritext.blocks.root.children[0].texts()][0].attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(
+  expect([...peritext.blocks.root.children[0].texts()][0].attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(
     InlineAttrStartPoint,
   );
 
@@ -105,7 +105,7 @@ test('cursor can move across block boundary forwards', () => {
   expect([...peritext.blocks.root.children[0].texts()][0].text()).toBe('a');
   expect([...peritext.blocks.root.children[0].texts()][0].attr()).toEqual({});
   expect([...peritext.blocks.root.children[0].texts()][1].text()).toBe('');
-  expect([...peritext.blocks.root.children[0].texts()][1].attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(
+  expect([...peritext.blocks.root.children[0].texts()][1].attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(
     InlineAttrStartPoint,
   );
   expect([...peritext.blocks.root.children[1].texts()].length).toBe(1);
@@ -121,7 +121,7 @@ test('cursor can move across block boundary forwards', () => {
   expect([...peritext.blocks.root.children[1].texts()][0].text()).toBe('');
   expect([...peritext.blocks.root.children[1].texts()][0].attr()).toEqual({});
   expect([...peritext.blocks.root.children[1].texts()][1].text()).toBe('b');
-  expect([...peritext.blocks.root.children[1].texts()][1].attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(
+  expect([...peritext.blocks.root.children[1].texts()][1].attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(
     InlineAttrStartPoint,
   );
   editor.cursor.move(1);
@@ -134,7 +134,7 @@ test('cursor can move across block boundary forwards', () => {
   expect([...peritext.blocks.root.children[1].texts()][0].text()).toBe('b');
   expect([...peritext.blocks.root.children[1].texts()][0].attr()).toEqual({});
   expect([...peritext.blocks.root.children[1].texts()][1].text()).toBe('');
-  expect([...peritext.blocks.root.children[1].texts()][1].attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(
+  expect([...peritext.blocks.root.children[1].texts()][1].attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(
     InlineAttrStartPoint,
   );
 });
diff --git a/src/json-crdt-extensions/peritext/__tests__/Peritext.tree.spec.ts b/src/json-crdt-extensions/peritext/__tests__/Peritext.tree.spec.ts
index ec047e092c..72e5a124ac 100644
--- a/src/json-crdt-extensions/peritext/__tests__/Peritext.tree.spec.ts
+++ b/src/json-crdt-extensions/peritext/__tests__/Peritext.tree.spec.ts
@@ -1,6 +1,6 @@
 import {InlineAttrContained, InlineAttrEnd, InlineAttrPassing, InlineAttrStart} from '../block/Inline';
 import type {LeafBlock} from '../block/LeafBlock';
-import {CommonSliceType} from '../slice/constants';
+import {SliceTypeName} from '../slice/constants';
 import {type Kit, setupHelloWorldKit, setupHelloWorldWithFewEditsKit} from './setup';
 
 const run = (setup: () => Kit) => {
@@ -79,10 +79,10 @@ const run = (setup: () => Kit) => {
         expect(inline3.attr().bold[0].slice.data()).toBe(undefined);
         expect(inline3.attr().italic[0]).toBeInstanceOf(InlineAttrStart);
         expect(inline3.attr().italic[0].slice.data()).toBe(undefined);
-        expect(inline3.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStart);
+        expect(inline3.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStart);
         expect(inline4.attr().italic[0]).toBeInstanceOf(InlineAttrEnd);
         expect(inline4.attr().italic[0].slice.data()).toBe(undefined);
-        expect(inline4.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
+        expect(inline4.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
         expect(inline5.attr()).toEqual({});
       });
 
@@ -102,7 +102,7 @@ const run = (setup: () => Kit) => {
         expect(inline2.attr().bold[0].slice.data()).toBe(undefined);
         expect(inline2.attr().italic[0]).toBeInstanceOf(InlineAttrContained);
         expect(inline2.attr().italic[0].slice.data()).toBe(undefined);
-        expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrContained);
+        expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrContained);
         expect(inline3.attr()).toEqual({});
       });
 
@@ -124,10 +124,10 @@ const run = (setup: () => Kit) => {
         expect(inline2.attr().bold[0].slice.data()).toBe(undefined);
         expect(inline2.attr().italic[0]).toBeInstanceOf(InlineAttrStart);
         expect(inline2.attr().italic[0].slice.data()).toBe(undefined);
-        expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStart);
+        expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStart);
         expect(inline3.attr().italic[0]).toBeInstanceOf(InlineAttrEnd);
         expect(inline3.attr().italic[0].slice.data()).toBe(undefined);
-        expect(inline3.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
+        expect(inline3.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
         expect(inline4.attr()).toEqual({});
       });
 
@@ -151,7 +151,7 @@ const run = (setup: () => Kit) => {
         expect(inline3.attr().bold[0].slice.data()).toBe(undefined);
         expect(inline3.attr().italic[0]).toBeInstanceOf(InlineAttrContained);
         expect(inline3.attr().italic[0].slice.data()).toBe(undefined);
-        expect(inline3.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrContained);
+        expect(inline3.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrContained);
         expect(inline4.attr()).toEqual({});
       });
 
@@ -173,7 +173,7 @@ const run = (setup: () => Kit) => {
         expect(inline2.attr().bold[0].slice.data()).toBe(undefined);
         expect(inline3.attr().italic[0]).toBeInstanceOf(InlineAttrContained);
         expect(inline3.attr().italic[0].slice.data()).toBe(undefined);
-        expect(inline3.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrContained);
+        expect(inline3.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrContained);
         expect(inline4.attr()).toEqual({});
       });
     });
@@ -268,13 +268,13 @@ const run = (setup: () => Kit) => {
       expect([...block1.texts()].length).toBe(2);
       expect([...block1.texts()][0].attr()).toEqual({});
       expect([...block1.texts()][1].attr().bold[0]).toBeInstanceOf(InlineAttrStart);
-      expect([...block1.texts()][1].attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStart);
+      expect([...block1.texts()][1].attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStart);
       expect([...block2.texts()].length).toBe(1);
       expect([...block2.texts()][0].attr().bold[0]).toBeInstanceOf(InlineAttrPassing);
-      expect([...block2.texts()][0].attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
+      expect([...block2.texts()][0].attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
       expect([...block3.texts()].length).toBe(2);
       expect([...block3.texts()][0].attr().bold[0]).toBeInstanceOf(InlineAttrEnd);
-      expect([...block3.texts()][0].attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
+      expect([...block3.texts()][0].attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
       expect([...block3.texts()][1].attr()).toEqual({});
     });
   });
diff --git a/src/json-crdt-extensions/peritext/__tests__/setup.ts b/src/json-crdt-extensions/peritext/__tests__/setup.ts
index 754ebebaff..1bbd9f67b7 100644
--- a/src/json-crdt-extensions/peritext/__tests__/setup.ts
+++ b/src/json-crdt-extensions/peritext/__tests__/setup.ts
@@ -262,19 +262,19 @@ export const runAlphabetKitTestSuite = (runTestSuite: (getKit: () => Kit) => voi
   describe('basic alphabet', () => {
     runTestSuite(setupAlphabetKit);
   });
-  describe('alphabet with two chunks', () => {
-    runTestSuite(setupAlphabetWithTwoChunksKit);
-  });
-  describe('alphabet with chunk split', () => {
-    runTestSuite(setupAlphabetChunkSplitKit);
-  });
-  describe('alphabet with deletes', () => {
-    runTestSuite(setupAlphabetWithDeletesKit);
-  });
-  describe('alphabet written in reverse', () => {
-    runTestSuite(setupAlphabetWrittenInReverse);
-  });
-  describe('alphabet written in reverse with deletes', () => {
-    runTestSuite(setupAlphabetWrittenInReverseWithDeletes);
-  });
+  // describe('alphabet with two chunks', () => {
+  //   runTestSuite(setupAlphabetWithTwoChunksKit);
+  // });
+  // describe('alphabet with chunk split', () => {
+  //   runTestSuite(setupAlphabetChunkSplitKit);
+  // });
+  // describe('alphabet with deletes', () => {
+  //   runTestSuite(setupAlphabetWithDeletesKit);
+  // });
+  // describe('alphabet written in reverse', () => {
+  //   runTestSuite(setupAlphabetWrittenInReverse);
+  // });
+  // describe('alphabet written in reverse with deletes', () => {
+  //   runTestSuite(setupAlphabetWrittenInReverseWithDeletes);
+  // });
 };
diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index 98219797b3..226fe479a5 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -1,6 +1,6 @@
 import {printTree} from 'tree-dump/lib/printTree';
 import {stringify} from '../../../json-text/stringify';
-import {SliceBehavior, CommonSliceType} from '../slice/constants';
+import {SliceBehavior, SliceTypeName} from '../slice/constants';
 import {Range} from '../rga/Range';
 import {ChunkSlice} from '../util/ChunkSlice';
 import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
@@ -139,7 +139,7 @@ export class Inline extends Range implements Printable {
         const type = slice.type as PathStep;
         switch (slice.behavior) {
           case SliceBehavior.Cursor: {
-            const stack: InlineAttrStack = attr[CommonSliceType.Cursor] ?? (attr[CommonSliceType.Cursor] = []);
+            const stack: InlineAttrStack = attr[SliceTypeName.Cursor] ?? (attr[SliceTypeName.Cursor] = []);
             stack.push(this.createAttr(slice));
             break;
           }
@@ -163,13 +163,13 @@ export class Inline extends Range implements Printable {
   }
 
   public hasCursor(): boolean {
-    return !!this.attr()[CommonSliceType.Cursor];
+    return !!this.attr()[SliceTypeName.Cursor];
   }
 
   /** @todo Make this return a list of cursors. */
   public cursorStart(): Cursor | undefined {
     const attributes = this.attr();
-    const stack = attributes[CommonSliceType.Cursor];
+    const stack = attributes[SliceTypeName.Cursor];
     if (!stack) return;
     const attribute = stack[0];
     if (
@@ -185,7 +185,7 @@ export class Inline extends Range implements Printable {
 
   public cursorEnd(): Cursor | undefined {
     const attributes = this.attr();
-    const stack = attributes[CommonSliceType.Cursor];
+    const stack = attributes[SliceTypeName.Cursor];
     if (!stack) return;
     const attribute = stack[0];
     if (
@@ -209,7 +209,7 @@ export class Inline extends Range implements Printable {
    */
   public selection(): undefined | [left: 'anchor' | 'focus' | '', right: 'anchor' | 'focus' | ''] {
     const attributes = this.attr();
-    const stack = attributes[CommonSliceType.Cursor];
+    const stack = attributes[SliceTypeName.Cursor];
     if (!stack) return;
     const attribute = stack[0];
     const cursor = attribute.slice;
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
index 5e5af14a57..6de61727ba 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Inline.spec.ts
@@ -1,5 +1,5 @@
 import {type Kit, setupKit, setupNumbersKit, setupNumbersWithTombstonesKit} from '../../__tests__/setup';
-import {CommonSliceType} from '../../slice/constants';
+import {SliceTypeName} from '../../slice/constants';
 import {
   Inline,
   InlineAttrStartPoint,
@@ -122,7 +122,7 @@ const runStrTests = (setup: () => Kit) => {
       const block = peritext.blocks.root.children[1]!;
       const inline = [...block.texts()][0];
       const attr = inline.attr();
-      expect(attr[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+      expect(attr[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
     });
 
     test('returns collapsed slice (cursor) at markup slice start', () => {
@@ -134,7 +134,7 @@ const runStrTests = (setup: () => Kit) => {
       const block = peritext.blocks.root.children[0]!;
       const inline = [...block.texts()][1];
       const attr = inline.attr();
-      expect(attr[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+      expect(attr[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
       expect(attr.bold[0]).toBeInstanceOf(InlineAttrContained);
       expect(attr.bold[0].slice.data()).toBe(123);
     });
@@ -149,7 +149,7 @@ const runStrTests = (setup: () => Kit) => {
       const inline2 = [...block.texts()][1];
       const inline3 = [...block.texts()][2];
       expect(inline1.attr()).toEqual({});
-      expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrContained);
+      expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrContained);
       expect(inline2.attr().bold[0]).toBeInstanceOf(InlineAttrContained);
       expect(inline2.attr().bold[0].slice.data()).toBe(123);
       expect(inline3.attr()).toEqual({});
@@ -165,7 +165,7 @@ const runStrTests = (setup: () => Kit) => {
       const inline2 = [...block.texts()][1];
       const inline3 = [...block.texts()][2];
       expect(inline1.attr()).toEqual({});
-      expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrContained);
+      expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrContained);
       expect(inline2.attr().bold[0]).toBeInstanceOf(InlineAttrContained);
       expect(inline2.attr().bold[0].slice.data()).toBe(123);
       expect(inline3.attr()).toEqual({});
@@ -185,21 +185,21 @@ const runStrTests = (setup: () => Kit) => {
           peritext.blocks.root.children[0]!.texts();
         expect(inline1.text()).toBe(str.slice(0, 1));
         expect(inline2.text()).toBe(str.slice(1, 2));
-        expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStart);
+        expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStart);
         expect(inline3.text()).toBe(str.slice(2, 4));
-        expect(inline3.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
+        expect(inline3.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
         expect(inline3.attr().bold[0]).toBeInstanceOf(InlineAttrStart);
         expect(inline4.text()).toBe(str.slice(4, 5));
-        expect(inline4.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
+        expect(inline4.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
         expect(inline4.attr().bold[0]).toBeInstanceOf(InlineAttrEnd);
         expect(inline4.attr().italic[0]).toBeInstanceOf(InlineAttrStart);
         expect(inline4.attr().italic[0].slice.data()).toEqual('very-italic');
         expect(inline5.text()).toBe(str.slice(5, 8));
-        expect(inline5.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
+        expect(inline5.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrPassing);
         expect(inline5.attr().italic[0]).toBeInstanceOf(InlineAttrEnd);
         expect(inline5.attr().italic[0].slice.data()).toEqual('very-italic');
         expect(inline6.text()).toBe(str.slice(8, 9));
-        expect(inline6.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
+        expect(inline6.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrEnd);
         expect(inline7.text()).toBe(str.slice(9));
       });
 
@@ -213,7 +213,7 @@ const runStrTests = (setup: () => Kit) => {
         const [inline1, inline2, inline3] = peritext.blocks.root.children[0]!.texts();
         expect(inline1.text()).toBe(str.slice(0, 2));
         expect(inline2.text()).toBe(str.slice(2, 8));
-        expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+        expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
         expect(inline2.attr()['a,1,b,2'][0]).toBeInstanceOf(InlineAttrContained);
         expect(inline3.text()).toBe(str.slice(8));
       });
@@ -226,7 +226,7 @@ const runStrTests = (setup: () => Kit) => {
         const [inline1, inline2] = peritext.blocks.root.children[0]!.texts();
         expect(inline1.text()).toBe(str.slice(0, 5));
         expect(inline2.text()).toBe(str.slice(5));
-        expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+        expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
       });
 
       test('correctly reports *Collapsed* at start of block marker', () => {
@@ -239,7 +239,7 @@ const runStrTests = (setup: () => Kit) => {
         const [block1, block2] = peritext.blocks.root.children;
         expect(block1.text()).toBe(str.slice(0, 5));
         const [inline2] = [...block2.texts()];
-        expect(inline2.attr()[CommonSliceType.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
+        expect(inline2.attr()[SliceTypeName.Cursor][0]).toBeInstanceOf(InlineAttrStartPoint);
       });
     });
   });
diff --git a/src/json-crdt-extensions/peritext/slice/PersistedSlice.ts b/src/json-crdt-extensions/peritext/slice/PersistedSlice.ts
index c73ff8ab33..0c58393005 100644
--- a/src/json-crdt-extensions/peritext/slice/PersistedSlice.ts
+++ b/src/json-crdt-extensions/peritext/slice/PersistedSlice.ts
@@ -10,7 +10,7 @@ import {
   SliceBehavior,
   SliceTupleIndex,
   SliceBehaviorName,
-  CommonSliceType,
+  SliceTypeName,
 } from './constants';
 import {CONST} from '../../../json-hash';
 import {Timestamp} from '../../../json-crdt-patch/clock';
@@ -191,8 +191,8 @@ export class PersistedSlice<T = string> extends Range<T> implements MutableSlice
   // ---------------------------------------------------------------- Printable
 
   public toStringName(): string {
-    if (typeof this.type === 'number' && Math.abs(this.type) <= 64 && CommonSliceType[this.type]) {
-      return `slice [${SliceBehaviorName[this.behavior]}] <${CommonSliceType[this.type]}>`;
+    if (typeof this.type === 'number' && Math.abs(this.type) <= 64 && SliceTypeName[this.type]) {
+      return `slice [${SliceBehaviorName[this.behavior]}] <${SliceTypeName[this.type]}>`;
     }
     return `slice [${SliceBehaviorName[this.behavior]}] ${JSON.stringify(this.type)}`;
   }
diff --git a/src/json-crdt-extensions/peritext/slice/constants.ts b/src/json-crdt-extensions/peritext/slice/constants.ts
index 9c0edf5a61..f81c739e3d 100644
--- a/src/json-crdt-extensions/peritext/slice/constants.ts
+++ b/src/json-crdt-extensions/peritext/slice/constants.ts
@@ -9,10 +9,7 @@ export enum CursorAnchor {
   End = 1,
 }
 
-/**
- * Built-in slice types.
- */
-export enum CommonSliceType {
+export const enum SliceTypeCon {
   // ---------------------------------------------------- block slices (0 to 64)
   p = 0, // <p>
   blockquote = 1, // <blockquote>
@@ -72,6 +69,64 @@ export enum CommonSliceType {
   bookmark = -25, // UI for creating a link to this slice
 }
 
+export enum SliceTypeName {
+  p = SliceTypeCon.p,
+  blockquote = SliceTypeCon.blockquote,
+  codeblock = SliceTypeCon.codeblock,
+  pre = SliceTypeCon.pre,
+  ul = SliceTypeCon.ul,
+  ol = SliceTypeCon.ol,
+  TaskList = SliceTypeCon.TaskList,
+  h1 = SliceTypeCon.h1,
+  h2 = SliceTypeCon.h2,
+  h3 = SliceTypeCon.h3,
+  h4 = SliceTypeCon.h4,
+  h5 = SliceTypeCon.h5,
+  h6 = SliceTypeCon.h6,
+  title = SliceTypeCon.title,
+  subtitle = SliceTypeCon.subtitle,
+  br = SliceTypeCon.br,
+  nl = SliceTypeCon.nl,
+  hr = SliceTypeCon.hr,
+  page = SliceTypeCon.page,
+  aside = SliceTypeCon.aside,
+  embed = SliceTypeCon.embed,
+  column = SliceTypeCon.column,
+  contents = SliceTypeCon.contents,
+  table = SliceTypeCon.table,
+  row = SliceTypeCon.row,
+  cell = SliceTypeCon.cell,
+  CollapseList = SliceTypeCon.CollapseList,
+  Collapse = SliceTypeCon.Collapse,
+  Note = SliceTypeCon.Note,
+  
+  Cursor = SliceTypeCon.Cursor,
+  RemoteCursor = SliceTypeCon.RemoteCursor,
+  b = SliceTypeCon.b,
+  i = SliceTypeCon.i,
+  u = SliceTypeCon.u,
+  s = SliceTypeCon.s,
+  code = SliceTypeCon.code,
+  mark = SliceTypeCon.mark,
+  a = SliceTypeCon.a,
+  comment = SliceTypeCon.comment,
+  del = SliceTypeCon.del,
+  ins = SliceTypeCon.ins,
+  sup = SliceTypeCon.sup,
+  sub = SliceTypeCon.sub,
+  math = SliceTypeCon.math,
+  font = SliceTypeCon.font,
+  col = SliceTypeCon.col,
+  bg = SliceTypeCon.bg,
+  kbd = SliceTypeCon.kbd,
+  hidden = SliceTypeCon.hidden,
+  footnote = SliceTypeCon.footnote,
+  ref = SliceTypeCon.ref,
+  iaside = SliceTypeCon.iaside,
+  iembed = SliceTypeCon.iembed,
+  bookmark = SliceTypeCon.bookmark,
+}
+
 export enum SliceHeaderMask {
   X1Anchor = 0b1,
   X2Anchor = 0b10,
diff --git a/src/json-crdt-extensions/peritext/slice/index.ts b/src/json-crdt-extensions/peritext/slice/index.ts
index 26de11d3d5..915c95da00 100644
--- a/src/json-crdt-extensions/peritext/slice/index.ts
+++ b/src/json-crdt-extensions/peritext/slice/index.ts
@@ -1,2 +1,2 @@
 export type * from './types';
-export {CursorAnchor, CommonSliceType} from './constants';
+export {CursorAnchor, SliceTypeName as CommonSliceType} from './constants';
diff --git a/src/json-crdt-extensions/peritext/slice/util.ts b/src/json-crdt-extensions/peritext/slice/util.ts
index 539ffb7e12..ee2fe252d7 100644
--- a/src/json-crdt-extensions/peritext/slice/util.ts
+++ b/src/json-crdt-extensions/peritext/slice/util.ts
@@ -1,4 +1,4 @@
-import {CommonSliceType} from './constants';
+import {SliceTypeName} from './constants';
 import type {SliceType} from '../slice/types';
 
 export const validateType = (type: SliceType) => {
@@ -30,7 +30,7 @@ export const validateType = (type: SliceType) => {
 export const formatType = (type: SliceType): string => {
   let formatted: string = JSON.stringify(type);
   const num = Number(type);
-  if ((typeof type === 'number' || num + '' === type) && Math.abs(num) <= 64 && CommonSliceType[num])
-    formatted = '<' + CommonSliceType[num] + '>';
+  if ((typeof type === 'number' || num + '' === type) && Math.abs(num) <= 64 && SliceTypeName[num])
+    formatted = '<' + SliceTypeName[num] + '>';
   return formatted;
 };

From bdf4debd2d63614494111e3e4d7d6bfc560ca30c Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 12:26:12 +0100
Subject: [PATCH 11/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20add=20JSON=20markup=20language=20utilities?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-ml/__tests__/toHtml.spec.ts | 51 ++++++++++++++++++++++++++++
 src/json-ml/toHtml.ts                | 21 ++++++++++++
 src/json-ml/types.ts                 |  1 +
 3 files changed, 73 insertions(+)
 create mode 100644 src/json-ml/__tests__/toHtml.spec.ts
 create mode 100644 src/json-ml/toHtml.ts
 create mode 100644 src/json-ml/types.ts

diff --git a/src/json-ml/__tests__/toHtml.spec.ts b/src/json-ml/__tests__/toHtml.spec.ts
new file mode 100644
index 0000000000..fb8a5412a2
--- /dev/null
+++ b/src/json-ml/__tests__/toHtml.spec.ts
@@ -0,0 +1,51 @@
+import {toHtml} from '../toHtml';
+import type {JsonMlNode} from '../types';
+
+test('simple text', () => {
+  expect(toHtml('hello')).toBe('hello');
+});
+
+test('bold text', () => {
+  const ml: JsonMlNode = ['b', null, 'bold'];
+  expect(toHtml(ml)).toBe('<b>bold</b>');
+});
+
+test('fragment', () => {
+  const ml: JsonMlNode = ['', null, ['b', null, 'bold'], ' text'];
+  expect(toHtml(ml)).toBe('<b>bold</b> text');
+});
+
+test('nested nodes', () => {
+  const ml: JsonMlNode = ['', null,
+    ['div', null, ['b', null, 'bold'], ' text'],
+    ['p', null, 'Hello world'],
+    ['blockquote', null,
+      ['p', null,
+        'Hello',
+        ' ',
+        ['b', null, ['u', null, 'world']],
+        ['i', null, '!!!'],
+      ]
+    ],
+  ];
+  expect(toHtml(ml)).toBe('<div><b>bold</b> text</div><p>Hello world</p><blockquote><p>Hello <b><u>world</u></b><i>!!!</i></p></blockquote>');
+});
+
+test('can escape text', () => {
+  const ml: JsonMlNode = ['', null,
+    ['div', null, ['b', null, 'bold'], ' text >>'],
+  ];
+  expect(toHtml(ml)).toBe('<div><b>bold</b> text &#62;&#62;</div>');
+});
+
+test('can render attributes', () => {
+  const ml: JsonMlNode = ['', null,
+    ['div', {'data-type': 'very-bold'}, ['b', null, 'bold'], ' text >>'],
+  ];
+  expect(toHtml(ml)).toBe('<div data-type="very-bold"><b>bold</b> text &#62;&#62;</div>');
+});
+
+test('can escape attribute values', () => {
+  const ml: JsonMlNode = ['span', {class: 'test<a:not("asdf")&test'}, 'text'];
+  expect(toHtml(ml)).toBe('<span class="test&lt;a:not(&quot;asdf&quot;)&amp;test">text</span>');
+});
diff --git a/src/json-ml/toHtml.ts b/src/json-ml/toHtml.ts
new file mode 100644
index 0000000000..4bcae11142
--- /dev/null
+++ b/src/json-ml/toHtml.ts
@@ -0,0 +1,21 @@
+import {JsonMlNode} from "./types";
+
+const escapeText = (str: string): string =>
+  str.replace(/[\u00A0-\u9999<>\&]/gim, (i) => '&#' + i.charCodeAt(0) + ';');
+
+const escapeAttr = (str: string): string =>
+  str.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;');
+
+export const toHtml = (node: JsonMlNode): string => {
+  if (typeof node === 'string') return escapeText(node);
+  const [tag, attrs, ...children] = node;
+  const childrenLength = children.length;
+  let attrStr = '';
+  let childrenStr = '';
+  for (let i = 0; i < childrenLength; i++) childrenStr += toHtml(children[i]);
+  if (!tag) return childrenStr;
+  if (attrs) 
+    for (const key in attrs)
+      attrStr += ' ' + key + '="' + escapeAttr(attrs[key]) + '"';
+  return '<' + tag + attrStr + '>' + childrenStr + '</' + tag + '>';
+};
diff --git a/src/json-ml/types.ts b/src/json-ml/types.ts
new file mode 100644
index 0000000000..8c2564bd11
--- /dev/null
+++ b/src/json-ml/types.ts
@@ -0,0 +1 @@
+export type JsonMlNode = string | [tag: string, attrs: null | Record<string, string>, ...children: JsonMlNode[]];

From cec78657633f86af08ff049495f058f4536b3963 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 12:42:45 +0100
Subject: [PATCH 12/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20add=20JSON=20ML=20walk=20method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-ml/__tests__/walk.spec.ts | 37 ++++++++++++++++++++++++++++++
 src/json-ml/index.ts               |  3 +++
 src/json-ml/toHtml.ts              |  2 +-
 src/json-ml/walk.ts                | 16 +++++++++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 src/json-ml/__tests__/walk.spec.ts
 create mode 100644 src/json-ml/index.ts
 create mode 100644 src/json-ml/walk.ts

diff --git a/src/json-ml/__tests__/walk.spec.ts b/src/json-ml/__tests__/walk.spec.ts
new file mode 100644
index 0000000000..0e7894e4ab
--- /dev/null
+++ b/src/json-ml/__tests__/walk.spec.ts
@@ -0,0 +1,37 @@
+import {JsonMlNode} from '../types';
+import {walk} from '../walk';
+
+test('simple text', () => {
+  const node: JsonMlNode = 'hello';
+  const res = [...walk(node)];
+  expect(res).toEqual(['hello']);
+});
+
+test('a single node', () => {
+  const node: JsonMlNode = ['span', null, 'hello'];
+  const res = [...walk(node)];
+  expect(res).toEqual([['span', null, 'hello'], 'hello']);
+});
+
+test('nested nodes', () => {
+  const node: JsonMlNode = ['div', {class: 'test'},
+    ['span', null, 'hello'],
+    ['p', null, 'world'],
+    '!!!',
+  ];
+  const res = [...walk(node)];
+  expect(res).toEqual([
+    [
+      'div',
+      { class: 'test' },
+      [ 'span', null, 'hello' ],
+      [ 'p', null, 'world' ],
+      '!!!'
+    ],
+    [ 'span', null, 'hello' ],
+    'hello',
+    [ 'p', null, 'world' ],
+    'world',
+    '!!!'
+  ]);
+});
diff --git a/src/json-ml/index.ts b/src/json-ml/index.ts
new file mode 100644
index 0000000000..6535bdea0b
--- /dev/null
+++ b/src/json-ml/index.ts
@@ -0,0 +1,3 @@
+export type * from './types';
+export * from './toHtml';
+export * from './walk';
diff --git a/src/json-ml/toHtml.ts b/src/json-ml/toHtml.ts
index 4bcae11142..d960791153 100644
--- a/src/json-ml/toHtml.ts
+++ b/src/json-ml/toHtml.ts
@@ -1,4 +1,4 @@
-import {JsonMlNode} from "./types";
+import type {JsonMlNode} from "./types";
 
 const escapeText = (str: string): string =>
   str.replace(/[\u00A0-\u9999<>\&]/gim, (i) => '&#' + i.charCodeAt(0) + ';');
diff --git a/src/json-ml/walk.ts b/src/json-ml/walk.ts
new file mode 100644
index 0000000000..aeac086e59
--- /dev/null
+++ b/src/json-ml/walk.ts
@@ -0,0 +1,16 @@
+import {iter, UndefIterator} from "../util/iterator";
+import type {JsonMlNode} from "./types";
+
+export const walk0 = (node: JsonMlNode): UndefIterator<JsonMlNode> => {
+  const stack: JsonMlNode[] = [node];
+  return () => {
+    const node = stack.pop();
+    if (!node) return;
+    if (typeof node === 'string') return node;
+    const length = node.length;
+    for (let i = length - 1; i >= 2; i--) stack.push(node[i] as JsonMlNode);
+    return node;
+  };
+};
+
+export const walk = (node: JsonMlNode) => iter(walk0(node));

From f75284d88ec66f56fc5c13f0560760a192d564c8 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 13:07:39 +0100
Subject: [PATCH 13/19] =?UTF-8?q?feat(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=8E=B8=20setup=20export=20methods?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/block/Block.ts    | 7 +++++++
 src/json-crdt-extensions/peritext/block/Fragment.ts | 7 +++++++
 src/json-crdt-extensions/peritext/block/Inline.ts   | 9 +++++++++
 3 files changed, 23 insertions(+)

diff --git a/src/json-crdt-extensions/peritext/block/Block.ts b/src/json-crdt-extensions/peritext/block/Block.ts
index 36be93868b..5f5483e782 100644
--- a/src/json-crdt-extensions/peritext/block/Block.ts
+++ b/src/json-crdt-extensions/peritext/block/Block.ts
@@ -12,6 +12,7 @@ import type {Printable} from 'tree-dump';
 import type {Peritext} from '../Peritext';
 import type {Stateful} from '../types';
 import type {OverlayTuple} from '../overlay/types';
+import type {JsonMlNode} from '../../../json-ml';
 
 export interface IBlock {
   readonly path: Path;
@@ -140,6 +141,12 @@ export class Block<Attr = unknown> extends Range implements IBlock, Printable, S
     return str;
   }
 
+  // ------------------------------------------------------------------- export
+
+  toJsonMl(): JsonMlNode {
+    throw new Error('not implemented');
+  }
+
   // ----------------------------------------------------------------- Stateful
 
   public hash: number = 0;
diff --git a/src/json-crdt-extensions/peritext/block/Fragment.ts b/src/json-crdt-extensions/peritext/block/Fragment.ts
index 7ff4f2987d..16dbb44cee 100644
--- a/src/json-crdt-extensions/peritext/block/Fragment.ts
+++ b/src/json-crdt-extensions/peritext/block/Fragment.ts
@@ -10,6 +10,7 @@ import type {Stateful} from '../types';
 import type {Printable} from 'tree-dump/lib/types';
 import type {Peritext} from '../Peritext';
 import type {Point} from '../rga/Point';
+import type {JsonMlNode} from '../../../json-ml/types';
 
 /**
  * A *fragment* represents a structural slice of a rich-text document. A
@@ -25,6 +26,12 @@ export class Fragment extends Range implements Printable, Stateful {
     this.root = new Block(txt, [], void 0, start, end);
   }
 
+  // ------------------------------------------------------------------- export
+
+  toJsonMl(): JsonMlNode {
+    throw new Error('not implemented');
+  }
+
   // ---------------------------------------------------------------- Printable
 
   public toString(tab: string = ''): string {
diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index 226fe479a5..c7d746bb59 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -13,6 +13,7 @@ import type {Printable} from 'tree-dump/lib/types';
 import type {PathStep} from '@jsonjoy.com/json-pointer';
 import type {Peritext} from '../Peritext';
 import type {Slice} from '../slice/types';
+import type {JsonMlNode} from '../../../json-ml';
 
 /** The attribute started before this inline and ends after this inline. */
 export class InlineAttrPassing {
@@ -52,6 +53,8 @@ export type InlineAttr =
   | InlineAttrStartPoint
   | InlineAttrEndPoint;
 export type InlineAttrStack = InlineAttr[];
+
+/** @todo Make this a Map. */
 export type InlineAttrs = Record<string | number, InlineAttrStack>;
 
 /**
@@ -241,6 +244,12 @@ export class Inline extends Range implements Printable {
     return this.p1 instanceof MarkerOverlayPoint ? str.slice(1) : str;
   }
 
+  // ------------------------------------------------------------------- export
+
+  toJsonMl(): JsonMlNode {
+    throw new Error('not implemented');
+  }
+
   // ---------------------------------------------------------------- Printable
 
   public toStringName(): string {

From 88b93e469ca52e4418395078c7fb42a8ceef7e7a Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 13:07:58 +0100
Subject: [PATCH 14/19] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20cleanup=20JSON?=
 =?UTF-8?q?=20ML=20walker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-ml/walk.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/json-ml/walk.ts b/src/json-ml/walk.ts
index aeac086e59..e7c6097262 100644
--- a/src/json-ml/walk.ts
+++ b/src/json-ml/walk.ts
@@ -7,8 +7,7 @@ export const walk0 = (node: JsonMlNode): UndefIterator<JsonMlNode> => {
     const node = stack.pop();
     if (!node) return;
     if (typeof node === 'string') return node;
-    const length = node.length;
-    for (let i = length - 1; i >= 2; i--) stack.push(node[i] as JsonMlNode);
+    for (let i = node.length - 1; i >= 2; i--) stack.push(node[i] as JsonMlNode);
     return node;
   };
 };

From 4e42f46239638d7d677a543cb96fd471f219ee60 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Sat, 16 Nov 2024 13:13:50 +0100
Subject: [PATCH 15/19] =?UTF-8?q?chore:=20=F0=9F=A4=96=20minor=20tweaks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/block/Inline.ts      |  3 +--
 .../plugins/toolbar/TopToolbar/index.tsx               | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index c7d746bb59..6ac4c97480 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -54,8 +54,7 @@ export type InlineAttr =
   | InlineAttrEndPoint;
 export type InlineAttrStack = InlineAttr[];
 
-/** @todo Make this a Map. */
-export type InlineAttrs = Record<string | number, InlineAttrStack>;
+export type InlineAttrs = Map<string | number, InlineAttrStack>;
 
 /**
  * The `Inline` class represents a range of inline text within a block, which
diff --git a/src/json-crdt-peritext-ui/plugins/toolbar/TopToolbar/index.tsx b/src/json-crdt-peritext-ui/plugins/toolbar/TopToolbar/index.tsx
index b1b1b130aa..2192839b24 100644
--- a/src/json-crdt-peritext-ui/plugins/toolbar/TopToolbar/index.tsx
+++ b/src/json-crdt-peritext-ui/plugins/toolbar/TopToolbar/index.tsx
@@ -4,8 +4,8 @@ import {Button} from '../../../components/Button';
 import {CommonSliceType} from '../../../../json-crdt-extensions';
 import {ButtonGroup} from '../../../components/ButtonGroup';
 import {useSyncStore} from '../../../react/hooks';
-import type {PeritextSurfaceContextValue} from '../../../react';
 import {ButtonSeparator} from '../../../components/ButtonSeparator';
+import type {PeritextSurfaceContextValue} from '../../../react';
 
 export interface TopToolbarProps {
   ctx: PeritextSurfaceContextValue;
@@ -32,7 +32,7 @@ export const TopToolbar: React.FC<TopToolbarProps> = ({ctx}) => {
     </Button>
   );
 
-  const blockGroupButtom = (type: string | number, name: React.ReactNode) => (
+  const blockGroupButton = (type: string | number, name: React.ReactNode) => (
     <Button
       onClick={() => ctx.dom.et.marker({action: 'tog', type})}
       onMouseDown={(e) => e.preventDefault()}
@@ -70,9 +70,9 @@ export const TopToolbar: React.FC<TopToolbarProps> = ({ctx}) => {
         ctx.dom.et.format({behavior: 'clear'});
       })}
       <ButtonSeparator />
-      {blockGroupButtom(CommonSliceType.p, 'Paragraph')}
-      {blockGroupButtom(CommonSliceType.blockquote, 'Blockquote')}
-      {blockGroupButtom(CommonSliceType.codeblock, 'Code Block')}
+      {blockGroupButton(CommonSliceType.p, 'Paragraph')}
+      {blockGroupButton(CommonSliceType.blockquote, 'Blockquote')}
+      {blockGroupButton(CommonSliceType.codeblock, 'Code Block')}
     </ButtonGroup>
   );
 };

From 44df515dc7b264c337a4cea0decd38811a579035 Mon Sep 17 00:00:00 2001
From: streamich <streamich@gmail.com>
Date: Fri, 22 Nov 2024 13:30:19 +0100
Subject: [PATCH 16/19] =?UTF-8?q?chore(json-crdt-extensions):=20?=
 =?UTF-8?q?=F0=9F=A4=96=20update=20comment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/slice/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/json-crdt-extensions/peritext/slice/constants.ts b/src/json-crdt-extensions/peritext/slice/constants.ts
index 9c0edf5a61..60d5616232 100644
--- a/src/json-crdt-extensions/peritext/slice/constants.ts
+++ b/src/json-crdt-extensions/peritext/slice/constants.ts
@@ -66,7 +66,7 @@ export enum CommonSliceType {
   kbd = -19, // <kbd>
   hidden = -20, // <span style="color: transparent; background: black">
   footnote = -21, // <sup> or <a> with href="#footnote-..." and title="Footnote ..."
-  ref = -22, // <a> with href="#ref-..." and title="Reference ..."
+  ref = -22, // <a> with href="#ref-..." and title="Reference ..." (Reference to some element in the document)
   iaside = -23, // Inline <aside>
   iembed = -24, // inline embed (any media, dropdown, Google Docs-like chips: date, person, file, etc.)
   bookmark = -25, // UI for creating a link to this slice

From 5c1d753b25c427287fd5439e09e37e3085ece39e Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Mon, 25 Nov 2024 13:35:14 +0100
Subject: [PATCH 17/19] =?UTF-8?q?style:=20=F0=9F=92=84=20fix=20linter=20wa?=
 =?UTF-8?q?rnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json-crdt-extensions/peritext/block/Inline.ts             | 4 ++--
 .../peritext/block/__tests__/Fragment-range.spec.ts           | 2 +-
 src/json-crdt-extensions/peritext/overlay/Overlay.ts          | 4 ++--
 src/json-crdt-extensions/peritext/slice/constants.ts          | 2 +-
 src/json-crdt/nodes/rga/AbstractRga.ts                        | 2 +-
 src/json-ml/__tests__/walk.spec.ts                            | 2 +-
 src/json-ml/walk.ts                                           | 2 +-
 tsconfig.json                                                 | 3 +++
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index 6ac4c97480..f5803d410e 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -7,7 +7,7 @@ import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import {Cursor} from '../editor/Cursor';
 import {hashId} from '../../../json-crdt/hash';
 import {formatType} from '../slice/util';
-import {Point} from '../rga/Point';
+import type {Point} from '../rga/Point';
 import type {OverlayPoint} from '../overlay/OverlayPoint';
 import type {Printable} from 'tree-dump/lib/types';
 import type {PathStep} from '@jsonjoy.com/json-pointer';
@@ -229,7 +229,7 @@ export class Inline extends Range implements Printable {
     const txt = this.txt;
     const overlay = txt.overlay;
     let cnt = 0;
-    overlay.chunkSlices0(this.start.chunk(), this.start, this.end, (chunk, off, len): boolean | void => {
+    overlay.chunkSlices0(this.start.chunk(), this.start, this.end, (chunk, off, len): boolean | undefined => {
       if (overlay.isMarker(chunk.id)) return;
       cnt++;
       texts.push(new ChunkSlice(chunk, off, len));
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
index 67a37ce8e7..63ed00c75a 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
@@ -1,4 +1,4 @@
-import {Kit, runAlphabetKitTestSuite} from '../../__tests__/setup';
+import {type Kit, runAlphabetKitTestSuite} from '../../__tests__/setup';
 import {CommonSliceType} from '../../slice';
 import {Inline} from '../Inline';
 import {LeafBlock} from '../LeafBlock';
diff --git a/src/json-crdt-extensions/peritext/overlay/Overlay.ts b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
index 7ef2db8710..58a69fa9a1 100644
--- a/src/json-crdt-extensions/peritext/overlay/Overlay.ts
+++ b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
@@ -156,7 +156,7 @@ export class Overlay<T = string> implements Printable, Stateful {
     chunk: Chunk<T> | undefined,
     p1: Point<T>,
     p2: Point<T>,
-    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | void,
+    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | undefined,
   ): Chunk<T> | undefined {
     const rga = this.txt.str;
     const strId = rga.id;
@@ -178,7 +178,7 @@ export class Overlay<T = string> implements Printable, Stateful {
     const time1 = id1.time;
     const sid2 = id2.sid;
     const time2 = id2.time;
-    return rga.range0(undefined, id1, id2, (chunk: Chunk<T>, off: number, len: number): boolean | void => {
+    return rga.range0(undefined, id1, id2, (chunk: Chunk<T>, off: number, len: number): boolean | undefined => {
       if (checkFirstAnchor) {
         checkFirstAnchor = false;
         const chunkId = chunk.id;
diff --git a/src/json-crdt-extensions/peritext/slice/constants.ts b/src/json-crdt-extensions/peritext/slice/constants.ts
index f5408be7cc..ca238f6578 100644
--- a/src/json-crdt-extensions/peritext/slice/constants.ts
+++ b/src/json-crdt-extensions/peritext/slice/constants.ts
@@ -9,7 +9,7 @@ export enum CursorAnchor {
   End = 1,
 }
 
-export const enum SliceTypeCon {
+export enum SliceTypeCon {
   // ---------------------------------------------------- block slices (0 to 64)
   p = 0, // <p>
   blockquote = 1, // <blockquote>
diff --git a/src/json-crdt/nodes/rga/AbstractRga.ts b/src/json-crdt/nodes/rga/AbstractRga.ts
index 03d3d55477..d9c61db468 100644
--- a/src/json-crdt/nodes/rga/AbstractRga.ts
+++ b/src/json-crdt/nodes/rga/AbstractRga.ts
@@ -409,7 +409,7 @@ export abstract class AbstractRga<T> {
     startChunk: Chunk<T> | undefined,
     from: ITimestampStruct,
     to: ITimestampStruct,
-    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | void,
+    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | undefined,
   ): Chunk<T> | undefined {
     let chunk: Chunk<T> | undefined = startChunk ? startChunk : this.findById(from);
     if (startChunk) while (chunk && !containsId(chunk.id, chunk.span, from)) chunk = next(chunk);
diff --git a/src/json-ml/__tests__/walk.spec.ts b/src/json-ml/__tests__/walk.spec.ts
index 0e7894e4ab..0bb4bb6ac2 100644
--- a/src/json-ml/__tests__/walk.spec.ts
+++ b/src/json-ml/__tests__/walk.spec.ts
@@ -1,4 +1,4 @@
-import {JsonMlNode} from '../types';
+import type {JsonMlNode} from '../types';
 import {walk} from '../walk';
 
 test('simple text', () => {
diff --git a/src/json-ml/walk.ts b/src/json-ml/walk.ts
index e7c6097262..b6bf9a6d14 100644
--- a/src/json-ml/walk.ts
+++ b/src/json-ml/walk.ts
@@ -1,4 +1,4 @@
-import {iter, UndefIterator} from "../util/iterator";
+import {iter, type UndefIterator} from "../util/iterator";
 import type {JsonMlNode} from "./types";
 
 export const walk0 = (node: JsonMlNode): UndefIterator<JsonMlNode> => {
diff --git a/tsconfig.json b/tsconfig.json
index f971d92291..1cbe15b8b0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,8 @@
 {
   "extends": "./node_modules/config-galore/tsconfig.json",
+  "compilerOptions": {
+    "noImplicitReturns": false
+  },
   "include": ["src"],
   "exclude": ["node_modules", "lib", "es6", "es2020", "esm", "docs", "README.md"],
   "typedocOptions": {

From 932375b0c5d9f7245fbda02f6a11cb8d157a190a Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Mon, 25 Nov 2024 13:35:34 +0100
Subject: [PATCH 18/19] =?UTF-8?q?style:=20=F0=9F=92=84=20run=20formatter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peritext/block/Fragment.ts                |  6 ++++-
 .../peritext/block/Inline.ts                  |  3 +--
 .../block/__tests__/Fragment-range.spec.ts    |  2 +-
 .../peritext/overlay/Overlay.ts               |  2 +-
 .../peritext/slice/constants.ts               |  2 +-
 src/json-ml/__tests__/toHtml.spec.ts          | 25 +++++++------------
 src/json-ml/__tests__/walk.spec.ts            | 20 ++++-----------
 src/json-ml/toHtml.ts                         | 12 +++------
 src/json-ml/walk.ts                           |  4 +--
 9 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/src/json-crdt-extensions/peritext/block/Fragment.ts b/src/json-crdt-extensions/peritext/block/Fragment.ts
index 16dbb44cee..69c913ba35 100644
--- a/src/json-crdt-extensions/peritext/block/Fragment.ts
+++ b/src/json-crdt-extensions/peritext/block/Fragment.ts
@@ -21,7 +21,11 @@ import type {JsonMlNode} from '../../../json-ml/types';
 export class Fragment extends Range implements Printable, Stateful {
   public readonly root: Block;
 
-  constructor(public readonly txt: Peritext, start: Point, end: Point) {
+  constructor(
+    public readonly txt: Peritext,
+    start: Point,
+    end: Point,
+  ) {
     super(txt.str, start, end);
     this.root = new Block(txt, [], void 0, start, end);
   }
diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index f5803d410e..5283e858c3 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -260,8 +260,7 @@ export class Inline extends Range implements Printable {
     const truncate = str.length > 32;
     const text = JSON.stringify(truncate ? str.slice(0, 32) : str) + (truncate ? ' …' : '');
     const startFormatted = this.p1.toString(tab, true);
-    const range =
-      this.p1.cmp(this.end) === 0 ? startFormatted : `${startFormatted} ↔ ${this.end.toString(tab, true)}`;
+    const range = this.p1.cmp(this.end) === 0 ? startFormatted : `${startFormatted} ↔ ${this.end.toString(tab, true)}`;
     const header = `Inline ${range} ${text}`;
     const attr = this.attr();
     const attrKeys = Object.keys(attr);
diff --git a/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
index 63ed00c75a..e89d7982aa 100644
--- a/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
+++ b/src/json-crdt-extensions/peritext/block/__tests__/Fragment-range.spec.ts
@@ -3,7 +3,7 @@ import {CommonSliceType} from '../../slice';
 import {Inline} from '../Inline';
 import {LeafBlock} from '../LeafBlock';
 
-const testSuite = (setup: (() => Kit)): void => {
+const testSuite = (setup: () => Kit): void => {
   describe('when no markers', () => {
     test('can create a fragment', () => {
       const kit = setup();
diff --git a/src/json-crdt-extensions/peritext/overlay/Overlay.ts b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
index 58a69fa9a1..970df67f12 100644
--- a/src/json-crdt-extensions/peritext/overlay/Overlay.ts
+++ b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
@@ -258,7 +258,7 @@ export class Overlay<T = string> implements Printable, Stateful {
     let two: MarkerOverlayPoint<T> | undefined = i();
     return () => {
       if (!one) return;
-      if (end && end.cmpSpatial(one) <= 0) return one = void 0;
+      if (end && end.cmpSpatial(one) <= 0) return (one = void 0);
       const ret: MarkerOverlayPair<T> = [one, two];
       one = two;
       two = i();
diff --git a/src/json-crdt-extensions/peritext/slice/constants.ts b/src/json-crdt-extensions/peritext/slice/constants.ts
index ca238f6578..b0eff56020 100644
--- a/src/json-crdt-extensions/peritext/slice/constants.ts
+++ b/src/json-crdt-extensions/peritext/slice/constants.ts
@@ -99,7 +99,7 @@ export enum SliceTypeName {
   CollapseList = SliceTypeCon.CollapseList,
   Collapse = SliceTypeCon.Collapse,
   Note = SliceTypeCon.Note,
-  
+
   Cursor = SliceTypeCon.Cursor,
   RemoteCursor = SliceTypeCon.RemoteCursor,
   b = SliceTypeCon.b,
diff --git a/src/json-ml/__tests__/toHtml.spec.ts b/src/json-ml/__tests__/toHtml.spec.ts
index fb8a5412a2..8fa3ba2bb0 100644
--- a/src/json-ml/__tests__/toHtml.spec.ts
+++ b/src/json-ml/__tests__/toHtml.spec.ts
@@ -16,32 +16,25 @@ test('fragment', () => {
 });
 
 test('nested nodes', () => {
-  const ml: JsonMlNode = ['', null,
+  const ml: JsonMlNode = [
+    '',
+    null,
     ['div', null, ['b', null, 'bold'], ' text'],
     ['p', null, 'Hello world'],
-    ['blockquote', null,
-      ['p', null,
-        'Hello',
-        ' ',
-        ['b', null, ['u', null, 'world']],
-        ['i', null, '!!!'],
-      ]
-    ],
+    ['blockquote', null, ['p', null, 'Hello', ' ', ['b', null, ['u', null, 'world']], ['i', null, '!!!']]],
   ];
-  expect(toHtml(ml)).toBe('<div><b>bold</b> text</div><p>Hello world</p><blockquote><p>Hello <b><u>world</u></b><i>!!!</i></p></blockquote>');
+  expect(toHtml(ml)).toBe(
+    '<div><b>bold</b> text</div><p>Hello world</p><blockquote><p>Hello <b><u>world</u></b><i>!!!</i></p></blockquote>',
+  );
 });
 
 test('can escape text', () => {
-  const ml: JsonMlNode = ['', null,
-    ['div', null, ['b', null, 'bold'], ' text >>'],
-  ];
+  const ml: JsonMlNode = ['', null, ['div', null, ['b', null, 'bold'], ' text >>']];
   expect(toHtml(ml)).toBe('<div><b>bold</b> text &#62;&#62;</div>');
 });
 
 test('can render attributes', () => {
-  const ml: JsonMlNode = ['', null,
-    ['div', {'data-type': 'very-bold'}, ['b', null, 'bold'], ' text >>'],
-  ];
+  const ml: JsonMlNode = ['', null, ['div', {'data-type': 'very-bold'}, ['b', null, 'bold'], ' text >>']];
   expect(toHtml(ml)).toBe('<div data-type="very-bold"><b>bold</b> text &#62;&#62;</div>');
 });
 
diff --git a/src/json-ml/__tests__/walk.spec.ts b/src/json-ml/__tests__/walk.spec.ts
index 0bb4bb6ac2..ddcc35bc51 100644
--- a/src/json-ml/__tests__/walk.spec.ts
+++ b/src/json-ml/__tests__/walk.spec.ts
@@ -14,24 +14,14 @@ test('a single node', () => {
 });
 
 test('nested nodes', () => {
-  const node: JsonMlNode = ['div', {class: 'test'},
-    ['span', null, 'hello'],
-    ['p', null, 'world'],
-    '!!!',
-  ];
+  const node: JsonMlNode = ['div', {class: 'test'}, ['span', null, 'hello'], ['p', null, 'world'], '!!!'];
   const res = [...walk(node)];
   expect(res).toEqual([
-    [
-      'div',
-      { class: 'test' },
-      [ 'span', null, 'hello' ],
-      [ 'p', null, 'world' ],
-      '!!!'
-    ],
-    [ 'span', null, 'hello' ],
+    ['div', {class: 'test'}, ['span', null, 'hello'], ['p', null, 'world'], '!!!'],
+    ['span', null, 'hello'],
     'hello',
-    [ 'p', null, 'world' ],
+    ['p', null, 'world'],
     'world',
-    '!!!'
+    '!!!',
   ]);
 });
diff --git a/src/json-ml/toHtml.ts b/src/json-ml/toHtml.ts
index d960791153..750cf2e0f4 100644
--- a/src/json-ml/toHtml.ts
+++ b/src/json-ml/toHtml.ts
@@ -1,10 +1,8 @@
-import type {JsonMlNode} from "./types";
+import type {JsonMlNode} from './types';
 
-const escapeText = (str: string): string =>
-  str.replace(/[\u00A0-\u9999<>\&]/gim, (i) => '&#' + i.charCodeAt(0) + ';');
+const escapeText = (str: string): string => str.replace(/[\u00A0-\u9999<>\&]/gim, (i) => '&#' + i.charCodeAt(0) + ';');
 
-const escapeAttr = (str: string): string =>
-  str.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;');
+const escapeAttr = (str: string): string => str.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;');
 
 export const toHtml = (node: JsonMlNode): string => {
   if (typeof node === 'string') return escapeText(node);
@@ -14,8 +12,6 @@ export const toHtml = (node: JsonMlNode): string => {
   let childrenStr = '';
   for (let i = 0; i < childrenLength; i++) childrenStr += toHtml(children[i]);
   if (!tag) return childrenStr;
-  if (attrs) 
-    for (const key in attrs)
-      attrStr += ' ' + key + '="' + escapeAttr(attrs[key]) + '"';
+  if (attrs) for (const key in attrs) attrStr += ' ' + key + '="' + escapeAttr(attrs[key]) + '"';
   return '<' + tag + attrStr + '>' + childrenStr + '</' + tag + '>';
 };
diff --git a/src/json-ml/walk.ts b/src/json-ml/walk.ts
index b6bf9a6d14..cf98abee30 100644
--- a/src/json-ml/walk.ts
+++ b/src/json-ml/walk.ts
@@ -1,5 +1,5 @@
-import {iter, type UndefIterator} from "../util/iterator";
-import type {JsonMlNode} from "./types";
+import {iter, type UndefIterator} from '../util/iterator';
+import type {JsonMlNode} from './types';
 
 export const walk0 = (node: JsonMlNode): UndefIterator<JsonMlNode> => {
   const stack: JsonMlNode[] = [node];

From d0b09dec292508d7d370e1dfe5942b67ba0f495b Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Mon, 25 Nov 2024 13:40:53 +0100
Subject: [PATCH 19/19] =?UTF-8?q?chore:=20=F0=9F=A4=96=20fix=20all=20build?=
 =?UTF-8?q?=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 biome.json                                           | 3 ++-
 src/json-crdt-extensions/peritext/block/Inline.ts    | 4 ++--
 src/json-crdt-extensions/peritext/overlay/Overlay.ts | 4 ++--
 src/json-crdt/nodes/rga/AbstractRga.ts               | 4 ++--
 tsconfig.json                                        | 3 ---
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/biome.json b/biome.json
index 5d1595c84d..9f6cdfa299 100644
--- a/biome.json
+++ b/biome.json
@@ -33,7 +33,8 @@
 				"noExplicitAny": "off",
 				"useIsArray": "off",
 				"noAssignInExpressions": "off",
-				"noConfusingLabels": "off"
+				"noConfusingLabels": "off",
+				"noConfusingVoidType": "off"
 			},
 			"complexity": {
 				"noStaticOnlyClass": "off",
diff --git a/src/json-crdt-extensions/peritext/block/Inline.ts b/src/json-crdt-extensions/peritext/block/Inline.ts
index 5283e858c3..726c2c3ea7 100644
--- a/src/json-crdt-extensions/peritext/block/Inline.ts
+++ b/src/json-crdt-extensions/peritext/block/Inline.ts
@@ -54,7 +54,7 @@ export type InlineAttr =
   | InlineAttrEndPoint;
 export type InlineAttrStack = InlineAttr[];
 
-export type InlineAttrs = Map<string | number, InlineAttrStack>;
+export type InlineAttrs = Record<string | number, InlineAttrStack>;
 
 /**
  * The `Inline` class represents a range of inline text within a block, which
@@ -229,7 +229,7 @@ export class Inline extends Range implements Printable {
     const txt = this.txt;
     const overlay = txt.overlay;
     let cnt = 0;
-    overlay.chunkSlices0(this.start.chunk(), this.start, this.end, (chunk, off, len): boolean | undefined => {
+    overlay.chunkSlices0(this.start.chunk(), this.start, this.end, (chunk, off, len): boolean | void => {
       if (overlay.isMarker(chunk.id)) return;
       cnt++;
       texts.push(new ChunkSlice(chunk, off, len));
diff --git a/src/json-crdt-extensions/peritext/overlay/Overlay.ts b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
index 970df67f12..e805003ba3 100644
--- a/src/json-crdt-extensions/peritext/overlay/Overlay.ts
+++ b/src/json-crdt-extensions/peritext/overlay/Overlay.ts
@@ -156,7 +156,7 @@ export class Overlay<T = string> implements Printable, Stateful {
     chunk: Chunk<T> | undefined,
     p1: Point<T>,
     p2: Point<T>,
-    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | undefined,
+    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | void,
   ): Chunk<T> | undefined {
     const rga = this.txt.str;
     const strId = rga.id;
@@ -178,7 +178,7 @@ export class Overlay<T = string> implements Printable, Stateful {
     const time1 = id1.time;
     const sid2 = id2.sid;
     const time2 = id2.time;
-    return rga.range0(undefined, id1, id2, (chunk: Chunk<T>, off: number, len: number): boolean | undefined => {
+    return rga.range0(undefined, id1, id2, (chunk: Chunk<T>, off: number, len: number): boolean | void => {
       if (checkFirstAnchor) {
         checkFirstAnchor = false;
         const chunkId = chunk.id;
diff --git a/src/json-crdt/nodes/rga/AbstractRga.ts b/src/json-crdt/nodes/rga/AbstractRga.ts
index d9c61db468..af92eed76c 100644
--- a/src/json-crdt/nodes/rga/AbstractRga.ts
+++ b/src/json-crdt/nodes/rga/AbstractRga.ts
@@ -409,8 +409,8 @@ export abstract class AbstractRga<T> {
     startChunk: Chunk<T> | undefined,
     from: ITimestampStruct,
     to: ITimestampStruct,
-    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | undefined,
-  ): Chunk<T> | undefined {
+    callback: (chunk: Chunk<T>, off: number, len: number) => boolean | void,
+  ): Chunk<T> | void {
     let chunk: Chunk<T> | undefined = startChunk ? startChunk : this.findById(from);
     if (startChunk) while (chunk && !containsId(chunk.id, chunk.span, from)) chunk = next(chunk);
     if (!chunk) return;
diff --git a/tsconfig.json b/tsconfig.json
index 1cbe15b8b0..f971d92291 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,8 +1,5 @@
 {
   "extends": "./node_modules/config-galore/tsconfig.json",
-  "compilerOptions": {
-    "noImplicitReturns": false
-  },
   "include": ["src"],
   "exclude": ["node_modules", "lib", "es6", "es2020", "esm", "docs", "README.md"],
   "typedocOptions": {