@fluidframework/sequence 2.0.0-internal.4.1.2 → 2.0.0-internal.4.2.0

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/sequence";
-export declare const pkgVersion = "2.0.0-internal.4.1.2";
+export declare const pkgVersion = "2.0.0-internal.4.2.0";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/sequence";
-export const pkgVersion = "2.0.0-internal.4.1.2";
+export const pkgVersion = "2.0.0-internal.4.2.0";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,0BAA0B,CAAC;AAClD,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/sequence\";\nexport const pkgVersion = \"2.0.0-internal.4.1.2\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,0BAA0B,CAAC;AAClD,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/sequence\";\nexport const pkgVersion = \"2.0.0-internal.4.2.0\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/sequence",
-  "version": "2.0.0-internal.4.1.2",
+  "version": "2.0.0-internal.4.2.0",
   "description": "Distributed sequence",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,30 +37,30 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.1.1",
-    "@fluidframework/container-utils": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
-    "@fluidframework/merge-tree": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
+    "@fluidframework/container-utils": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
+    "@fluidframework/merge-tree": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
-    "@fluidframework/shared-object-base": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
+    "@fluidframework/shared-object-base": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@fluid-internal/stochastic-test-utils": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
-    "@fluid-internal/test-dds-utils": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
+    "@fluid-internal/stochastic-test-utils": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
+    "@fluid-internal/test-dds-utils": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
     "@fluid-tools/benchmark": "^0.47.0",
-    "@fluid-tools/build-cli": "^0.15.0",
+    "@fluid-tools/build-cli": "^0.17.0",
     "@fluidframework/build-common": "^1.1.0",
-    "@fluidframework/build-tools": "^0.15.0",
+    "@fluidframework/build-tools": "^0.17.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
     "@fluidframework/gitresources": "^0.1039.1000",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
     "@fluidframework/sequence-previous": "npm:@fluidframework/sequence@2.0.0-internal.4.1.0",
     "@fluidframework/server-services-client": "^0.1039.1000",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.4.1.2 <2.0.0-internal.4.2.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.4.2.0 <2.0.0-internal.4.3.0",
     "@microsoft/api-extractor": "^7.34.4",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^9.1.1",
@@ -101,9 +101,12 @@
     "format": "npm run prettier:fix",
     "lint": "npm run prettier && npm run eslint",
     "lint:fix": "npm run prettier:fix && npm run eslint:fix",
+    "perf": "cross-env FLUID_TEST_VERBOSE=1 mocha \"dist/**/*.spec.js\" --node-option unhandled-rejections=strict,expose-gc --exit -r node_modules/@fluidframework/mocha-test-setup --perfMode --fgrep @Benchmark --reporter @fluid-tools/benchmark/dist/MochaReporter.js --timeout 30000",
+    "perf:measure": "npm run perf -- --fgrep @Measurement",
     "prettier": "prettier --check . --ignore-path ../../../.prettierignore",
     "prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
+    "test:benchmark:report": "mocha \"dist/test/*.perf.spec.js\" --node-option unhandled-rejections=strict,expose-gc --exit --perfMode --fgrep @Benchmark -r @fluidframework/mocha-test-setup --reporter @fluid-tools/benchmark/dist/MochaReporter.js --timeout 60000",
     "test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
     "test:memory": "mocha --config src/test/memory/.mocharc.js",
     "test:memory-profiling:report": "mocha --config src/test/memory/.mocharc.js",

package/src/intervalCollection.ts

