@fluidframework/merge-tree 2.12.0 → 2.20.0

package/src/endOfTreeSegment.ts

@@ -6,12 +6,11 @@
 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";
-// eslint-disable-next-line import/no-deprecated
-import { ISegment, ISegmentLeaf, type MergeBlock } from "./mergeTreeNodes.js";
+import { ISegment, type ISegmentLeaf, type MergeBlock } from "./mergeTreeNodes.js";
+import { type IMergeNodeInfo } from "./segmentInfos.js";
 
 /**
  * This is a special segment that is not bound or known by the merge tree itself,
@@ -34,7 +33,7 @@ import { ISegment, ISegmentLeaf, type MergeBlock } from "./mergeTreeNodes.js";
  * must be possible in some way to refer to a position before or after the tree
  * respectively. The endpoint segments allow us to support such behavior.
  */
-abstract class BaseEndpointSegment {
+abstract class BaseEndpointSegment implements IMergeNodeInfo {
 	constructor(protected readonly mergeTree: MergeTree) {}
 	/*
 	 * segments must be of at least length one, but
@@ -73,7 +72,6 @@ abstract class BaseEndpointSegment {
 
 	abstract get ordinal(): string;
 
-	// eslint-disable-next-line import/no-deprecated
 	localRefs?: LocalReferenceCollection;
 
 	/*

package/src/index.ts

@@ -58,20 +58,13 @@ export {
 export {
 	BaseSegment,
 	CollaborationWindow,
-	debugMarkerToString,
 	IJSONMarkerSegment,
-	IMergeNodeCommon,
-	IMoveInfo,
-	IRemovalInfo,
 	segmentIsRemoved,
 	ISegment,
 	ISegmentAction,
 	Marker,
 	reservedMarkerIdKey,
 	reservedMarkerSimpleTypeKey,
-	SegmentGroup,
-	toRemovalInfo,
-	ObliterateInfo,
 	ISegmentInternal,
 } from "./mergeTreeNodes.js";
 export {

package/src/localReference.ts

@@ -7,7 +7,7 @@ import { assert } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import { DoublyLinkedList, ListNode, walkList } from "./collections/index.js";
-import { ISegmentInternal, type ISegment } from "./mergeTreeNodes.js";
+import { type ISegmentInternal } from "./mergeTreeNodes.js";
 import { TrackingGroup, TrackingGroupCollection } from "./mergeTreeTracking.js";
 import { ReferenceType } from "./ops.js";
 import { PropertySet, addProperties } from "./properties.js";
@@ -226,12 +226,10 @@ export function setValidateRefCount(
  * Represents a collection of {@link LocalReferencePosition}s associated with one segment in a merge-tree.
  * @sealed
  *
- * @legacy
- * @alpha
- * @deprecated - This class will be removed in 2.20 with no replacement.
+ * @internal
  */
 export class LocalReferenceCollection {
-	public static append(seg1: ISegment, seg2: ISegment): void {
+	public static append(seg1: ISegmentInternal, seg2: ISegmentInternal): void {
 		if (seg2.localRefs && !seg2.localRefs.empty) {
 			if (!seg1.localRefs) {
 				seg1.localRefs = new LocalReferenceCollection(seg1);
@@ -250,7 +248,7 @@ export class LocalReferenceCollection {
 		validateRefCount?.(seg2.localRefs);
 	}
 
-	public static setOrGet(segment: ISegment): LocalReferenceCollection {
+	public static setOrGet(segment: ISegmentInternal): LocalReferenceCollection {
 		return (segment.localRefs ??= new LocalReferenceCollection(segment));
 	}
 
@@ -261,7 +259,7 @@ export class LocalReferenceCollection {
 		/**
 		 * The segment this `LocalReferenceCollection` is associated with.
 		 */
-		private readonly segment: ISegment,
+		private readonly segment: ISegmentInternal,
 		initialRefsByfOffset: (IRefsAtOffset | undefined)[] = Array.from({
 			length: segment.cachedLength,
 		}),
@@ -461,7 +459,7 @@ export class LocalReferenceCollection {
 	 *
 	 * @remarks This method should only be called by mergeTree.
 	 */
-	public split(offset: number, splitSeg: ISegment): void {
+	public split(offset: number, splitSeg: ISegmentInternal): void {
 		if (this.empty) {
 			// shrink the offset array when empty and splitting
 			this.refsByOffset.length = offset;