@fluidframework/merge-tree 2.11.0 → 2.12.0

package/src/attributionPolicy.ts

@@ -19,6 +19,7 @@ import {
 	IMergeTreeSegmentDelta,
 	MergeTreeMaintenanceType,
 } from "./mergeTreeDeltaCallback.js";
+import type { ISegmentLeaf } from "./mergeTreeNodes.js";
 import { MergeTreeDeltaType } from "./ops.js";
 
 // Note: these thinly wrap MergeTreeDeltaCallback and MergeTreeMaintenanceCallback to provide the client.
@@ -102,7 +103,8 @@ const attributeInsertionOnSegments = (
 	key: AttributionKey,
 ): void => {
 	for (const { segment } of deltaSegments) {
-		if (segment.seq !== undefined) {
+		const seg: ISegmentLeaf = segment;
+		if (seg.seq !== undefined) {
 			segment.attribution?.update(
 				undefined,
 				new AttributionCollection(segment.cachedLength, key),

package/src/client.ts

@@ -396,7 +396,7 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 	): void {
 		let localInserts = 0;
 		let localRemoves = 0;
-		walkAllChildSegments(this._mergeTree.root, (seg) => {
+		walkAllChildSegments(this._mergeTree.root, (seg: ISegmentLeaf) => {
 			if (seg.seq === UnassignedSequenceNumber) {
 				localInserts++;
 			}

package/src/endOfTreeSegment.ts

@@ -6,10 +6,12 @@
 import { assert } from "@fluidframework/core-utils/internal";
 
 import { LocalClientId } from "./constants.js";
+// eslint-disable-next-line import/no-deprecated
 import { LocalReferenceCollection } from "./localReference.js";
 import { MergeTree } from "./mergeTree.js";
 import { NodeAction, depthFirstNodeWalk } from "./mergeTreeNodeWalk.js";
-import { IRemovalInfo, ISegment, ISegmentLeaf, type MergeBlock } from "./mergeTreeNodes.js";
+// eslint-disable-next-line import/no-deprecated
+import { ISegment, ISegmentLeaf, type MergeBlock } from "./mergeTreeNodes.js";
 
 /**
  * This is a special segment that is not bound or known by the merge tree itself,
@@ -71,6 +73,7 @@ abstract class BaseEndpointSegment {
 
 	abstract get ordinal(): string;
 
+	// eslint-disable-next-line import/no-deprecated
 	localRefs?: LocalReferenceCollection;
 
 	/*
@@ -99,7 +102,7 @@ const notSupported = (): never => {
 /**
  * The position immediately prior to the start of the tree
  */
-export class StartOfTreeSegment extends BaseEndpointSegment implements ISegment, IRemovalInfo {
+export class StartOfTreeSegment extends BaseEndpointSegment implements ISegment {
 	type: string = "StartOfTreeSegment";
 	readonly endpointType = "start";
 
@@ -149,7 +152,7 @@ export class StartOfTreeSegment extends BaseEndpointSegment implements ISegment,
 /**
  * The position immediately after the end of the tree
  */
-export class EndOfTreeSegment extends BaseEndpointSegment implements ISegment, IRemovalInfo {
+export class EndOfTreeSegment extends BaseEndpointSegment implements ISegment {
 	type: string = "EndOfTreeSegment";
 	readonly endpointType = "end";
 

package/src/index.ts

@@ -63,6 +63,7 @@ export {
 	IMergeNodeCommon,
 	IMoveInfo,
 	IRemovalInfo,
+	segmentIsRemoved,
 	ISegment,
 	ISegmentAction,
 	Marker,

package/src/localReference.ts

@@ -228,6 +228,7 @@ export function setValidateRefCount(
  *
  * @legacy
  * @alpha
+ * @deprecated - This class will be removed in 2.20 with no replacement.
  */
 export class LocalReferenceCollection {
 	public static append(seg1: ISegment, seg2: ISegment): void {

package/src/mergeTree.ts

@@ -20,6 +20,7 @@ import {
 } from "./constants.js";
 import { EndOfTreeSegment, StartOfTreeSegment } from "./endOfTreeSegment.js";
 import {
+	// eslint-disable-next-line import/no-deprecated
 	LocalReferenceCollection,
 	LocalReferencePosition,
 	SlidingPreference,
@@ -46,7 +47,9 @@ import {
 	// eslint-disable-next-line import/no-deprecated
 	CollaborationWindow,
 	IMergeNode,
+	// eslint-disable-next-line import/no-deprecated
 	IMoveInfo,
+	// eslint-disable-next-line import/no-deprecated
 	IRemovalInfo,
 	ISegmentAction,
 	ISegmentChanges,
@@ -100,6 +103,7 @@ import { Side, type InteriorSequencePlace } from "./sequencePlace.js";
 import { SortedSegmentSet } from "./sortedSegmentSet.js";
 import { zamboniSegments } from "./zamboni.js";
 
+// eslint-disable-next-line import/no-deprecated
 function markSegmentMoved(seg: ISegmentLeaf, moveInfo: IMoveInfo): void {
 	seg.moveDst = moveInfo.moveDst;
 	seg.movedClientIds = [...moveInfo.movedClientIds];
@@ -109,19 +113,23 @@ function markSegmentMoved(seg: ISegmentLeaf, moveInfo: IMoveInfo): void {
 	seg.wasMovedOnInsert = moveInfo.wasMovedOnInsert;
 }
 
+// eslint-disable-next-line import/no-deprecated
 function isMoved(segment: ISegmentLeaf): segment is ISegmentLeaf & IMoveInfo {
 	return toMoveInfo(segment) !== undefined;
 }
 
+// eslint-disable-next-line import/no-deprecated
 function isRemoved(segment: ISegmentLeaf): segment is ISegmentLeaf & IRemovalInfo {
 	return toRemovalInfo(segment) !== undefined;
 }
 
+// eslint-disable-next-line import/no-deprecated
 function isRemovedAndAcked(segment: ISegmentLeaf): segment is ISegmentLeaf & IRemovalInfo {
 	const removalInfo = toRemovalInfo(segment);
 	return removalInfo !== undefined && removalInfo.removedSeq !== UnassignedSequenceNumber;
 }
 
+// eslint-disable-next-line import/no-deprecated
 function isMovedAndAcked(segment: ISegmentLeaf): segment is ISegmentLeaf & IMoveInfo {
 	const moveInfo = toMoveInfo(segment);
 	return moveInfo !== undefined && moveInfo.movedSeq !== UnassignedSequenceNumber;
@@ -180,6 +188,7 @@ function ackSegment(
 		}
 
 		case MergeTreeDeltaType.REMOVE: {
+			// eslint-disable-next-line import/no-deprecated
 			const removalInfo: IRemovalInfo | undefined = toRemovalInfo(segment);
 			assert(removalInfo !== undefined, 0x046 /* "On remove ack, missing removal info!" */);
 			segment.localRemovedSeq = undefined;
@@ -192,6 +201,7 @@ function ackSegment(
 
 		case MergeTreeDeltaType.OBLITERATE:
 		case MergeTreeDeltaType.OBLITERATE_SIDED: {
+			// eslint-disable-next-line import/no-deprecated
 			const moveInfo: IMoveInfo | undefined = toMoveInfo(segment);
 			assert(moveInfo !== undefined, 0x86e /* On obliterate ack, missing move info! */);
 			const obliterateInfo = segmentGroup.obliterateInfo;
@@ -877,7 +887,9 @@ export class MergeTree {
 	 */
 	private slideAckedRemovedSegmentReferences(segments: ISegmentLeaf[]): void {
 		// References are slid in groups to preserve their order.
+		// eslint-disable-next-line import/no-deprecated
 		let currentForwardSlideGroup: LocalReferenceCollection[] = [];
+		// eslint-disable-next-line import/no-deprecated
 		let currentBackwardSlideGroup: LocalReferenceCollection[] = [];
 
 		let currentForwardMaybeEndpoint: "start" | "end" | undefined;
@@ -891,6 +903,7 @@ export class MergeTree {
 		const slideGroup = (
 			currentSlideDestination: ISegmentLeaf | undefined,
 			currentSlideIsForward: boolean | undefined,
+			// eslint-disable-next-line import/no-deprecated
 			currentSlideGroup: LocalReferenceCollection[],
 			pred: (ref: LocalReferencePosition) => boolean,
 			maybeEndpoint: "start" | "end" | undefined,
@@ -915,6 +928,7 @@ export class MergeTree {
 
 			if (maybeEndpoint) {
 				const endpoint = maybeEndpoint === "start" ? this.startOfTree : this.endOfTree;
+				// eslint-disable-next-line import/no-deprecated
 				const localRefs = LocalReferenceCollection.setOrGet(endpoint);
 				if (currentSlideIsForward) {
 					localRefs.addBeforeTombstones(...endpointRefsToAdd);
@@ -934,6 +948,7 @@ export class MergeTree {
 					}
 				}
 			} else {
+				// eslint-disable-next-line import/no-deprecated
 				const localRefs = LocalReferenceCollection.setOrGet(currentSlideDestination);
 				if (currentSlideIsForward) {
 					localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
@@ -947,11 +962,13 @@ export class MergeTree {
 			segment: ISegmentLeaf,
 			currentSlideDestination: ISegmentLeaf | undefined,
 			currentSlideIsForward: boolean | undefined,
+			// eslint-disable-next-line import/no-deprecated
 			currentSlideGroup: LocalReferenceCollection[],
 			pred: (ref: LocalReferencePosition) => boolean,
 			slidingPreference: SlidingPreference,
 			currentMaybeEndpoint: "start" | "end" | undefined,
 			reassign: (
+				// eslint-disable-next-line import/no-deprecated
 				localRefs: LocalReferenceCollection,
 				slideToSegment: ISegmentLeaf | undefined,
 				slideIsForward: boolean,
@@ -1649,6 +1666,7 @@ export class MergeTree {
 				}
 
 				if (oldest && newest?.clientId !== clientId) {
+					// eslint-disable-next-line import/no-deprecated
 					const moveInfo: IMoveInfo = {
 						movedClientIds,
 						movedSeq: oldest.seq,
@@ -2510,6 +2528,7 @@ export class MergeTree {
 			segment = _segment;
 		}
 
+		// eslint-disable-next-line import/no-deprecated
 		const localRefs = LocalReferenceCollection.setOrGet(segment);
 
 		const segRef = localRefs.createLocalRef(

package/src/mergeTreeNodeWalk.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { type MergeBlock, IMergeNode, ISegment } from "./mergeTreeNodes.js";
+import { type ISegmentLeaf, type MergeBlock, IMergeNode } from "./mergeTreeNodes.js";
 
 export const LeafAction = {
 	Exit: false,
@@ -38,7 +38,7 @@ export function depthFirstNodeWalk(
 	startBlock: MergeBlock,
 	startChild: IMergeNode | undefined,
 	downAction?: (node: IMergeNode) => NodeAction,
-	leafActionOverride?: (seg: ISegment) => LeafAction,
+	leafActionOverride?: (seg: ISegmentLeaf) => LeafAction,
 	upAction?: (block: MergeBlock) => void,
 	forward: boolean = true,
 ): boolean {
@@ -77,7 +77,7 @@ export function depthFirstNodeWalk(
 			for (let i = start.index; i !== -1 && i !== childCount; i += increment) {
 				// the above loop ensures start is a leaf or undefined, so all children
 				// will be leaves if start exits, so the cast is safe
-				if (leafAction(block.children[i] as ISegment) === LeafAction.Exit) {
+				if (leafAction(block.children[i] as ISegmentLeaf) === LeafAction.Exit) {
 					exit = true;
 					break;
 				}
@@ -122,7 +122,7 @@ export function depthFirstNodeWalk(
  */
 export function forwardExcursion(
 	startNode: IMergeNode,
-	leafAction: (seg: ISegment) => boolean | undefined,
+	leafAction: (seg: ISegmentLeaf) => boolean | undefined,
 ): boolean {
 	if (startNode.parent === undefined) {
 		return true;
@@ -145,7 +145,7 @@ export function forwardExcursion(
  */
 export function backwardExcursion(
 	startNode: IMergeNode,
-	leafAction: (seg: ISegment) => boolean | undefined,
+	leafAction: (seg: ISegmentLeaf) => boolean | undefined,
 ): boolean {
 	if (startNode.parent === undefined) {
 		return true;
@@ -171,7 +171,7 @@ export function backwardExcursion(
  */
 export function walkAllChildSegments(
 	startBlock: MergeBlock,
-	leafAction: (segment: ISegment) => boolean | undefined | void,
+	leafAction: (segment: ISegmentLeaf) => boolean | undefined | void,
 ): boolean {
 	if (startBlock.childCount === 0) {
 		return true;

package/src/mergeTreeNodes.ts

@@ -14,6 +14,7 @@ import {
 	UnassignedSequenceNumber,
 	UniversalSequenceNumber,
 } from "./constants.js";
+// eslint-disable-next-line import/no-deprecated
 import { LocalReferenceCollection, type LocalReferencePosition } from "./localReference.js";
 import { TrackingGroupCollection } from "./mergeTreeTracking.js";
 import { IJSONSegment, IMarkerDef, ReferenceType } from "./ops.js";
@@ -34,6 +35,7 @@ import { PropertiesManager } from "./segmentPropertiesManager.js";
  * Common properties for a node in a merge tree.
  * @legacy
  * @alpha
+ * @deprecated - This interface will be removed in 2.20 with no replacement.
  */
 export interface IMergeNodeCommon {
 	/**
@@ -58,9 +60,13 @@ export interface IMergeNodeCommon {
  *
  * @internal
  */
-export type ISegmentInternal = ISegment & {
-	localRefs?: LocalReferenceCollection;
-};
+export type ISegmentInternal = Omit<ISegment, keyof IRemovalInfo | keyof IMoveInfo> &
+	Partial<IMergeNodeCommon> &
+	Partial<IRemovalInfo> &
+	Partial<IMoveInfo> & {
+		// eslint-disable-next-line import/no-deprecated
+		localRefs?: LocalReferenceCollection;
+	};
 
 /**
  * We use tiered interface to control visibility of segment properties.
@@ -89,6 +95,7 @@ export type IMergeNode = MergeBlock | ISegmentLeaf;
  * Contains removal information associated to an {@link ISegment}.
  * @legacy
  * @alpha
+ * @deprecated - This interface will be removed in 2.20 with no replacement.
  */
 export interface IRemovalInfo {
 	/**
@@ -133,6 +140,7 @@ export function toRemovalInfo(
  * in the future, when moves _are_ supported.
  * @legacy
  * @alpha
+ * @deprecated - This interface will be removed in 2.20 with no replacement.
  */
 export interface IMoveInfo {
 	/**
@@ -211,7 +219,7 @@ export function toMoveInfo(maybe: Partial<IMoveInfo> | undefined): IMoveInfo | u
  * @legacy
  * @alpha
  */
-export interface ISegment extends IMergeNodeCommon, Partial<IRemovalInfo>, Partial<IMoveInfo> {
+export interface ISegment {
 	readonly type: string;
 
 	readonly trackingCollection: TrackingGroupCollection;
@@ -223,6 +231,7 @@ export interface ISegment extends IMergeNodeCommon, Partial<IRemovalInfo>, Parti
 	 * after the tree. These segments cannot be referenced by regular operations
 	 * and exist primarily as a bucket for local references to slide onto during
 	 * deletion of regular segments.
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
 	 */
 	readonly endpointType?: "start" | "end";
 
@@ -254,6 +263,7 @@ export interface ISegment extends IMergeNodeCommon, Partial<IRemovalInfo>, Parti
 	 *
 	 * @privateRemarks
 	 * See {@link CollaborationWindow.localSeq} for more information on the semantics of localSeq.
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
 	 */
 	localSeq?: number;
 	/**
@@ -265,20 +275,25 @@ export interface ISegment extends IMergeNodeCommon, Partial<IRemovalInfo>, Parti
 	 *
 	 * @privateRemarks
 	 * See {@link CollaborationWindow.localSeq} for more information on the semantics of localSeq.
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
 	 */
 	localRemovedSeq?: number;
 	/**
 	 * Seq at which this segment was inserted.
 	 * If undefined, it is assumed the segment was inserted prior to the collab window's minimum sequence number.
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
 	 */
 	seq?: number;
 	/**
 	 * Short clientId for the client that inserted this segment.
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
 	 */
 	clientId: number;
 	/**
 	 * Local references added to this segment.
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
 	 */
+	// eslint-disable-next-line import/no-deprecated
 	localRefs?: LocalReferenceCollection;
 	/**
 	 * Properties that have been added to this segment via annotation.
@@ -292,6 +307,70 @@ export interface ISegment extends IMergeNodeCommon, Partial<IRemovalInfo>, Parti
 	// Changing this to something other than any would break consumers.
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	toJSONObject(): any;
+	isLeaf(): this is ISegment;
+
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMergeNodeCommon.index}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	index: number;
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMergeNodeCommon.ordinal}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	ordinal: string;
+
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IRemovalInfo.removedSeq}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	removedSeq?: number;
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IRemovalInfo.removedClientIds}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	removedClientIds?: number[];
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMoveInfo.localMovedSeq}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	localMovedSeq?: number;
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMoveInfo.movedSeq}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	movedSeq?: number;
+
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMoveInfo.movedSeqs}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	movedSeqs?: number[];
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMoveInfo.moveDst}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	moveDst?: ReferencePosition;
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMoveInfo.movedClientIds}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	movedClientIds?: number[];
+	/**
+	 * {@inheritDoc @fluidframework/merge-tree#IMoveInfo.wasMovedOnInsert}
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	wasMovedOnInsert?: boolean;
+}
+
+/**
+ * Determine if a segment has been removed.
+ * @legacy
+ * @alpha
+ */
+export function segmentIsRemoved(segment: ISegment): boolean {
+	const leaf: ISegmentLeaf = segment;
+	return leaf.removedSeq !== undefined;
 }
 
 /**
@@ -322,8 +401,8 @@ export interface ISegmentAction<TClientData> {
  * @internal
  */
 export interface ISegmentChanges {
-	next?: ISegment;
-	replaceCurrent?: ISegment;
+	next?: ISegmentInternal;
+	replaceCurrent?: ISegmentInternal;
 }
 /**
  * @internal
@@ -361,8 +440,12 @@ export interface NodeAction<TClientData> {
  * @internal
  */
 export interface InsertContext {
-	candidateSegment?: ISegment;
-	leaf: (segment: ISegment | undefined, pos: number, ic: InsertContext) => ISegmentChanges;
+	candidateSegment?: ISegmentInternal;
+	leaf: (
+		segment: ISegmentInternal | undefined,
+		pos: number,
+		ic: InsertContext,
+	) => ISegmentChanges;
 	continuePredicate?: (continueFromBlock: MergeBlock) => boolean;
 }
 
@@ -433,7 +516,7 @@ export class MergeBlock implements IMergeNodeCommon {
 	 */
 	public leftmostTiles: Readonly<MapLike<Marker>>;
 
-	isLeaf(): this is ISegment {
+	isLeaf(): this is ISegmentInternal {
 		return false;
 	}
 
@@ -490,15 +573,45 @@ export function seqLTE(seq: number, minOrRefSeq: number): boolean {
  * @alpha
  */
 export abstract class BaseSegment implements ISegment {
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public clientId: number = LocalClientId;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public seq: number = UniversalSequenceNumber;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public removedSeq?: number;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public removedClientIds?: number[];
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public movedSeq?: number;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public movedSeqs?: number[];
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public movedClientIds?: number[];
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public wasMovedOnInsert?: boolean | undefined;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public index: number = 0;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public ordinal: string = "";
 	public cachedLength: number = 0;
 
@@ -509,10 +622,23 @@ export abstract class BaseSegment implements ISegment {
 	public attribution?: IAttributionCollection<AttributionKey>;
 
 	public properties?: PropertySet;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
+	// eslint-disable-next-line import/no-deprecated
 	public localRefs?: LocalReferenceCollection;
 	public abstract readonly type: string;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public localSeq?: number;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public localRemovedSeq?: number;
+	/**
+	 * @deprecated - This property will be removed in 2.20 with no replacement.
+	 */
 	public localMovedSeq?: number;
 
 	public constructor(properties?: PropertySet) {
@@ -606,6 +732,7 @@ export abstract class BaseSegment implements ISegment {
 	public append(other: ISegment): void {
 		// Note: Must call 'appendLocalRefs' before modifying this segment's length as
 		//       'this.cachedLength' is used to adjust the offsets of the local refs.
+		// eslint-disable-next-line import/no-deprecated
 		LocalReferenceCollection.append(this, other);
 		if (this.attribution) {
 			assert(

package/src/partialLengths.ts

@@ -12,9 +12,11 @@ import {
 	// eslint-disable-next-line import/no-deprecated
 	CollaborationWindow,
 	IMergeNode,
+	// eslint-disable-next-line import/no-deprecated
 	IMoveInfo,
+	// eslint-disable-next-line import/no-deprecated
 	IRemovalInfo,
-	ISegment,
+	ISegmentLeaf,
 	compareNumbers,
 	seqLTE,
 	toMoveInfo,
@@ -504,7 +506,7 @@ export class PartialSequenceLengths {
 	 */
 	static accumulateMoveOverlapForExisting(
 		segmentLen: number,
-		segment: ISegment,
+		segment: ISegmentLeaf,
 		firstGte: PartialSequenceLength,
 		clientIds: number[],
 	): void {
@@ -537,7 +539,7 @@ export class PartialSequenceLengths {
 	 * segment
 	 */
 	private static getMoveOverlapForExisting(
-		segment: ISegment,
+		segment: ISegmentLeaf,
 		obliterateOverlapLen: number,
 		clientIds: number[],
 	): RedBlackTree<number, IOverlapClient> {
@@ -558,7 +560,7 @@ export class PartialSequenceLengths {
 	}
 
 	private static updatePartialsAfterInsertion(
-		segment: ISegment,
+		segment: ISegmentLeaf,
 		segmentLen: number,
 		remoteObliteratedLen: number | undefined,
 		obliterateOverlapLen: number = segmentLen,
@@ -638,8 +640,10 @@ export class PartialSequenceLengths {
 	 */
 	private static insertSegment(
 		combinedPartialLengths: PartialSequenceLengths,
-		segment: ISegment,
+		segment: ISegmentLeaf,
+		// eslint-disable-next-line import/no-deprecated
 		removalInfo?: IRemovalInfo,
+		// eslint-disable-next-line import/no-deprecated
 		moveInfo?: IMoveInfo,
 	): void {
 		const removalIsLocal =

package/src/perspective.ts

@@ -6,14 +6,14 @@
 import { UnassignedSequenceNumber } from "./constants.js";
 import { type MergeTree } from "./mergeTree.js";
 import { LeafAction, backwardExcursion, forwardExcursion } from "./mergeTreeNodeWalk.js";
-import { seqLTE, type ISegment } from "./mergeTreeNodes.js";
+import { seqLTE, type ISegmentLeaf } from "./mergeTreeNodes.js";
 
 /**
  * Provides a view of a MergeTree from the perspective of a specific client at a specific sequence number.
  */
 export interface Perspective {
-	nextSegment(segment: ISegment, forward?: boolean): ISegment;
-	previousSegment(segment: ISegment): ISegment;
+	nextSegment(segment: ISegmentLeaf, forward?: boolean): ISegmentLeaf;
+	previousSegment(segment: ISegmentLeaf): ISegmentLeaf;
 }
 
 /**
@@ -47,9 +47,9 @@ export class PerspectiveImpl implements Perspective {
 	 * @param forward - The direction to search.
 	 * @returns the next segment in the specified direction, or the start or end of the tree if there is no next segment.
 	 */
-	public nextSegment(segment: ISegment, forward: boolean = true): ISegment {
-		let next: ISegment | undefined;
-		const action = (seg: ISegment): boolean | undefined => {
+	public nextSegment(segment: ISegmentLeaf, forward: boolean = true): ISegmentLeaf {
+		let next: ISegmentLeaf | undefined;
+		const action = (seg: ISegmentLeaf): boolean | undefined => {
 			if (isSegmentPresent(seg, this._seqTime)) {
 				next = seg;
 				return LeafAction.Exit;
@@ -65,7 +65,7 @@ export class PerspectiveImpl implements Perspective {
 	 * @returns the previous segment, or the start of the tree if there is no previous segment.
 	 * @remarks This is a convenient equivalent to calling `nextSegment(segment, false)`.
 	 */
-	public previousSegment(segment: ISegment): ISegment {
+	public previousSegment(segment: ISegmentLeaf): ISegmentLeaf {
 		return this.nextSegment(segment, false);
 	}
 }
@@ -77,7 +77,7 @@ export class PerspectiveImpl implements Perspective {
  * @param localSeq - The latest local sequence number to consider.
  * @returns true iff this segment was removed in the given perspective.
  */
-export function wasRemovedBefore(seg: ISegment, { refSeq, localSeq }: SeqTime): boolean {
+export function wasRemovedBefore(seg: ISegmentLeaf, { refSeq, localSeq }: SeqTime): boolean {
 	if (
 		seg.removedSeq === UnassignedSequenceNumber &&
 		localSeq !== undefined &&
@@ -95,7 +95,7 @@ export function wasRemovedBefore(seg: ISegment, { refSeq, localSeq }: SeqTime):
  * @param localSeq - The latest local sequence number to consider.
  * @returns true iff this segment was moved (aka obliterated) in the given perspective.
  */
-export function wasMovedBefore(seg: ISegment, { refSeq, localSeq }: SeqTime): boolean {
+export function wasMovedBefore(seg: ISegmentLeaf, { refSeq, localSeq }: SeqTime): boolean {
 	if (
 		seg.movedSeq === UnassignedSequenceNumber &&
 		localSeq !== undefined &&
@@ -109,7 +109,7 @@ export function wasMovedBefore(seg: ISegment, { refSeq, localSeq }: SeqTime): bo
 /**
  * See {@link wasRemovedBefore} and {@link wasMovedBefore}.
  */
-export function wasRemovedOrMovedBefore(seg: ISegment, seqTime: SeqTime): boolean {
+export function wasRemovedOrMovedBefore(seg: ISegmentLeaf, seqTime: SeqTime): boolean {
 	return wasRemovedBefore(seg, seqTime) || wasMovedBefore(seg, seqTime);
 }
 
@@ -120,7 +120,7 @@ export function wasRemovedOrMovedBefore(seg: ISegment, seqTime: SeqTime): boolea
  * @returns true iff this segment was inserted before the given perspective,
  * and it was not removed or moved in the given perspective.
  */
-export function isSegmentPresent(seg: ISegment, seqTime: SeqTime): boolean {
+export function isSegmentPresent(seg: ISegmentLeaf, seqTime: SeqTime): boolean {
 	const { refSeq, localSeq } = seqTime;
 	// If seg.seq is undefined, then this segment has existed since minSeq.
 	// It may have been moved or removed since.