fix (OT-server): tests

Author: e11sy

packages/collaboration-manager/src/BatchedOperation.spec.ts

@@ -1,15 +1,15 @@
-import { createDataKey, IndexBuilder, TextRange } from '@editorjs/model';
+import { createDataKey, Index, IndexBuilder, type TextRange } from '@editorjs/model';
 import { BatchedOperation } from './BatchedOperation.js';
 import type { SerializedOperation } from './Operation.js';
 import { Operation, OperationType } from './Operation.js';
 
-const createIndexByRange = (range: TextRange) => new IndexBuilder()
+const createIndexByRange = (range: TextRange): Index => new IndexBuilder()
   .addBlockIndex(0)
   .addDataKey(createDataKey('key'))
   .addTextRange(range)
   .build();
 
-const templateIndex = createIndexByRange([0, 0])
+const templateIndex = createIndexByRange([0, 0]);
 
 const userId = 'user';
 
@@ -98,16 +98,18 @@ describe('Batch', () => {
       expect(transformedBatch).not.toBeNull();
       expect(transformedBatch!.operations.length).toBe(2);
       // Check if text ranges were shifted by 1 due to insertion
+      /* eslint-disable @typescript-eslint-no-magic-numbers */
       expect(transformedBatch!.operations[0].index.textRange![0]).toBe(2);
       expect(transformedBatch!.operations[1].index.textRange![0]).toBe(3);
+      /* eslint-enable @typescript-eslint-no-magic-numbers */
     });
 
     it('should return batch with Neutral operations if no operations can be transformed', () => {
       const op = new Operation(OperationType.Insert, createIndexByRange([1, 1]), { payload: 'a' }, userId);
 
       const batch = new BatchedOperation(op);
 
-      const deleteIndex = createIndexByRange([0, 2])
+      const deleteIndex = createIndexByRange([0, 2]);
 
       // An operation that would make transformation impossible
       const againstOp = new Operation(OperationType.Delete, deleteIndex, { payload: 'a' }, 'other-user');

packages/collaboration-manager/src/CollaborationManager.spec.ts

@@ -1026,7 +1026,7 @@ describe('CollaborationManager', () => {
       // Create local delete operation
       const localIndex = new IndexBuilder().addBlockIndex(0)
         .addDataKey(createDataKey('text'))
-        .addTextRange([0, 7])
+        .addTextRange([0, 0])
         .build();
 
       const localOp = new Operation(OperationType.Insert, localIndex, {

packages/collaboration-manager/src/OperationsTransformer.ts

@@ -170,10 +170,13 @@ export class OperationsTransformer {
       return Operation.from(operation);
     }
 
+    const sameInput = index.dataKey === againstIndex.dataKey;
+    const sameBlock = index.blockIndex === againstIndex.blockIndex;
+
     /**
      * Check that againstOp affects current operation
      */
-    if (index.dataKey === againstIndex.dataKey && index.blockIndex === againstIndex.blockIndex && againstIndex.textRange![0] >= index.textRange![1]) {
+    if (sameInput && sameBlock && againstIndex.textRange![0] > index.textRange![1]) {
       return Operation.from(operation);
     }
 
@@ -220,6 +223,7 @@ export class OperationsTransformer {
 
     switch (intersectionType) {
       case (RangeIntersectionType.None):
+      case (RangeIntersectionType.Left):
         newIndexBuilder.addTextRange([index.textRange![0] + insertedLength, index.textRange![1] + insertedLength]);
         break;
 

packages/collaboration-manager/src/utils/getRangesIntersectionType.ts

@@ -25,15 +25,15 @@ export function getRangesIntersectionType(range: TextRange, rangeToCompare: Text
   /**
    * Range is fully on the left or right of the range to compare
    */
-  if (end <= startToCompare || start >= endToCompare) {
+  if (end < startToCompare || start > endToCompare) {
     return RangeIntersectionType.None;
   }
 
   /**
    * Range includes the range to compare
    * If two ranges are the same, intersection type is "includes"
    */
-  if (start <= startToCompare && end >= endToCompare) {
+  if (start <= startToCompare && end >= endToCompare && start != end) {
     return RangeIntersectionType.Includes;
   }