@@ -12,7 +12,6 @@ import {
 	addProperties,
 	Client,
 	compareReferencePositions,
-	ConflictAction,
 	createMap,
 	ICombiningOp,
 	ISegment,
@@ -791,97 +790,54 @@ export function createSequenceInterval(
 	return ival;
 }
 
-export function defaultIntervalConflictResolver(a: Interval, b: Interval) {
-	a.addPropertySet(b.properties);
-	return a;
-}
-
-export function createIntervalIndex(conflict?: IntervalConflictResolver<Interval>) {
+export function createIntervalIndex() {
 	const helpers: IIntervalHelpers<Interval> = {
 		compareEnds: compareIntervalEnds,
 		create: createInterval,
 	};
 	const lc = new LocalIntervalCollection<Interval>(undefined as any as Client, "", helpers);
-	if (conflict) {
-		lc.addConflictResolver(conflict);
-	} else {
-		lc.addConflictResolver(defaultIntervalConflictResolver);
-	}
 	return lc;
 }
 
-export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
-	private readonly intervalTree = new IntervalTree<TInterval>();
-	private readonly endIntervalTree: RedBlackTree<TInterval, TInterval>;
-	private readonly intervalIdMap: Map<string, TInterval> = new Map();
-	private conflictResolver: IntervalConflictResolver<TInterval> | undefined;
-	private endConflictResolver: ConflictAction<TInterval, TInterval> | undefined;
+/**
+ * Collection of intervals.
+ *
+ * Implementers of this interface will typically implement additional APIs to support efficiently querying a collection
+ * of intervals in some manner, for example:
+ * - "find all intervals with start endpoint between these two points"
+ * - "find all intervals which overlap this range"
+ * etc.
+ */
+export interface IntervalIndex<TInterval extends ISerializableInterval> {
+	/**
+	 * Adds an interval to the index.
+	 * @remarks - Application code should never need to invoke this method on their index for production scenarios:
+	 * Fluid handles adding and removing intervals from an index in response to sequence or interval changes.
+	 */
+	add(interval: TInterval): void;
 
-	private static readonly legacyIdPrefix = "legacy";
+	/**
+	 * Removes an interval from the index.
+	 * @remarks - Application code should never need to invoke this method on their index for production scenarios:
+	 * Fluid handles adding and removing intervals from an index in response to sequence or interval changes.
+	 */
+	remove(interval: TInterval): void;
+}
+
+class OverlappingIntervalsIndex<TInterval extends ISerializableInterval>
+	implements IntervalIndex<TInterval>
+{
+	private readonly intervalTree = new IntervalTree<TInterval>();
 
 	constructor(
 		private readonly client: Client,
-		private readonly label: string,
 		private readonly helpers: IIntervalHelpers<TInterval>,
-		/** Callback invoked each time one of the endpoints of an interval slides. */
-		private readonly onPositionChange?: (
-			interval: TInterval,
-			previousInterval: TInterval,
-		) => void,
-	) {
-		// eslint-disable-next-line @typescript-eslint/unbound-method
-		this.endIntervalTree = new RedBlackTree<TInterval, TInterval>(helpers.compareEnds);
-	}
-
-	public addConflictResolver(conflictResolver: IntervalConflictResolver<TInterval>) {
-		this.conflictResolver = conflictResolver;
-		this.endConflictResolver = (key: TInterval, currentKey: TInterval) => {
-			const ival = conflictResolver(key, currentKey);
-			return {
-				data: ival,
-				key: ival,
-			};
-		};
-	}
+	) {}
 
 	public map(fn: (interval: TInterval) => void) {
 		this.intervalTree.map(fn);
 	}
 
-	public createLegacyId(start: number, end: number): string {
-		// Create a non-unique ID based on start and end to be used on intervals that come from legacy clients
-		// without ID's.
-		return `${LocalIntervalCollection.legacyIdPrefix}${start}-${end}`;
-	}
-
-	/**
-	 * Validates that a serialized interval has the ID property. Creates an ID
-	 * if one does not already exist
-	 *
-	 * @param serializedInterval - The interval to be checked
-	 * @returns The interval's existing or newly created id
-	 */
-	public ensureSerializedId(serializedInterval: ISerializedInterval): string {
-		let id: string | undefined = serializedInterval.properties?.[reservedIntervalIdKey];
-		if (id === undefined) {
-			// An interval came over the wire without an ID, so create a non-unique one based on start/end.
-			// This will allow all clients to refer to this interval consistently.
-			id = this.createLegacyId(serializedInterval.start, serializedInterval.end);
-			const newProps = {
-				[reservedIntervalIdKey]: id,
-			};
-			serializedInterval.properties = addProperties(serializedInterval.properties, newProps);
-		}
-		// Make the ID immutable for safety's sake.
-		Object.defineProperty(serializedInterval.properties, reservedIntervalIdKey, {
-			configurable: false,
-			enumerable: true,
-			writable: false,
-		});
-
-		return id;
-	}
-
 	public mapUntil(fn: (interval: TInterval) => boolean) {
 		this.intervalTree.mapUntil(fn);
 	}
@@ -988,6 +944,61 @@ export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
 		return overlappingIntervalNodes.map((node) => node.key);
 	}
 
+	public remove(interval: TInterval) {
+		this.intervalTree.removeExisting(interval);
+	}
+
+	public add(interval: TInterval) {
+		this.intervalTree.put(interval);
+	}
+}
+
+class IdIntervalIndex<TInterval extends ISerializableInterval>
+	implements IntervalIndex<TInterval>, Iterable<TInterval>
+{
+	private readonly intervalIdMap: Map<string, TInterval> = new Map();
+
+	public add(interval: TInterval) {
+		const id = interval.getIntervalId();
+		assert(
+			id !== undefined,
+			0x2c0 /* "ID must be created before adding interval to collection" */,
+		);
+		// Make the ID immutable.
+		Object.defineProperty(interval.properties, reservedIntervalIdKey, {
+			configurable: false,
+			enumerable: true,
+			writable: false,
+		});
+		this.intervalIdMap.set(id, interval);
+	}
+
+	public remove(interval: TInterval) {
+		const id = interval.getIntervalId();
+		assert(id !== undefined, 0x311 /* expected id to exist on interval */);
+		this.intervalIdMap.delete(id);
+	}
+
+	public getIntervalById(id: string) {
+		return this.intervalIdMap.get(id);
+	}
+
+	public [Symbol.iterator]() {
+		return this.intervalIdMap.values();
+	}
+}
+
+class EndpointIndex<TInterval extends ISerializableInterval> implements IntervalIndex<TInterval> {
+	private readonly endIntervalTree: RedBlackTree<TInterval, TInterval>;
+
+	constructor(
+		private readonly client: Client,
+		private readonly helpers: IIntervalHelpers<TInterval>,
+	) {
+		// eslint-disable-next-line @typescript-eslint/unbound-method
+		this.endIntervalTree = new RedBlackTree<TInterval, TInterval>(helpers.compareEnds);
+	}
+
 	public previousInterval(pos: number) {
 		const transientInterval = this.helpers.create(
 			"transient",
@@ -1016,32 +1027,85 @@ export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
 		}
 	}
 
-	public removeInterval(startPosition: number, endPosition: number) {
-		const transientInterval = this.helpers.create(
-			"transient",
-			startPosition,
-			endPosition,
-			this.client,
-			IntervalType.Transient,
-		);
-		this.intervalTree.remove(transientInterval);
-		this.endIntervalTree.remove(transientInterval);
-		return transientInterval;
+	public add(interval: TInterval): void {
+		this.endIntervalTree.put(interval, interval);
 	}
 
-	private removeIntervalFromIndex(interval: TInterval) {
-		this.intervalTree.removeExisting(interval);
+	public remove(interval: TInterval): void {
 		this.endIntervalTree.remove(interval);
+	}
+}
 
-		const id = interval.getIntervalId();
+export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
+	private static readonly legacyIdPrefix = "legacy";
+	public readonly overlappingIntervalsIndex: OverlappingIntervalsIndex<TInterval>;
+	public readonly idIntervalIndex: IdIntervalIndex<TInterval>;
+	public readonly endIntervalIndex: EndpointIndex<TInterval>;
+	private readonly indexes: IntervalIndex<TInterval>[];
 
-		assert(id !== undefined, 0x311 /* expected id to exist on interval */);
+	constructor(
+		private readonly client: Client,
+		private readonly label: string,
+		private readonly helpers: IIntervalHelpers<TInterval>,
+		/** Callback invoked each time one of the endpoints of an interval slides. */
+		private readonly onPositionChange?: (
+			interval: TInterval,
+			previousInterval: TInterval,
+		) => void,
+	) {
+		this.overlappingIntervalsIndex = new OverlappingIntervalsIndex(client, helpers);
+		this.idIntervalIndex = new IdIntervalIndex();
+		this.endIntervalIndex = new EndpointIndex(client, helpers);
+		this.indexes = [
+			this.overlappingIntervalsIndex,
+			this.idIntervalIndex,
+			this.endIntervalIndex,
+		];
+	}
 
-		this.intervalIdMap.delete(id);
+	public createLegacyId(start: number, end: number): string {
+		// Create a non-unique ID based on start and end to be used on intervals that come from legacy clients
+		// without ID's.
+		return `${LocalIntervalCollection.legacyIdPrefix}${start}-${end}`;
+	}
+
+	/**
+	 * Validates that a serialized interval has the ID property. Creates an ID
+	 * if one does not already exist
+	 *
+	 * @param serializedInterval - The interval to be checked
+	 * @returns The interval's existing or newly created id
+	 */
+	public ensureSerializedId(serializedInterval: ISerializedInterval): string {
+		let id: string | undefined = serializedInterval.properties?.[reservedIntervalIdKey];
+		if (id === undefined) {
+			// Back-compat: 0.39 and earlier did not have IDs on intervals. If an interval from such a client
+			// comes over the wire, create a non-unique one based on start/end.
+			// This will allow all clients to refer to this interval consistently.
+			id = this.createLegacyId(serializedInterval.start, serializedInterval.end);
+			const newProps = {
+				[reservedIntervalIdKey]: id,
+			};
+			serializedInterval.properties = addProperties(serializedInterval.properties, newProps);
+		}
+		// Make the ID immutable for safety's sake.
+		Object.defineProperty(serializedInterval.properties, reservedIntervalIdKey, {
+			configurable: false,
+			enumerable: true,
+			writable: false,
+		});
+
+		return id;
+	}
+
+	private removeIntervalFromIndexes(interval: TInterval) {
+		for (const index of this.indexes) {
+			index.remove(interval);
+		}
 	}
 
 	public removeExistingInterval(interval: TInterval) {
-		this.removeIntervalFromIndex(interval);
+		this.removeIntervalFromIndexes(interval);
 		this.removeIntervalListeners(interval);
 	}
 
@@ -1083,33 +1147,18 @@ export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
 		}
 	}
 
