@fluidframework/sequence 2.31.1 → 2.32.0

package/src/intervals/intervalUtils.ts

@@ -7,15 +7,12 @@
 
 import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import {
-	PropertiesManager,
 	PropertySet,
 	SlidingPreference,
 	SequencePlace,
 	Side,
 } from "@fluidframework/merge-tree/internal";
 
-import type { SequenceIntervalClass } from "./sequenceInterval.js";
-
 /**
  * Basic interval abstraction
  * @legacy
@@ -171,10 +168,6 @@ export interface ISerializableInterval extends IInterval {
 	getIntervalId(): string;
 }
 
-export type ISerializableIntervalPrivate = SequenceIntervalClass & {
-	propertyManager?: PropertiesManager;
-};
-
 /**
  * Represents a change that should be applied to an existing interval.
  * Changes can modify any of start/end/properties, with `undefined` signifying no change should be made.

package/src/intervals/sequenceInterval.ts

@@ -29,14 +29,13 @@ import {
 	addProperties,
 	copyPropertiesAndManager,
 	type ISegmentInternal,
+	UnassignedSequenceNumber,
+	UniversalSequenceNumber,
 } from "@fluidframework/merge-tree/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
+import { v4 as uuid } from "uuid";
 
-import {
-	computeStickinessFromSide,
-	reservedIntervalIdKey,
-	sidesFromStickiness,
-} from "../intervalCollection.js";
+import { computeStickinessFromSide } from "../intervalCollection.js";
 
 import {
 	ISerializableInterval,
@@ -45,6 +44,7 @@ import {
 	IntervalType,
 	endReferenceSlidingPreference,
 	startReferenceSlidingPreference,
+	type SerializedIntervalDelta,
 } from "./intervalUtils.js";
 
 function compareSides(sideA: Side, sideB: Side): number {
@@ -75,6 +75,30 @@ function maxSide(sideA: Side, sideB: Side): Side {
 	return Side.After;
 }
 
+const reservedIntervalIdKey = "intervalId";
+
+const legacyIdPrefix = "legacy";
+
+export function getSerializedProperties(
+	serializedInterval: ISerializedInterval | SerializedIntervalDelta,
+): {
+	id: string;
+	labels: string[];
+	properties: PropertySet;
+} {
+	const {
+		[reservedIntervalIdKey]: maybeId,
+		[reservedRangeLabelsKey]: labels,
+		...properties
+	} = serializedInterval.properties ?? {};
+	// Create a non-unique ID based on start and end to be used on intervals that come from legacy clients
+	// without ID's.
+	const id =
+		maybeId ?? `${legacyIdPrefix}${serializedInterval.start}-${serializedInterval.end}`;
+
+	return { id, labels, properties };
+}
+
 /**
  * Interval implementation whose ends are associated with positions in a mutatable sequence.
  * As such, when content is inserted into the middle of the interval, the interval expands to
@@ -183,15 +207,32 @@ export interface SequenceInterval extends ISerializableInterval {
 }
 
 export class SequenceIntervalClass implements SequenceInterval {
+	readonly #props: {
+		propertyManager?: PropertiesManager;
+		properties: PropertySet;
+	} = { properties: createMap<any>() };
+
 	/**
 	 * {@inheritDoc ISerializableInterval.properties}
 	 */
-	public properties: PropertySet = createMap<any>();
+	public get properties(): Readonly<PropertySet> {
+		return this.#props.properties;
+	}
 
