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

package/dist/intervalCollection.js

@@ -15,43 +15,16 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.intervalLocatorFromEndpoint = exports.IntervalCollection = exports.makeOpsMap = exports.IntervalCollectionValueType = exports.SequenceIntervalCollectionValueType = exports.intervalHelpers = exports.sequenceIntervalHelpers = exports.compareSequenceIntervalStarts = exports.compareSequenceIntervalEnds = exports.LocalIntervalCollection = exports.createStartpointInRangeIndex = exports.createEndpointInRangeIndex = exports.createIntervalIndex = exports.createSequenceInterval = exports.createPositionReferenceFromSegoff = exports.SequenceInterval = exports.Interval = exports.IntervalStickiness = exports.IntervalType = exports.IntervalOpType = void 0;
+exports.intervalLocatorFromEndpoint = exports.IntervalCollection = exports.makeOpsMap = exports.IntervalCollectionValueType = exports.SequenceIntervalCollectionValueType = exports.LocalIntervalCollection = exports.createIntervalIndex = void 0;
 /* eslint-disable no-bitwise */
 const common_utils_1 = require("@fluidframework/common-utils");
 const container_utils_1 = require("@fluidframework/container-utils");
 const merge_tree_1 = require("@fluidframework/merge-tree");
 const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
 const uuid_1 = require("uuid");
+const intervals_1 = require("./intervals");
 const intervalIndex_1 = require("./intervalIndex");
 const reservedIntervalIdKey = "intervalId";