-	private addIntervalToIndex(interval: TInterval) {
-		const id = interval.getIntervalId();
-		assert(
-			id !== undefined,
-			0x2c0 /* "ID must be created before adding interval to collection" */,
-		);
-		// Make the ID immutable.
-		Object.defineProperty(interval.properties, reservedIntervalIdKey, {
-			configurable: false,
-			enumerable: true,
-			writable: false,
-		});
-		this.intervalTree.put(interval, this.conflictResolver);
-		this.endIntervalTree.put(interval, interval, this.endConflictResolver);
-		this.intervalIdMap.set(id, interval);
+	private addIntervalToIndexes(interval: TInterval) {
+		for (const index of this.indexes) {
+			index.add(interval);
+		}
 	}
 
 	public add(interval: TInterval): void {
 		this.linkEndpointsToInterval(interval);
-		this.addIntervalToIndex(interval);
+		this.addIntervalToIndexes(interval);
 		this.addIntervalListeners(interval);
 	}
 
-	public getIntervalById(id: string) {
-		return this.intervalIdMap.get(id);
-	}
-
 	public changeInterval(
 		interval: TInterval,
 		start: number | undefined,
@@ -1128,10 +1177,11 @@ export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
 	}
 
 	public serialize(): ISerializedIntervalCollectionV2 {
-		const intervals = this.intervalTree.intervals.keys();
 		return {
 			label: this.label,
-			intervals: intervals.map((interval) => compressInterval(interval.serialize())),
+			intervals: Array.from(this.idIntervalIndex, (interval) =>
+				compressInterval(interval.serialize()),
+			),
 			version: 2,
 		};
 	}
@@ -1164,7 +1214,7 @@ export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
 						previousInterval = interval.clone() as TInterval & SequenceInterval;
 						previousInterval.start = cloneRef(previousInterval.start);
 						previousInterval.end = cloneRef(previousInterval.end);
-						this.removeIntervalFromIndex(interval);
+						this.removeIntervalFromIndexes(interval);
 					}
 				},
 				() => {
@@ -1174,7 +1224,7 @@ export class LocalIntervalCollection<TInterval extends ISerializableInterval> {
 					);
 					pendingChanges--;
 					if (pendingChanges === 0) {
-						this.addIntervalToIndex(interval);
+						this.addIntervalToIndexes(interval);
 						this.onPositionChange?.(interval, previousInterval);
 						previousInterval = undefined;
 					}
@@ -1646,7 +1696,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 		if (!this.localCollection) {
 			throw new LoggingError("attach must be called before accessing intervals");
 		}
-		return this.localCollection.getIntervalById(id);
+		return this.localCollection.idIntervalIndex.getIntervalById(id);
 	}
 
 	/**
@@ -1734,7 +1784,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 		if (!this.localCollection) {
 			throw new LoggingError("Attach must be called before accessing intervals");
 		}
-		const interval = this.localCollection.getIntervalById(id);
+		const interval = this.localCollection.idIntervalIndex.getIntervalById(id);
 		if (interval) {
 			this.deleteExistingInterval(interval, true, undefined);
 		}
@@ -1965,11 +2015,10 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 	 *
 	 * As such, the conflict resolver is never invoked and unnecessary. This API will be removed in an upcoming release.
 	 */