-	/**
-	 * {@inheritDoc ISerializableInterval.propertyManager}
-	 */
-	public propertyManager?: PropertiesManager;
+	public changeProperties(props: PropertySet | undefined, op?: ISequencedDocumentMessage) {
+		if (props !== undefined) {
+			this.#props.propertyManager ??= new PropertiesManager();
+			return this.#props.propertyManager.handleProperties(
+				{ props },
+				this.#props,
+				this.client.getCollabWindow().collaborating
+					? (op?.sequenceNumber ?? UnassignedSequenceNumber)
+					: UniversalSequenceNumber,
+				op?.minimumSequenceNumber ?? UniversalSequenceNumber,
+				this.client.getCollabWindow().collaborating,
+			);
+		}
+	}
 
 	/***/
 	public get stickiness(): IntervalStickiness {
@@ -207,6 +248,8 @@ export class SequenceIntervalClass implements SequenceInterval {
 
 	constructor(
 		private readonly client: Client,
+		private readonly id: string,
+		private readonly label: string,
 		/**
 		 * Start endpoint of this interval.
 		 * @remarks This endpoint can be resolved into a character position using the SharedString it's a part of.
@@ -223,7 +266,7 @@ export class SequenceIntervalClass implements SequenceInterval {
 		public readonly endSide: Side = Side.Before,
 	) {
 		if (props) {
-			this.properties = addProperties(this.properties, props);
+			this.#props.properties = addProperties(this.#props.properties, props);
 		}
 	}
 
@@ -264,27 +307,42 @@ export class SequenceIntervalClass implements SequenceInterval {
 	 * {@inheritDoc ISerializableInterval.serialize}
 	 */
 	public serialize(): ISerializedInterval {
-		const startPosition = this.client.localReferencePositionToPosition(this.start);
-		const endPosition = this.client.localReferencePositionToPosition(this.end);
-		const { startSide, endSide } = sidesFromStickiness(this.stickiness);
-		const serializedInterval: ISerializedInterval = {
+		return this.serializeDelta({
+			props: this.properties,
+			includeEndpoints: true,
+		}) as ISerializedInterval;
+	}
+
+	public serializeDelta({
+		props,
+		includeEndpoints,
+	}: {
+		props: PropertySet | undefined;
+		includeEndpoints: boolean;
+	}): SerializedIntervalDelta {
+		const startSegment: ISegmentInternal | undefined = this.start.getSegment();
+		const endSegment: ISegmentInternal | undefined = this.end.getSegment();
+		const startPosition = includeEndpoints
+			? (startSegment?.endpointType ??
+				this.client.localReferencePositionToPosition(this.start))
+			: undefined;
+		const endPosition = includeEndpoints
+			? (endSegment?.endpointType ?? this.client.localReferencePositionToPosition(this.end))
+			: undefined;
+		return {
 			end: endPosition,
 			intervalType: this.intervalType,
 			sequenceNumber: this.client.getCurrentSeq(),
 			start: startPosition,
 			stickiness: this.stickiness,
-			startSide,
-			endSide,
-		};
-
-		if (this.properties) {
-			serializedInterval.properties = addProperties(
-				serializedInterval.properties,
-				this.properties,
-			);
-		}
-
-		return serializedInterval;
+			startSide: includeEndpoints ? this.startSide : undefined,
+			endSide: includeEndpoints ? this.endSide : undefined,
+			properties: {
+				...props,
+				[reservedIntervalIdKey]: this.id,
+				[reservedRangeLabelsKey]: [this.label],
+			},
+		} satisfies SerializedIntervalDelta;
 	}
 
 	/**
@@ -293,6 +351,8 @@ export class SequenceIntervalClass implements SequenceInterval {
 	public clone(): SequenceIntervalClass {
 		return new SequenceIntervalClass(
 			this.client,
+			this.id,
+			this.label,
 			this.start,
 			this.end,
 			this.intervalType,
@@ -367,9 +427,7 @@ export class SequenceIntervalClass implements SequenceInterval {
 	 * {@inheritDoc ISerializableInterval.getIntervalId}
 	 */
 	public getIntervalId(): string {
-		const id = this.properties?.[reservedIntervalIdKey];
-		assert(id !== undefined, 0x5e2 /* interval ID should not be undefined */);
-		return `${id}`;
+		return this.id;
 	}
 
 	/**
@@ -397,6 +455,8 @@ export class SequenceIntervalClass implements SequenceInterval {
 
 		return new SequenceIntervalClass(
 			this.client,
+			uuid(),
+			this.label,
 			newStart,
 			newEnd,
 			this.intervalType,
@@ -482,6 +542,8 @@ export class SequenceIntervalClass implements SequenceInterval {
 
 		const newInterval = new SequenceIntervalClass(
 			this.client,
+			this.id,
+			this.label,
 			startRef,
 			endRef,
 			this.intervalType,
@@ -489,9 +551,17 @@ export class SequenceIntervalClass implements SequenceInterval {
 			startSide ?? this.startSide,
 			endSide ?? this.endSide,
 		);
-		copyPropertiesAndManager(this, newInterval);
+		copyPropertiesAndManager(this.#props, newInterval.#props);
 		return newInterval;
 	}
+
+	public ackPropertiesChange(newProps: PropertySet, op: ISequencedDocumentMessage) {
+		this.#props.propertyManager ??= new PropertiesManager();
+		// Let the propertyManager prune its pending change-properties set.
+		this.#props.propertyManager.ack(op.sequenceNumber, op.minimumSequenceNumber, {
+			props: newProps,
+		});
+	}
 }
 
 export function createPositionReferenceFromSegoff(
@@ -569,7 +639,7 @@ function createPositionReference(
 				referenceSequenceNumber: op.referenceSequenceNumber,
 				clientId: op.clientId,
 			});
-			segoff = getSlideToSegoff(segoff, slidingPreference, useNewSlidingBehavior);
+			segoff = getSlideToSegoff(segoff, slidingPreference, undefined, useNewSlidingBehavior);
 		}
 	} else {
 		assert(
@@ -594,8 +664,24 @@ function createPositionReference(
 	);
 }
 
+export function createTransientInterval(
+	start: SequencePlace | undefined,
+	end: SequencePlace | undefined,
+	client: Client,
+) {
+	return createSequenceInterval(
+		"transient",
+		uuid(),
+		start,
+		end,
+		client,
+		IntervalType.Transient,
+	);
+}
+
 export function createSequenceInterval(
 	label: string,
+	id: string,
 	start: SequencePlace | undefined,
 	end: SequencePlace | undefined,
 	client: Client,
@@ -603,6 +689,7 @@ export function createSequenceInterval(
 	op?: ISequencedDocumentMessage,
 	fromSnapshot?: boolean,
 	useNewSlidingBehavior: boolean = false,
+	props?: PropertySet,
 ): SequenceIntervalClass {
 	const { startPos, startSide, endPos, endSide } = endpointPosAndSide(
 		start ?? "start",
@@ -666,10 +753,14 @@ export function createSequenceInterval(
 
 	const ival = new SequenceIntervalClass(
 		client,
+		id,
+		label,
 		startLref,
 		endLref,
 		intervalType,
-		rangeProp,
+		props === undefined
+			? undefined
+			: { ...props, [reservedIntervalIdKey]: undefined, [reservedRangeLabelsKey]: undefined },
 		startSide,
 		endSide,
 	);

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/sequence";
-export const pkgVersion = "2.31.1";
+export const pkgVersion = "2.32.0";

package/src/revertibles.ts

@@ -341,7 +341,7 @@ export function appendSharedStringDeltaToRevertibles(
 
 				revertible.intervals.push({
 					intervalId: interval.getIntervalId(),
-					label: interval.properties.referenceRangeLabels[0],
+					label: interval.start.properties?.referenceRangeLabels[0],
 					startOffset: offset,
 					endOffset,
 				});
@@ -351,7 +351,7 @@ export function appendSharedStringDeltaToRevertibles(
 			endIntervals.forEach(({ interval, offset }) => {
 				revertible.intervals.push({
 					intervalId: interval.getIntervalId(),
-					label: interval.properties.referenceRangeLabels[0],
+					label: interval.start.properties?.referenceRangeLabels[0],
 					endOffset: offset,
 				});
 			});
@@ -433,7 +433,7 @@ function revertLocalAdd(
 	revertible: TypedRevertible<typeof IntervalOpType.ADD>,
 ) {
 	const id = getUpdatedIdFromInterval(revertible.interval);
-	const label = revertible.interval.properties.referenceRangeLabels[0];
+	const label = revertible.interval.start.properties?.referenceRangeLabels[0];
 	string.getIntervalCollection(label).removeIntervalById(id);
 }
 
@@ -461,14 +461,15 @@ function revertLocalDelete(
 	string: ISharedString,
 	revertible: TypedRevertible<typeof IntervalOpType.DELETE>,
 ) {
-	const label = revertible.interval.properties.referenceRangeLabels[0];
+	const label = revertible.interval.start.properties?.referenceRangeLabels[0];
 	const collection = string.getIntervalCollection(label);
 	const start = string.localReferencePositionToPosition(revertible.start);
 	const startSlidePos = getSlidePosition(string, revertible.start, start);
 	const end = string.localReferencePositionToPosition(revertible.end);
 	const endSlidePos = getSlidePosition(string, revertible.end, end);
 	// reusing the id causes eventual consistency bugs, so it is removed here and recreated in add
-	const { intervalId, ...props } = revertible.interval.properties;
+	const { ...props } = revertible.interval.properties;
+	const intervalId = revertible.interval.getIntervalId();
 	if (
 		isValidRange(
 			startSlidePos,
@@ -500,7 +501,7 @@ function revertLocalChange(
 	string: ISharedString,
 	revertible: TypedRevertible<typeof IntervalOpType.CHANGE>,
 ) {
-	const label = revertible.interval.properties.referenceRangeLabels[0];
+	const label = revertible.interval.start.properties?.referenceRangeLabels[0];
 	const collection = string.getIntervalCollection(label);
 	const id = getUpdatedIdFromInterval(revertible.interval);
 	const start = string.localReferencePositionToPosition(revertible.start);
@@ -540,7 +541,7 @@ function revertLocalPropertyChanged(
 	string: ISharedString,
 	revertible: TypedRevertible<typeof IntervalOpType.PROPERTY_CHANGED>,
 ) {
-	const label = revertible.interval.properties.referenceRangeLabels[0];
+	const label = revertible.interval.start.properties?.referenceRangeLabels[0];
 	const id = getUpdatedIdFromInterval(revertible.interval);
 	const newProps = revertible.propertyDeltas;
 	string.getIntervalCollection(label).change(id, { props: newProps });

package/dist/intervalIndex/overlappingSequenceIntervalsIndex.d.ts

@@ -1,11 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISharedString } from "../sharedString.js";
-import { SequenceIntervalIndexes } from "./sequenceIntervalIndexes.js";
-/**
- * @internal
- */
-export declare function createOverlappingSequenceIntervalsIndex(sharedString: ISharedString): SequenceIntervalIndexes.Overlapping;
-//# sourceMappingURL=overlappingSequenceIntervalsIndex.d.ts.map

package/dist/intervalIndex/overlappingSequenceIntervalsIndex.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"overlappingSequenceIntervalsIndex.d.ts","sourceRoot":"","sources":["../../src/intervalIndex/overlappingSequenceIntervalsIndex.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AA+CvE;;GAEG;AACH,wBAAgB,uCAAuC,CACtD,YAAY,EAAE,aAAa,GACzB,uBAAuB,CAAC,WAAW,CAGrC"}

package/dist/intervalIndex/overlappingSequenceIntervalsIndex.js

@@ -1,38 +0,0 @@
-"use strict";
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOverlappingSequenceIntervalsIndex = void 0;
-/* eslint-disable import/no-deprecated */
-const internal_1 = require("@fluidframework/merge-tree/internal");
-const index_js_1 = require("../intervals/index.js");
-const overlappingIntervalsIndex_js_1 = require("./overlappingIntervalsIndex.js");
-class OverlappingSequenceIntervalsIndex extends overlappingIntervalsIndex_js_1.OverlappingIntervalsIndex {
-    constructor(client) {
-        super(client);
-    }
-    findOverlappingIntervalsBySegoff(startSegoff, endSegoff) {
-        if (this.intervalTree.intervals.isEmpty()) {
-            return [];
-        }
-        const startLref = (0, index_js_1.createPositionReferenceFromSegoff)(this.client, startSegoff, internal_1.ReferenceType.Transient);
-        const endLref = (0, index_js_1.createPositionReferenceFromSegoff)(this.client, endSegoff, internal_1.ReferenceType.Transient);
-        if ((0, internal_1.compareReferencePositions)(startLref, endLref) > 0) {
-            return [];
-        }
-        const transientInterval = new index_js_1.SequenceIntervalClass(this.client, startLref, endLref, index_js_1.IntervalType.Transient, { [internal_1.reservedRangeLabelsKey]: ["transient"] });
-        const overlappingIntervalNodes = this.intervalTree.match(transientInterval);
-        return overlappingIntervalNodes.map((node) => node.key);
-    }
-}
-/**
- * @internal
- */
-function createOverlappingSequenceIntervalsIndex(sharedString) {
-    const client = sharedString.client;
-    return new OverlappingSequenceIntervalsIndex(client);
-}
-exports.createOverlappingSequenceIntervalsIndex = createOverlappingSequenceIntervalsIndex;
-//# sourceMappingURL=overlappingSequenceIntervalsIndex.js.map

package/dist/intervalIndex/overlappingSequenceIntervalsIndex.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"overlappingSequenceIntervalsIndex.js","sourceRoot":"","sources":["../../src/intervalIndex/overlappingSequenceIntervalsIndex.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,yCAAyC;AAEzC,kEAM6C;AAE7C,oDAK+B;AAG/B,iFAA2E;AAG3E,MAAM,iCACL,SAAQ,wDAAyB;IAGjC,YAAY,MAAc;QACzB,KAAK,CAAC,MAAM,CAAC,CAAC;IACf,CAAC;IAEM,gCAAgC,CACtC,WAA0E,EAC1E,SAAwE;QAExE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3C,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,4CAAiC,EAClD,IAAI,CAAC,MAAM,EACX,WAAW,EACX,wBAAa,CAAC,SAAS,CACvB,CAAC;QAEF,MAAM,OAAO,GAAG,IAAA,4CAAiC,EAChD,IAAI,CAAC,MAAM,EACX,SAAS,EACT,wBAAa,CAAC,SAAS,CACvB,CAAC;QAEF,IAAI,IAAA,oCAAyB,EAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,gCAAqB,CAClD,IAAI,CAAC,MAAM,EACX,SAAS,EACT,OAAO,EACP,uBAAY,CAAC,SAAS,EACtB,EAAE,CAAC,iCAAsB,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAC3C,CAAC;QAEF,MAAM,wBAAwB,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5E,OAAO,wBAAwB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzD,CAAC;CACD;AAED;;GAEG;AACH,SAAgB,uCAAuC,CACtD,YAA2B;IAE3B,MAAM,MAAM,GAAI,YAA8C,CAAC,MAAM,CAAC;IACtE,OAAO,IAAI,iCAAiC,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC;AALD,0FAKC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/* eslint-disable import/no-deprecated */\n\nimport {\n\tClient,\n\tISegment,\n\tReferenceType,\n\tcompareReferencePositions,\n\treservedRangeLabelsKey,\n} from \"@fluidframework/merge-tree/internal\";\n\nimport {\n\tIntervalType,\n\tSequenceInterval,\n\tSequenceIntervalClass,\n\tcreatePositionReferenceFromSegoff,\n} from \"../intervals/index.js\";\nimport { ISharedString } from \"../sharedString.js\";\n\nimport { OverlappingIntervalsIndex } from \"./overlappingIntervalsIndex.js\";\nimport { SequenceIntervalIndexes } from \"./sequenceIntervalIndexes.js\";\n\nclass OverlappingSequenceIntervalsIndex\n\textends OverlappingIntervalsIndex\n\timplements SequenceIntervalIndexes.Overlapping\n{\n\tconstructor(client: Client) {\n\t\tsuper(client);\n\t}\n\n\tpublic findOverlappingIntervalsBySegoff(\n\t\tstartSegoff: { segment: ISegment | undefined; offset: number | undefined },\n\t\tendSegoff: { segment: ISegment | undefined; offset: number | undefined },\n\t): Iterable<SequenceInterval> {\n\t\tif (this.intervalTree.intervals.isEmpty()) {\n\t\t\treturn [];\n\t\t}\n\n\t\tconst startLref = createPositionReferenceFromSegoff(\n\t\t\tthis.client,\n\t\t\tstartSegoff,\n\t\t\tReferenceType.Transient,\n\t\t);\n\n\t\tconst endLref = createPositionReferenceFromSegoff(\n\t\t\tthis.client,\n\t\t\tendSegoff,\n\t\t\tReferenceType.Transient,\n\t\t);\n\n\t\tif (compareReferencePositions(startLref, endLref) > 0) {\n\t\t\treturn [];\n\t\t}\n\n\t\tconst transientInterval = new SequenceIntervalClass(\n\t\t\tthis.client,\n\t\t\tstartLref,\n\t\t\tendLref,\n\t\t\tIntervalType.Transient,\n\t\t\t{ [reservedRangeLabelsKey]: [\"transient\"] },\n\t\t);\n\n\t\tconst overlappingIntervalNodes = this.intervalTree.match(transientInterval);\n\t\treturn overlappingIntervalNodes.map((node) => node.key);\n\t}\n}\n\n/**\n * @internal\n */\nexport function createOverlappingSequenceIntervalsIndex(\n\tsharedString: ISharedString,\n): SequenceIntervalIndexes.Overlapping {\n\tconst client = (sharedString as unknown as { client: Client }).client;\n\treturn new OverlappingSequenceIntervalsIndex(client);\n}\n"]}

package/lib/intervalIndex/overlappingSequenceIntervalsIndex.d.ts

@@ -1,11 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISharedString } from "../sharedString.js";
-import { SequenceIntervalIndexes } from "./sequenceIntervalIndexes.js";
-/**
- * @internal
- */
-export declare function createOverlappingSequenceIntervalsIndex(sharedString: ISharedString): SequenceIntervalIndexes.Overlapping;
-//# sourceMappingURL=overlappingSequenceIntervalsIndex.d.ts.map

package/lib/intervalIndex/overlappingSequenceIntervalsIndex.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"overlappingSequenceIntervalsIndex.d.ts","sourceRoot":"","sources":["../../src/intervalIndex/overlappingSequenceIntervalsIndex.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AA+CvE;;GAEG;AACH,wBAAgB,uCAAuC,CACtD,YAAY,EAAE,aAAa,GACzB,uBAAuB,CAAC,WAAW,CAGrC"}

package/lib/intervalIndex/overlappingSequenceIntervalsIndex.js

@@ -1,34 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-/* eslint-disable import/no-deprecated */
-import { ReferenceType, compareReferencePositions, reservedRangeLabelsKey, } from "@fluidframework/merge-tree/internal";
-import { IntervalType, SequenceIntervalClass, createPositionReferenceFromSegoff, } from "../intervals/index.js";
-import { OverlappingIntervalsIndex } from "./overlappingIntervalsIndex.js";
-class OverlappingSequenceIntervalsIndex extends OverlappingIntervalsIndex {
-    constructor(client) {
-        super(client);
-    }
-    findOverlappingIntervalsBySegoff(startSegoff, endSegoff) {
-        if (this.intervalTree.intervals.isEmpty()) {
-            return [];
-        }
-        const startLref = createPositionReferenceFromSegoff(this.client, startSegoff, ReferenceType.Transient);
-        const endLref = createPositionReferenceFromSegoff(this.client, endSegoff, ReferenceType.Transient);
-        if (compareReferencePositions(startLref, endLref) > 0) {
-            return [];
-        }
-        const transientInterval = new SequenceIntervalClass(this.client, startLref, endLref, IntervalType.Transient, { [reservedRangeLabelsKey]: ["transient"] });
-        const overlappingIntervalNodes = this.intervalTree.match(transientInterval);
-        return overlappingIntervalNodes.map((node) => node.key);
-    }
-}
-/**
- * @internal
- */
-export function createOverlappingSequenceIntervalsIndex(sharedString) {
-    const client = sharedString.client;
-    return new OverlappingSequenceIntervalsIndex(client);
-}
-//# sourceMappingURL=overlappingSequenceIntervalsIndex.js.map

package/lib/intervalIndex/overlappingSequenceIntervalsIndex.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"overlappingSequenceIntervalsIndex.js","sourceRoot":"","sources":["../../src/intervalIndex/overlappingSequenceIntervalsIndex.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,yCAAyC;AAEzC,OAAO,EAGN,aAAa,EACb,yBAAyB,EACzB,sBAAsB,GACtB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EACN,YAAY,EAEZ,qBAAqB,EACrB,iCAAiC,GACjC,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAG3E,MAAM,iCACL,SAAQ,yBAAyB;IAGjC,YAAY,MAAc;QACzB,KAAK,CAAC,MAAM,CAAC,CAAC;IACf,CAAC;IAEM,gCAAgC,CACtC,WAA0E,EAC1E,SAAwE;QAExE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3C,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,SAAS,GAAG,iCAAiC,CAClD,IAAI,CAAC,MAAM,EACX,WAAW,EACX,aAAa,CAAC,SAAS,CACvB,CAAC;QAEF,MAAM,OAAO,GAAG,iCAAiC,CAChD,IAAI,CAAC,MAAM,EACX,SAAS,EACT,aAAa,CAAC,SAAS,CACvB,CAAC;QAEF,IAAI,yBAAyB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,qBAAqB,CAClD,IAAI,CAAC,MAAM,EACX,SAAS,EACT,OAAO,EACP,YAAY,CAAC,SAAS,EACtB,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAC3C,CAAC;QAEF,MAAM,wBAAwB,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5E,OAAO,wBAAwB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzD,CAAC;CACD;AAED;;GAEG;AACH,MAAM,UAAU,uCAAuC,CACtD,YAA2B;IAE3B,MAAM,MAAM,GAAI,YAA8C,CAAC,MAAM,CAAC;IACtE,OAAO,IAAI,iCAAiC,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/* eslint-disable import/no-deprecated */\n\nimport {\n\tClient,\n\tISegment,\n\tReferenceType,\n\tcompareReferencePositions,\n\treservedRangeLabelsKey,\n} from \"@fluidframework/merge-tree/internal\";\n\nimport {\n\tIntervalType,\n\tSequenceInterval,\n\tSequenceIntervalClass,\n\tcreatePositionReferenceFromSegoff,\n} from \"../intervals/index.js\";\nimport { ISharedString } from \"../sharedString.js\";\n\nimport { OverlappingIntervalsIndex } from \"./overlappingIntervalsIndex.js\";\nimport { SequenceIntervalIndexes } from \"./sequenceIntervalIndexes.js\";\n\nclass OverlappingSequenceIntervalsIndex\n\textends OverlappingIntervalsIndex\n\timplements SequenceIntervalIndexes.Overlapping\n{\n\tconstructor(client: Client) {\n\t\tsuper(client);\n\t}\n\n\tpublic findOverlappingIntervalsBySegoff(\n\t\tstartSegoff: { segment: ISegment | undefined; offset: number | undefined },\n\t\tendSegoff: { segment: ISegment | undefined; offset: number | undefined },\n\t): Iterable<SequenceInterval> {\n\t\tif (this.intervalTree.intervals.isEmpty()) {\n\t\t\treturn [];\n\t\t}\n\n\t\tconst startLref = createPositionReferenceFromSegoff(\n\t\t\tthis.client,\n\t\t\tstartSegoff,\n\t\t\tReferenceType.Transient,\n\t\t);\n\n\t\tconst endLref = createPositionReferenceFromSegoff(\n\t\t\tthis.client,\n\t\t\tendSegoff,\n\t\t\tReferenceType.Transient,\n\t\t);\n\n\t\tif (compareReferencePositions(startLref, endLref) > 0) {\n\t\t\treturn [];\n\t\t}\n\n\t\tconst transientInterval = new SequenceIntervalClass(\n\t\t\tthis.client,\n\t\t\tstartLref,\n\t\t\tendLref,\n\t\t\tIntervalType.Transient,\n\t\t\t{ [reservedRangeLabelsKey]: [\"transient\"] },\n\t\t);\n\n\t\tconst overlappingIntervalNodes = this.intervalTree.match(transientInterval);\n\t\treturn overlappingIntervalNodes.map((node) => node.key);\n\t}\n}\n\n/**\n * @internal\n */\nexport function createOverlappingSequenceIntervalsIndex(\n\tsharedString: ISharedString,\n): SequenceIntervalIndexes.Overlapping {\n\tconst client = (sharedString as unknown as { client: Client }).client;\n\treturn new OverlappingSequenceIntervalsIndex(client);\n}\n"]}

