@fluidframework/sequence 2.0.0-internal.5.4.2 → 2.0.0-internal.6.0.1

package/src/intervalTree.ts

@@ -9,7 +9,6 @@ import {
 	IRBAugmentation,
 	IRBMatcher,
 	RedBlackTree,
-	ConflictAction,
 	RBNodeActions,
 } from "@fluidframework/merge-tree";
 import { IInterval } from "./intervals";
@@ -24,15 +23,6 @@ const intervalComparer = (a: IInterval, b: IInterval) => a.compare(b);
 
 export type IntervalNode<T extends IInterval> = RBNode<T, AugmentedIntervalNode>;
 
-/**
- * @deprecated - This functionality was useful when adding two intervals at the same start/end positions resulted
- * in a conflict. This is no longer the case (as of PR#6407), as interval collections support multiple intervals
- * at the same location and gives each interval a unique id.
- *
- * As such, conflict resolvers are never invoked and unnecessary. They will be removed in an upcoming release.
- */
-export type IntervalConflictResolver<TInterval> = (a: TInterval, b: TInterval) => TInterval;
-
 export class IntervalTree<T extends IInterval>
 	implements IRBAugmentation<T, AugmentedIntervalNode>, IRBMatcher<T, AugmentedIntervalNode>
 {
@@ -46,17 +36,8 @@ export class IntervalTree<T extends IInterval>
 		this.intervals.removeExisting(x);
 	}
 
-	public put(x: T, conflict?: IntervalConflictResolver<T>) {
-		let rbConflict: ConflictAction<T, AugmentedIntervalNode> | undefined;
-		if (conflict) {
-			rbConflict = (key: T, currentKey: T) => {
-				const ival = conflict(key, currentKey);
-				return {
-					key: ival,
-				};
-			};
-		}
-		this.intervals.put(x, { minmax: x.clone() }, rbConflict);
+	public put(x: T) {
+		this.intervals.put(x, { minmax: x.clone() });
 	}
 
 	public map(fn: (x: T) => void) {

package/src/intervals/interval.ts

@@ -28,7 +28,7 @@ export class Interval implements ISerializableInterval {
 	public auxProps: PropertySet[] | undefined;
 	/**
 	 * {@inheritDoc ISerializableInterval.propertyManager}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public propertyManager: PropertiesManager;
 	constructor(public start: number, public end: number, props?: PropertySet) {
@@ -144,7 +144,7 @@ export class Interval implements ISerializableInterval {
 
 	/**
 	 * {@inheritDoc IInterval.union}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public union(b: Interval) {
 		return new Interval(
@@ -160,7 +160,7 @@ export class Interval implements ISerializableInterval {
 
 	/**
 	 * {@inheritDoc ISerializableInterval.addProperties}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public addProperties(
 		newProps: PropertySet,
@@ -182,7 +182,7 @@ export class Interval implements ISerializableInterval {
 
 	/**
 	 * {@inheritDoc IInterval.modify}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public modify(label: string, start: number, end: number, op?: ISequencedDocumentMessage) {
 		const startPos = start ?? this.start;

package/src/intervals/sequenceInterval.ts

@@ -66,7 +66,7 @@ export class SequenceInterval implements ISerializableInterval {
 	public properties: PropertySet;
 	/**
 	 * {@inheritDoc ISerializableInterval.propertyManager}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public propertyManager: PropertiesManager;
 
@@ -227,7 +227,7 @@ export class SequenceInterval implements ISerializableInterval {
 
 	/**
 	 * {@inheritDoc IInterval.union}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public union(b: SequenceInterval) {
 		return new SequenceInterval(
@@ -240,7 +240,7 @@ export class SequenceInterval implements ISerializableInterval {
 
 	/**
 	 * {@inheritDoc ISerializableInterval.addProperties}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public addProperties(
 		newProps: PropertySet,
@@ -263,7 +263,7 @@ export class SequenceInterval implements ISerializableInterval {
 
 	/**
 	 * {@inheritDoc IInterval.modify}
-	 * @deprecated - This API was never intended to be public and will be marked internal in a future release.
+	 * @internal
 	 */
 	public modify(
 		label: string,

package/src/packageVersion.ts

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