-	public addConflictResolver(conflictResolver: IntervalConflictResolver<TInterval>): void {
+	public addConflictResolver(_: IntervalConflictResolver<TInterval>): void {
 		if (!this.localCollection) {
 			throw new LoggingError("attachSequence must be called");
 		}
-		this.localCollection.addConflictResolver(conflictResolver);
 	}
 
 	public attachDeserializer(onDeserialize: DeserializeCallback): void {
@@ -1982,9 +2031,9 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 		this.onDeserialize = onDeserialize;
 
 		// Trigger the async prepare work across all values in the collection
-		this.localCollection?.map((interval) => {
-			onDeserialize(interval);
-		});
+		if (this.attached) {
+			this.map(onDeserialize);
+		}
 	}
 
 	/**
@@ -2013,7 +2062,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 			this.localSeqToRebasedInterval.get(localSeq) ?? this.computeRebasedPositions(localSeq);
 
 		const intervalId = properties?.[reservedIntervalIdKey];
-		const localInterval = this.localCollection?.getIntervalById(intervalId);
+		const localInterval = this.localCollection?.idIntervalIndex.getIntervalById(intervalId);
 
 		const rebased: SerializedIntervalDelta = {
 			start: startRebased,
@@ -2235,7 +2284,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 		}
 
 		const id = this.localCollection.ensureSerializedId(serializedInterval);
-		const interval = this.localCollection.getIntervalById(id);
+		const interval = this.localCollection.idIntervalIndex.getIntervalById(id);
 		if (interval) {
 			this.deleteExistingInterval(interval, local, op);
 		}
@@ -2328,7 +2377,12 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 			return;
 		}
 
-		this.localCollection.gatherIterationResults(results, iteratesForward, start, end);
+		this.localCollection.overlappingIntervalsIndex.gatherIterationResults(
+			results,
+			iteratesForward,
+			start,
+			end,
+		);
 	}
 
 	/**
@@ -2340,7 +2394,10 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 			throw new LoggingError("attachSequence must be called");
 		}
 
-		return this.localCollection.findOverlappingIntervals(startPosition, endPosition);
+		return this.localCollection.overlappingIntervalsIndex.findOverlappingIntervals(
+			startPosition,
+			endPosition,
+		);
 	}
 
 	/**
@@ -2351,7 +2408,9 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 			throw new LoggingError("attachSequence must be called");
 		}
 
-		this.localCollection.map(fn);
+		for (const interval of this.localCollection.idIntervalIndex) {
+			fn(interval);
+		}
 	}
 
 	public previousInterval(pos: number): TInterval | undefined {
@@ -2359,7 +2418,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 			throw new LoggingError("attachSequence must be called");
 		}
 
-		return this.localCollection.previousInterval(pos);
+		return this.localCollection.endIntervalIndex.previousInterval(pos);
 	}
 
 	public nextInterval(pos: number): TInterval | undefined {
@@ -2367,7 +2426,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
 			throw new LoggingError("attachSequence must be called");
 		}
 
-		return this.localCollection.nextInterval(pos);
+		return this.localCollection.endIntervalIndex.nextInterval(pos);
 	}
 }
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/sequence";
-export const pkgVersion = "2.0.0-internal.4.1.2";
+export const pkgVersion = "2.0.0-internal.4.2.0";