@fluidframework/sequence 2.0.0-rc.1.0.6 → 2.0.0-rc.2.0.1

package/dist/intervalCollection.js

@@ -4,7 +4,7 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.intervalLocatorFromEndpoint = exports.IntervalCollection = exports.makeOpsMap = exports.IntervalCollectionValueType = exports.SequenceIntervalCollectionValueType = exports.LocalIntervalCollection = exports.createIntervalIndex = exports.computeStickinessFromSide = exports.endpointPosAndSide = exports.sidesFromStickiness = exports.Side = void 0;
+exports.intervalLocatorFromEndpoint = exports.IntervalCollection = exports.makeOpsMap = exports.IntervalCollectionValueType = exports.SequenceIntervalCollectionValueType = exports.LocalIntervalCollection = exports.createIntervalIndex = exports.computeStickinessFromSide = exports.toOptionalSequencePlace = exports.toSequencePlace = exports.endpointPosAndSide = exports.sidesFromStickiness = exports.reservedIntervalIdKey = exports.Side = void 0;
 /* eslint-disable no-bitwise */
 /* eslint-disable import/no-deprecated */
 const client_utils_1 = require("@fluid-internal/client-utils");
@@ -12,8 +12,8 @@ const core_utils_1 = require("@fluidframework/core-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 index_js_1 = require("./intervals/index.js");
+const index_js_2 = require("./intervalIndex/index.js");
 /**
  * Defines a side relative to a character in a sequence.
  *
@@ -25,10 +25,10 @@ var Side;
     Side[Side["Before"] = 0] = "Before";
     Side[Side["After"] = 1] = "After";
 })(Side || (exports.Side = Side = {}));
-const reservedIntervalIdKey = "intervalId";
+exports.reservedIntervalIdKey = "intervalId";
 function sidesFromStickiness(stickiness) {
-    const startSide = (stickiness & intervals_1.IntervalStickiness.START) !== 0 ? Side.After : Side.Before;
-    const endSide = (stickiness & intervals_1.IntervalStickiness.END) !== 0 ? Side.Before : Side.After;
+    const startSide = (stickiness & index_js_1.IntervalStickiness.START) !== 0 ? Side.After : Side.Before;
+    const endSide = (stickiness & index_js_1.IntervalStickiness.END) !== 0 ? Side.Before : Side.After;
     return { startSide, endSide };
 }
 exports.sidesFromStickiness = sidesFromStickiness;
@@ -37,7 +37,7 @@ exports.sidesFromStickiness = sidesFromStickiness;
  * of this compression is unspecified and subject to change
  */
 function decompressInterval(interval, label) {
-    const stickiness = interval[5] ?? intervals_1.IntervalStickiness.END;
+    const stickiness = interval[5] ?? index_js_1.IntervalStickiness.END;
     const { startSide, endSide } = sidesFromStickiness(stickiness);
     return {
         start: interval[0],
@@ -65,7 +65,7 @@ function compressInterval(interval) {
         // in the `label` field of the summary
         { ...properties, [merge_tree_1.reservedRangeLabelsKey]: undefined },
     ];
-    if (interval.stickiness !== undefined && interval.stickiness !== intervals_1.IntervalStickiness.END) {
+    if (interval.stickiness !== undefined && interval.stickiness !== index_js_1.IntervalStickiness.END) {
         // reassignment to make it easier for typescript to reason about types
         base = [...base, interval.stickiness];
     }
@@ -87,25 +87,27 @@ function endpointPosAndSide(start, end) {
 }
 exports.endpointPosAndSide = endpointPosAndSide;
 function toSequencePlace(pos, side) {
-    return typeof pos === "number" ? { pos, side } : pos;
+    return typeof pos === "number" && side !== undefined ? { pos, side } : pos;
 }
-function toOptionalSequencePlace(pos, side = Side.Before) {
-    return typeof pos === "number" ? { pos, side } : pos;
+exports.toSequencePlace = toSequencePlace;
+function toOptionalSequencePlace(pos, side) {
+    return typeof pos === "number" && side !== undefined ? { pos, side } : pos;
 }
+exports.toOptionalSequencePlace = toOptionalSequencePlace;
 function computeStickinessFromSide(startPos = -1, startSide = Side.Before, endPos = -1, endSide = Side.Before) {
-    let stickiness = intervals_1.IntervalStickiness.NONE;
+    let stickiness = index_js_1.IntervalStickiness.NONE;
     if (startSide === Side.After || startPos === "start") {
-        stickiness |= intervals_1.IntervalStickiness.START;
+        stickiness |= index_js_1.IntervalStickiness.START;
     }
     if (endSide === Side.Before || endPos === "end") {
-        stickiness |= intervals_1.IntervalStickiness.END;
+        stickiness |= index_js_1.IntervalStickiness.END;
     }
     return stickiness;
 }
 exports.computeStickinessFromSide = computeStickinessFromSide;
 function createIntervalIndex() {
     const helpers = {
-        create: intervals_1.createInterval,
+        create: index_js_1.createInterval,
     };
     const lc = new LocalIntervalCollection(undefined, "", helpers, {});
     return lc;
@@ -120,9 +122,9 @@ class LocalIntervalCollection {
         this.helpers = helpers;
         this.options = options;
         this.onPositionChange = onPositionChange;
-        this.overlappingIntervalsIndex = new intervalIndex_1.OverlappingIntervalsIndex(client, helpers);
-        this.idIntervalIndex = (0, intervalIndex_1.createIdIntervalIndex)();
-        this.endIntervalIndex = new intervalIndex_1.EndpointIndex(client, helpers);
+        this.overlappingIntervalsIndex = new index_js_2.OverlappingIntervalsIndex(client, helpers);
+        this.idIntervalIndex = (0, index_js_2.createIdIntervalIndex)();
+        this.endIntervalIndex = new index_js_2.EndpointIndex(client, helpers);
         this.indexes = new Set([
             this.overlappingIntervalsIndex,
             this.idIntervalIndex,
@@ -142,19 +144,19 @@ class LocalIntervalCollection {
      * @returns The interval's existing or newly created id
      */
     ensureSerializedId(serializedInterval) {
-        let id = serializedInterval.properties?.[reservedIntervalIdKey];
+        let id = serializedInterval.properties?.[exports.reservedIntervalIdKey];
         if (id === undefined) {
             // Back-compat: 0.39 and earlier did not have IDs on intervals. If an interval from such a client
             // comes over the wire, create a non-unique one based on start/end.
             // This will allow all clients to refer to this interval consistently.
             id = this.createLegacyId(serializedInterval.start, serializedInterval.end);
             const newProps = {
-                [reservedIntervalIdKey]: id,
+                [exports.reservedIntervalIdKey]: id,
             };
             serializedInterval.properties = (0, merge_tree_1.addProperties)(serializedInterval.properties, newProps);
         }
         // Make the ID immutable for safety's sake.
-        Object.defineProperty(serializedInterval.properties, reservedIntervalIdKey, {
+        Object.defineProperty(serializedInterval.properties, exports.reservedIntervalIdKey, {
             configurable: false,
             enumerable: true,
             writable: false,
@@ -196,13 +198,13 @@ class LocalIntervalCollection {
                 }
                 interval.addProperties(props);
             }
-            (_a = interval.properties)[reservedIntervalIdKey] ?? (_a[reservedIntervalIdKey] = (0, uuid_1.v4)());
+            (_a = interval.properties)[exports.reservedIntervalIdKey] ?? (_a[exports.reservedIntervalIdKey] = (0, uuid_1.v4)());
             this.add(interval);
         }
         return interval;
     }
     linkEndpointsToInterval(interval) {
-        if (interval instanceof intervals_1.SequenceInterval) {
+        if (interval instanceof index_js_1.SequenceInterval) {
             interval.start.addProperties({ interval });
             interval.end.addProperties({ interval });
         }
@@ -243,7 +245,7 @@ class LocalIntervalCollection {
             }
             return this.client.createLocalReferencePosition(segment, ref.getOffset(), merge_tree_1.ReferenceType.Transient, ref.properties, ref.slidingPreference, ref.canSlideToEndpoint);
         };
-        if (interval instanceof intervals_1.SequenceInterval) {
+        if (interval instanceof index_js_1.SequenceInterval) {
             let previousInterval;
             let pendingChanges = 0;
             interval.addPositionChangeListeners(() => {
@@ -267,7 +269,7 @@ class LocalIntervalCollection {
         }
     }
     removeIntervalListeners(interval) {
-        if (interval instanceof intervals_1.SequenceInterval) {
+        if (interval instanceof index_js_1.SequenceInterval) {
             interval.removePositionChangeListeners();
         }
     }
@@ -276,7 +278,7 @@ exports.LocalIntervalCollection = LocalIntervalCollection;
 LocalIntervalCollection.legacyIdPrefix = "legacy";
 class SequenceIntervalCollectionFactory {
     load(emitter, raw = [], options) {
-        return new IntervalCollection(intervals_1.sequenceIntervalHelpers, true, emitter, raw, options);
+        return new IntervalCollection(index_js_1.sequenceIntervalHelpers, true, emitter, raw, options);
     }
     store(value) {
         return value.serializeInternal();
@@ -300,7 +302,7 @@ SequenceIntervalCollectionValueType._ops = makeOpsMap();
 class IntervalCollectionFactory {
     load(emitter, raw = [], options) {
         const helpers = {
-            create: intervals_1.createInterval,
+            create: index_js_1.createInterval,
         };
         const collection = new IntervalCollection(helpers, false, emitter, raw, options);
         collection.attachGraph(undefined, "");
@@ -335,12 +337,9 @@ function makeOpsMap() {
         const rebasedOp = { ...op, value: rebasedValue };
         return { rebasedOp, rebasedLocalOpMetadata: localOpMetadata };
     };
-    const applyStashedOp = (collection, op) => {
-        return collection.applyStashedOp(op);
-    };
     return new Map([
         [
-            intervals_1.IntervalOpType.ADD,
+            index_js_1.IntervalOpType.ADD,
             {
                 process: (collection, params, local, op, localOpMetadata) => {
                     // if params is undefined, the interval was deleted during
@@ -352,11 +351,10 @@ function makeOpsMap() {
                     collection.ackAdd(params, local, op, localOpMetadata);
                 },
                 rebase,
-                applyStashedOp,
             },
         ],
         [
-            intervals_1.IntervalOpType.DELETE,
+            index_js_1.IntervalOpType.DELETE,
             {
                 process: (collection, params, local, op) => {
                     (0, core_utils_1.assert)(op !== undefined, 0x3fc /* op should exist here */);
@@ -366,11 +364,10 @@ function makeOpsMap() {
                     // Deletion of intervals is based on id, so requires no rebasing.
                     return { rebasedOp: op, rebasedLocalOpMetadata: localOpMetadata };
                 },
-                applyStashedOp,
             },
         ],
         [
-            intervals_1.IntervalOpType.CHANGE,
+            index_js_1.IntervalOpType.CHANGE,
             {
                 process: (collection, params, local, op, localOpMetadata) => {
                     // if params is undefined, the interval was deleted during
@@ -382,7 +379,6 @@ function makeOpsMap() {
                     collection.ackChange(params, local, op, localOpMetadata);
                 },
                 rebase,
-                applyStashedOp,
             },
         ],
     ]);
@@ -414,7 +410,6 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
     get attached() {
         return !!this.localCollection;
     }
-    /** @internal */
     constructor(helpers, requiresClient, emitter, serializedIntervals, options = {}) {
         super();
         this.helpers = helpers;
@@ -493,7 +488,6 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         }
         return rebased;
     }
-    /** @internal */
     attachGraph(client, label) {
         if (this.attached) {
             throw new telemetry_utils_1.LoggingError("Only supports one Sequence attach");
@@ -545,17 +539,19 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         // is restored as single-endpoint changes re-use previous references.
         let startRefType;
         let endRefType;
-        if (previousInterval instanceof intervals_1.SequenceInterval) {
+        if (previousInterval instanceof index_js_1.SequenceInterval) {
             startRefType = previousInterval.start.refType;
             endRefType = previousInterval.end.refType;
             previousInterval.start.refType = merge_tree_1.ReferenceType.Transient;
             previousInterval.end.refType = merge_tree_1.ReferenceType.Transient;
             this.emit("changeInterval", interval, previousInterval, local, op, slide);
+            this.emit("changed", interval, undefined, previousInterval ?? undefined, local, slide);
             previousInterval.start.refType = startRefType;
             previousInterval.end.refType = endRefType;
         }
         else {
             this.emit("changeInterval", interval, previousInterval, local, op, slide);
+            this.emit("changed", interval, undefined, previousInterval ?? undefined, local, slide);
         }
     }
     /**
@@ -587,16 +583,16 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             endSide !== undefined, 0x793 /* start and end cannot be undefined because they were not passed in as undefined */);
         const stickiness = computeStickinessFromSide(startPos, startSide, endPos, endSide);
         this.assertStickinessEnabled(start, end);
-        const interval = this.localCollection.addInterval(toSequencePlace(startPos, startSide), toSequencePlace(endPos, endSide), intervals_1.IntervalType.SlideOnRemove, props);
+        const interval = this.localCollection.addInterval(toSequencePlace(startPos, startSide), toSequencePlace(endPos, endSide), index_js_1.IntervalType.SlideOnRemove, props);
         if (interval) {
-            if (!this.isCollaborating && interval instanceof intervals_1.SequenceInterval) {
+            if (!this.isCollaborating && interval instanceof index_js_1.SequenceInterval) {
                 setSlideOnRemove(interval.start);
                 setSlideOnRemove(interval.end);
             }
             const serializedInterval = {
                 start: startPos,
                 end: endPos,
-                intervalType: intervals_1.IntervalType.SlideOnRemove,
+                intervalType: index_js_1.IntervalType.SlideOnRemove,
                 properties: interval.properties,
                 sequenceNumber: this.client?.getCurrentSeq() ?? 0,
                 stickiness,
@@ -604,7 +600,9 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
                 endSide,
             };
             const localSeq = this.getNextLocalSeq();
-            this.localSeqToSerializedInterval.set(localSeq, serializedInterval);
+            if (this.isCollaborating) {
+                this.localSeqToSerializedInterval.set(localSeq, serializedInterval);
+            }
             // Local ops get submitted to the server. Remote ops have the deserializer run.
             this.emitter.emit("add", undefined, serializedInterval, { localSeq });
         }
@@ -674,7 +672,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             }
             if (start !== undefined && end !== undefined) {
                 newInterval = this.localCollection.changeInterval(interval, start, end);
-                if (!this.isCollaborating && newInterval instanceof intervals_1.SequenceInterval) {
+                if (!this.isCollaborating && newInterval instanceof index_js_1.SequenceInterval) {
                     setSlideOnRemove(newInterval.start);
                     setSlideOnRemove(newInterval.end);
                 }
@@ -689,14 +687,17 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             serializedInterval.stickiness = stickiness;
             // Emit a property bag containing the ID and the other (if any) properties changed
             serializedInterval.properties = {
-                [reservedIntervalIdKey]: interval.getIntervalId(),
+                [exports.reservedIntervalIdKey]: interval.getIntervalId(),
                 ...props,
             };
             const localSeq = this.getNextLocalSeq();
-            this.localSeqToSerializedInterval.set(localSeq, serializedInterval);
+            if (this.isCollaborating) {
+                this.localSeqToSerializedInterval.set(localSeq, serializedInterval);
+            }
             this.emitter.emit("change", undefined, serializedInterval, { localSeq });
             if (deltaProps !== undefined) {
                 this.emit("propertyChanged", interval, deltaProps, true, undefined);
+                this.emit("changed", newInterval ?? interval, deltaProps, newInterval ? interval : undefined, true, false);
             }
             if (newInterval) {
                 this.addPendingChange(id, serializedInterval);
@@ -731,7 +732,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
     }
     removePendingChange(serializedInterval) {
         // Change ops always have an ID.
-        const id = serializedInterval.properties?.[reservedIntervalIdKey];
+        const id = serializedInterval.properties?.[exports.reservedIntervalIdKey];
         if (serializedInterval.start !== undefined) {
             this.removePendingChangeHelper(id, this.pendingChangesStart, serializedInterval);
         }
@@ -760,7 +761,6 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         const entries = this.pendingChangesEnd.get(id);
         return entries && entries.length !== 0;
     }
-    /** @internal */
     ackChange(serializedInterval, local, op, localOpMetadata) {
         if (!this.localCollection) {
             throw new telemetry_utils_1.LoggingError("Attach must be called before accessing intervals");
@@ -774,7 +774,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         // Note that the ID is in the property bag only to allow us to find the interval.
         // This API cannot change the ID, and writing to the ID property will result in an exception. So we
         // strip it out of the properties here.
-        const { [reservedIntervalIdKey]: id, ...newProps } = serializedInterval.properties ?? {};
+        const { [exports.reservedIntervalIdKey]: id, ...newProps } = serializedInterval.properties ?? {};
         (0, core_utils_1.assert)(id !== undefined, 0x3fe /* id must exist on the interval */);
         const interval = this.getIntervalById(id);
         if (!interval) {
@@ -806,7 +806,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
                 // If changeInterval gives us a new interval, work with that one. Otherwise keep working with
                 // the one we originally found in the tree.
                 newInterval =
-                    this.localCollection.changeInterval(interval, toOptionalSequencePlace(start, serializedInterval.startSide), toOptionalSequencePlace(end, serializedInterval.endSide), op) ?? interval;
+                    this.localCollection.changeInterval(interval, toOptionalSequencePlace(start, serializedInterval.startSide ?? Side.Before), toOptionalSequencePlace(end, serializedInterval.endSide ?? Side.Before), op) ?? interval;
             }
             const deltaProps = newInterval.addProperties(newProps, true, op.sequenceNumber);
             if (this.onDeserialize) {
@@ -818,6 +818,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             const changedProperties = Object.keys(newProps).length > 0;
             if (changedProperties) {
                 this.emit("propertyChanged", interval, deltaProps, local, op);
+                this.emit("changed", interval, deltaProps, undefined, local, false);
             }
         }
     }
@@ -841,7 +842,6 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
      * deleted as a result of rebasing. This can occur if the interval applies
      * to a range that no longer exists, and the interval was unable to slide.
      *
-     * @internal
      */
     rebaseLocalInterval(opName, serializedInterval, localSeq) {
         if (!this.client) {
@@ -853,7 +853,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         }
         const { intervalType, properties, stickiness, startSide, endSide } = serializedInterval;
         const { start: startRebased, end: endRebased } = this.localSeqToRebasedInterval.get(localSeq) ?? this.computeRebasedPositions(localSeq);
-        const intervalId = properties?.[reservedIntervalIdKey];
+        const intervalId = properties?.[exports.reservedIntervalIdKey];
         const localInterval = this.localCollection?.idIntervalIndex.getIntervalById(intervalId);
         const rebased = {
             start: startRebased,
@@ -881,59 +881,13 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         }
         if (localInterval !== undefined) {
             // we know we must be using `SequenceInterval` because `this.client` exists
-            (0, core_utils_1.assert)(localInterval instanceof intervals_1.SequenceInterval, 0x3a0 /* localInterval must be `SequenceInterval` when used with client */);
+            (0, core_utils_1.assert)(localInterval instanceof index_js_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.
-            this.localCollection?.changeInterval(localInterval, toOptionalSequencePlace(startRebased, startSide), toOptionalSequencePlace(endRebased, endSide), undefined, localSeq);
+            this.localCollection?.changeInterval(localInterval, toOptionalSequencePlace(startRebased, startSide ?? Side.Before), toOptionalSequencePlace(endRebased, endSide ?? Side.Before), undefined, localSeq);
         }
         return rebased;
     }
-    applyStashedOp(op) {
-        let interval;
-        let props;
-        let intervalId;
-        switch (op.opName) {
-            case intervals_1.IntervalDeltaOpType.ADD: {
-                (0, core_utils_1.assert)(op.value.start !== undefined, 0x87a /* start is undefined */);
-                (0, core_utils_1.assert)(op.value.end !== undefined, 0x87b /* end is undefined */);
-                interval = this.add({
-                    start: op.value.start,
-                    end: op.value.end,
-                    props: op.value.properties,
-                });
-                const metadata = {
-                    localSeq: this.getNextLocalSeq(),
-                };
-                if (interval !== undefined) {
-                    this.localSeqToSerializedInterval.set(metadata.localSeq, interval.serialize());
-                }
-                return metadata;
-            }
-            case intervals_1.IntervalDeltaOpType.DELETE:
-                this.removeIntervalById(op.value.properties?.intervalId);
-                return {
-                    localSeq: this.getNextLocalSeq(),
-                };
-            case intervals_1.IntervalDeltaOpType.CHANGE: {
-                (0, core_utils_1.assert)(op.value.properties !== undefined, 0x87c /* properties is undefined */);
-                ({ intervalId, ...props } = op.value.properties);
-                interval = this.change(intervalId, {
-                    start: op.value.start,
-                    end: op.value.end,
-                    props,
-                });
-                const metadata = {
-                    localSeq: this.getNextLocalSeq(),
-                };
-                if (interval !== undefined) {
-                    this.localSeqToSerializedInterval.set(metadata.localSeq, interval.serialize());
-                }
-                return metadata;
-            }
-            default:
-                (0, core_utils_1.unreachableCase)(op.opName, `Unknown interval op type: ${op.opName}`);
-        }
-    }
     getSlideToSegment(lref) {
         if (!this.client) {
             throw new telemetry_utils_1.LoggingError("client does not exist");
@@ -950,7 +904,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
     }
     ackInterval(interval, op) {
         // Only SequenceIntervals need potential sliding
-        if (!(interval instanceof intervals_1.SequenceInterval)) {
+        if (!(interval instanceof index_js_1.SequenceInterval)) {
             return;
         }
         if (!(0, merge_tree_1.refTypeIncludesFlag)(interval.start, merge_tree_1.ReferenceType.StayOnRemove) &&
@@ -959,7 +913,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         }
         const newStart = this.getSlideToSegment(interval.start);
         const newEnd = this.getSlideToSegment(interval.end);
-        const id = interval.properties[reservedIntervalIdKey];
+        const id = interval.properties[exports.reservedIntervalIdKey];
         const hasPendingStartChange = this.hasPendingChangeStart(id);
         const hasPendingEndChange = this.hasPendingChangeEnd(id);
         if (!hasPendingStartChange) {
@@ -985,7 +939,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             }
             if (needsStartUpdate) {
                 const props = interval.start.properties;
-                interval.start = (0, intervals_1.createPositionReferenceFromSegoff)(this.client, newStart, interval.start.refType, op, undefined, undefined, (0, intervals_1.startReferenceSlidingPreference)(interval.stickiness), (0, intervals_1.startReferenceSlidingPreference)(interval.stickiness) ===
+                interval.start = (0, index_js_1.createPositionReferenceFromSegoff)(this.client, newStart, interval.start.refType, op, undefined, undefined, (0, index_js_1.startReferenceSlidingPreference)(interval.stickiness), (0, index_js_1.startReferenceSlidingPreference)(interval.stickiness) ===
                     merge_tree_1.SlidingPreference.BACKWARD);
                 if (props) {
                     interval.start.addProperties(props);
@@ -998,7 +952,7 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             }
             if (needsEndUpdate) {
                 const props = interval.end.properties;
-                interval.end = (0, intervals_1.createPositionReferenceFromSegoff)(this.client, newEnd, interval.end.refType, op, undefined, undefined, (0, intervals_1.endReferenceSlidingPreference)(interval.stickiness), (0, intervals_1.endReferenceSlidingPreference)(interval.stickiness) ===
+                interval.end = (0, index_js_1.createPositionReferenceFromSegoff)(this.client, newEnd, interval.end.refType, op, undefined, undefined, (0, index_js_1.endReferenceSlidingPreference)(interval.stickiness), (0, index_js_1.endReferenceSlidingPreference)(interval.stickiness) ===
                     merge_tree_1.SlidingPreference.FORWARD);
                 if (props) {
                     interval.end.addProperties(props);
@@ -1013,12 +967,11 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             this.emitChange(interval, oldInterval, true, true, op);
         }
     }
-    /** @internal */
     ackAdd(serializedInterval, local, op, localOpMetadata) {
         if (local) {
             (0, core_utils_1.assert)(localOpMetadata !== undefined, 0x553 /* op metadata should be defined for local op */);
             this.localSeqToSerializedInterval.delete(localOpMetadata.localSeq);
-            const id = serializedInterval.properties?.[reservedIntervalIdKey];
+            const id = serializedInterval.properties?.[exports.reservedIntervalIdKey];
             const localInterval = this.getIntervalById(id);
             if (localInterval) {
                 this.ackInterval(localInterval, op);
@@ -1038,7 +991,6 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
         this.emit("addInterval", interval, local, op);
         return interval;
     }
-    /** @internal */
     ackDelete(serializedInterval, local, op) {
         if (local) {
             // Local ops were applied when the message was created and there's no "pending delete"
@@ -1055,9 +1007,6 @@ class IntervalCollection extends client_utils_1.TypedEventEmitter {
             this.deleteExistingInterval(interval, local, op);
         }
     }
-    /**
-     * @internal
-     */
     serializeInternal() {
         if (!this.localCollection) {
             throw new telemetry_utils_1.LoggingError("attachSequence must be called");