@fluidframework/merge-tree 2.0.0-rc.1.0.3 → 2.0.0-rc.2.0.0

package/src/index.ts

@@ -9,9 +9,9 @@ export {
 	IAttributionCollectionSpec,
 	SerializedAttributionCollection,
 	SequenceOffsets,
-} from "./attributionCollection";
-export { createInsertOnlyAttributionPolicy } from "./attributionPolicy";
-export { Client, IClientEvents } from "./client";
+} from "./attributionCollection.js";
+export { createInsertOnlyAttributionPolicy } from "./attributionPolicy.js";
+export { Client, IClientEvents } from "./client.js";
 export {
 	ConflictAction,
 	Dictionary,
@@ -26,20 +26,20 @@ export {
 	RBNodeActions,
 	RedBlackTree,
 	SortedDictionary,
-} from "./collections";
-export { UnassignedSequenceNumber, UniversalSequenceNumber } from "./constants";
+} from "./collections/index.js";
+export { UnassignedSequenceNumber, UniversalSequenceNumber } from "./constants.js";
 export {
 	createDetachedLocalReferencePosition,
 	LocalReferenceCollection,
 	LocalReferencePosition,
 	SlidingPreference,
-} from "./localReference";
+} from "./localReference.js";
 export {
 	AttributionPolicy,
 	IMergeTreeAttributionOptions,
 	IMergeTreeOptions,
 	getSlideToSegoff,
-} from "./mergeTree";
+} from "./mergeTree.js";
 export {
 	IMergeTreeClientSequenceArgs,
 	IMergeTreeDeltaCallbackArgs,
@@ -49,7 +49,7 @@ export {
 	MergeTreeDeltaOperationType,
 	MergeTreeDeltaOperationTypes,
 	MergeTreeMaintenanceType,
-} from "./mergeTreeDeltaCallback";
+} from "./mergeTreeDeltaCallback.js";
 export {
 	BaseSegment,
 	CollaborationWindow,
@@ -66,13 +66,13 @@ export {
 	reservedMarkerSimpleTypeKey,
 	SegmentGroup,
 	toRemovalInfo,
-} from "./mergeTreeNodes";
+} from "./mergeTreeNodes.js";
 export {
 	Trackable,
 	TrackingGroup,
 	ITrackingGroup,
 	TrackingGroupCollection,
-} from "./mergeTreeTracking";
+} from "./mergeTreeTracking.js";
 export {
 	createAnnotateRangeOp,
 	createGroupOp,
@@ -80,7 +80,7 @@ export {
 	createInsertSegmentOp,
 	createRemoveRangeOp,
 	createObliterateRangeOp,
-} from "./opBuilder";
+} from "./opBuilder.js";
 export {
 	IJSONSegment,
 	IMarkerDef,
@@ -95,8 +95,8 @@ export {
 	MergeTreeDeltaType,
 	ReferenceType,
 	IMergeTreeObliterateMsg,
-} from "./ops";
-export { addProperties, createMap, MapLike, matchProperties, PropertySet } from "./properties";
+} from "./ops.js";
+export { addProperties, createMap, MapLike, matchProperties, PropertySet } from "./properties.js";
 export {
 	compareReferencePositions,
 	DetachedReferencePosition,
@@ -109,12 +109,12 @@ export {
 	refTypeIncludesFlag,
 	reservedRangeLabelsKey,
 	reservedTileLabelsKey,
-} from "./referencePositions";
-export { SegmentGroupCollection } from "./segmentGroupCollection";
-export { PropertiesManager, PropertiesRollback } from "./segmentPropertiesManager";
-export { SortedSet } from "./sortedSet";
-export { SortedSegmentSet, SortedSegmentSetItem } from "./sortedSegmentSet";
-export { IJSONTextSegment, IMergeTreeTextHelper, TextSegment } from "./textSegment";
+} from "./referencePositions.js";
+export { SegmentGroupCollection } from "./segmentGroupCollection.js";
+export { PropertiesManager, PropertiesRollback } from "./segmentPropertiesManager.js";
+export { SortedSet } from "./sortedSet.js";
+export { SortedSegmentSet, SortedSegmentSetItem } from "./sortedSegmentSet.js";
+export { IJSONTextSegment, IMergeTreeTextHelper, TextSegment } from "./textSegment.js";
 export {
 	appendToMergeTreeDeltaRevertibles,
 	discardMergeTreeDeltaRevertible,
@@ -122,4 +122,4 @@ export {
 	MergeTreeDeltaRevertible,
 	MergeTreeRevertibleDriver,
 	revertMergeTreeDeltaRevertibles,
-} from "./revertibles";
+} from "./revertibles.js";