-/**
- * Values are used in persisted formats (ops) and revertibles.
- * @alpha
- */
-exports.IntervalOpType = {
-    ADD: "add",
-    DELETE: "delete",
-    CHANGE: "change",
-    PROPERTY_CHANGED: "propertyChanged",
-    POSITION_REMOVE: "positionRemove",
-};
-var IntervalType;
-(function (IntervalType) {
-    IntervalType[IntervalType["Simple"] = 0] = "Simple";
-    IntervalType[IntervalType["Nest"] = 1] = "Nest";
-    /**
-     * SlideOnRemove indicates that the ends of the interval will slide if the segment
-     * they reference is removed and acked.
-     * See `packages\dds\merge-tree\docs\REFERENCEPOSITIONS.md` for details
-     * SlideOnRemove is the default interval behavior and does not need to be specified.
-     */
-    IntervalType[IntervalType["SlideOnRemove"] = 2] = "SlideOnRemove";
-    /**
-     * A temporary interval, used internally
-     * @internal
-     */
-    IntervalType[IntervalType["Transient"] = 4] = "Transient";
-})(IntervalType = exports.IntervalType || (exports.IntervalType = {}));
 /**
  * Decompress an interval after loading a summary from JSON. The exact format
  * of this compression is unspecified and subject to change
@@ -79,677 +52,20 @@ function compressInterval(interval) {
         intervalType,
         Object.assign(Object.assign({}, properties), { [merge_tree_1.reservedRangeLabelsKey]: undefined }),
     ];
-    if (interval.stickiness !== undefined && interval.stickiness !== exports.IntervalStickiness.END) {
+    if (interval.stickiness !== undefined && interval.stickiness !== intervals_1.IntervalStickiness.END) {
         base.push(interval.stickiness);
     }
     return base;
 }
-function startReferenceSlidingPreference(stickiness) {
-    // if any start stickiness, prefer sliding backwards
-    return (stickiness & exports.IntervalStickiness.START) !== 0
-        ? merge_tree_1.SlidingPreference.BACKWARD
-        : merge_tree_1.SlidingPreference.FORWARD;
-}
-function endReferenceSlidingPreference(stickiness) {
-    // if any end stickiness, prefer sliding forwards
-    return (stickiness & exports.IntervalStickiness.END) !== 0
-        ? merge_tree_1.SlidingPreference.FORWARD
-        : merge_tree_1.SlidingPreference.BACKWARD;
-}
-/**
- * Determines how an interval should expand when segments are inserted adjacent
- * to the range it spans
- *
- * Note that interval stickiness is currently an experimental feature and must
- * be explicitly enabled with the `intervalStickinessEnabled` flag
- */
-exports.IntervalStickiness = {
-    /**
-     * Interval does not expand to include adjacent segments
-     */
-    NONE: 0b00,
-    /**
-     * Interval expands to include segments inserted adjacent to the start
-     */
-    START: 0b01,
-    /**
-     * Interval expands to include segments inserted adjacent to the end
-     *
-     * This is the default stickiness
-     */
-    END: 0b10,
-    /**
-     * Interval expands to include all segments inserted adjacent to it
-     */
-    FULL: 0b11,
-};
-/**
- * Serializable interval whose endpoints are plain-old numbers.
- */
-class Interval {
-    constructor(start, end, props) {
-        this.start = start;
-        this.end = end;
-        this.propertyManager = new merge_tree_1.PropertiesManager();
-        this.properties = {};
-        if (props) {
-            this.addProperties(props);
-        }
-    }
-    /**
-     * {@inheritDoc ISerializableInterval.getIntervalId}
-     */
-    getIntervalId() {
-        var _a;
-        const id = (_a = this.properties) === null || _a === void 0 ? void 0 : _a[reservedIntervalIdKey];
-        (0, common_utils_1.assert)(id !== undefined, 0x5e1 /* interval ID should not be undefined */);
-        return `${id}`;
-    }
-    /**
-     * @returns an array containing any auxiliary property sets added with `addPropertySet`.
-     */
-    getAdditionalPropertySets() {
-        var _a;
-        return (_a = this.auxProps) !== null && _a !== void 0 ? _a : [];
-    }
-    /**
-     * Adds an auxiliary set of properties to this interval.
-     * These properties can be recovered using `getAdditionalPropertySets`
-     * @param props - set of properties to add
-     * @remarks - This gets called as part of the default conflict resolver for `IIntervalCollection<Interval>`
-     * (i.e. non-sequence-based interval collections). However, the additional properties don't get serialized.
-     * This functionality seems half-baked.
-     */
-    addPropertySet(props) {
-        if (this.auxProps === undefined) {
-            this.auxProps = [];
-        }
-        this.auxProps.push(props);
-    }
-    /**
-     * {@inheritDoc ISerializableInterval.serialize}
-     * @internal
-     */
-    serialize() {
-        const serializedInterval = {
-            end: this.end,
-            intervalType: 0,
-            sequenceNumber: 0,
-            start: this.start,
-        };
-        if (this.properties) {
-            serializedInterval.properties = this.properties;
-        }
-        return serializedInterval;
-    }
-    /**
-     * {@inheritDoc IInterval.clone}
-     */
-    clone() {
-        return new Interval(this.start, this.end, this.properties);
-    }
-    /**
-     * {@inheritDoc IInterval.compare}
-     */
-    compare(b) {
-        const startResult = this.compareStart(b);
-        if (startResult === 0) {
-            const endResult = this.compareEnd(b);
-            if (endResult === 0) {
-                const thisId = this.getIntervalId();
-                if (thisId) {
-                    const bId = b.getIntervalId();
-                    if (bId) {
-                        return thisId > bId ? 1 : thisId < bId ? -1 : 0;
-                    }
-                    return 0;
-                }
-                return 0;
-            }
-            else {
-                return endResult;
-            }
-        }
-        else {
-            return startResult;
-        }
-    }
-    /**
-     * {@inheritDoc IInterval.compareStart}
-     */
-    compareStart(b) {
-        return this.start - b.start;
-    }
-    /**
-     * {@inheritDoc IInterval.compareEnd}
-     */
-    compareEnd(b) {
-        return this.end - b.end;
-    }
-    /**
-     * {@inheritDoc IInterval.overlaps}
-     */
-    overlaps(b) {
-        const result = this.start <= b.end && this.end >= b.start;
-        return result;
-    }
-    /**
-     * {@inheritDoc IInterval.union}
-     * @deprecated - This API was never intended to be public and will be marked internal in a future release.
-     */
-    union(b) {
-        return new Interval(Math.min(this.start, b.start), Math.max(this.end, b.end), this.properties);
-    }
-    getProperties() {
-        return this.properties;
-    }
-    /**
-     * {@inheritDoc ISerializableInterval.addProperties}
-     * @deprecated - This API was never intended to be public and will be marked internal in a future release.
-     */
-    addProperties(newProps, collaborating = false, seq, op) {
-        if (newProps) {
-            this.initializeProperties();
-            return this.propertyManager.addProperties(this.properties, newProps, op, seq, collaborating);
-        }
-    }
-    /**
-     * {@inheritDoc IInterval.modify}
-     * @deprecated - This API was never intended to be public and will be marked internal in a future release.
-     */
-    modify(label, start, end, op) {
-        const startPos = start !== null && start !== void 0 ? start : this.start;
-        const endPos = end !== null && end !== void 0 ? end : this.end;
-        if (this.start === startPos && this.end === endPos) {
-            // Return undefined to indicate that no change is necessary.
-            return;
-        }
-        const newInterval = new Interval(startPos, endPos);
-        if (this.properties) {
-            newInterval.initializeProperties();
-            this.propertyManager.copyTo(this.properties, newInterval.properties, newInterval.propertyManager);
-        }
-        return newInterval;
-    }
-    initializeProperties() {
-        if (!this.propertyManager) {
-            this.propertyManager = new merge_tree_1.PropertiesManager();
-        }
-        if (!this.properties) {
-            this.properties = (0, merge_tree_1.createMap)();
-        }
-    }
-}
-exports.Interval = Interval;
-/**
- * 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
- * include that content.
- *
- * @remarks - The endpoint's position should be treated exclusively to get reasonable behavior--i.e.
- * an interval referring to "hello" in "hello world" should have a start position of 0 and an end
- * position of 5.
- *
- * To see why, consider what happens if "llo wor" is removed from the string to make "held".
- * The interval's startpoint remains on the "h" (it isn't altered), but the interval's endpoint
- * slides forward to the next unremoved position, which is the "l" in "held".
- * Users would generally expect the interval to now refer to "he" (as it is the subset of content
- * remaining after the removal), hence the "l" should be excluded.
- * If the interval endpoint was treated inclusively, the interval would now refer to "hel", which
- * is undesirable.
- *
- * Since the end of an interval is treated exclusively but cannot be greater than or equal to the
- * length of the associated sequence, application models which leverage interval collections should
- * consider inserting a marker at the end of the sequence to represent the end of the content.
- */
-class SequenceInterval {
-    constructor(client, 
-    /**
-     * Start endpoint of this interval.
-     * @remarks - This endpoint can be resolved into a character position using the SharedString it's a part of.
-     */
-    start, 
-    /**
-     * End endpoint of this interval.
-     * @remarks - This endpoint can be resolved into a character position using the SharedString it's a part of.
-     */
-    end, intervalType, props, stickiness = exports.IntervalStickiness.END) {
-        this.client = client;
-        this.start = start;
-        this.end = end;
-        this.intervalType = intervalType;
-        this.stickiness = stickiness;
-        this.propertyManager = new merge_tree_1.PropertiesManager();
-        this.properties = {};
-        if (props) {
-            this.addProperties(props);
-        }
-    }
-    /**
-     * Subscribes to position change events on this interval if there are no current listeners.
-     * @internal
-     */
-    addPositionChangeListeners(beforePositionChange, afterPositionChange) {
-        var _a, _b;
-        var _c, _d;
-        if (this.callbacks === undefined) {
-            this.callbacks = {
-                beforePositionChange,
-                afterPositionChange,
-            };
-            const startCbs = ((_a = (_c = this.start).callbacks) !== null && _a !== void 0 ? _a : (_c.callbacks = {}));
-            const endCbs = ((_b = (_d = this.end).callbacks) !== null && _b !== void 0 ? _b : (_d.callbacks = {}));
-            startCbs.beforeSlide = endCbs.beforeSlide = beforePositionChange;
-            startCbs.afterSlide = endCbs.afterSlide = afterPositionChange;
-        }
-    }
-    /**
-     * Removes the currently subscribed position change listeners.
-     * @internal
-     */
-    removePositionChangeListeners() {
-        if (this.callbacks) {
-            this.callbacks = undefined;
-            this.start.callbacks = undefined;
-            this.end.callbacks = undefined;
-        }
-    }
-    /**
-     * {@inheritDoc ISerializableInterval.serialize}
-     * @internal
-     */
-    serialize() {
-        const startPosition = this.client.localReferencePositionToPosition(this.start);
-        const endPosition = this.client.localReferencePositionToPosition(this.end);
-        const serializedInterval = {
-            end: endPosition,
-            intervalType: this.intervalType,
-            sequenceNumber: this.client.getCurrentSeq(),
-            start: startPosition,
-        };
-        if (this.properties) {
-            serializedInterval.properties = this.properties;
-        }
-        if (this.stickiness !== exports.IntervalStickiness.END) {
-            serializedInterval.stickiness = this.stickiness;
-        }
-        return serializedInterval;
-    }
-    /**
-     * {@inheritDoc IInterval.clone}
-     */
-    clone() {
-        return new SequenceInterval(this.client, this.start, this.end, this.intervalType, this.properties, this.stickiness);
-    }
-    /**
-     * {@inheritDoc IInterval.compare}
-     */
-    compare(b) {
-        const startResult = this.compareStart(b);
-        if (startResult === 0) {
-            const endResult = this.compareEnd(b);
-            if (endResult === 0) {
-                const thisId = this.getIntervalId();
-                if (thisId) {
-                    const bId = b.getIntervalId();
-                    if (bId) {
-                        return thisId > bId ? 1 : thisId < bId ? -1 : 0;
-                    }
-                    return 0;
-                }
-                return 0;
-            }
-            else {
-                return endResult;
-            }
-        }
-        else {
-            return startResult;
-        }
-    }
-    /**
-     * {@inheritDoc IInterval.compareStart}
-     */
-    compareStart(b) {
-        return (0, merge_tree_1.compareReferencePositions)(this.start, b.start);
-    }
-    /**
-     * {@inheritDoc IInterval.compareEnd}
-     */
-    compareEnd(b) {
-        return (0, merge_tree_1.compareReferencePositions)(this.end, b.end);
-    }
-    /**
-     * {@inheritDoc IInterval.overlaps}
-     */
-    overlaps(b) {
-        const result = (0, merge_tree_1.compareReferencePositions)(this.start, b.end) <= 0 &&
-            (0, merge_tree_1.compareReferencePositions)(this.end, b.start) >= 0;
-        return result;
-    }
-    /**
-     * {@inheritDoc ISerializableInterval.getIntervalId}
-     */
-    getIntervalId() {
-        var _a;
-        const id = (_a = this.properties) === null || _a === void 0 ? void 0 : _a[reservedIntervalIdKey];
-        (0, common_utils_1.assert)(id !== undefined, 0x5e2 /* interval ID should not be undefined */);
-        return `${id}`;
-    }
-    /**
-     * {@inheritDoc IInterval.union}
-     * @deprecated - This API was never intended to be public and will be marked internal in a future release.
-     */
-    union(b) {
-        return new SequenceInterval(this.client, (0, merge_tree_1.minReferencePosition)(this.start, b.start), (0, merge_tree_1.maxReferencePosition)(this.end, b.end), this.intervalType);
-    }
-    /**
-     * {@inheritDoc ISerializableInterval.addProperties}
-     * @deprecated - This API was never intended to be public and will be marked internal in a future release.
-     */
-    addProperties(newProps, collab = false, seq, op) {
-        this.initializeProperties();
-        return this.propertyManager.addProperties(this.properties, newProps, op, seq, collab);
-    }
-    /**
-     * @returns whether this interval overlaps two numerical positions.
-     */
-    overlapsPos(bstart, bend) {
-        const startPos = this.client.localReferencePositionToPosition(this.start);
-        const endPos = this.client.localReferencePositionToPosition(this.end);
-        return endPos > bstart && startPos < bend;
-    }
-    /**
-     * {@inheritDoc IInterval.modify}
-     * @deprecated - This API was never intended to be public and will be marked internal in a future release.
-     */
-    modify(label, start, end, op, localSeq, stickiness = exports.IntervalStickiness.END) {
-        const getRefType = (baseType) => {
-            let refType = baseType;
-            if (op === undefined) {
-                refType &= ~merge_tree_1.ReferenceType.SlideOnRemove;
-                refType |= merge_tree_1.ReferenceType.StayOnRemove;
-            }
-            return refType;
-        };
-        let startRef = this.start;
-        if (start !== undefined) {
-            startRef = createPositionReference(this.client, start, getRefType(this.start.refType), op, undefined, localSeq, startReferenceSlidingPreference(stickiness));
-            if (this.start.properties) {
-                startRef.addProperties(this.start.properties);
-            }
-        }
-        let endRef = this.end;
-        if (end !== undefined) {
-            endRef = createPositionReference(this.client, end, getRefType(this.end.refType), op, undefined, localSeq, endReferenceSlidingPreference(stickiness));
-            if (this.end.properties) {
-                endRef.addProperties(this.end.properties);
-            }
-        }
-        const newInterval = new SequenceInterval(this.client, startRef, endRef, this.intervalType);
-        if (this.properties) {
-            newInterval.initializeProperties();
-            this.propertyManager.copyTo(this.properties, newInterval.properties, newInterval.propertyManager);
-        }
-        return newInterval;
-    }
-    initializeProperties() {
-        if (!this.propertyManager) {
-            this.propertyManager = new merge_tree_1.PropertiesManager();
-        }
-        if (!this.properties) {
-            this.properties = (0, merge_tree_1.createMap)();
-        }
-    }
-}
-exports.SequenceInterval = SequenceInterval;
-function createPositionReferenceFromSegoff(client, segoff, refType, op, localSeq, fromSnapshot, slidingPreference) {
-    if (segoff.segment) {
-        const ref = client.createLocalReferencePosition(segoff.segment, segoff.offset, refType, undefined, slidingPreference);
-        return ref;
-    }
-    // Creating references on detached segments is allowed for:
-    // - Transient segments
-    // - References coming from a remote client (location may have been concurrently removed)
-    // - References being rebased to a new sequence number
-    //   (segment they originally referred to may have been removed with no suitable replacement)
-    if (!op &&
-        !localSeq &&
-        !fromSnapshot &&
-        !(0, merge_tree_1.refTypeIncludesFlag)(refType, merge_tree_1.ReferenceType.Transient)) {
-        throw new container_utils_1.UsageError("Non-transient references need segment");
-    }
-    return (0, merge_tree_1.createDetachedLocalReferencePosition)(refType);
-}
-exports.createPositionReferenceFromSegoff = createPositionReferenceFromSegoff;
-function createPositionReference(client, pos, refType, op, fromSnapshot, localSeq, slidingPreference) {
-    let segoff;
-    if (op) {
-        (0, common_utils_1.assert)((refType & merge_tree_1.ReferenceType.SlideOnRemove) !== 0, 0x2f5 /* op create references must be SlideOnRemove */);
-        segoff = client.getContainingSegment(pos, {
-            referenceSequenceNumber: op.referenceSequenceNumber,
-            clientId: op.clientId,
-        });
-        segoff = (0, merge_tree_1.getSlideToSegoff)(segoff);
-    }
-    else {
-        (0, common_utils_1.assert)((refType & merge_tree_1.ReferenceType.SlideOnRemove) === 0 || !!fromSnapshot, 0x2f6 /* SlideOnRemove references must be op created */);
-        segoff = client.getContainingSegment(pos, undefined, localSeq);
-    }
-    return createPositionReferenceFromSegoff(client, segoff, refType, op, localSeq, fromSnapshot, slidingPreference);
-}
-function createSequenceInterval(label, start, end, client, intervalType, op, fromSnapshot, stickiness = exports.IntervalStickiness.END) {
-    let beginRefType = merge_tree_1.ReferenceType.RangeBegin;
-    let endRefType = merge_tree_1.ReferenceType.RangeEnd;
-    if (intervalType === IntervalType.Transient) {
-        beginRefType = merge_tree_1.ReferenceType.Transient;
-        endRefType = merge_tree_1.ReferenceType.Transient;
-    }
-    else {
-        if (intervalType === IntervalType.Nest) {
-            beginRefType = merge_tree_1.ReferenceType.NestBegin;
-            endRefType = merge_tree_1.ReferenceType.NestEnd;
-        }
-        // All non-transient interval references must eventually be SlideOnRemove
-        // To ensure eventual consistency, they must start as StayOnRemove when
-        // pending (created locally and creation op is not acked)
-        if (op || fromSnapshot) {
-            beginRefType |= merge_tree_1.ReferenceType.SlideOnRemove;
-            endRefType |= merge_tree_1.ReferenceType.SlideOnRemove;
-        }
-        else {
-            beginRefType |= merge_tree_1.ReferenceType.StayOnRemove;
-            endRefType |= merge_tree_1.ReferenceType.StayOnRemove;
-        }
-    }
-    const startLref = createPositionReference(client, start, beginRefType, op, fromSnapshot, undefined, startReferenceSlidingPreference(stickiness));
-    const endLref = createPositionReference(client, end, endRefType, op, fromSnapshot, undefined, endReferenceSlidingPreference(stickiness));
-    const rangeProp = {
-        [merge_tree_1.reservedRangeLabelsKey]: [label],
-    };
-    startLref.addProperties(rangeProp);
-    endLref.addProperties(rangeProp);
-    const ival = new SequenceInterval(client, startLref, endLref, intervalType, rangeProp, stickiness);
-    return ival;
-}
-exports.createSequenceInterval = createSequenceInterval;
 function createIntervalIndex() {
     const helpers = {
-        compareEnds: compareIntervalEnds,
-        create: createInterval,
+        compareEnds: (a, b) => a.end - b.end,
+        create: intervals_1.createInterval,
     };
     const lc = new LocalIntervalCollection(undefined, "", helpers);
     return lc;
 }
 exports.createIntervalIndex = createIntervalIndex;
