@fluidframework/sequence 2.0.0-internal.4.2.1 → 2.0.0-internal.4.4.0

package/src/packageVersion.ts

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

package/src/revertibles.ts

@@ -0,0 +1,572 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/* eslint-disable no-bitwise */
+
+import { assert, unreachableCase } from "@fluidframework/common-utils";
+import {
+	appendToMergeTreeDeltaRevertibles,
+	discardMergeTreeDeltaRevertible,
+	isMergeTreeDeltaRevertible,
+	LocalReferencePosition,
+	MergeTreeDeltaOperationType,
+	MergeTreeDeltaRevertible,
+	MergeTreeDeltaType,
+	PropertySet,
+	ReferenceType,
+	refTypeIncludesFlag,
+	revertMergeTreeDeltaRevertibles,
+	SortedSet,
+} from "@fluidframework/merge-tree";
+import { IntervalOpType, SequenceInterval } from "./intervalCollection";
+import { SharedString, SharedStringSegment } from "./sharedString";
+import { ISequenceDeltaRange, SequenceDeltaEvent } from "./sequenceDeltaEvent";
+
+/**
+ * Data for undoing edits on SharedStrings and Intervals.
+ *
+ * Revertibles are new and require the option mergeTreeUseNewLengthCalculations to
+ * be set as true on the underlying merge tree in order to function correctly.
+ *
+ * @alpha
+ */
+export type SharedStringRevertible = MergeTreeDeltaRevertible | IntervalRevertible;
+
+const idMap = new Map<string, string>();
+
+type IntervalOpType = typeof IntervalOpType[keyof typeof IntervalOpType];
+
+/**
+ * Data for undoing edits affecting Intervals.
+ *
+ * Revertibles are new and require the option mergeTreeUseNewLengthCalculations to
+ * be set as true on the underlying merge tree in order to function correctly.
+ *
+ * @alpha
+ */
+export type IntervalRevertible =
+	| {
+			event: typeof IntervalOpType.CHANGE;
+			interval: SequenceInterval;
+			start: LocalReferencePosition;
+			end: LocalReferencePosition;
+	  }
+	| {
+			event: typeof IntervalOpType.ADD;
+			interval: SequenceInterval;
+	  }
+	| {
+			event: typeof IntervalOpType.DELETE;
+			interval: SequenceInterval;
+			start: LocalReferencePosition;
+			end: LocalReferencePosition;
+	  }
+	| {
+			event: typeof IntervalOpType.PROPERTY_CHANGED;
+			interval: SequenceInterval;
+			propertyDeltas: PropertySet;
+	  }
+	| {
+			event: typeof IntervalOpType.POSITION_REMOVE;
+			intervals: {
+				intervalId: string;
+				label: string;
+				startOffset?: number; // interval start index within a removed range
+				endOffset?: number; // interval end index within a removed range
+			}[];
+			// local refs used by IntervalOpType.CHANGE and DELETE revertibles
+			revertibleRefs: {
+				revertible: IntervalRevertible;
+				offset: number;
+				isStart: boolean;
+			}[];
+			mergeTreeRevertible: MergeTreeDeltaRevertible;
+	  };
+
+type TypedRevertible<T extends IntervalRevertible["event"]> = IntervalRevertible & { event: T };
+
+function getUpdatedIdFromInterval(interval: SequenceInterval): string {
+	const maybeId = interval.getIntervalId();
+	return getUpdatedId(maybeId);
+}
+
+function getUpdatedId(intervalId: string): string {
+	return idMap.get(intervalId) ?? intervalId;
+}
+
+/**
+ * Create revertibles for adding an interval
+ * @alpha
+ */
+export function appendAddIntervalToRevertibles(
+	interval: SequenceInterval,
+	revertibles: SharedStringRevertible[],
+) {
+	revertibles.push({
+		event: IntervalOpType.ADD,
+		interval,
+	});
+
+	return revertibles;
+}
+
+/**
+ * Create revertibles for deleting an interval
+ * @alpha
+ */
+export function appendDeleteIntervalToRevertibles(
+	string: SharedString,
+	interval: SequenceInterval,
+	revertibles: SharedStringRevertible[],
+) {
+	const startSeg = interval.start.getSegment() as SharedStringSegment;
+	const endSeg = interval.end.getSegment() as SharedStringSegment;
+	const startRef = string.createLocalReferencePosition(
+		startSeg,
+		interval.start.getOffset(),
+		ReferenceType.StayOnRemove | ReferenceType.RangeBegin,
+		undefined,
+	);
+	const endRef = string.createLocalReferencePosition(
+		endSeg,
+		interval.end.getOffset(),
+		ReferenceType.StayOnRemove | ReferenceType.RangeEnd,
+		undefined,
+	);
+	const revertible = {
+		event: IntervalOpType.DELETE,
+		interval,
+		start: startRef,
+		end: endRef,
+	};
+	revertible.start.addProperties({ revertible });
+	revertible.end.addProperties({ revertible });
+	revertibles.push(revertible);
+
+	return revertibles;
+}
+
+/**
+ * Create revertibles for moving endpoints of an interval
+ * @alpha
+ */
+export function appendChangeIntervalToRevertibles(
+	string: SharedString,
+	newInterval: SequenceInterval,
+	previousInterval: SequenceInterval,
+	revertibles: SharedStringRevertible[],
+) {
+	const startSeg = previousInterval.start.getSegment() as SharedStringSegment;
+	const endSeg = previousInterval.end.getSegment() as SharedStringSegment;
+	const prevStartRef = string.createLocalReferencePosition(
+		startSeg,
+		previousInterval.start.getOffset(),
+		ReferenceType.StayOnRemove | ReferenceType.RangeBegin,
+		undefined,
+	);
+	const prevEndRef = string.createLocalReferencePosition(
+		endSeg,
+		previousInterval.end.getOffset(),
+		ReferenceType.StayOnRemove | ReferenceType.RangeEnd,
+		undefined,
+	);
+	const revertible = {
+		event: IntervalOpType.CHANGE,
+		interval: newInterval,
+		start: prevStartRef,
+		end: prevEndRef,
+	};
+	revertible.start.addProperties({ revertible });
+	revertible.end.addProperties({ revertible });
+	revertibles.push(revertible);
+
+	return revertibles;
+}
+
+/**
+ * Create revertibles for changing properties of an interval
+ * @alpha
+ */
+export function appendIntervalPropertyChangedToRevertibles(
+	interval: SequenceInterval,
+	deltas: PropertySet,
+	revertibles: SharedStringRevertible[],
+) {
+	revertibles.push({
+		event: IntervalOpType.PROPERTY_CHANGED,
+		interval,
+		propertyDeltas: deltas,
+	});
+
+	return revertibles;
+}
+
+function addIfIntervalEndpoint(
+	ref: LocalReferencePosition,
+	segmentLengths: number,
+	startIntervals: { offset: number; interval: SequenceInterval }[],
+	endIntervals: { offset: number; interval: SequenceInterval }[],
+) {
+	if (refTypeIncludesFlag(ref.refType, ReferenceType.RangeBegin)) {
+		const interval = ref.properties?.interval;
+		if (interval && interval instanceof SequenceInterval) {
+			startIntervals.push({ offset: segmentLengths + interval.start.getOffset(), interval });
+			return true;
+		}
+	} else if (refTypeIncludesFlag(ref.refType, ReferenceType.RangeEnd)) {
+		const interval = ref.properties?.interval;
+		if (interval && interval instanceof SequenceInterval) {
+			endIntervals.push({ offset: segmentLengths + interval.end.getOffset(), interval });
+			return true;
+		}
+	}
+	return false;
+}
+
+function addIfRevertibleRef(
+	ref: LocalReferencePosition,
+	segmentLengths: number,
+	revertibleRefs: {
+		revertible: IntervalRevertible;
+		offset: number;
+		isStart: boolean;
+	}[],
+) {
+	const revertible = ref.properties?.revertible;
+	if (revertible) {
+		revertibleRefs.push({
+			revertible,
+			offset: segmentLengths + ref.getOffset(),
+			isStart: refTypeIncludesFlag(ref.refType, ReferenceType.RangeBegin),
+		});
+	}
+}
+
+/**
+ * Create revertibles for SharedStringDeltas, handling indirectly modified intervals
+ * (e.g. reverting remove of a range that contains an interval will move the interval back)
+ *
+ * Revertibles are new and require the option mergeTreeUseNewLengthCalculations to
+ * be set as true on the underlying merge tree in order to function correctly.
+ *
+ * @alpha
+ */
+export function appendSharedStringDeltaToRevertibles(
+	string: SharedString,
+	delta: SequenceDeltaEvent,
+	revertibles: SharedStringRevertible[],
+) {
+	if (delta.ranges.length === 0) {
+		return;
+	}
+	if (delta.deltaOperation === MergeTreeDeltaType.REMOVE) {
+		const startIntervals: { offset: number; interval: SequenceInterval }[] = [];
+		const endIntervals: { offset: number; interval: SequenceInterval }[] = [];
+		const revertibleRefs: {
+			revertible: IntervalRevertible;
+			offset: number;
+			isStart: boolean;
+		}[] = [];
+		let segmentLengths = 0;
+
+		// find interval endpoints in each segment
+		for (const deltaRange of delta.ranges) {
+			const refs = deltaRange.segment.localRefs;
+			if (refs !== undefined && deltaRange.position !== -1) {
+				for (const ref of refs) {
+					addIfIntervalEndpoint(ref, segmentLengths, startIntervals, endIntervals);
+					addIfRevertibleRef(ref, segmentLengths, revertibleRefs);
+				}
+			}
+			segmentLengths += deltaRange.segment.cachedLength;
+		}
+
+		if (startIntervals.length > 0 || endIntervals.length > 0 || revertibleRefs.length > 0) {
+			const removeRevertibles: MergeTreeDeltaRevertible[] = [];
+			appendToMergeTreeDeltaRevertibles(string, delta.deltaArgs, removeRevertibles);
+			assert(
+				removeRevertibles.length === 1,
+				0x6c4 /* Remove revertible should be a single delta */,
+			);
+
+			const revertible: TypedRevertible<typeof IntervalOpType.POSITION_REMOVE> = {
+				event: IntervalOpType.POSITION_REMOVE,
+				intervals: [],
+				revertibleRefs,
+				mergeTreeRevertible: removeRevertibles[0],
+			};
+
+			// add an interval for each startInterval, accounting for any corresponding endIntervals
+			startIntervals.forEach(({ interval, offset }) => {
+				// find any corresponding end for this interval
+				const endIntervalIndex = endIntervals.findIndex((end) => {
+					return end.interval === interval;
+				});
+				let endOffset: number | undefined;
+				if (endIntervalIndex !== -1) {
+					endOffset = endIntervals[endIntervalIndex].offset;
+					endIntervals.splice(endIntervalIndex, 1);
+				}
+
+				revertible.intervals.push({
+					intervalId: interval.getIntervalId(),
+					label: interval.properties.referenceRangeLabels[0],
+					startOffset: offset,
+					endOffset,
+				});
+			});
+
+			// add any remaining endIntervals that aren't matched with a startInterval
+			endIntervals.forEach(({ interval, offset }) => {
+				revertible.intervals.push({
+					intervalId: interval.getIntervalId(),
+					label: interval.properties.referenceRangeLabels[0],
+					endOffset: offset,
+				});
+			});
+
+			revertibles.push(revertible);
+			return;
+		}
+	}
+
+	// Handle any merge tree delta that is not REMOVE or is REMOVE with no interval endpoints
+	const mergeTreeRevertibles: MergeTreeDeltaRevertible[] = [];
+	// Allow merging MergeTreeDeltaRevertible with previous
+	if (revertibles.length > 0 && isMergeTreeDeltaRevertible(revertibles[revertibles.length - 1])) {
+		mergeTreeRevertibles.push(revertibles.pop() as MergeTreeDeltaRevertible);
+	}
+	appendToMergeTreeDeltaRevertibles(string, delta.deltaArgs, mergeTreeRevertibles);
+	revertibles.push(...mergeTreeRevertibles);
+}
+
+/**
+ * Clean up resources held by revertibles that are no longer needed.
+ * @alpha
+ */
+export function discardSharedStringRevertibles(
+	sharedString: SharedString,
+	revertibles: SharedStringRevertible[],
+) {
+	revertibles.forEach((r) => {
+		if (isMergeTreeDeltaRevertible(r)) {
+			discardMergeTreeDeltaRevertible([r]);
+		} else if (r.event === IntervalOpType.CHANGE || r.event === IntervalOpType.DELETE) {
+			sharedString.removeLocalReferencePosition(r.start);
+			sharedString.removeLocalReferencePosition(r.end);
+		}
+	});
+}
+
+// Uses of referenceRangeLabels will be removed once AB#4081 is completed.
+function revertLocalAdd(
+	string: SharedString,
+	revertible: TypedRevertible<typeof IntervalOpType.ADD>,
+) {
+	const id = getUpdatedIdFromInterval(revertible.interval);
+	const label = revertible.interval.properties.referenceRangeLabels[0];
+	string.getIntervalCollection(label).removeIntervalById(id);
+}
+
+function revertLocalDelete(
+	string: SharedString,
+	revertible: TypedRevertible<typeof IntervalOpType.DELETE>,
+) {
+	const label = revertible.interval.properties.referenceRangeLabels[0];
+	const start = string.localReferencePositionToPosition(revertible.start);
+	const end = string.localReferencePositionToPosition(revertible.end);
+	const type = revertible.interval.intervalType;
+	// reusing the id causes eventual consistency bugs, so it is removed here and recreated in add
+	const { intervalId, ...props } = revertible.interval.properties;
+	const int = string.getIntervalCollection(label).add(start, end, type, props);
+
+	idMap.forEach((newId, oldId) => {
+		if (intervalId === newId) {
+			idMap.set(oldId, getUpdatedIdFromInterval(int));
+		}
+	});
+	idMap.set(intervalId, int.getIntervalId());
+
+	string.removeLocalReferencePosition(revertible.start);
+	string.removeLocalReferencePosition(revertible.end);
+}
+
+function revertLocalChange(
+	string: SharedString,
+	revertible: TypedRevertible<typeof IntervalOpType.CHANGE>,
+) {
+	const label = revertible.interval.properties.referenceRangeLabels[0];
+	const id = getUpdatedIdFromInterval(revertible.interval);
+	const start = string.localReferencePositionToPosition(revertible.start);
+	const end = string.localReferencePositionToPosition(revertible.end);
+	string.getIntervalCollection(label).change(id, start, end);
+
+	string.removeLocalReferencePosition(revertible.start);
+	string.removeLocalReferencePosition(revertible.end);
+}
+
+function revertLocalPropertyChanged(
+	string: SharedString,
+	revertible: TypedRevertible<typeof IntervalOpType.PROPERTY_CHANGED>,
+) {
+	const label = revertible.interval.properties.referenceRangeLabels[0];
+	const id = getUpdatedIdFromInterval(revertible.interval);
+	const newProps = revertible.propertyDeltas;
+	string.getIntervalCollection(label).changeProperties(id, newProps);
+}
+
+function newPosition(offset: number | undefined, restoredRanges: SortedRangeSet) {
+	if (offset === undefined) {
+		return undefined;
+	}
+
+	let offsetFromSegment = offset;
+	for (const rangeInfo of restoredRanges.items) {
+		if (offsetFromSegment < rangeInfo.length) {
+			// find the segment inside the range
+			for (const range of rangeInfo.ranges) {
+				if (range.segment.cachedLength > offsetFromSegment) {
+					return { segment: range.segment, offset: offsetFromSegment };
+				}
+				offsetFromSegment -= range.segment.cachedLength;
+			}
+		}
+		offsetFromSegment -= rangeInfo.length;
+	}
+
+	return undefined;
+}
+
+function newEndpointPosition(
+	offset: number | undefined,
+	restoredRanges: SortedRangeSet,
+	sharedString: SharedString,
+) {
+	const pos = newPosition(offset, restoredRanges);
+	return pos === undefined ? undefined : sharedString.getPosition(pos.segment) + pos.offset;
+}
+
+interface RangeInfo {
+	ranges: readonly Readonly<ISequenceDeltaRange<MergeTreeDeltaOperationType>>[];
+	length: number;
+}
+
+class SortedRangeSet extends SortedSet<RangeInfo, string> {
+	protected getKey(item: RangeInfo): string {
+		return item.ranges[0].segment.ordinal;
+	}
+}
+
+function revertLocalSequenceRemove(
+	sharedString: SharedString,
+	revertible: TypedRevertible<typeof IntervalOpType.POSITION_REMOVE>,
+) {
+	const restoredRanges = new SortedRangeSet();
+	const saveSegments = (event: SequenceDeltaEvent) => {
+		if (event.ranges.length > 0) {
+			let length = 0;
+			event.ranges.forEach((range) => {
+				length += range.segment.cachedLength;
+			});
+			restoredRanges.addOrUpdate({ ranges: event.ranges, length });
+		}
+	};
+	sharedString.on("sequenceDelta", saveSegments);
+	revertMergeTreeDeltaRevertibles(sharedString, [revertible.mergeTreeRevertible]);
+	sharedString.off("sequenceDelta", saveSegments);
+
+	revertible.intervals.forEach((intervalInfo) => {
+		const intervalCollection = sharedString.getIntervalCollection(intervalInfo.label);
+		const intervalId = getUpdatedId(intervalInfo.intervalId);
+		const interval = intervalCollection.getIntervalById(intervalId);
+		if (interval !== undefined) {
+			const newStart = newEndpointPosition(
+				intervalInfo.startOffset,
+				restoredRanges,
+				sharedString,
+			);
+			const newEnd = newEndpointPosition(
+				intervalInfo.endOffset,
+				restoredRanges,
+				sharedString,
+			);
+			if (newStart !== undefined || newEnd !== undefined) {
+				intervalCollection.change(intervalId, newStart, newEnd);
+			}
+		}
+	});
+
+	// fix up the local references used by delete and change revertibles
+	revertible.revertibleRefs.forEach((revertibleRef) => {
+		assert(
+			revertibleRef.revertible.event === IntervalOpType.CHANGE ||
+				revertibleRef.revertible.event === IntervalOpType.DELETE,
+			0x6c5 /* revertible is not delete or change */,
+		);
+		const pos = newPosition(revertibleRef.offset, restoredRanges);
+		if (pos !== undefined) {
+			if (revertibleRef.isStart) {
+				sharedString.removeLocalReferencePosition(revertibleRef.revertible.start);
+				const newRef = sharedString.createLocalReferencePosition(
+					pos.segment as SharedStringSegment,
+					pos.offset,
+					ReferenceType.StayOnRemove | ReferenceType.RangeBegin,
+					{ revertible: revertibleRef.revertible },
+				);
+				revertibleRef.revertible.start = newRef;
+			} else {
+				sharedString.removeLocalReferencePosition(revertibleRef.revertible.end);
+				const newRef = sharedString.createLocalReferencePosition(
+					pos.segment as SharedStringSegment,
+					pos.offset,
+					ReferenceType.StayOnRemove | ReferenceType.RangeEnd,
+					{ revertible: revertibleRef.revertible },
+				);
+				revertibleRef.revertible.end = newRef;
+			}
+		}
+	});
+}
+
+/**
+ * Invoke revertibles to reverse prior edits
+ *
+ * Revertibles are new and require the option mergeTreeUseNewLengthCalculations to
+ * be set as true on the underlying merge tree in order to function correctly.
+ *
+ * @alpha
+ */
+export function revertSharedStringRevertibles(
+	sharedString: SharedString,
+	revertibles: SharedStringRevertible[],
+) {
+	while (revertibles.length > 0) {
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		const r = revertibles.pop()!;
+		if ("event" in r) {
+			const event = r.event;
+			switch (event) {
+				case IntervalOpType.ADD:
+					revertLocalAdd(sharedString, r);
+					break;
+				case IntervalOpType.DELETE:
+					revertLocalDelete(sharedString, r);
+					break;
+				case IntervalOpType.CHANGE:
+					revertLocalChange(sharedString, r);
+					break;
+				case IntervalOpType.PROPERTY_CHANGED:
+					revertLocalPropertyChanged(sharedString, r);
+					break;
+				case IntervalOpType.POSITION_REMOVE:
+					revertLocalSequenceRemove(sharedString, r);
+					break;
+				default:
+					unreachableCase(event);
+			}
+		} else {
+			revertMergeTreeDeltaRevertibles(sharedString, [r]);
+		}
+	}
+}