package/src/localReference.ts

@@ -5,13 +5,13 @@
 
 import { assert } from "@fluidframework/core-utils";
 import { UsageError } from "@fluidframework/telemetry-utils";
-import { DoublyLinkedList, ListNode, walkList } from "./collections";
-import { ISegment } from "./mergeTreeNodes";
-import { TrackingGroup, TrackingGroupCollection } from "./mergeTreeTracking";
-import { ReferenceType } from "./ops";
+import { DoublyLinkedList, ListNode, walkList } from "./collections/index.js";
+import { ISegment } from "./mergeTreeNodes.js";
+import { TrackingGroup, TrackingGroupCollection } from "./mergeTreeTracking.js";
+import { ReferenceType } from "./ops.js";
 // eslint-disable-next-line import/no-deprecated
-import { addProperties, PropertySet } from "./properties";
-import { ReferencePosition, refTypeIncludesFlag } from "./referencePositions";
+import { addProperties, PropertySet } from "./properties.js";
+import { ReferencePosition, refTypeIncludesFlag } from "./referencePositions.js";
 
 /**
  * Dictates the preferential direction for a {@link ReferencePosition} to slide
@@ -212,6 +212,8 @@ export function setValidateRefCount(cb?: (collection?: LocalReferenceCollection)
  * Represents a collection of {@link LocalReferencePosition}s associated with
  * one segment in a merge-tree.
  * Represents a collection of {@link LocalReferencePosition}s associated with one segment in a merge-tree.
+ * @sealed
+ *
  * @alpha
  */
 export class LocalReferenceCollection {
@@ -234,11 +236,15 @@ export class LocalReferenceCollection {
 		validateRefCount?.(seg2.localRefs);
 	}
 
+	public static setOrGet(segment: ISegment) {
+		return (segment.localRefs ??= new LocalReferenceCollection(segment));
+	}
+
 	private readonly refsByOffset: (IRefsAtOffset | undefined)[];
 	private refCount: number = 0;
 
 	/***/
-	constructor(
+	private constructor(
 		/** Segment this `LocalReferenceCollection` is associated to. */
 		private readonly segment: ISegment,
 		initialRefsByfOffset = new Array<IRefsAtOffset | undefined>(segment.cachedLength),

package/src/mergeTree.ts

@@ -8,28 +8,28 @@
 
 import { assert, Heap, IComparer } from "@fluidframework/core-utils";
 import { DataProcessingError, UsageError } from "@fluidframework/telemetry-utils";
-import { IAttributionCollectionSerializer } from "./attributionCollection";
-import { DoublyLinkedList, ListNode } from "./collections";
+import { IAttributionCollectionSerializer } from "./attributionCollection.js";
+import { DoublyLinkedList, ListNode } from "./collections/index.js";
 import {
 	NonCollabClient,
 	TreeMaintenanceSequenceNumber,
 	UnassignedSequenceNumber,
 	UniversalSequenceNumber,
-} from "./constants";
+} from "./constants.js";
 import {
 	anyLocalReferencePosition,
 	filterLocalReferencePositions,
 	LocalReferenceCollection,
 	LocalReferencePosition,
 	SlidingPreference,
-} from "./localReference";
+} from "./localReference.js";
 import {
 	BlockAction,
 	// eslint-disable-next-line import/no-deprecated
 	CollaborationWindow,
 	IHierBlock,
 	IMergeBlock,
-	IMergeLeaf,
+	ISegmentLeaf,
 	IMergeNode,
 	IMoveInfo,
 	InsertContext,
@@ -46,45 +46,39 @@ import {
 	toMoveInfo,
 	seqLTE,
 	toRemovalInfo,
-} from "./mergeTreeNodes";
+} from "./mergeTreeNodes.js";
 import {
 	IMergeTreeDeltaOpArgs,
 	IMergeTreeSegmentDelta,
 	MergeTreeDeltaCallback,
 	MergeTreeMaintenanceCallback,
 	MergeTreeMaintenanceType,
-} from "./mergeTreeDeltaCallback";
-import { createAnnotateRangeOp, createInsertSegmentOp, createRemoveRangeOp } from "./opBuilder";
-import { IMergeTreeDeltaOp, IRelativePosition, MergeTreeDeltaType, ReferenceType } from "./ops";
-import { PartialSequenceLengths } from "./partialLengths";
+} from "./mergeTreeDeltaCallback.js";
+import { createAnnotateRangeOp, createInsertSegmentOp, createRemoveRangeOp } from "./opBuilder.js";
+import { IMergeTreeDeltaOp, IRelativePosition, MergeTreeDeltaType, ReferenceType } from "./ops.js";
+import { PartialSequenceLengths } from "./partialLengths.js";
 // eslint-disable-next-line import/no-deprecated
