@fluidframework/merge-tree 2.1.0-276985 → 2.1.0

package/src/mergeTree.ts

@@ -77,7 +77,6 @@ import {
 } from "./ops.js";
 import { PartialSequenceLengths } from "./partialLengths.js";
 import { PerspectiveImpl, isSegmentPresent } from "./perspective.js";
-// eslint-disable-next-line import/no-deprecated
 import { PropertySet, createMap, extend, extendIfUndefined } from "./properties.js";
 import {
 	DetachedReferencePosition,
@@ -98,7 +97,7 @@ function wasRemovedAfter(seg: ISegment, seq: number): boolean {
 
 function markSegmentMoved(seg: ISegment, moveInfo: IMoveInfo): void {
 	seg.moveDst = moveInfo.moveDst;
-	seg.movedClientIds = moveInfo.movedClientIds.slice();
+	seg.movedClientIds = [...moveInfo.movedClientIds];
 	seg.movedSeqs = [moveInfo.movedSeq];
 	seg.movedSeq = moveInfo.movedSeq;
 	seg.localMovedSeq = moveInfo.localMovedSeq;
@@ -271,18 +270,19 @@ export function findRootMergeBlock(
 		maybeRoot = maybeRoot.parent;
 	}
 
-	return maybeRoot?.mergeTree !== undefined ? maybeRoot : undefined;
+	return maybeRoot?.mergeTree === undefined ? undefined : maybeRoot;
 }
 
 /**
+ * Find the segment to which a reference will slide if it needs to slide, or undefined if there
+ * is no valid segment (i.e. the tree is empty).
+ *
  * @param segment - The segment to slide from.
  * @param cache - Optional cache mapping segments to their sliding destinations.
  * Excursions will be avoided for segments in the cache, and the cache will be populated with
  * entries for all segments visited during excursion.
  * This can reduce the number of times the tree needs to be scanned if a range containing many
  * SlideOnRemove references is removed.
- * @returns The segment a SlideOnRemove reference should slide to, or undefined if there is no
- * valid segment (i.e. the tree is empty).
  * @internal
  */
 function getSlideToSegment(
@@ -305,7 +305,7 @@ function getSlideToSegment(
 	}
 	const result: { seg?: ISegment } = {};
 	cache?.set(segment, result);
-	const goFurtherToFindSlideToSegment = (seg: ISegment) => {
+	const goFurtherToFindSlideToSegment = (seg: ISegment): boolean => {
 		if (seg.seq !== UnassignedSequenceNumber && !isRemovedAndAckedOrMovedAndAcked(seg)) {
 			result.seg = seg;
 			return false;
@@ -366,7 +366,10 @@ export function getSlideToSegoff(
 	segoff: { segment: ISegment | undefined; offset: number | undefined },
 	slidingPreference: SlidingPreference = SlidingPreference.FORWARD,
 	useNewSlidingBehavior: boolean = false,
-) {
+): {
+	segment: ISegment | undefined;
+	offset: number | undefined;
+} {
 	if (segoff.segment === undefined) {
 		return segoff;
 	}
@@ -387,6 +390,11 @@ export function getSlideToSegoff(
 	};
 }
 
+const forwardPred = (ref: LocalReferencePosition): boolean =>
+	ref.slidingPreference !== SlidingPreference.BACKWARD;
+const backwardPred = (ref: LocalReferencePosition): boolean =>
+	ref.slidingPreference === SlidingPreference.BACKWARD;
+
 /**
  * @internal
  */
@@ -465,12 +473,12 @@ export class MergeTree {
 		return this._root;
 	}
 
-	public set root(value) {
+	public set root(value: IRootMergeBlock) {
 		this._root = value;
 		value.mergeTree = this;
 	}
 
-	public makeBlock(childCount: number) {
+	public makeBlock(childCount: number): MergeBlock {
 		const block = new MergeBlock(childCount);
 		block.ordinal = "";
 		return block;
@@ -513,7 +521,22 @@ export class MergeTree {
 		);
 		assert(segment.seq !== undefined, 0x399 /* segment with no seq in mergeTree */);
 		const { seq, removedSeq, localRemovedSeq, movedSeq, localMovedSeq } = segment;
-		if (seq !== UnassignedSequenceNumber) {
+		if (seq === UnassignedSequenceNumber) {
+			assert(
+				segment.localSeq !== undefined,
+				0x39a /* unacked segment with undefined localSeq */,
+			);
+			// inserted locally, still un-acked
+			if (
+				segment.localSeq > localSeq ||
+				(localRemovedSeq !== undefined && localRemovedSeq <= localSeq) ||
+				(localMovedSeq !== undefined && localMovedSeq <= localSeq)
+			) {
+				return 0;
+			}
+			const { cachedLength } = segment;
+			return cachedLength;
+		} else {
 			// inserted remotely
 			if (
 				seq > refSeq ||
@@ -529,37 +552,23 @@ export class MergeTree {
 				return 0;
 			}
 			return segment.cachedLength;
-		} else {
-			assert(
-				segment.localSeq !== undefined,
-				0x39a /* unacked segment with undefined localSeq */,
-			);
-			// inserted locally, still un-acked
-			if (
-				segment.localSeq > localSeq ||
-				(localRemovedSeq !== undefined && localRemovedSeq <= localSeq) ||
-				(localMovedSeq !== undefined && localMovedSeq <= localSeq)
-			) {
-				return 0;
-			}
-			return segment.cachedLength;
 		}
 	}
 
-	public unlinkMarker(marker: Marker) {
+	public unlinkMarker(marker: Marker): void {
 		const id = marker.getId();
 		if (id) {
 			this.idToMarker.delete(id);
 		}
 	}
 
-	private addNode(block: MergeBlock, node: IMergeNode) {
+	private addNode(block: MergeBlock, node: IMergeNode): number {
 		const index = block.childCount++;
 		block.assignChild(node, index, false);
 		return index;
 	}
 
-	public reloadFromSegments(segments: ISegment[]) {
+	public reloadFromSegments(segments: ISegment[]): void {
 		// This code assumes that a later call to `startCollaboration()` will initialize partial lengths.
 		assert(
 			!this.collabWindow.collaborating,
@@ -571,7 +580,7 @@ export class MergeTree {
 		// Starting with the leaf segments, recursively builds the B-Tree layer by layer from the bottom up.
 		const buildMergeBlock = (nodes: IMergeNode[]): IRootMergeBlock => {
 			const blockCount = Math.ceil(nodes.length / maxChildren); // Compute # blocks require for this level of B-Tree
-			const blocks: MergeBlock[] = new Array(blockCount); // Pre-alloc array to collect nodes
+			const blocks: MergeBlock[] = Array.from({ length: blockCount }); // Pre-alloc array to collect nodes
 
 			// For each block in this level of the B-Tree...
 			for (
@@ -589,7 +598,8 @@ export class MergeTree {
 					childIndex++, nodeIndex++ // Advance to next child & node
 				) {
 					// Insert the next node into the current block
-					this.addNode(block, nodes[nodeIndex]);
+					// TODO Non null asserting, why is this not null?
+					this.addNode(block, nodes[nodeIndex]!);
 				}
 
 				// Calculate this block's info.  Previously this was inlined into the above loop as a micro-optimization,
@@ -599,7 +609,8 @@ export class MergeTree {
 			}
 
 			return blocks.length === 1 // If there is only one block at this layer...
-				? blocks[0] // ...then we're done.  Return the root.
+				? // Non null asserting here because of the length check above
+					blocks[0]! // ...then we're done.  Return the root.
 				: buildMergeBlock(blocks); // ...otherwise recursively build the next layer above blocks.
 		};
 		if (segments.length > 0) {
@@ -611,7 +622,7 @@ export class MergeTree {
 	}
 
 	// For now assume min starts at zero
-	public startCollaboration(localClientId: number, minSeq: number, currentSeq: number) {
+	public startCollaboration(localClientId: number, minSeq: number, currentSeq: number): void {
 		this.collabWindow.clientId = localClientId;
 		this.collabWindow.minSeq = minSeq;
 		this.collabWindow.collaborating = true;
@@ -619,7 +630,7 @@ export class MergeTree {
 		this.nodeUpdateLengthNewStructure(this.root, true);
 	}
 
-	private addToLRUSet(leaf: ISegmentLeaf, seq: number) {
+	private addToLRUSet(leaf: ISegmentLeaf, seq: number): void {
 		// If the parent node has not yet been marked for scour (i.e., needsScour is not false or undefined),
 		// add the segment and mark the mark the node now.
 
@@ -638,7 +649,7 @@ export class MergeTree {
 	/**
 	 * Returns the current length of the MergeTree for the local client.
 	 */
-	public get length() {
+	public get length(): number | undefined {
 		return this.root.cachedLength;
 	}
 
@@ -658,7 +669,8 @@ export class MergeTree {
 		while (parent) {
 			const children = parent.children;
 			for (let childIndex = 0; childIndex < parent.childCount; childIndex++) {
-				const child = children[childIndex];
+				// TODO Non null asserting, why is this not null?
+				const child = children[childIndex]!;
 				if ((!!prevParent && child === prevParent) || child === node) {
 					break;
 				}
@@ -675,7 +687,10 @@ export class MergeTree {
 		refSeq: number,
 		clientId: number,
 		localSeq?: number,
-	) {
+	): {
+		segment: T | undefined;
+		offset: number | undefined;
+	} {
 		assert(
 			localSeq === undefined || clientId === this.collabWindow.clientId,
 			0x39b /* localSeq provided for non-local client */,
@@ -689,7 +704,7 @@ export class MergeTree {
 			_refSeq: number,
 			_clientId: number,
 			start: number,
-		) => {
+		): boolean => {
 			segment = leafSeg as T;
 			offset = start;
 			return false;
@@ -718,7 +733,7 @@ export class MergeTree {
 	 *
 	 * @param segments - An array of (not necessarily contiguous) segments with increasing ordinals.
 	 */
-	private slideAckedRemovedSegmentReferences(segments: ISegment[]) {
+	private slideAckedRemovedSegmentReferences(segments: ISegment[]): void {
 		// References are slid in groups to preserve their order.
 		let currentForwardSlideGroup: LocalReferenceCollection[] = [];
 		let currentBackwardSlideGroup: LocalReferenceCollection[] = [];
@@ -726,14 +741,10 @@ export class MergeTree {
 		let currentForwardMaybeEndpoint: "start" | "end" | undefined;
 		let currentForwardSlideDestination: ISegment | undefined;
 		let currentForwardSlideIsForward: boolean | undefined;
-		const forwardPred = (ref: LocalReferencePosition) =>
-			ref.slidingPreference !== SlidingPreference.BACKWARD;
 
 		let currentBackwardMaybeEndpoint: "start" | "end" | undefined;
 		let currentBackwardSlideDestination: ISegment | undefined;
 		let currentBackwardSlideIsForward: boolean | undefined;
-		const backwardPred = (ref: LocalReferencePosition) =>
-			ref.slidingPreference === SlidingPreference.BACKWARD;
 
 		const slideGroup = (
 			currentSlideDestination: ISegmentLeaf | undefined,
@@ -741,7 +752,7 @@ export class MergeTree {
 			currentSlideGroup: LocalReferenceCollection[],
 			pred: (ref: LocalReferencePosition) => boolean,
 			maybeEndpoint: "start" | "end" | undefined,
-		) => {
+		): void => {
 			if (currentSlideIsForward === undefined) {
 				return;
 			}
@@ -770,14 +781,7 @@ export class MergeTree {
 				}
 			}
 
-			if (currentSlideDestination !== undefined) {
-				const localRefs = LocalReferenceCollection.setOrGet(currentSlideDestination);
-				if (currentSlideIsForward) {
-					localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
-				} else {
-					localRefs.addAfterTombstones(...nonEndpointRefsToAdd);
-				}
-			} else {
+			if (currentSlideDestination === undefined) {
 				for (const collection of currentSlideGroup) {
 					for (const ref of collection) {
 						if (pred(ref) && !refTypeIncludesFlag(ref, ReferenceType.StayOnRemove)) {
@@ -787,6 +791,13 @@ export class MergeTree {
 						}
 					}
 				}
+			} else {
+				const localRefs = LocalReferenceCollection.setOrGet(currentSlideDestination);
+				if (currentSlideIsForward) {
+					localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
+				} else {
+					localRefs.addAfterTombstones(...nonEndpointRefsToAdd);
+				}
 			}
 		};
 
@@ -804,7 +815,7 @@ export class MergeTree {
 				slideIsForward: boolean,
 				maybeEndpoint: "start" | "end" | undefined,
 			) => void,
-		) => {
+		): void => {
 			// avoid sliding logic if this segment doesn't have any references
 			// with the given sliding preference
 			if (!segment.localRefs || !anyLocalReferencePosition(segment.localRefs, pred)) {
@@ -916,7 +927,7 @@ export class MergeTree {
 	 *
 	 * Public only for use by internal tests
 	 */
-	public computeLocalPartials(refSeq: number) {
+	public computeLocalPartials(refSeq: number): void {
 		if (this.localPartialsComputed) {
 			return;
 		}
@@ -966,13 +977,7 @@ export class MergeTree {
 			}
 		} else {
 			// Sequence number within window
-			if (!node.isLeaf()) {
-				const partialLen = node.partialLengths!.getPartialLength(refSeq, clientId);
-
-				PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId);
-
-				return partialLen;
-			} else {
+			if (node.isLeaf()) {
 				const segment = node;
 				const removalInfo = toRemovalInfo(segment);
 				const moveInfo = toMoveInfo(segment);
@@ -1004,11 +1009,17 @@ export class MergeTree {
 				return seqLTE(node.seq ?? 0, refSeq) || segment.clientId === clientId
 					? segment.cachedLength
 					: 0;
+			} else {
+				const partialLen = node.partialLengths!.getPartialLength(refSeq, clientId);
+
+				PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId);
+
+				return partialLen;
 			}
 		}
 	}
 
-	public setMinSeq(minSeq: number) {
+	public setMinSeq(minSeq: number): void {
 		assert(
 			minSeq <= this.collabWindow.currentSeq,
 			0x04e /* "Trying to set minSeq above currentSeq of collab window!" */,
@@ -1038,7 +1049,6 @@ export class MergeTree {
 	 * Defaults to including all edits which have been applied.
 	 * @param clientId - The ID of the client from whose perspective to resolve this reference. Defaults to the current client.
 	 * @param localSeq - The local sequence number to consider. Defaults to including all local edits.
-	 * @returns the count of elements before the given reference position in the given perspective.
 	 */
 	public referencePositionToLocalPosition(
 		refPos: ReferencePosition,
@@ -1129,7 +1139,7 @@ export class MergeTree {
 						foundMarker = marker;
 					}
 				}
-				return foundMarker !== undefined ? NodeAction.Exit : NodeAction.Skip;
+				return foundMarker === undefined ? NodeAction.Skip : NodeAction.Exit;
 			},
 			undefined,
 			undefined,
@@ -1139,7 +1149,7 @@ export class MergeTree {
 		return foundMarker;
 	}
 
-	private updateRoot(splitNode: MergeBlock | undefined) {
+	private updateRoot(splitNode: MergeBlock | undefined): void {
 		if (splitNode !== undefined) {
 			const newRoot = this.makeBlock(2);
 			newRoot.assignChild(this.root, 0, false);
@@ -1154,7 +1164,7 @@ export class MergeTree {
 	 * Assign sequence number to existing segment; update partial lengths to reflect the change
 	 * @param seq - sequence number given by server to pending segment
 	 */
-	public ackPendingSegment(opArgs: IMergeTreeDeltaOpArgs) {
+	public ackPendingSegment(opArgs: IMergeTreeDeltaOpArgs): void {
 		const seq = opArgs.sequencedMessage!.sequenceNumber;
 		const pendingSegmentGroup = this.pendingSegments.shift()?.data;
 		const nodesToUpdate: MergeBlock[] = [];
@@ -1170,6 +1180,8 @@ export class MergeTree {
 					const locallyMovedSegments = this.locallyMovedSegments.get(localMovedSeq);
 
 					if (locallyMovedSegments) {
+						// Disabling because a for of loop causes the type of segment to be ISegment, which does not have parent information stored
+						// eslint-disable-next-line unicorn/no-array-for-each
 						locallyMovedSegments.segments.forEach((segment: ISegmentLeaf) => {
 							segment.localMovedSeq = undefined;
 
@@ -1241,7 +1253,8 @@ export class MergeTree {
 		segmentGroup?: SegmentGroup,
 		localSeq?: number,
 		previousProps?: PropertySet,
-	) {
+		// eslint-disable-next-line import/no-deprecated
+	): SegmentGroup {
 		let _segmentGroup = segmentGroup;
 		if (_segmentGroup === undefined) {
 			_segmentGroup = {
@@ -1290,7 +1303,7 @@ export class MergeTree {
 		relativePos: IRelativePosition,
 		refseq = this.collabWindow.currentSeq,
 		clientId = this.collabWindow.clientId,
-	) {
+	): number {
 		let pos = -1;
 		let marker: Marker | undefined;
 		if (relativePos.id) {
@@ -1298,14 +1311,14 @@ export class MergeTree {
 		}
 		if (marker) {
 			pos = this.getPosition(marker, refseq, clientId);
-			if (!relativePos.before) {
-				pos += marker.cachedLength;
+			if (relativePos.before) {
 				if (relativePos.offset !== undefined) {
-					pos += relativePos.offset;
+					pos -= relativePos.offset;
 				}
 			} else {
+				pos += marker.cachedLength;
 				if (relativePos.offset !== undefined) {
-					pos -= relativePos.offset;
+					pos += relativePos.offset;
 				}
 			}
 		}
@@ -1319,7 +1332,7 @@ export class MergeTree {
 		clientId: number,
 		seq: number,
 		opArgs: IMergeTreeDeltaOpArgs | undefined,
-	) {
+	): void {
 		this.ensureIntervalBoundary(pos, refSeq, clientId);
 
 		const localSeq =
@@ -1398,8 +1411,10 @@ export class MergeTree {
 		seq: number,
 		localSeq: number | undefined,
 		newSegments: T[],
-	) {
-		const continueFrom = (node: MergeBlock) => {
+	): void {
+		// Keeping this function within the scope of blockInsert for readability.
+		// eslint-disable-next-line unicorn/consistent-function-scoping
+		const continueFrom = (node: MergeBlock): boolean => {
 			let siblingExists = false;
 			forwardExcursion(node, () => {
 				siblingExists = true;
@@ -1407,10 +1422,9 @@ export class MergeTree {
 			});
 			return siblingExists;
 		};
-
 		// eslint-disable-next-line import/no-deprecated
 		let segmentGroup: SegmentGroup;
-		const saveIfLocal = (locSegment: ISegment) => {
+		const saveIfLocal = (locSegment: ISegment): void => {
 			// Save segment so we can assign sequence number when acked by server
 			if (this.collabWindow.collaborating) {
 				if (
@@ -1430,7 +1444,13 @@ export class MergeTree {
 				}
 			}
 		};
-		const onLeaf = (segment: ISegment | undefined, _pos: number, context: InsertContext) => {
+		const onLeaf = (
+			segment: ISegment | undefined,
+			_pos: number,
+			context: InsertContext,
+			// Keeping this function within the scope of blockInsert for readability.
+			// eslint-disable-next-line unicorn/consistent-function-scoping
+		): ISegmentChanges => {
 			const segmentChanges: ISegmentChanges = {};
 			if (segment) {
 				// Insert before segment
@@ -1464,7 +1484,7 @@ export class MergeTree {
 
 				if (newSegment.parent === undefined) {
 					// Indicates an attempt to insert past the end of the merge-tree's content.
-					const errorConstructor = localSeq !== undefined ? UsageError : DataProcessingError;
+					const errorConstructor = localSeq === undefined ? DataProcessingError : UsageError;
 					throw new errorConstructor("MergeTree insert failed", {
 						currentSeq: this.collabWindow.currentSeq,
 						minSeq: this.collabWindow.minSeq,
@@ -1495,7 +1515,7 @@ export class MergeTree {
 				let _movedSeq: number | undefined;
 				let movedClientIds: number[] | undefined;
 
-				const findLeftMovedSegment = (seg: ISegment) => {
+				const findLeftMovedSegment = (seg: ISegment): boolean => {
 					const movedSeqs = seg.movedSeqs?.filter((movedSeq) => movedSeq >= refSeq) ?? [];
 					const localMovedSeqs = seg.localMovedSeq ? [seg.localMovedSeq] : [];
 					for (const movedSeq of movedSeqs) {
@@ -1518,7 +1538,7 @@ export class MergeTree {
 					return moveUpperBound >= smallestSeqMoveOp;
 				};
 
-				const findRightMovedSegment = (seg: ISegment) => {
+				const findRightMovedSegment = (seg: ISegment): boolean => {
 					const movedSeqs = seg.movedSeqs?.filter((movedSeq) => movedSeq >= refSeq) ?? [];
 					const localMovedSeqs = seg.localMovedSeq ? [seg.localMovedSeq] : [];
 
@@ -1616,7 +1636,7 @@ export class MergeTree {
 		return { next };
 	};
 
-	private ensureIntervalBoundary(pos: number, refSeq: number, clientId: number) {
+	private ensureIntervalBoundary(pos: number, refSeq: number, clientId: number): void {
 		const splitNode = this.insertingWalk(
 			this.root,
 			pos,
@@ -1629,7 +1649,7 @@ export class MergeTree {
 	}
 
 	// Assume called only when pos == len
-	private breakTie(pos: number, node: IMergeNode, seq: number) {
+	private breakTie(pos: number, node: IMergeNode, seq: number): boolean {
 		if (node.isLeaf()) {
 			if (pos !== 0) {
 				return false;
@@ -1670,7 +1690,7 @@ export class MergeTree {
 		seq: number,
 		context: InsertContext,
 		isLastChildBlock: boolean = true,
-	) {
+	): MergeBlock | undefined {
 		let _pos = pos;
 		const children = block.children;
 		let childIndex: number;
@@ -1678,7 +1698,8 @@ export class MergeTree {
 		let newNode: IMergeNode | undefined;
 		let fromSplit: MergeBlock | undefined;
 		for (childIndex = 0; childIndex < block.childCount; childIndex++) {
-			child = children[childIndex];
+			// TODO Non null asserting, why is this not null?
+			child = children[childIndex]!;
 			// ensure we walk down the far edge of the tree, even if all sub-tree is eligible for zamboni
 			const isLastNonLeafBlock =
 				isLastChildBlock && !child.isLeaf() && childIndex === block.childCount - 1;
@@ -1695,7 +1716,21 @@ export class MergeTree {
 
 			if (_pos < len || (_pos === len && this.breakTie(_pos, child, seq))) {
 				// Found entry containing pos
-				if (!child.isLeaf()) {
+				if (child.isLeaf()) {
+					const segment = child;
+					const segmentChanges = context.leaf(segment, _pos, context);
+					if (segmentChanges.replaceCurrent) {
+						block.assignChild(segmentChanges.replaceCurrent, childIndex, false);
+						segmentChanges.replaceCurrent.ordinal = child.ordinal;
+					}
+					if (segmentChanges.next) {
+						newNode = segmentChanges.next;
+						childIndex++; // Insert after
+					} else {
+						// No change
+						return undefined;
+					}
+				} else {
 					const childBlock = child;
 					// Internal node
 					const splitNode = this.insertingWalk(
@@ -1718,41 +1753,27 @@ export class MergeTree {
 						fromSplit = splitNode;
 						childIndex++; // Insert after
 					}
-				} else {
-					const segment = child;
-					const segmentChanges = context.leaf(segment, _pos, context);
-					if (segmentChanges.replaceCurrent) {
-						block.assignChild(segmentChanges.replaceCurrent, childIndex, false);
-						segmentChanges.replaceCurrent.ordinal = child.ordinal;
-					}
-					if (segmentChanges.next) {
-						newNode = segmentChanges.next;
-						childIndex++; // Insert after
-					} else {
-						// No change
-						return undefined;
-					}
 				}
 				break;
 			} else {
 				_pos -= len;
 			}
 		}
-		if (!newNode) {
-			if (_pos === 0) {
-				if (context.continuePredicate?.(block)) {
-					return MergeTree.theUnfinishedNode;
-				} else {
-					const segmentChanges = context.leaf(undefined, _pos, context);
-					newNode = segmentChanges.next;
-					// Assert segmentChanges.replaceCurrent === undefined
-				}
+		if (!newNode && _pos === 0) {
+			if (context.continuePredicate?.(block)) {
+				return MergeTree.theUnfinishedNode;
+			} else {
+				const segmentChanges = context.leaf(undefined, _pos, context);
+				newNode = segmentChanges.next;
+				// Assert segmentChanges.replaceCurrent === undefined
 			}
 		}
 		if (newNode) {
 			for (let i = block.childCount; i > childIndex; i--) {
-				block.children[i] = block.children[i - 1];
-				block.children[i].index = i;
+				// TODO Non null asserting, why is this not null?
+				block.children[i] = block.children[i - 1]!;
+				// TODO Non null asserting, why is this not null?
+				block.children[i]!.index = i;
 			}
 			block.assignChild(newNode, childIndex, false);
 			block.childCount++;
@@ -1782,14 +1803,15 @@ export class MergeTree {
 		}
 	}
 
-	private split(node: MergeBlock) {
+	private split(node: MergeBlock): MergeBlock {
 		const halfCount = MaxNodesInBlock / 2;
 		const newNode = this.makeBlock(halfCount);
 		node.childCount = halfCount;
 		// Update ordinals to reflect lowered child count
 		this.nodeUpdateOrdinals(node);
 		for (let i = 0; i < halfCount; i++) {
-			newNode.assignChild(node.children[halfCount + i], i, false);
+			// TODO Non null asserting, why is this not null?
+			newNode.assignChild(node.children[halfCount + i]!, i, false);
 			node.children[halfCount + i] = undefined!;
 		}
 		this.nodeUpdateLengthNewStructure(node);
@@ -1797,9 +1819,10 @@ export class MergeTree {
 		return newNode;
 	}
 
-	public nodeUpdateOrdinals(block: MergeBlock) {
+	public nodeUpdateOrdinals(block: MergeBlock): void {
 		for (let i = 0; i < block.childCount; i++) {
-			const child = block.children[i];
+			// TODO Non null asserting, why is this not null?
+			const child = block.children[i]!;
 			block.setOrdinal(child, i);
 			if (!child.isLeaf()) {
 				this.nodeUpdateOrdinals(child);
@@ -1827,7 +1850,7 @@ export class MergeTree {
 		seq: number,
 		opArgs: IMergeTreeDeltaOpArgs,
 		rollback: PropertiesRollback = PropertiesRollback.None,
-	) {
+	): void {
 		this.ensureIntervalBoundary(start, refSeq, clientId);
 		this.ensureIntervalBoundary(end, refSeq, clientId);
 		const deltaSegments: IMergeTreeSegmentDelta[] = [];
@@ -1835,7 +1858,7 @@ export class MergeTree {
 			seq === UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
 		// eslint-disable-next-line import/no-deprecated
 		let segmentGroup: SegmentGroup | undefined;
-		const annotateSegment = (segment: ISegment) => {
+		const annotateSegment = (segment: ISegment): boolean => {
 			assert(
 				!Marker.is(segment) ||
 					!(reservedMarkerIdKey in props) ||
@@ -1877,10 +1900,12 @@ export class MergeTree {
 				deltaSegments,
 			});
 		}
-		if (this.collabWindow.collaborating && seq !== UnassignedSequenceNumber) {
-			if (MergeTree.options.zamboniSegments) {
-				zamboniSegments(this);
-			}
+		if (
+			this.collabWindow.collaborating &&
+			seq !== UnassignedSequenceNumber &&
+			MergeTree.options.zamboniSegments
+		) {
+			zamboniSegments(this);
 		}
 	}
 
@@ -1912,7 +1937,12 @@ export class MergeTree {
 		}
 		// eslint-disable-next-line import/no-deprecated
 		let segmentGroup: SegmentGroup;
-		const markMoved = (segment: ISegment, pos: number, _start: number, _end: number) => {
+		const markMoved = (
+			segment: ISegment,
+			pos: number,
+			_start: number,
+			_end: number,
+		): boolean => {
 			const existingMoveInfo = toMoveInfo(segment);
 
 			if (
@@ -1924,7 +1954,16 @@ export class MergeTree {
 				segment.wasMovedOnInsert = true;
 			}
 
-			if (existingMoveInfo !== undefined) {
+			if (existingMoveInfo === undefined) {
+				segment.movedClientIds = [clientId];
+				segment.movedSeq = seq;
+				segment.localMovedSeq = localSeq;
+				segment.movedSeqs = [seq];
+
+				if (!toRemovalInfo(segment)) {
+					movedSegments.push({ segment });
+				}
+			} else {
 				_overwrite = true;
 				if (existingMoveInfo.movedSeq === UnassignedSequenceNumber) {
 					// we moved this locally, but someone else moved it first
@@ -1943,15 +1982,6 @@ export class MergeTree {
 					existingMoveInfo.movedClientIds.push(clientId);
 					existingMoveInfo.movedSeqs.push(seq);
 				}
-			} else {
-				segment.movedClientIds = [clientId];
-				segment.movedSeq = seq;
-				segment.localMovedSeq = localSeq;
-				segment.movedSeqs = [seq];
-
-				if (!toRemovalInfo(segment)) {
-					movedSegments.push({ segment });
-				}
 			}
 
 			// Save segment so can assign moved sequence number when acked by server
@@ -1970,7 +2000,12 @@ export class MergeTree {
 			return true;
 		};
 
-		const afterMarkMoved = (node: MergeBlock, pos: number, _start: number, _end: number) => {
+		const afterMarkMoved = (
+			node: MergeBlock,
+			pos: number,
+			_start: number,
+			_end: number,
+		): boolean => {
 			if (_overwrite) {
 				this.nodeUpdateLengthNewStructure(node);
 			} else {
@@ -1988,7 +2023,7 @@ export class MergeTree {
 			start,
 			end,
 			undefined,
-			seq !== UnassignedSequenceNumber ? seq : undefined,
+			seq === UnassignedSequenceNumber ? undefined : seq,
 		);
 
 		this.slideAckedRemovedSegmentReferences(localOverlapWithRefs);
@@ -2011,10 +2046,12 @@ export class MergeTree {
 			this.slideAckedRemovedSegmentReferences(movedSegments.map(({ segment }) => segment));
 		}
 
-		if (this.collabWindow.collaborating && seq !== UnassignedSequenceNumber) {
-			if (MergeTree.options.zamboniSegments) {
-				zamboniSegments(this);
-			}
+		if (
+			this.collabWindow.collaborating &&
+			seq !== UnassignedSequenceNumber &&
+			MergeTree.options.zamboniSegments
+		) {
+			zamboniSegments(this);
 		}
 	}
 
@@ -2036,10 +2073,23 @@ export class MergeTree {
 		const localOverlapWithRefs: ISegment[] = [];
 		const localSeq =
 			seq === UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
-		const markRemoved = (segment: ISegment, pos: number, _start: number, _end: number) => {
+		const markRemoved = (
+			segment: ISegment,
+			pos: number,
+			_start: number,
+			_end: number,
+		): boolean => {
 			const existingRemovalInfo = toRemovalInfo(segment);
 
-			if (existingRemovalInfo !== undefined) {
+			if (existingRemovalInfo === undefined) {
+				segment.removedClientIds = [clientId];
+				segment.removedSeq = seq;
+				segment.localRemovedSeq = localSeq;
+
+				if (!toMoveInfo(segment)) {
+					removedSegments.push({ segment });
+				}
+			} else {
 				_overwrite = true;
 				if (existingRemovalInfo.removedSeq === UnassignedSequenceNumber) {
 					// we removed this locally, but someone else removed it first
@@ -2056,14 +2106,6 @@ export class MergeTree {
 					// Do not replace earlier sequence number for remove
 					existingRemovalInfo.removedClientIds.push(clientId);
 				}
-			} else {
-				segment.removedClientIds = [clientId];
-				segment.removedSeq = seq;
-				segment.localRemovedSeq = localSeq;
-
-				if (!toMoveInfo(segment)) {
-					removedSegments.push({ segment });
-				}
 			}
 
 			// Save segment so we can assign removed sequence number when acked by server
@@ -2081,7 +2123,12 @@ export class MergeTree {
 			}
 			return true;
 		};
-		const afterMarkRemoved = (node: MergeBlock, pos: number, _start: number, _end: number) => {
+		const afterMarkRemoved = (
+			node: MergeBlock,
+			pos: number,
+			_start: number,
+			_end: number,
+		): boolean => {
 			if (_overwrite) {
 				this.nodeUpdateLengthNewStructure(node);
 			} else {
@@ -2107,10 +2154,12 @@ export class MergeTree {
 			this.slideAckedRemovedSegmentReferences(removedSegments.map(({ segment }) => segment));
 		}
 
-		if (this.collabWindow.collaborating && seq !== UnassignedSequenceNumber) {
-			if (MergeTree.options.zamboniSegments) {
-				zamboniSegments(this);
-			}
+		if (
+			this.collabWindow.collaborating &&
+			seq !== UnassignedSequenceNumber &&
+			MergeTree.options.zamboniSegments
+		) {
+			zamboniSegments(this);
 		}
 	}
 
@@ -2118,12 +2167,14 @@ export class MergeTree {
 	 * Revert an unacked local op
 	 */
 	// eslint-disable-next-line import/no-deprecated
-	public rollback(op: IMergeTreeDeltaOp, localOpMetadata: SegmentGroup) {
+	public rollback(op: IMergeTreeDeltaOp, localOpMetadata: SegmentGroup): void {
 		if (op.type === MergeTreeDeltaType.REMOVE) {
 			const pendingSegmentGroup = this.pendingSegments.pop?.()?.data;
 			if (pendingSegmentGroup === undefined || pendingSegmentGroup !== localOpMetadata) {
 				throw new Error("Rollback op doesn't match last edit");
 			}
+			// Disabling because a for of loop causes the type of segment to be ISegment, which does not have parent information stored
+			// eslint-disable-next-line unicorn/no-array-for-each
 			pendingSegmentGroup.segments.forEach((segment: ISegmentLeaf) => {
 				const segmentSegmentGroup = segment.segmentGroups?.pop?.();
 				assert(
@@ -2197,7 +2248,8 @@ export class MergeTree {
 						{ op: removeOp },
 					);
 				} /* op.type === MergeTreeDeltaType.ANNOTATE */ else {
-					const props = pendingSegmentGroup.previousProps![i];
+					// TODO Non null asserting, why is this not null?
+					const props = pendingSegmentGroup.previousProps![i]!;
 					const annotateOp = createAnnotateRangeOp(start, start + segment.cachedLength, props);
 					this.annotateRange(
 						start,
@@ -2220,7 +2272,7 @@ export class MergeTree {
 	/**
 	 * Walk the segments up to the current segment and calculate its position
 	 */
-	private findRollbackPosition(segment: ISegment) {
+	private findRollbackPosition(segment: ISegment): number {
 		let segmentPosition = 0;
 		walkAllChildSegments(this.root, (seg) => {
 			// If we've found the desired segment, terminate the walk and return 'segmentPosition'.
@@ -2239,7 +2291,7 @@ export class MergeTree {
 		return segmentPosition;
 	}
 
-	public nodeUpdateLengthNewStructure(node: MergeBlock, recur = false) {
+	public nodeUpdateLengthNewStructure(node: MergeBlock, recur = false): void {
 		this.blockUpdate(node);
 		if (this.collabWindow.collaborating) {
 			this.localPartialsComputed = false;
@@ -2355,14 +2407,13 @@ export class MergeTree {
 			}
 		}
 
-		const newOrder = Array.from(affectedSegments.map(({ data }) => data));
-		newOrder.forEach((seg) =>
-			seg.localRefs?.walkReferences((lref) => lref.callbacks?.beforeSlide?.(lref)),
-		);
+		const newOrder = Array.from(affectedSegments, ({ data }) => data);
+		for (const seg of newOrder)
+			seg.localRefs?.walkReferences((lref) => lref.callbacks?.beforeSlide?.(lref));
 		const perSegmentTrackingGroups = new Map<ISegment, TrackingGroup[]>();
 		for (const segment of newOrder) {
 			const { trackingCollection } = segment;
-			const trackingGroups = Array.from(trackingCollection.trackingGroups);
+			const trackingGroups = [...trackingCollection.trackingGroups];
 			perSegmentTrackingGroups.set(segment, trackingGroups);
 			for (const group of trackingCollection.trackingGroups) {
 				trackingCollection.unlink(group);
@@ -2370,8 +2421,9 @@ export class MergeTree {
 		}
 
 		for (let i = 0; i < newOrder.length; i++) {
-			const seg = newOrder[i];
-			const { parent, index, ordinal } = currentOrder[i];
+			// TODO Non null asserting, why is this not null?
+			const seg = newOrder[i]!;
+			const { parent, index, ordinal } = currentOrder[i]!;
 			parent?.assignChild(seg, index, false);
 			seg.ordinal = ordinal;
 		}
@@ -2391,15 +2443,16 @@ export class MergeTree {
 			}
 			return depths.get(block)!;
 		};
-		newOrder.forEach(computeDepth);
-		for (const [node] of Array.from(depths.entries()).sort((a, b) => b[1] - a[1])) {
+		for (const element of newOrder) {
+			computeDepth(element);
+		}
+		for (const [node] of [...depths.entries()].sort((a, b) => b[1] - a[1])) {
 			if (!node.isLeaf()) {
 				this.nodeUpdateLengthNewStructure(node);
 			}
 		}
-		newOrder.forEach((seg) =>
-			seg.localRefs?.walkReferences((lref) => lref.callbacks?.afterSlide?.(lref)),
-		);
+		for (const seg of newOrder)
+			seg.localRefs?.walkReferences((lref) => lref.callbacks?.afterSlide?.(lref));
 	}
 
 	/**
@@ -2426,7 +2479,7 @@ export class MergeTree {
 		let currentRangeToNormalize = new DoublyLinkedList<ISegment>();
 		let rangeContainsLocalSegs = false;
 		let rangeContainsRemoteRemovedSegs = false;
-		const normalize = () => {
+		const normalize = (): void => {
 			if (
 				rangeContainsLocalSegs &&
 				rangeContainsRemoteRemovedSegs &&
@@ -2456,16 +2509,15 @@ export class MergeTree {
 
 		normalize();
 	}
-	private blockUpdate(block: MergeBlock) {
+	private blockUpdate(block: MergeBlock): void {
 		let len: number | undefined;
 
-		// eslint-disable-next-line import/no-deprecated
 		const rightmostTiles = createMap<Marker>();
-		// eslint-disable-next-line import/no-deprecated
 		const leftmostTiles = createMap<Marker>();
 
 		for (let i = 0; i < block.childCount; i++) {
-			const node = block.children[i];
+			// TODO Non null asserting, why is this not null?
+			const node = block.children[i]!;
 			const nodeLength = nodeTotalLength(this, node);
 			if (nodeLength !== undefined) {
 				len ??= 0;
@@ -2495,9 +2547,7 @@ export class MergeTree {
 					}
 				}
 			} else {
-				// eslint-disable-next-line import/no-deprecated
 				extend(rightmostTiles, node.rightmostTiles);
-				// eslint-disable-next-line import/no-deprecated
 				extendIfUndefined(leftmostTiles, node.leftmostTiles);
 			}
 		}
@@ -2511,7 +2561,7 @@ export class MergeTree {
 		seq: number,
 		clientId: number,
 		newStructure = false,
-	) {
+	): void {
 		let block: MergeBlock | undefined = startBlock;
 		while (block !== undefined) {
 			if (newStructure) {
@@ -2523,7 +2573,7 @@ export class MergeTree {
 		}
 	}
 
-	private blockUpdateLength(node: MergeBlock, seq: number, clientId: number) {
+	private blockUpdateLength(node: MergeBlock, seq: number, clientId: number): void {
 		this.blockUpdate(node);
 		this.localPartialsComputed = false;
 		if (
@@ -2561,7 +2611,7 @@ export class MergeTree {
 		end?: number,
 		splitRange: boolean = false,
 		visibilitySeq: number = refSeq,
-	) {
+	): void {
 		if (splitRange) {
 			if (start) {
 				this.ensureIntervalBoundary(start, refSeq, clientId);
@@ -2666,7 +2716,8 @@ export class MergeTree {
 			undefined,
 			post === undefined
 				? undefined
-				: (block) => post(block, pos, refSeq, clientId, start - pos, endPos - pos, accum),
+				: (block): boolean =>
+						post(block, pos, refSeq, clientId, start - pos, endPos - pos, accum),
 		);
 	}
 }