test(json-crdt-extensions): 💍 pass Overlay smoke tests after refactor

Author: streamich

src/json-crdt-extensions/peritext/Peritext.ts

@@ -59,6 +59,7 @@ export class Peritext implements Printable {
     this.extraSlices = new Slices(extraModel, extraModel.root.node().get(0)!, this.str);
 
     // TODO: flush patches
+    // TODO: remove `arr` tombstones
     const localModel = Model
       .withLogicalClock(SESSION.LOCAL)
       .setSchema(s.vec(s.arr([])));

src/json-crdt-extensions/peritext/editor/Cursor.ts

@@ -1,4 +1,5 @@
 import {Point} from '../rga/Point';
+import {Range} from '../rga/Range';
 import {CursorAnchor} from '../slice/constants';
 import {PersistedSlice} from '../slice/PersistedSlice';
 
@@ -28,15 +29,20 @@ export class Cursor<T = string> extends PersistedSlice<T> {
     });
   }
 
+  /** Move to persisted slice. */
   public setAt(start: number, length: number = 0): void {
     let at = start;
     let len = length;
     if (len < 0) {
       at += len;
       len = -len;
     }
-    super.setAt(at, len);
-    this.anchorSide = length < 0 ? CursorAnchor.End : CursorAnchor.Start;
+    const range = Range.at<T>(this.rga, start, length);
+    const anchorSide = this.anchorSide;
+    this.update({
+      range,
+      type: anchorSide !== this.anchorSide ? anchorSide : undefined,
+    });
   }
 
   /**

src/json-crdt-extensions/peritext/overlay/Overlay.ts

@@ -15,6 +15,7 @@ import type {Peritext} from '../Peritext';
 import type {Stateful} from '../types';
 import type {Printable} from 'tree-dump/lib/types';
 import type {MutableSlice, Slice} from '../slice/types';
+import type {Slices} from '../slice/Slices';
 
 export class Overlay implements Printable, Stateful {
   public root: OverlayPoint | undefined = undefined;
@@ -91,8 +92,10 @@ export class Overlay implements Printable, Stateful {
   public hash: number = 0;
 
   public refresh(slicesOnly: boolean = false): number {
+    const txt = this.txt;
     let hash: number = CONST.START_STATE;
-    hash = this.refreshSlices(hash);
+    hash = this.refreshSlices(hash, txt.savedSlices);
+    hash = this.refreshSlices(hash, txt.localSlices);
     // hash = this.refreshCursor(hash);
     // TODO: refresh ephemeral slices
     // if (!slicesOnly) this.computeSplitTextHashes();
@@ -101,15 +104,13 @@ export class Overlay implements Printable, Stateful {
 
   public readonly slices = new Map<Slice, [start: OverlayPoint, end: OverlayPoint]>();
 
-  private refreshSlices(state: number): number {
-    const slices = this.txt.savedSlices;
+  private refreshSlices(state: number, slices: Slices): number {
     const oldSlicesHash = slices.hash;
     const changed = oldSlicesHash !== slices.refresh();
     const sliceSet = this.slices;
     state = updateNum(state, slices.hash);
     if (changed) {
       slices.forEach((slice) => {
-        // console.log('slice', slice + '');
         let tuple: [start: OverlayPoint, end: OverlayPoint] | undefined = sliceSet.get(slice);
         if (tuple) {
           if ((slice as any).isDel && (slice as any).isDel()) {

src/json-crdt-extensions/peritext/overlay/__tests__/Overlay.spec.ts

@@ -46,7 +46,6 @@ describe('markers', () => {
       const points = [];
       let point;
       for (const iterator = peritext.overlay.iterator(); (point = iterator()); ) points.push(point);
-      // console.log(peritext + '');
       expect(points.length).toBe(2);
       point = points[0];
       expect(point.pos()).toBe(5);

src/json-crdt-extensions/peritext/slice/PersistedSlice.ts

@@ -1,3 +1,4 @@
+import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty';
 import {Point} from '../rga/Point';
 import {Range} from '../rga/Range';
 import {updateNode} from '../../../json-crdt/hash';
@@ -73,31 +74,30 @@ export class PersistedSlice<T = string> extends Range<T> implements MutableSlice
 
   public update(params: SliceUpdateParams<T>): void {
     let updateHeader = false;
-    const {start, end} = this;
     const changes: [number, unknown][] = [];
     if (params.behavior !== undefined) {
       this.behavior = params.behavior;
       updateHeader = true;
     }
     if (params.range) {
       const range = params.range;
-      if (range.start.anchor !== start.anchor) updateHeader = true;
-      if (range.end.anchor !== end.anchor) updateHeader = true;
-      if (compare(range.start.id, start.id) !== 0) changes.push([SliceTupleIndex.X1, s.con(range.start.id)]);
-      if (compare(range.end.id, end.id) !== 0) changes.push([SliceTupleIndex.X2, s.con(range.end.id)]);
+      updateHeader = true;
+      changes.push(
+        [SliceTupleIndex.X1, s.con(range.start.id)],
+        [SliceTupleIndex.X2, s.con(range.end.id)]);
       this.start = range.start;
       this.end = range.start === range.end ? range.end.clone() : range.end;
     }
     if (params.type !== undefined) {
       this.type = params.type;
       changes.push([SliceTupleIndex.Type, s.con(this.type)]);
     }
-    if (params.data !== undefined) changes.push([SliceTupleIndex.Data, s.con(params.data)]);
+    if (hasOwnProperty(params, 'data')) changes.push([SliceTupleIndex.Data, s.con(params.data)]);
     if (updateHeader) {
       const header =
-        (this.behavior << SliceHeaderShift.Behavior) +
-        (this.start.anchor << SliceHeaderShift.X1Anchor) +
-        (this.end.anchor << SliceHeaderShift.X2Anchor);
+      (this.behavior << SliceHeaderShift.Behavior) +
+      (this.start.anchor << SliceHeaderShift.X1Anchor) +
+      (this.end.anchor << SliceHeaderShift.X2Anchor);
       changes.push([SliceTupleIndex.Header, s.con(header)]);
     }
     this.tupleApi().set(changes);