package/src/intervalIndex/overlappingSequenceIntervalsIndex.ts

@@ -1,80 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-/* eslint-disable import/no-deprecated */
-
-import {
-	Client,
-	ISegment,
-	ReferenceType,
-	compareReferencePositions,
-	reservedRangeLabelsKey,
-} from "@fluidframework/merge-tree/internal";
-
-import {
-	IntervalType,
-	SequenceInterval,
-	SequenceIntervalClass,
-	createPositionReferenceFromSegoff,
-} from "../intervals/index.js";
-import { ISharedString } from "../sharedString.js";
-
-import { OverlappingIntervalsIndex } from "./overlappingIntervalsIndex.js";
-import { SequenceIntervalIndexes } from "./sequenceIntervalIndexes.js";
-
-class OverlappingSequenceIntervalsIndex
-	extends OverlappingIntervalsIndex
-	implements SequenceIntervalIndexes.Overlapping
-{
-	constructor(client: Client) {
-		super(client);
-	}
-
-	public findOverlappingIntervalsBySegoff(
-		startSegoff: { segment: ISegment | undefined; offset: number | undefined },
-		endSegoff: { segment: ISegment | undefined; offset: number | undefined },
-	): Iterable<SequenceInterval> {
-		if (this.intervalTree.intervals.isEmpty()) {
-			return [];
-		}
-
-		const startLref = createPositionReferenceFromSegoff(
-			this.client,
-			startSegoff,
-			ReferenceType.Transient,
-		);
-
-		const endLref = createPositionReferenceFromSegoff(
-			this.client,
-			endSegoff,
-			ReferenceType.Transient,
-		);
-
-		if (compareReferencePositions(startLref, endLref) > 0) {
-			return [];
-		}
-
-		const transientInterval = new SequenceIntervalClass(
-			this.client,
-			startLref,
-			endLref,
-			IntervalType.Transient,
-			{ [reservedRangeLabelsKey]: ["transient"] },
-		);
-
-		const overlappingIntervalNodes = this.intervalTree.match(transientInterval);
-		return overlappingIntervalNodes.map((node) => node.key);
-	}
-}
-
-/**
- * @internal
- */
-export function createOverlappingSequenceIntervalsIndex(
-	sharedString: ISharedString,
-): SequenceIntervalIndexes.Overlapping {
-	const client = (sharedString as unknown as { client: Client }).client;
-	return new OverlappingSequenceIntervalsIndex(client);
-}