-class IdIntervalIndex {
-    constructor() {
-        this.intervalIdMap = new Map();
-    }
-    add(interval) {
-        const id = interval.getIntervalId();
-        (0, common_utils_1.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);
-    }
-    remove(interval) {
-        const id = interval.getIntervalId();
-        (0, common_utils_1.assert)(id !== undefined, 0x311 /* expected id to exist on interval */);
-        this.intervalIdMap.delete(id);
-    }
-    getIntervalById(id) {
-        return this.intervalIdMap.get(id);
-    }
-    [Symbol.iterator]() {
-        return this.intervalIdMap.values();
-    }
-}
-class EndpointIndex {
-    constructor(client, helpers) {
-        this.client = client;
-        this.helpers = helpers;
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        this.endIntervalTree = new merge_tree_1.RedBlackTree(helpers.compareEnds);
-    }
-    previousInterval(pos) {
-        const transientInterval = this.helpers.create("transient", pos, pos, this.client, IntervalType.Transient);
-        const rbNode = this.endIntervalTree.floor(transientInterval);
-        if (rbNode) {
-            return rbNode.data;
-        }
-    }
-    nextInterval(pos) {
-        const transientInterval = this.helpers.create("transient", pos, pos, this.client, IntervalType.Transient);
-        const rbNode = this.endIntervalTree.ceil(transientInterval);
-        if (rbNode) {
-            return rbNode.data;
-        }
-    }
-    add(interval) {
-        this.endIntervalTree.put(interval, interval);
-    }
-    remove(interval) {
-        this.endIntervalTree.remove(interval);
-    }
-}
-/**
- * Interface for intervals that have comparison override properties.
- */
-const forceCompare = Symbol();
-/**
- * Compares two objects based on their comparison override properties.
- * @returns A number indicating the order of the intervals (negative for a is lower than b, 0 for tie, positive for a is greater than b).
- */
-function compareOverrideables(a, b) {
-    var _a, _b;
-    const forceCompareA = (_a = a[forceCompare]) !== null && _a !== void 0 ? _a : 0;
-    const forceCompareB = (_b = b[forceCompare]) !== null && _b !== void 0 ? _b : 0;
-    return forceCompareA - forceCompareB;
-}
-class EndpointInRangeIndex {
-    constructor(helpers, client) {
-        this.helpers = helpers;
-        this.client = client;
-        this.intervalTree = new merge_tree_1.RedBlackTree((a, b) => {
-            const compareEndsResult = helpers.compareEnds(a, b);
-            if (compareEndsResult !== 0) {
-                return compareEndsResult;
-            }
-            const overrideablesComparison = compareOverrideables(a, b);
-            if (overrideablesComparison !== 0) {
-                return overrideablesComparison;
-            }
-            const aId = a.getIntervalId();
-            const bId = b.getIntervalId();
-            if (aId !== undefined && bId !== undefined) {
-                return aId.localeCompare(bId);
-            }
-            return 0;
-        });
-    }
-    add(interval) {
-        this.intervalTree.put(interval, interval);
-    }
-    remove(interval) {
-        this.intervalTree.remove(interval);
-    }
-    findIntervalsWithEndpointInRange(start, end) {
-        if (start <= 0 || start > end || this.intervalTree.isEmpty()) {
-            return [];
-        }
-        const results = [];
-        const action = (node) => {
-            results.push(node.data);
-            return true;
-        };
-        const transientStartInterval = this.helpers.create("transient", start, start, this.client, IntervalType.Transient);
-        const transientEndInterval = this.helpers.create("transient", end, end, this.client, IntervalType.Transient);
-        // Add comparison overrides to the transient intervals
-        transientStartInterval[forceCompare] = -1;
-        transientEndInterval[forceCompare] = 1;
-        this.intervalTree.mapRange(action, results, transientStartInterval, transientEndInterval);
-        return results;
-    }
-}
-class StartpointInRangeIndex {
-    constructor(helpers, client) {
-        this.helpers = helpers;
-        this.client = client;
-        this.intervalTree = new merge_tree_1.RedBlackTree((a, b) => {
-            (0, common_utils_1.assert)(typeof helpers.compareStarts === "function", 0x6d1 /* compareStarts does not exist in the helpers */);
-            const compareStartsResult = helpers.compareStarts(a, b);
-            if (compareStartsResult !== 0) {
-                return compareStartsResult;
-            }
-            const overrideablesComparison = compareOverrideables(a, b);
-            if (overrideablesComparison !== 0) {
-                return overrideablesComparison;
-            }
-            const aId = a.getIntervalId();
-            const bId = b.getIntervalId();
-            if (aId !== undefined && bId !== undefined) {
-                return aId.localeCompare(bId);
-            }
-            return 0;
-        });
-    }
-    add(interval) {
-        this.intervalTree.put(interval, interval);
-    }
-    remove(interval) {
-        this.intervalTree.remove(interval);
-    }
-    findIntervalsWithStartpointInRange(start, end) {
-        if (start <= 0 || start > end || this.intervalTree.isEmpty()) {
-            return [];
-        }
-        const results = [];
-        const action = (node) => {
-            results.push(node.data);
-            return true;
-        };
-        const transientStartInterval = this.helpers.create("transient", start, start, this.client, IntervalType.Transient);
-        const transientEndInterval = this.helpers.create("transient", end, end, this.client, IntervalType.Transient);
-        // Add comparison overrides to the transient intervals
-        transientStartInterval[forceCompare] = -1;
-        transientEndInterval[forceCompare] = 1;
-        this.intervalTree.mapRange(action, results, transientStartInterval, transientEndInterval);
-        return results;
-    }
-}
-function createEndpointInRangeIndex(helpers, client) {
-    return new EndpointInRangeIndex(helpers, client);
-}
-exports.createEndpointInRangeIndex = createEndpointInRangeIndex;
-function createStartpointInRangeIndex(helpers, client) {
-    return new StartpointInRangeIndex(helpers, client);
-}
-exports.createStartpointInRangeIndex = createStartpointInRangeIndex;
 class LocalIntervalCollection {
     constructor(client, label, helpers, 
     /** Callback invoked each time one of the endpoints of an interval slides. */
@@ -759,8 +75,8 @@ class LocalIntervalCollection {
         this.helpers = helpers;
         this.onPositionChange = onPositionChange;
         this.overlappingIntervalsIndex = (0, intervalIndex_1.createOverlappingIntervalsIndex)(client, helpers);
-        this.idIntervalIndex = new IdIntervalIndex();
-        this.endIntervalIndex = new EndpointIndex(client, helpers);
+        this.idIntervalIndex = (0, intervalIndex_1.createIdIntervalIndex)();
+        this.endIntervalIndex = (0, intervalIndex_1.createEndpointIndex)(client, helpers);
         this.indexes = new Set([
             this.overlappingIntervalsIndex,
             this.idIntervalIndex,
@@ -815,10 +131,10 @@ class LocalIntervalCollection {
         this.removeIntervalFromIndexes(interval);
         this.removeIntervalListeners(interval);
     }
-    createInterval(start, end, intervalType, op, stickiness = exports.IntervalStickiness.END) {
+    createInterval(start, end, intervalType, op, stickiness = intervals_1.IntervalStickiness.END) {
         return this.helpers.create(this.label, start, end, this.client, intervalType, op, undefined, stickiness);
     }
-    addInterval(start, end, intervalType, props, op, stickiness = exports.IntervalStickiness.END) {
+    addInterval(start, end, intervalType, props, op, stickiness = intervals_1.IntervalStickiness.END) {
         var _a;
         var _b;
         const interval = this.createInterval(start, end, intervalType, op, stickiness);
@@ -842,7 +158,7 @@ class LocalIntervalCollection {
         return interval;
     }
     linkEndpointsToInterval(interval) {
-        if (interval instanceof SequenceInterval) {
+        if (interval instanceof intervals_1.SequenceInterval) {
             interval.start.addProperties({ interval });
             interval.end.addProperties({ interval });
         }
@@ -883,7 +199,7 @@ class LocalIntervalCollection {
             }
             return this.client.createLocalReferencePosition(segment, ref.getOffset(), merge_tree_1.ReferenceType.Transient, ref.properties, ref.slidingPreference);
         };
-        if (interval instanceof SequenceInterval) {
+        if (interval instanceof intervals_1.SequenceInterval) {
             let previousInterval;
             let pendingChanges = 0;
             interval.addPositionChangeListeners(() => {
@@ -908,30 +224,16 @@ class LocalIntervalCollection {
         }
     }
     removeIntervalListeners(interval) {
-        if (interval instanceof SequenceInterval) {
+        if (interval instanceof intervals_1.SequenceInterval) {
             interval.removePositionChangeListeners();
         }
     }
 }
 exports.LocalIntervalCollection = LocalIntervalCollection;
 LocalIntervalCollection.legacyIdPrefix = "legacy";
-const compareSequenceIntervalEnds = (a, b) => (0, merge_tree_1.compareReferencePositions)(a.end, b.end);
-exports.compareSequenceIntervalEnds = compareSequenceIntervalEnds;
-const compareSequenceIntervalStarts = (a, b) => (0, merge_tree_1.compareReferencePositions)(a.start, b.start);
-exports.compareSequenceIntervalStarts = compareSequenceIntervalStarts;
-exports.sequenceIntervalHelpers = {
-    compareEnds: exports.compareSequenceIntervalEnds,
-    compareStarts: exports.compareSequenceIntervalStarts,
-    create: createSequenceInterval,
-};
-exports.intervalHelpers = {
-    compareEnds: (a, b) => a.end - b.end,
-    compareStarts: (a, b) => a.start - b.start,
-    create: createInterval,
-};
 class SequenceIntervalCollectionFactory {
     load(emitter, raw = [], options) {
-        return new IntervalCollection(exports.sequenceIntervalHelpers, true, emitter, raw, options);
+        return new IntervalCollection(intervals_1.sequenceIntervalHelpers, true, emitter, raw, options);
     }
     store(value) {
         return value.serializeInternal();
@@ -952,19 +254,11 @@ exports.SequenceIntervalCollectionValueType = SequenceIntervalCollectionValueTyp
 SequenceIntervalCollectionValueType.Name = "sharedStringIntervalCollection";
 SequenceIntervalCollectionValueType._factory = new SequenceIntervalCollectionFactory();
 SequenceIntervalCollectionValueType._ops = makeOpsMap();
-const compareIntervalEnds = (a, b) => a.end - b.end;
-function createInterval(label, start, end, client, intervalType, op, fromSnapshot) {
-    const rangeProp = {};
-    if (label && label.length > 0) {
-        rangeProp[merge_tree_1.reservedRangeLabelsKey] = [label];
-    }
-    return new Interval(start, end, rangeProp);
-}
 class IntervalCollectionFactory {
     load(emitter, raw = [], options) {
         const helpers = {
-            compareEnds: compareIntervalEnds,
-            create: createInterval,
+            compareEnds: (a, b) => a.end - b.end,
+            create: intervals_1.createInterval,
         };
         const collection = new IntervalCollection(helpers, false, emitter, raw, options);
         collection.attachGraph(undefined, "");
@@ -998,7 +292,7 @@ function makeOpsMap() {
     };
     return new Map([
         [
-            exports.IntervalOpType.ADD,
+            intervals_1.IntervalOpType.ADD,
             {
                 process: (collection, params, local, op, localOpMetadata) => {
                     // if params is undefined, the interval was deleted during
@@ -1013,7 +307,7 @@ function makeOpsMap() {
             },
         ],
         [
-            exports.IntervalOpType.DELETE,
+            intervals_1.IntervalOpType.DELETE,
             {
                 process: (collection, params, local, op) => {
                     (0, common_utils_1.assert)(op !== undefined, 0x3fc /* op should exist here */);
@@ -1026,7 +320,7 @@ function makeOpsMap() {
             },
         ],
         [
-            exports.IntervalOpType.CHANGE,
+            intervals_1.IntervalOpType.CHANGE,
             {
                 process: (collection, params, local, op, localOpMetadata) => {
                     // if params is undefined, the interval was deleted during
@@ -1194,7 +488,7 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
         // is restored as single-endpoint changes re-use previous references.
         let startRefType;
         let endRefType;
-        if (previousInterval instanceof SequenceInterval) {
+        if (previousInterval instanceof intervals_1.SequenceInterval) {
             startRefType = previousInterval.start.refType;
             endRefType = previousInterval.end.refType;
             previousInterval.start.refType = merge_tree_1.ReferenceType.Transient;
@@ -1219,15 +513,15 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     /**
      * {@inheritdoc IIntervalCollection.add}
      */
-    add(start, end, intervalType, props, stickiness = exports.IntervalStickiness.END) {
+    add(start, end, intervalType, props, stickiness = intervals_1.IntervalStickiness.END) {
         var _a, _b;
         if (!this.localCollection) {
             throw new telemetry_utils_1.LoggingError("attach must be called prior to adding intervals");
         }
-        if (intervalType & IntervalType.Transient) {
+        if (intervalType & intervals_1.IntervalType.Transient) {
             throw new telemetry_utils_1.LoggingError("Can not add transient intervals");
         }
-        if (stickiness !== exports.IntervalStickiness.END && !this.options.intervalStickinessEnabled) {
+        if (stickiness !== intervals_1.IntervalStickiness.END && !this.options.intervalStickinessEnabled) {
             throw new container_utils_1.UsageError("attempted to set interval stickiness without enabling `intervalStickinessEnabled` feature flag");
         }
         const interval = this.localCollection.addInterval(start, end, intervalType, props, undefined, stickiness);
@@ -1530,7 +824,7 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
         }
         if (localInterval !== undefined) {
             // we know we must be using `SequenceInterval` because `this.client` exists
-            (0, common_utils_1.assert)(localInterval instanceof SequenceInterval, 0x3a0 /* localInterval must be `SequenceInterval` when used with client */);
+            (0, common_utils_1.assert)(localInterval instanceof intervals_1.SequenceInterval, 0x3a0 /* localInterval must be `SequenceInterval` when used with client */);
             // The rebased op may place this interval's endpoints on different segments. Calling `changeInterval` here
             // updates the local client's state to be consistent with the emitted op.
             (_f = this.localCollection) === null || _f === void 0 ? void 0 : _f.changeInterval(localInterval, startRebased, endRebased, undefined, localSeq);
@@ -1561,7 +855,7 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     ackInterval(interval, op) {
         var _a, _b;
         // Only SequenceIntervals need potential sliding
-        if (!(interval instanceof SequenceInterval)) {
+        if (!(interval instanceof intervals_1.SequenceInterval)) {
             return;
         }
         if (!(0, merge_tree_1.refTypeIncludesFlag)(interval.start, merge_tree_1.ReferenceType.StayOnRemove) &&
@@ -1596,7 +890,7 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
             }
             if (needsStartUpdate) {
                 const props = interval.start.properties;
-                interval.start = createPositionReferenceFromSegoff(this.client, newStart, interval.start.refType, op, startReferenceSlidingPreference(interval.stickiness));
+                interval.start = (0, intervals_1.createPositionReferenceFromSegoff)(this.client, newStart, interval.start.refType, op, (0, intervals_1.startReferenceSlidingPreference)(interval.stickiness));
                 if (props) {
                     interval.start.addProperties(props);
                 }
@@ -1608,7 +902,7 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
             }
             if (needsEndUpdate) {
                 const props = interval.end.properties;
-                interval.end = createPositionReferenceFromSegoff(this.client, newEnd, interval.end.refType, op, endReferenceSlidingPreference(interval.stickiness));
+                interval.end = (0, intervals_1.createPositionReferenceFromSegoff)(this.client, newEnd, interval.end.refType, op, (0, intervals_1.endReferenceSlidingPreference)(interval.stickiness));
                 if (props) {
                     interval.end.addProperties(props);
                 }
@@ -1683,6 +977,8 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.CreateForwardIteratorWithStartPosition}
+     *
+     * @deprecated - The sequence order of collection order will not be supported
      */
     CreateForwardIteratorWithStartPosition(startPosition) {
         const iterator = new IntervalCollectionIterator(this, true, startPosition);
@@ -1690,6 +986,8 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.CreateBackwardIteratorWithStartPosition}
+     *
+     * @deprecated - The sequence order of collection order will not be supported
      */
     CreateBackwardIteratorWithStartPosition(startPosition) {
         const iterator = new IntervalCollectionIterator(this, false, startPosition);
@@ -1697,6 +995,8 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.CreateForwardIteratorWithEndPosition}
+     *
+     * @deprecated - The sequence order of collection order will not be supported
      */
     CreateForwardIteratorWithEndPosition(endPosition) {
         const iterator = new IntervalCollectionIterator(this, true, undefined, endPosition);
@@ -1704,6 +1004,8 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.CreateBackwardIteratorWithEndPosition}
+     *
+     * @deprecated - The sequence order of collection order will not be supported
      */
     CreateBackwardIteratorWithEndPosition(endPosition) {
         const iterator = new IntervalCollectionIterator(this, false, undefined, endPosition);
@@ -1711,6 +1013,8 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.gatherIterationResults}
+     * @deprecated - This API will be deprecated as its functionality will be moved to the `OverlappingIntervalsIndex`.
+     * We would like the user to attach the index to the collection on their own.
      */
     gatherIterationResults(results, iteratesForward, start, end) {
         if (!this.localCollection) {
@@ -1720,6 +1024,8 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.findOverlappingIntervals}
+     * @deprecated - This API will be deprecated as its functionality will be moved to the `OverlappingIntervalsIndex`.
+     * We would like the user to attach the index to the collection on their own.
      */
     findOverlappingIntervals(startPosition, endPosition) {
         if (!this.localCollection) {
@@ -1740,6 +1046,9 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.previousInterval}
+     *
+     * @deprecated - This API will be deprecated as its functionality will be moved to the `EndpointIndex`.
+     * We would like the user to attach the index to the collection on their own.
      */
     previousInterval(pos) {
         if (!this.localCollection) {
@@ -1749,6 +1058,9 @@ class IntervalCollection extends common_utils_1.TypedEventEmitter {
     }
     /**
      * {@inheritdoc IIntervalCollection.nextInterval}
+     *
+     * @deprecated - This API will be deprecated as its functionality will be moved to the `EndpointIndex`.
+     * We would like the user to attach the index to the collection on their own.
      */
     nextInterval(pos) {
         if (!this.localCollection) {