package/src/sequence.ts

@@ -35,6 +35,7 @@ import {
 	ReferenceType,
 	MergeTreeRevertibleDriver,
 	SegmentGroup,
+	SlidingPreference,
 } from "@fluidframework/merge-tree";
 import { ObjectStoragePartition, SummaryTreeBuilder } from "@fluidframework/runtime-utils";
 import {
@@ -48,7 +49,7 @@ import {
 import { IEventThisPlaceHolder } from "@fluidframework/common-definitions";
 import { ISummaryTreeWithStats, ITelemetryContext } from "@fluidframework/runtime-definitions";
 
-import { DefaultMap } from "./defaultMap";
+import { DefaultMap, IMapOperation } from "./defaultMap";
 import { IMapMessageLocalMetadata, IValueChanged } from "./defaultMapInterfaces";
 import {
 	IntervalCollection,
@@ -219,6 +220,7 @@ export abstract class SharedSegmentSequence<T extends ISegment>
 			this.handle,
 			(op, localOpMetadata) => this.submitLocalMessage(op, localOpMetadata),
 			new SequenceIntervalCollectionValueType(),
+			dataStoreRuntime.options,
 		);
 	}
 
@@ -307,8 +309,15 @@ export abstract class SharedSegmentSequence<T extends ISegment>
 		offset: number,
 		refType: ReferenceType,
 		properties: PropertySet | undefined,
+		slidingPreference?: SlidingPreference,
 	): LocalReferencePosition {
-		return this.client.createLocalReferencePosition(segment, offset, refType, properties);
+		return this.client.createLocalReferencePosition(
+			segment,
+			offset,
+			refType,
+			properties,
+			slidingPreference,
+		);
 	}
 
 	/**
@@ -634,7 +643,7 @@ export abstract class SharedSegmentSequence<T extends ISegment>
 			);
 
 			const handled = this.intervalCollections.tryProcessMessage(
-				message.contents,
+				message.contents as IMapOperation,
 				local,
 				message,
 				localOpMetadata,

package/src/sharedIntervalCollection.ts

@@ -24,7 +24,7 @@ import {
 	IntervalCollectionValueType,
 	ISerializableInterval,
 } from "./intervalCollection";
-import { DefaultMap } from "./defaultMap";
+import { DefaultMap, IMapOperation } from "./defaultMap";
 import { pkgVersion } from "./packageVersion";
 import { IMapMessageLocalMetadata } from "./defaultMapInterfaces";
 
@@ -122,6 +122,7 @@ export class SharedIntervalCollection
 			this.handle,
 			(op, localOpMetadata) => this.submitLocalMessage(op, localOpMetadata),
 			new IntervalCollectionValueType(),
+			runtime.options,
 		);
 	}
 
@@ -163,7 +164,7 @@ export class SharedIntervalCollection
 	) {
 		if (message.type === MessageType.Operation) {
 			this.intervalCollections.tryProcessMessage(
-				message.contents,
+				message.contents as IMapOperation,
 				local,
 				message,
 				localOpMetadata,

package/.vscode/launch.json

@@ -1,16 +0,0 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "Sequence Test",
-			"type": "node",
-			"request": "launch",
-			"program": "${workspaceRoot}/../../../node_modules/mocha/bin/_mocha",
-			"args": ["dist/test", "--no-timeouts", "--exit"],
-			"cwd": "${workspaceRoot}"
-		}
-	]
-}