-import { createMap, extend, extendIfUndefined, MapLike, PropertySet } from "./properties";
+import { createMap, extend, extendIfUndefined, MapLike, PropertySet } from "./properties.js";
 import {
 	refTypeIncludesFlag,
 	ReferencePosition,
 	DetachedReferencePosition,
 	refGetTileLabels,
 	refHasTileLabel,
-} from "./referencePositions";
-import { PropertiesRollback } from "./segmentPropertiesManager";
+} from "./referencePositions.js";
+import { PropertiesRollback } from "./segmentPropertiesManager.js";
 import {
 	backwardExcursion,
 	depthFirstNodeWalk,
 	forwardExcursion,
 	NodeAction,
 	walkAllChildSegments,
-} from "./mergeTreeNodeWalk";
-import type { TrackingGroup } from "./mergeTreeTracking";
-import { zamboniSegments } from "./zamboni";
+} from "./mergeTreeNodeWalk.js";
+import type { TrackingGroup } from "./mergeTreeTracking.js";
+import { zamboniSegments } from "./zamboni.js";
 // eslint-disable-next-line import/no-deprecated
-import { Client } from "./client";
-import { EndOfTreeSegment, StartOfTreeSegment } from "./endOfTreeSegment";
-
-/**
- * someday we may split tree leaves from segments, but for now they are the same
- * this is just a convenience type that makes it clear that we need something that is both a segment and a leaf node
- */
-export type ISegmentLeaf = ISegment & IMergeLeaf;
+import { Client } from "./client.js";
+import { EndOfTreeSegment, StartOfTreeSegment } from "./endOfTreeSegment.js";
 
 function wasRemovedAfter(seg: ISegment, seq: number): boolean {
 	return (
@@ -124,6 +118,10 @@ function isRemovedAndAckedOrMovedAndAcked(segment: ISegment): boolean {
 	return isRemovedAndAcked(segment) || isMovedAndAcked(segment);
 }
 
+function isRemovedOrMoved(segment: ISegment): boolean {
+	return isRemoved(segment) || isMoved(segment);
+}
+
 function nodeTotalLength(mergeTree: MergeTree, node: IMergeNode): number | undefined {
 	if (!node.isLeaf()) {
 		return node.cachedLength;
@@ -643,7 +641,7 @@ export class MergeTree {
 		this.nodeUpdateLengthNewStructure(this.root, true);
 	}
 
-	private addToLRUSet(leaf: IMergeLeaf, seq: number) {
+	private addToLRUSet(leaf: ISegmentLeaf, seq: number) {
 		// 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.
 
@@ -786,7 +784,7 @@ export class MergeTree {
 
 			if (maybeEndpoint) {
 				const endpoint = maybeEndpoint === "start" ? this.startOfTree : this.endOfTree;
-				const localRefs = (endpoint.localRefs ??= new LocalReferenceCollection(endpoint));
+				const localRefs = LocalReferenceCollection.setOrGet(endpoint);
 				if (currentSlideIsForward) {
 					localRefs.addBeforeTombstones(...endpointRefsToAdd);
 				} else {
@@ -795,8 +793,7 @@ export class MergeTree {
 			}
 
 			if (currentSlideDestination !== undefined) {
-				const localRefs = (currentSlideDestination.localRefs ??=
-					new LocalReferenceCollection(currentSlideDestination));
+				const localRefs = LocalReferenceCollection.setOrGet(currentSlideDestination);
 				if (currentSlideIsForward) {
 					localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
 				} else {
@@ -1072,8 +1069,14 @@ export class MergeTree {
 			return this.getPosition(refPos, refSeq, clientId);
 		}
 		if (refTypeIncludesFlag(refPos, ReferenceType.Transient) || seg.localRefs?.has(refPos)) {
-			const offset = isRemoved(seg) || isMoved(seg) ? 0 : refPos.getOffset();
-			return offset + this.getPosition(seg, refSeq, clientId);
+			const offset = isRemovedOrMoved(seg) ? 0 : refPos.getOffset();
+			const pos = this.getPosition(seg, refSeq, clientId);
+
+			if (isRemovedOrMoved(seg) && refPos.slidingPreference === SlidingPreference.BACKWARD) {
+				return pos === 0 ? 0 : pos - 1;
+			}
+
+			return offset + pos;
 		}
 		return DetachedReferencePosition;
 	}
@@ -1099,7 +1102,7 @@ export class MergeTree {
 		let foundMarker: Marker | undefined;
 
 		const { segment } = this.getContainingSegment(startPos, UniversalSequenceNumber, clientId);
-		const segWithParent: IMergeLeaf | undefined = segment;
+		const segWithParent: ISegmentLeaf | undefined = segment;
 		if (segWithParent?.parent === undefined) {
 			return undefined;
 		}
@@ -1169,7 +1172,7 @@ export class MergeTree {
 					const locallyMovedSegments = this.locallyMovedSegments.get(localMovedSeq);
 
 					if (locallyMovedSegments) {
-						for (const segment of locallyMovedSegments.segments) {
+						locallyMovedSegments.segments.forEach((segment: ISegmentLeaf) => {
 							segment.localMovedSeq = undefined;
 
 							if (!nodesToUpdate.includes(segment.parent!)) {
@@ -1179,7 +1182,7 @@ export class MergeTree {
 							if (segment.movedSeq === UnassignedSequenceNumber) {
 								segment.movedSeq = seq;
 							}
-						}
+						});
 
 						this.locallyMovedSegments.delete(localMovedSeq);
 					}
@@ -1328,10 +1331,16 @@ export class MergeTree {
 
 		// opArgs == undefined => loading snapshot or test code
 		if (opArgs !== undefined) {
-			this.mergeTreeDeltaCallback?.(opArgs, {
-				operation: MergeTreeDeltaType.INSERT,
-				deltaSegments: segments.map((segment) => ({ segment })),
-			});
+			const deltaSegments = segments
+				.filter((segment) => !toMoveInfo(segment))
+				.map((segment) => ({ segment }));
+
+			if (deltaSegments.length > 0) {
+				this.mergeTreeDeltaCallback?.(opArgs, {
+					operation: MergeTreeDeltaType.INSERT,
+					deltaSegments,
+				});
+			}
 		}
 
 		if (
@@ -1892,9 +1901,6 @@ export class MergeTree {
 		}
 	}
 
-	/**
-	 * @alpha
-	 */
 	public obliterateRange(
 		start: number,
 		end: number,
@@ -1960,7 +1966,9 @@ export class MergeTree {
 				segment.localMovedSeq = localSeq;
 				segment.movedSeqs = [seq];
 
-				movedSegments.push({ segment });
+				if (!toRemovalInfo(segment)) {
+					movedSegments.push({ segment });
+				}
 			}
 
 			// Save segment so can assign moved sequence number when acked by server
@@ -2070,7 +2078,9 @@ export class MergeTree {
 				segment.removedSeq = seq;
 				segment.localRemovedSeq = localSeq;
 
-				removedSegments.push({ segment });
+				if (!toMoveInfo(segment)) {
+					removedSegments.push({ segment });
+				}
 			}
 
 			// Save segment so we can assign removed sequence number when acked by server
@@ -2298,8 +2308,7 @@ export class MergeTree {
 			segment = _segment;
 		}
 
-		const localRefs = segment.localRefs ?? new LocalReferenceCollection(segment);
-		segment.localRefs = localRefs;
+		const localRefs = LocalReferenceCollection.setOrGet(segment);
 
 		const segRef = localRefs.createLocalRef(
 			offset,

package/src/mergeTreeDeltaCallback.ts

@@ -4,9 +4,9 @@
  */
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 // eslint-disable-next-line import/no-deprecated
-import { IMergeTreeGroupMsg, IMergeTreeOp, MergeTreeDeltaType } from "./ops";
-import { PropertySet } from "./properties";
-import { ISegment } from "./mergeTreeNodes";
+import { IMergeTreeGroupMsg, IMergeTreeOp, MergeTreeDeltaType } from "./ops.js";
+import { PropertySet } from "./properties.js";
+import { ISegment } from "./mergeTreeNodes.js";
 
 /**
  * @alpha
@@ -99,11 +99,6 @@ export interface IMergeTreeDeltaOpArgs {
 	 * Delta op args are for an unacked local change
 	 */
 	readonly sequencedMessage?: ISequencedDocumentMessage;
-
-	/**
-	 * If the operation is being applied as a stashed op, which means it may have been previously submitted, and therefore should not be resubmitted
-	 */
-	readonly stashed?: boolean;
 }
 
 /**

package/src/mergeTreeNodeWalk.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { IMergeBlock, IMergeNode, ISegment } from "./mergeTreeNodes";
+import { IMergeBlock, IMergeNode, ISegment } from "./mergeTreeNodes.js";
 
 export const LeafAction = {
 	Exit: false,

package/src/mergeTreeNodes.ts

@@ -7,20 +7,19 @@
 
 import { assert } from "@fluidframework/core-utils";
 import { AttributionKey } from "@fluidframework/runtime-definitions";
-import { IAttributionCollection } from "./attributionCollection";
-import { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber } from "./constants";
-import { LocalReferenceCollection } from "./localReference";
-import { ISegmentLeaf } from "./mergeTree";
-import { IMergeTreeDeltaOpArgs } from "./mergeTreeDeltaCallback";
-import { TrackingGroupCollection } from "./mergeTreeTracking";
-import { IJSONSegment, IMarkerDef, MergeTreeDeltaType, ReferenceType } from "./ops";
-import { computeHierarchicalOrdinal } from "./ordinal";
-import { PartialSequenceLengths } from "./partialLengths";
+import { IAttributionCollection } from "./attributionCollection.js";
+import { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber } from "./constants.js";
+import { LocalReferenceCollection } from "./localReference.js";
+import { IMergeTreeDeltaOpArgs } from "./mergeTreeDeltaCallback.js";
+import { TrackingGroupCollection } from "./mergeTreeTracking.js";
+import { IJSONSegment, IMarkerDef, MergeTreeDeltaType, ReferenceType } from "./ops.js";
+import { computeHierarchicalOrdinal } from "./ordinal.js";
+import { PartialSequenceLengths } from "./partialLengths.js";
 // eslint-disable-next-line import/no-deprecated
-import { clone, createMap, MapLike, PropertySet } from "./properties";
-import { refTypeIncludesFlag, ReferencePosition, refGetTileLabels } from "./referencePositions";
-import { SegmentGroupCollection } from "./segmentGroupCollection";
-import { PropertiesManager, PropertiesRollback } from "./segmentPropertiesManager";
+import { clone, createMap, MapLike, PropertySet } from "./properties.js";
+import { refTypeIncludesFlag, ReferencePosition, refGetTileLabels } from "./referencePositions.js";
+import { SegmentGroupCollection } from "./segmentGroupCollection.js";
+import { PropertiesManager, PropertiesRollback } from "./segmentPropertiesManager.js";
 
 /**
  * Common properties for a node in a merge tree.
@@ -38,9 +37,12 @@ export interface IMergeNodeCommon {
 	ordinal: string;
 	isLeaf(): this is ISegment;
 }
-
-export type IMergeLeaf = ISegment & { parent?: IMergeBlock };
-export type IMergeNode = IMergeBlock | IMergeLeaf;
+/**
+ * someday we may split tree leaves from segments, but for now they are the same
+ * this is just a convenience type that makes it clear that we need something that is both a segment and a leaf node
+ */
+export type ISegmentLeaf = ISegment & { parent?: IMergeBlock };
+export type IMergeNode = IMergeBlock | ISegmentLeaf;
 /**
  * Internal (i.e. non-leaf) node in a merge tree.
  * @internal
@@ -399,7 +401,7 @@ export interface SegmentActions<TClientData> {
  * @alpha
  */
 export interface SegmentGroup {
-	segments: ISegmentLeaf[];
+	segments: ISegment[];
 	previousProps?: PropertySet[];
 	localSeq?: number;
 	refSeq: number;
@@ -610,7 +612,7 @@ export abstract class BaseSegment extends MergeNode implements ISegment {
 			return undefined;
 		}
 
-		const leafSegment: IMergeLeaf | undefined = this.createSplitSegmentAt(pos);
+		const leafSegment: ISegmentLeaf | undefined = this.createSplitSegmentAt(pos);
 
 		if (!leafSegment) {
 			return undefined;
@@ -618,7 +620,7 @@ export abstract class BaseSegment extends MergeNode implements ISegment {
 
 		this.copyPropertiesTo(leafSegment);
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const thisAsMergeSegment: IMergeLeaf = this;
+		const thisAsMergeSegment: ISegmentLeaf = this;
 		leafSegment.parent = thisAsMergeSegment.parent;
 
 		// Give the leaf a temporary yet valid ordinal.

package/src/mergeTreeTracking.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { LocalReferencePosition } from "./localReference";
-import { ISegment } from "./mergeTreeNodes";
+import { LocalReferencePosition } from "./localReference.js";
+import { ISegment } from "./mergeTreeNodes.js";
 // eslint-disable-next-line import/no-deprecated
-import { SortedSegmentSet } from "./sortedSegmentSet";
+import { SortedSegmentSet } from "./sortedSegmentSet.js";
 
 /**
  * @alpha

package/src/opBuilder.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ISegment, Marker } from "./mergeTreeNodes";
+import { ISegment, Marker } from "./mergeTreeNodes.js";
 import {
 	IMergeTreeAnnotateMsg,
 	// eslint-disable-next-line import/no-deprecated
@@ -14,8 +14,8 @@ import {
 	IMergeTreeDeltaOp,
 	// eslint-disable-next-line import/no-deprecated
 	IMergeTreeObliterateMsg,
-} from "./ops";
-import { PropertySet } from "./properties";
+} from "./ops.js";
+import { PropertySet } from "./properties.js";
 
 /**
  * Creates the op for annotating the markers with the provided properties

package/src/partialLengths.ts

@@ -4,9 +4,9 @@
  */
 
 import { assert } from "@fluidframework/core-utils";
-import { Property, RedBlackTree } from "./collections";
-import { UnassignedSequenceNumber } from "./constants";
-import { MergeTree } from "./mergeTree";
+import { Property, RedBlackTree } from "./collections/index.js";
+import { UnassignedSequenceNumber } from "./constants.js";
+import { MergeTree } from "./mergeTree.js";
 import {
 	// eslint-disable-next-line import/no-deprecated
 	CollaborationWindow,
@@ -19,9 +19,9 @@ import {
 	toMoveInfo,
 	seqLTE,
 	toRemovalInfo,
-} from "./mergeTreeNodes";
+} from "./mergeTreeNodes.js";
 // eslint-disable-next-line import/no-deprecated
-import { SortedSet } from "./sortedSet";
+import { SortedSet } from "./sortedSet.js";
 
 // eslint-disable-next-line import/no-deprecated
 class PartialSequenceLengthsSet extends SortedSet<PartialSequenceLength, number> {
@@ -1185,7 +1185,7 @@ export class PartialSequenceLengths {
 }
 
 /* eslint-disable @typescript-eslint/dot-notation */
-function verifyPartialLengths(
+function verifyPartialLengthsInner(
 	partialSeqLengths: PartialSequenceLengths,
 	partialLengths: PartialSequenceLengthsSet,
 	clientPartials: boolean,
@@ -1266,7 +1266,7 @@ function verifyPartialLengths(
 	return count;
 }
 
-export function verifyExpected(
+export function verifyExpectedPartialLengths(
 	mergeTree: MergeTree,
 	node: IMergeBlock,
 	refSeq: number,
@@ -1305,11 +1305,11 @@ export function verifyExpected(
 	}
 }
 
-export function verify(partialSeqLengths: PartialSequenceLengths) {
+export function verifyPartialLengths(partialSeqLengths: PartialSequenceLengths) {
 	if (partialSeqLengths["clientSeqNumbers"]) {
 		for (const cliSeq of partialSeqLengths["clientSeqNumbers"]) {
 			if (cliSeq) {
-				verifyPartialLengths(partialSeqLengths, cliSeq, true);
+				verifyPartialLengthsInner(partialSeqLengths, cliSeq, true);
 			}
 		}
 
@@ -1319,7 +1319,7 @@ export function verify(partialSeqLengths: PartialSequenceLengths) {
 			0x059 /* "Client view exists but flat view does not!" */,
 		);
 
-		verifyPartialLengths(partialSeqLengths, partialSeqLengths["partialLengths"], false);
+		verifyPartialLengthsInner(partialSeqLengths, partialSeqLengths["partialLengths"], false);
 	} else {
 		// If we don't have a client view, we shouldn't have the flat view either
 		assert(

package/src/referencePositions.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { SlidingPreference } from "./localReference";
-import { ISegment } from "./mergeTreeNodes";
-import { ReferenceType } from "./ops";
-import { PropertySet } from "./properties";
+import { SlidingPreference } from "./localReference.js";
+import { ISegment } from "./mergeTreeNodes.js";
+import { ReferenceType } from "./ops.js";
+import { PropertySet } from "./properties.js";
 
 /**
  * @internal