chore(json-crdt-peritext-ui): 🤖 fix all formatting and linter errors

Author: streamich

src/json-crdt-extensions/peritext/__tests__/Peritext.render-block.spec.ts

@@ -220,17 +220,17 @@ runInlineSlicesTests('text with block split', (editor: Editor) => {
 runInlineSlicesTests('text with deletes', (editor: Editor) => {
   editor.insert('lmXXXnwYxyz');
   editor.cursor.setAt(2, 3);
-  editor.cursor.delBwd();
+  editor.cursor.del();
   editor.cursor.setAt(3);
   editor.insert('opqrstuv');
   editor.cursor.setAt(12, 1);
-  editor.cursor.delBwd();
+  editor.cursor.del();
   editor.cursor.setAt(0);
   editor.insert('ab1c3defghijk4444');
   editor.cursor.setAt(2, 1);
-  editor.cursor.delBwd();
+  editor.cursor.del();
   editor.cursor.setAt(3, 1);
-  editor.cursor.delBwd();
+  editor.cursor.del();
   editor.cursor.setAt(11, 4);
-  editor.cursor.delBwd();
+  editor.cursor.del();
 });

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

@@ -10,12 +10,12 @@ export class Cursor<T = string> extends PersistedSlice<T> {
 
   /** @todo Rename to `isStartFocus`. */
   public isStartFocused(): boolean {
-    return this.type === CursorAnchor.End || (this.start.cmp(this.end) === 0);
+    return this.type === CursorAnchor.End || this.start.cmp(this.end) === 0;
   }
 
   /** @todo Rename to `isEndFocus`. */
   public isEndFocused(): boolean {
-    return this.type === CursorAnchor.Start || (this.start.cmp(this.end) === 0);
+    return this.type === CursorAnchor.Start || this.start.cmp(this.end) === 0;
   }
 
   // ---------------------------------------------------------------- mutations
@@ -105,8 +105,8 @@ export class Cursor<T = string> extends PersistedSlice<T> {
       this.collapse();
       return;
     }
-    let point1 = this.start.clone();
-    let point2 = point1.clone();
+    const point1 = this.start.clone();
+    const point2 = point1.clone();
     if (step > 0) point2.step(1);
     else if (step < 0) point1.step(-1);
     else if (step === 0) {

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

@@ -51,8 +51,9 @@ export class Editor<T = string> {
    */
   public get cursor(): Cursor<T> {
     let cursor: Cursor<T> | undefined;
-    for (let i: Cursor<T> | undefined, iterator = this.cursors0(); i = iterator();)
-      if (!cursor) cursor = i; else this.local.del(i);
+    for (let i: Cursor<T> | undefined, iterator = this.cursors0(); (i = iterator()); )
+      if (!cursor) cursor = i;
+      else this.local.del(i);
     return cursor ?? this.addCursor(this.txt.rangeAt(0));
   }
 
@@ -65,15 +66,15 @@ export class Editor<T = string> {
   }
 
   public cursors(callback: (cursor: Cursor<T>) => void): void {
-    for (let cursor: Cursor<T> | undefined, iterator = this.cursors0(); cursor = iterator();) callback(cursor);
+    for (let cursor: Cursor<T> | undefined, iterator = this.cursors0(); (cursor = iterator()); ) callback(cursor);
   }
 
   public delCursor(cursor: Cursor<T>): void {
     this.local.del(cursor);
   }
 
   public delCursors(): void {
-    for (let cursor: Cursor<T> | undefined, iterator = this.cursors0(); cursor = iterator();) this.delCursor(cursor);
+    for (let cursor: Cursor<T> | undefined, iterator = this.cursors0(); (cursor = iterator()); ) this.delCursor(cursor);
   }
 
   // ------------------------------------------------------------- text editing
@@ -325,7 +326,8 @@ export class Editor<T = string> {
         else for (let i = 0; i < -steps; i++) point = this.bob(point);
         return point;
       }
-      case 'all': return steps > 0 ? this.end() : this.start();
+      case 'all':
+        return steps > 0 ? this.end() : this.start();
     }
   }
 
@@ -341,7 +343,8 @@ export class Editor<T = string> {
     this.cursors((cursor) => {
       let point = endpoint === 0 ? cursor.focus() : cursor.anchor();
       point = this.skip(point.clone(), steps, unit);
-      if (collapse) cursor.set(point); else cursor.setEndpoint(point, endpoint);
+      if (collapse) cursor.set(point);
+      else cursor.setEndpoint(point, endpoint);
     });
   }
 
@@ -366,7 +369,7 @@ export class Editor<T = string> {
    */
   public rangeWord(point: Point<T>): Range<T> | undefined {
     const char = point.rightChar() || point.leftChar();
-    if (!char) return
+    if (!char) return;
     const c = String(char.view())[0];
     const predicate: CharPredicate<string> = isLetter(c) ? isLetter : isWhitespace(c) ? isWhitespace : isPunctuation;
     const start = this.bow(point, predicate, true);
@@ -390,9 +393,10 @@ export class Editor<T = string> {
   }
 
   public select(unit: TextRangeUnit): void {
-    this.cursors(cursor => {
+    this.cursors((cursor) => {
       const range = this.range(cursor.start, unit);
-      if (range) cursor.setRange(range); else this.delCursors
+      if (range) cursor.setRange(range);
+      else this.delCursors;
     });
   }
 
@@ -430,11 +434,7 @@ export class Editor<T = string> {
   // ------------------------------------------------------------------ various
 
   public point(at: Position<T>): Point<T> {
-    return typeof at === 'number'
-    ? this.txt.pointAt(at)
-    : Array.isArray(at)
-      ? this.txt.pointAt(at[0], at[1])
-      : at;
+    return typeof at === 'number' ? this.txt.pointAt(at) : Array.isArray(at) ? this.txt.pointAt(at[0], at[1]) : at;
   }
 
   public end(): Point<T> {

src/json-crdt-extensions/peritext/editor/__tests__/Editor-movement.spec.ts

@@ -130,9 +130,7 @@ describe('.eow()', () => {
   });
 
   test('can select a character', () => {
-    const {editor, peritext} = setup((editor) =>
-      editor.insert('x a x'),
-    );
+    const {editor, peritext} = setup((editor) => editor.insert('x a x'));
     const point1 = peritext.pointAt(2);
     const point2 = editor.eow(point1);
     expect(point1.id.sid).toBe(point2!.id.sid);

src/json-crdt-extensions/peritext/editor/__tests__/Editor-selection.spec.ts

@@ -154,7 +154,7 @@ describe('.range()', () => {
       const range3 = editor.range(peritext.pointAt(20), 'word');
       expect(range3?.text()).toBe('setup');
     });
-  
+
     test('can select punctuation', () => {
       const {editor, peritext} = setup((editor) => {
         editor.insert("const {editor} = setup(editor => editor.insert('Hello world!'));");
@@ -166,7 +166,7 @@ describe('.range()', () => {
       const range1 = editor.range(peritext.pointAt(30), 'word');
       expect(range1?.text()).toBe('=>');
     });
-  
+
     test('can select punctuation at the end of text', () => {
       const {editor, peritext} = setup((editor) => {
         editor.insert("const {editor} = setup(editor => editor.insert('Hello world!'));");
@@ -177,7 +177,7 @@ describe('.range()', () => {
       const range2 = editor.range(peritext.pointAt(peritext.str.length() - 3), 'word');
       expect(range2?.text()).toBe("!'));");
     });
-  
+
     test('can select whitespace', () => {
       const {editor, peritext} = setup((editor) => {
         editor.insert("const {editor} = setup(editor => editor.insert('Hello world!'));");

src/json-crdt-extensions/peritext/rga/__tests__/Point.spec.ts

@@ -1164,7 +1164,8 @@ describe('.halfstep()', () => {
   test('can reach the end of str', () => {
     const {peritext} = setupWithChunkedText();
     const p = peritext.pointAt(0, Anchor.After);
-    const endReached = p.halfstep(1) || p.halfstep(2) || p.halfstep(3) || p.halfstep(4) || p.halfstep(5) || p.halfstep(6);
+    const endReached =
+      p.halfstep(1) || p.halfstep(2) || p.halfstep(3) || p.halfstep(4) || p.halfstep(5) || p.halfstep(6);
     expect(endReached).toBe(true);
     expect(p.isAbsEnd()).toBe(true);
     expect(p.viewPos()).toBe(9);
@@ -1190,7 +1191,7 @@ describe('.halfstep()', () => {
     const points: Point[] = [];
     let point: Point | undefined = peritext.pointAbsStart();
     while (point) {
-      let nextPoint = point.clone();
+      const nextPoint = point.clone();
       const endReached = nextPoint.halfstep(1);
       if (endReached) {
         point = undefined;
@@ -1215,7 +1216,7 @@ describe('.halfstep()', () => {
     const points: Point[] = [];
     let point: Point | undefined = peritext.pointAbsEnd();
     while (point) {
-      let nextPoint = point.clone();
+      const nextPoint = point.clone();
       const endReached = nextPoint.halfstep(-1);
       if (endReached) {
         point = undefined;

tslint.json

@@ -12,6 +12,7 @@
     "no-angle-bracket-type-assertion": false,
     "ban-comma-operator": false,
     "no-unused-expression": false,
-    "no-implicit-dependencies": false
+    "no-implicit-dependencies": false,
+    "adjacent-overload-signatures": false
   }
 }