@fluidframework/merge-tree 2.0.0-rc.1.0.3 → 2.0.0-rc.2.0.0

package/dist/mergeTree.js

@@ -9,23 +9,23 @@ exports.MergeTree = exports.getSlideToSegoff = exports.findRootMergeBlock = void
 /* eslint-disable no-bitwise */
 const core_utils_1 = require("@fluidframework/core-utils");
 const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
-const collections_1 = require("./collections");
-const constants_1 = require("./constants");
-const localReference_1 = require("./localReference");
-const mergeTreeNodes_1 = require("./mergeTreeNodes");
-const mergeTreeDeltaCallback_1 = require("./mergeTreeDeltaCallback");
-const opBuilder_1 = require("./opBuilder");
-const ops_1 = require("./ops");
-const partialLengths_1 = require("./partialLengths");
+const index_js_1 = require("./collections/index.js");
+const constants_js_1 = require("./constants.js");
+const localReference_js_1 = require("./localReference.js");
+const mergeTreeNodes_js_1 = require("./mergeTreeNodes.js");
+const mergeTreeDeltaCallback_js_1 = require("./mergeTreeDeltaCallback.js");
+const opBuilder_js_1 = require("./opBuilder.js");
+const ops_js_1 = require("./ops.js");
+const partialLengths_js_1 = require("./partialLengths.js");
 // eslint-disable-next-line import/no-deprecated
-const properties_1 = require("./properties");
-const referencePositions_1 = require("./referencePositions");
-const segmentPropertiesManager_1 = require("./segmentPropertiesManager");
-const mergeTreeNodeWalk_1 = require("./mergeTreeNodeWalk");
-const zamboni_1 = require("./zamboni");
-const endOfTreeSegment_1 = require("./endOfTreeSegment");
+const properties_js_1 = require("./properties.js");
+const referencePositions_js_1 = require("./referencePositions.js");
+const segmentPropertiesManager_js_1 = require("./segmentPropertiesManager.js");
+const mergeTreeNodeWalk_js_1 = require("./mergeTreeNodeWalk.js");
+const zamboni_js_1 = require("./zamboni.js");
+const endOfTreeSegment_js_1 = require("./endOfTreeSegment.js");
 function wasRemovedAfter(seg, seq) {
-    return (seg.removedSeq !== constants_1.UnassignedSequenceNumber &&
+    return (seg.removedSeq !== constants_js_1.UnassignedSequenceNumber &&
         (seg.removedSeq === undefined || seg.removedSeq > seq));
 }
 function markSegmentMoved(seg, moveInfo) {
@@ -37,22 +37,25 @@ function markSegmentMoved(seg, moveInfo) {
     seg.wasMovedOnInsert = moveInfo.wasMovedOnInsert;
 }
 function isMoved(segment) {
-    return (0, mergeTreeNodes_1.toMoveInfo)(segment) !== undefined;
+    return (0, mergeTreeNodes_js_1.toMoveInfo)(segment) !== undefined;
 }
 function isRemoved(segment) {
-    return (0, mergeTreeNodes_1.toRemovalInfo)(segment) !== undefined;
+    return (0, mergeTreeNodes_js_1.toRemovalInfo)(segment) !== undefined;
 }
 function isRemovedAndAcked(segment) {
-    const removalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
-    return removalInfo !== undefined && removalInfo.removedSeq !== constants_1.UnassignedSequenceNumber;
+    const removalInfo = (0, mergeTreeNodes_js_1.toRemovalInfo)(segment);
+    return removalInfo !== undefined && removalInfo.removedSeq !== constants_js_1.UnassignedSequenceNumber;
 }
 function isMovedAndAcked(segment) {
-    const moveInfo = (0, mergeTreeNodes_1.toMoveInfo)(segment);
-    return moveInfo !== undefined && moveInfo.movedSeq !== constants_1.UnassignedSequenceNumber;
+    const moveInfo = (0, mergeTreeNodes_js_1.toMoveInfo)(segment);
+    return moveInfo !== undefined && moveInfo.movedSeq !== constants_js_1.UnassignedSequenceNumber;
 }
 function isRemovedAndAckedOrMovedAndAcked(segment) {
     return isRemovedAndAcked(segment) || isMovedAndAcked(segment);
 }
+function isRemovedOrMoved(segment) {
+    return isRemoved(segment) || isMoved(segment);
+}
 function nodeTotalLength(mergeTree, node) {
     if (!node.isLeaf()) {
         return node.cachedLength;
@@ -64,7 +67,7 @@ const LRUSegmentComparer = {
     compare: (a, b) => a.maxSeq - b.maxSeq,
 };
 function addTile(tile, tiles) {
-    const tileLabels = (0, referencePositions_1.refGetTileLabels)(tile);
+    const tileLabels = (0, referencePositions_js_1.refGetTileLabels)(tile);
     if (tileLabels) {
         for (const tileLabel of tileLabels) {
             tiles[tileLabel] = tile;
@@ -72,7 +75,7 @@ function addTile(tile, tiles) {
     }
 }
 function addTileIfNotPresent(tile, tiles) {
-    const tileLabels = (0, referencePositions_1.refGetTileLabels)(tile);
+    const tileLabels = (0, referencePositions_js_1.refGetTileLabels)(tile);
     if (tileLabels) {
         for (const tileLabel of tileLabels) {
             if (tiles[tileLabel] === undefined) {
@@ -81,13 +84,13 @@ function addTileIfNotPresent(tile, tiles) {
         }
     }
 }
-class HierMergeBlock extends mergeTreeNodes_1.MergeBlock {
+class HierMergeBlock extends mergeTreeNodes_js_1.MergeBlock {
     constructor(childCount) {
         super(childCount);
         // eslint-disable-next-line import/no-deprecated
-        this.rightmostTiles = (0, properties_1.createMap)();
+        this.rightmostTiles = (0, properties_js_1.createMap)();
         // eslint-disable-next-line import/no-deprecated
-        this.leftmostTiles = (0, properties_1.createMap)();
+        this.leftmostTiles = (0, properties_js_1.createMap)();
     }
     hierBlock() {
         return this;
@@ -117,7 +120,7 @@ exports.findRootMergeBlock = findRootMergeBlock;
  * valid segment (i.e. the tree is empty).
  * @internal
  */
-function getSlideToSegment(segment, slidingPreference = localReference_1.SlidingPreference.FORWARD, cache, useNewSlidingBehavior = false) {
+function getSlideToSegment(segment, slidingPreference = localReference_js_1.SlidingPreference.FORWARD, cache, useNewSlidingBehavior = false) {
     if (!segment ||
         !isRemovedAndAckedOrMovedAndAcked(segment) ||
         segment.endpointType !== undefined) {
@@ -130,7 +133,7 @@ function getSlideToSegment(segment, slidingPreference = localReference_1.Sliding
     const result = {};
     cache?.set(segment, result);
     const goFurtherToFindSlideToSegment = (seg) => {
-        if (seg.seq !== constants_1.UnassignedSequenceNumber && !isRemovedAndAckedOrMovedAndAcked(seg)) {
+        if (seg.seq !== constants_js_1.UnassignedSequenceNumber && !isRemovedAndAckedOrMovedAndAcked(seg)) {
             result.seg = seg;
             return false;
         }
@@ -140,11 +143,11 @@ function getSlideToSegment(segment, slidingPreference = localReference_1.Sliding
         }
         return true;
     };
-    if (slidingPreference === localReference_1.SlidingPreference.BACKWARD) {
-        (0, mergeTreeNodeWalk_1.backwardExcursion)(segment, goFurtherToFindSlideToSegment);
+    if (slidingPreference === localReference_js_1.SlidingPreference.BACKWARD) {
+        (0, mergeTreeNodeWalk_js_1.backwardExcursion)(segment, goFurtherToFindSlideToSegment);
     }
     else {
-        (0, mergeTreeNodeWalk_1.forwardExcursion)(segment, goFurtherToFindSlideToSegment);
+        (0, mergeTreeNodeWalk_js_1.forwardExcursion)(segment, goFurtherToFindSlideToSegment);
     }
     if (result.seg !== undefined) {
         return [result.seg, undefined];
@@ -159,18 +162,18 @@ function getSlideToSegment(segment, slidingPreference = localReference_1.Sliding
     // in both of these cases detached may be substituted for one of the special
     // endpoint segments, if such behavior is enabled
     if (!useNewSlidingBehavior) {
-        if (slidingPreference === localReference_1.SlidingPreference.BACKWARD) {
-            (0, mergeTreeNodeWalk_1.forwardExcursion)(segment, goFurtherToFindSlideToSegment);
+        if (slidingPreference === localReference_js_1.SlidingPreference.BACKWARD) {
+            (0, mergeTreeNodeWalk_js_1.forwardExcursion)(segment, goFurtherToFindSlideToSegment);
         }
         else {
-            (0, mergeTreeNodeWalk_1.backwardExcursion)(segment, goFurtherToFindSlideToSegment);
+            (0, mergeTreeNodeWalk_js_1.backwardExcursion)(segment, goFurtherToFindSlideToSegment);
         }
     }
     let maybeEndpoint;
-    if (slidingPreference === localReference_1.SlidingPreference.BACKWARD) {
+    if (slidingPreference === localReference_js_1.SlidingPreference.BACKWARD) {
         maybeEndpoint = "start";
     }
-    else if (slidingPreference === localReference_1.SlidingPreference.FORWARD) {
+    else if (slidingPreference === localReference_js_1.SlidingPreference.FORWARD) {
         maybeEndpoint = "end";
     }
     return [result.seg, maybeEndpoint];
@@ -181,7 +184,7 @@ function getSlideToSegment(segment, slidingPreference = localReference_1.Sliding
  * @returns segment and offset to slide the reference to
  * @internal
  */
-function getSlideToSegoff(segoff, slidingPreference = localReference_1.SlidingPreference.FORWARD, useNewSlidingBehavior = false) {
+function getSlideToSegoff(segoff, slidingPreference = localReference_js_1.SlidingPreference.FORWARD, useNewSlidingBehavior = false) {
     if (segoff.segment === undefined) {
         return segoff;
     }
@@ -203,9 +206,9 @@ class MergeTree {
     constructor(options) {
         this.options = options;
         // eslint-disable-next-line import/no-deprecated
-        this.collabWindow = new mergeTreeNodes_1.CollaborationWindow();
+        this.collabWindow = new mergeTreeNodes_js_1.CollaborationWindow();
         // eslint-disable-next-line import/no-deprecated
-        this.pendingSegments = new collections_1.DoublyLinkedList();
+        this.pendingSegments = new index_js_1.DoublyLinkedList();
         this.segmentsToScour = new core_utils_1.Heap(LRUSegmentComparer);
         /**
          * Whether or not all blocks in the mergeTree currently have information about local partial lengths computed.
@@ -252,13 +255,13 @@ class MergeTree {
             }
             const next = segment.splitAt(pos);
             this.mergeTreeMaintenanceCallback?.({
-                operation: mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT,
+                operation: mergeTreeDeltaCallback_js_1.MergeTreeMaintenanceType.SPLIT,
                 deltaSegments: [{ segment }, { segment: next }],
             }, undefined);
             return { next };
         };
-        this.startOfTree = new endOfTreeSegment_1.StartOfTreeSegment(this);
-        this.endOfTree = new endOfTreeSegment_1.EndOfTreeSegment(this);
+        this.startOfTree = new endOfTreeSegment_js_1.StartOfTreeSegment(this);
+        this.endOfTree = new endOfTreeSegment_js_1.EndOfTreeSegment(this);
         this._root = this.makeBlock(0);
         this._root.mergeTree = this;
         this.attributionPolicy = options?.attribution?.policyFactory?.();
@@ -283,12 +286,12 @@ class MergeTree {
      * numbers corresponding to un-acked operations give valid results.
      */
     localNetLength(segment, refSeq, localSeq) {
-        const removalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
-        const moveInfo = (0, mergeTreeNodes_1.toMoveInfo)(segment);
+        const removalInfo = (0, mergeTreeNodes_js_1.toRemovalInfo)(segment);
+        const moveInfo = (0, mergeTreeNodes_js_1.toMoveInfo)(segment);
         if (localSeq === undefined) {
             if (removalInfo !== undefined || moveInfo !== undefined) {
-                if ((!!removalInfo && !(0, mergeTreeNodes_1.seqLTE)(removalInfo.removedSeq, this.collabWindow.minSeq)) ||
-                    (!!moveInfo && !(0, mergeTreeNodes_1.seqLTE)(moveInfo.movedSeq, this.collabWindow.minSeq))) {
+                if ((!!removalInfo && !(0, mergeTreeNodes_js_1.seqLTE)(removalInfo.removedSeq, this.collabWindow.minSeq)) ||
+                    (!!moveInfo && !(0, mergeTreeNodes_js_1.seqLTE)(moveInfo.movedSeq, this.collabWindow.minSeq))) {
                     return 0;
                 }
                 // this segment removed and outside the collab window which means it is zamboni eligible
@@ -303,14 +306,14 @@ class MergeTree {
         (0, core_utils_1.assert)(refSeq !== undefined, 0x398 /* localSeq provided for local length without refSeq */);
         (0, core_utils_1.assert)(segment.seq !== undefined, 0x399 /* segment with no seq in mergeTree */);
         const { seq, removedSeq, localRemovedSeq, movedSeq, localMovedSeq } = segment;
-        if (seq !== constants_1.UnassignedSequenceNumber) {
+        if (seq !== constants_js_1.UnassignedSequenceNumber) {
             // inserted remotely
             if (seq > refSeq ||
                 (removedSeq !== undefined &&
-                    removedSeq !== constants_1.UnassignedSequenceNumber &&
+                    removedSeq !== constants_js_1.UnassignedSequenceNumber &&
                     removedSeq <= refSeq) ||
                 (movedSeq !== undefined &&
-                    movedSeq !== constants_1.UnassignedSequenceNumber &&
+                    movedSeq !== constants_js_1.UnassignedSequenceNumber &&
                     movedSeq <= refSeq) ||
                 (localRemovedSeq !== undefined && localRemovedSeq <= localSeq) ||
                 (localMovedSeq !== undefined && localMovedSeq <= localSeq)) {
@@ -343,7 +346,7 @@ class MergeTree {
     reloadFromSegments(segments) {
         // This code assumes that a later call to `startCollaboration()` will initialize partial lengths.
         (0, core_utils_1.assert)(!this.collabWindow.collaborating, 0x049 /* "Trying to reload from segments while collaborating!" */);
-        const maxChildren = mergeTreeNodes_1.MaxNodesInBlock - 1;
+        const maxChildren = mergeTreeNodes_js_1.MaxNodesInBlock - 1;
         // Starting with the leaf segments, recursively builds the B-Tree layer by layer from the bottom up.
         const buildMergeBlock = (nodes) => {
             const blockCount = Math.ceil(nodes.length / maxChildren); // Compute # blocks require for this level of B-Tree
@@ -466,20 +469,20 @@ class MergeTree {
         let currentForwardMaybeEndpoint;
         let currentForwardSlideDestination;
         let currentForwardSlideIsForward;
-        const forwardPred = (ref) => ref.slidingPreference !== localReference_1.SlidingPreference.BACKWARD;
+        const forwardPred = (ref) => ref.slidingPreference !== localReference_js_1.SlidingPreference.BACKWARD;
         let currentBackwardMaybeEndpoint;
         let currentBackwardSlideDestination;
         let currentBackwardSlideIsForward;
-        const backwardPred = (ref) => ref.slidingPreference === localReference_1.SlidingPreference.BACKWARD;
+        const backwardPred = (ref) => ref.slidingPreference === localReference_js_1.SlidingPreference.BACKWARD;
         const slideGroup = (currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, maybeEndpoint) => {
             if (currentSlideIsForward === undefined) {
                 return;
             }
-            const nonEndpointRefsToAdd = currentSlideGroup.map((collection) => (0, localReference_1.filterLocalReferencePositions)(collection, (ref) => pred(ref) && (maybeEndpoint ? !ref.canSlideToEndpoint : true)));
-            const endpointRefsToAdd = currentSlideGroup.map((collection) => (0, localReference_1.filterLocalReferencePositions)(collection, (ref) => pred(ref) && !!ref.canSlideToEndpoint));
+            const nonEndpointRefsToAdd = currentSlideGroup.map((collection) => (0, localReference_js_1.filterLocalReferencePositions)(collection, (ref) => pred(ref) && (maybeEndpoint ? !ref.canSlideToEndpoint : true)));
+            const endpointRefsToAdd = currentSlideGroup.map((collection) => (0, localReference_js_1.filterLocalReferencePositions)(collection, (ref) => pred(ref) && !!ref.canSlideToEndpoint));
             if (maybeEndpoint) {
                 const endpoint = maybeEndpoint === "start" ? this.startOfTree : this.endOfTree;
-                const localRefs = (endpoint.localRefs ?? (endpoint.localRefs = new localReference_1.LocalReferenceCollection(endpoint)));
+                const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(endpoint);
                 if (currentSlideIsForward) {
                     localRefs.addBeforeTombstones(...endpointRefsToAdd);
                 }
@@ -488,7 +491,7 @@ class MergeTree {
                 }
             }
             if (currentSlideDestination !== undefined) {
-                const localRefs = (currentSlideDestination.localRefs ?? (currentSlideDestination.localRefs = new localReference_1.LocalReferenceCollection(currentSlideDestination)));
+                const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(currentSlideDestination);
                 if (currentSlideIsForward) {
                     localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
                 }
@@ -499,7 +502,7 @@ class MergeTree {
             else {
                 for (const collection of currentSlideGroup) {
                     for (const ref of collection) {
-                        if (pred(ref) && !(0, referencePositions_1.refTypeIncludesFlag)(ref, ops_1.ReferenceType.StayOnRemove)) {
+                        if (pred(ref) && !(0, referencePositions_js_1.refTypeIncludesFlag)(ref, ops_js_1.ReferenceType.StayOnRemove)) {
                             ref.callbacks?.beforeSlide?.(ref);
                             collection.removeLocalRef(ref);
                             ref.callbacks?.afterSlide?.(ref);
@@ -511,10 +514,10 @@ class MergeTree {
         const trySlideSegment = (segment, currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, slidingPreference, currentMaybeEndpoint, reassign) => {
             // avoid sliding logic if this segment doesn't have any references
             // with the given sliding preference
-            if (!segment.localRefs || !(0, localReference_1.anyLocalReferencePosition)(segment.localRefs, pred)) {
+            if (!segment.localRefs || !(0, localReference_js_1.anyLocalReferencePosition)(segment.localRefs, pred)) {
                 return;
             }
-            const [slideToSegment, maybeEndpoint] = getSlideToSegment(segment, slidingPreference, slidingPreference === localReference_1.SlidingPreference.FORWARD
+            const [slideToSegment, maybeEndpoint] = getSlideToSegment(segment, slidingPreference, slidingPreference === localReference_js_1.SlidingPreference.FORWARD
                 ? forwardSegmentCache
                 : backwardSegmentCache, this.options?.mergeTreeReferencesCanSlideToEndpoint);
             const slideIsForward = slideToSegment === undefined ? false : slideToSegment.ordinal > segment.ordinal;
@@ -535,13 +538,13 @@ class MergeTree {
             if (segment.localRefs === undefined || segment.localRefs.empty) {
                 continue;
             }
-            trySlideSegment(segment, currentForwardSlideDestination, currentForwardSlideIsForward, currentForwardSlideGroup, forwardPred, localReference_1.SlidingPreference.FORWARD, currentForwardMaybeEndpoint, (localRefs, slideToSegment, slideIsForward, maybeEndpoint) => {
+            trySlideSegment(segment, currentForwardSlideDestination, currentForwardSlideIsForward, currentForwardSlideGroup, forwardPred, localReference_js_1.SlidingPreference.FORWARD, currentForwardMaybeEndpoint, (localRefs, slideToSegment, slideIsForward, maybeEndpoint) => {
                 currentForwardSlideGroup = [localRefs];
                 currentForwardSlideDestination = slideToSegment;
                 currentForwardSlideIsForward = slideIsForward;
                 currentForwardMaybeEndpoint = maybeEndpoint;
             });
-            trySlideSegment(segment, currentBackwardSlideDestination, currentBackwardSlideIsForward, currentBackwardSlideGroup, backwardPred, localReference_1.SlidingPreference.BACKWARD, currentBackwardMaybeEndpoint, (localRefs, slideToSegment, slideIsForward, maybeEndpoint) => {
+            trySlideSegment(segment, currentBackwardSlideDestination, currentBackwardSlideIsForward, currentBackwardSlideGroup, backwardPred, localReference_js_1.SlidingPreference.BACKWARD, currentBackwardMaybeEndpoint, (localRefs, slideToSegment, slideIsForward, maybeEndpoint) => {
                 currentBackwardSlideGroup = [localRefs];
                 currentBackwardSlideDestination = slideToSegment;
                 currentBackwardSlideIsForward = slideIsForward;
@@ -566,12 +569,12 @@ class MergeTree {
             return;
         }
         // eslint-disable-next-line import/no-deprecated
-        const rebaseCollabWindow = new mergeTreeNodes_1.CollaborationWindow();
+        const rebaseCollabWindow = new mergeTreeNodes_js_1.CollaborationWindow();
         rebaseCollabWindow.loadFrom(this.collabWindow);
         if (refSeq < this.collabWindow.minSeq) {
             rebaseCollabWindow.minSeq = refSeq;
         }
-        this.root.partialLengths = partialLengths_1.PartialSequenceLengths.combine(this.root, rebaseCollabWindow, true, true);
+        this.root.partialLengths = partialLengths_js_1.PartialSequenceLengths.combine(this.root, rebaseCollabWindow, true, true);
         this.localPartialsComputed = true;
     }
     nodeLength(node, refSeq, clientId, localSeq) {
@@ -587,7 +590,7 @@ class MergeTree {
                 this.computeLocalPartials(refSeq);
                 // Local client should see all segments except those after localSeq.
                 const partialLen = node.partialLengths.getPartialLength(refSeq, clientId, localSeq);
-                partialLengths_1.PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId, localSeq);
+                partialLengths_js_1.PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId, localSeq);
                 return partialLen;
             }
         }
@@ -595,32 +598,32 @@ class MergeTree {
             // Sequence number within window
             if (!node.isLeaf()) {
                 const partialLen = node.partialLengths.getPartialLength(refSeq, clientId);
-                partialLengths_1.PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId);
+                partialLengths_js_1.PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId);
                 return partialLen;
             }
             else {
                 const segment = node;
-                const removalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
-                const moveInfo = (0, mergeTreeNodes_1.toMoveInfo)(segment);
+                const removalInfo = (0, mergeTreeNodes_js_1.toRemovalInfo)(segment);
+                const moveInfo = (0, mergeTreeNodes_js_1.toMoveInfo)(segment);
                 if (removalInfo !== undefined) {
-                    if ((0, mergeTreeNodes_1.seqLTE)(removalInfo.removedSeq, this.collabWindow.minSeq)) {
+                    if ((0, mergeTreeNodes_js_1.seqLTE)(removalInfo.removedSeq, this.collabWindow.minSeq)) {
                         return undefined;
                     }
-                    if ((0, mergeTreeNodes_1.seqLTE)(removalInfo.removedSeq, refSeq) ||
+                    if ((0, mergeTreeNodes_js_1.seqLTE)(removalInfo.removedSeq, refSeq) ||
                         removalInfo.removedClientIds.includes(clientId)) {
                         return 0;
                     }
                 }
                 if (moveInfo !== undefined) {
-                    if ((0, mergeTreeNodes_1.seqLTE)(moveInfo.movedSeq, this.collabWindow.minSeq)) {
+                    if ((0, mergeTreeNodes_js_1.seqLTE)(moveInfo.movedSeq, this.collabWindow.minSeq)) {
                         return undefined;
                     }
-                    if ((0, mergeTreeNodes_1.seqLTE)(moveInfo.movedSeq, refSeq) ||
+                    if ((0, mergeTreeNodes_js_1.seqLTE)(moveInfo.movedSeq, refSeq) ||
                         moveInfo.movedClientIds.includes(clientId)) {
                         return 0;
                     }
                 }
-                return (0, mergeTreeNodes_1.seqLTE)(node.seq ?? 0, refSeq) || segment.clientId === clientId
+                return (0, mergeTreeNodes_js_1.seqLTE)(node.seq ?? 0, refSeq) || segment.clientId === clientId
                     ? segment.cachedLength
                     : 0;
             }
@@ -635,23 +638,27 @@ class MergeTree {
             const firstMoveSeqIdx = this.moveSeqs.findIndex((seq) => seq >= minSeq);
             this.moveSeqs = firstMoveSeqIdx === -1 ? [] : this.moveSeqs.slice(firstMoveSeqIdx);
             if (MergeTree.options.zamboniSegments) {
-                (0, zamboni_1.zamboniSegments)(this);
+                (0, zamboni_js_1.zamboniSegments)(this);
             }
         }
     }
     referencePositionToLocalPosition(refPos, refSeq = this.collabWindow.currentSeq, clientId = this.collabWindow.clientId) {
         const seg = refPos.getSegment();
         if (seg?.parent === undefined) {
-            return referencePositions_1.DetachedReferencePosition;
+            return referencePositions_js_1.DetachedReferencePosition;
         }
         if (refPos.isLeaf()) {
             return this.getPosition(refPos, refSeq, clientId);
         }
-        if ((0, referencePositions_1.refTypeIncludesFlag)(refPos, ops_1.ReferenceType.Transient) || seg.localRefs?.has(refPos)) {
-            const offset = isRemoved(seg) || isMoved(seg) ? 0 : refPos.getOffset();
-            return offset + this.getPosition(seg, refSeq, clientId);
+        if ((0, referencePositions_js_1.refTypeIncludesFlag)(refPos, ops_js_1.ReferenceType.Transient) || seg.localRefs?.has(refPos)) {
+            const offset = isRemovedOrMoved(seg) ? 0 : refPos.getOffset();
+            const pos = this.getPosition(seg, refSeq, clientId);
+            if (isRemovedOrMoved(seg) && refPos.slidingPreference === localReference_js_1.SlidingPreference.BACKWARD) {
+                return pos === 0 ? 0 : pos - 1;
+            }
+            return offset + pos;
         }
-        return referencePositions_1.DetachedReferencePosition;
+        return referencePositions_js_1.DetachedReferencePosition;
     }
     /**
      * Finds the nearest reference with ReferenceType.Tile to `startPos` in the direction dictated by `forwards`.
@@ -667,14 +674,14 @@ class MergeTree {
      */
     searchForMarker(startPos, clientId, markerLabel, forwards = true) {
         let foundMarker;
-        const { segment } = this.getContainingSegment(startPos, constants_1.UniversalSequenceNumber, clientId);
+        const { segment } = this.getContainingSegment(startPos, constants_js_1.UniversalSequenceNumber, clientId);
         const segWithParent = segment;
         if (segWithParent?.parent === undefined) {
             return undefined;
         }
-        (0, mergeTreeNodeWalk_1.depthFirstNodeWalk)(segWithParent.parent, segWithParent, (seg) => {
+        (0, mergeTreeNodeWalk_js_1.depthFirstNodeWalk)(segWithParent.parent, segWithParent, (seg) => {
             if (seg.isLeaf()) {
-                if (mergeTreeNodes_1.Marker.is(seg) && (0, referencePositions_1.refHasTileLabel)(seg, markerLabel)) {
+                if (mergeTreeNodes_js_1.Marker.is(seg) && (0, referencePositions_js_1.refHasTileLabel)(seg, markerLabel)) {
                     foundMarker = seg;
                 }
             }
@@ -684,11 +691,11 @@ class MergeTree {
                     ? block.leftmostTiles[markerLabel]
                     : block.rightmostTiles[markerLabel];
                 if (marker !== undefined) {
-                    (0, core_utils_1.assert)(marker.isLeaf() && mergeTreeNodes_1.Marker.is(marker), 0x751 /* Object returned is not a valid marker */);
+                    (0, core_utils_1.assert)(marker.isLeaf() && mergeTreeNodes_js_1.Marker.is(marker), 0x751 /* Object returned is not a valid marker */);
                     foundMarker = marker;
                 }
             }
-            return foundMarker !== undefined ? mergeTreeNodeWalk_1.NodeAction.Exit : mergeTreeNodeWalk_1.NodeAction.Skip;
+            return foundMarker !== undefined ? mergeTreeNodeWalk_js_1.NodeAction.Exit : mergeTreeNodeWalk_js_1.NodeAction.Skip;
         }, undefined, undefined, forwards);
         return foundMarker;
     }
@@ -717,24 +724,24 @@ class MergeTree {
             pendingSegmentGroup.segments.map((pendingSegment) => {
                 const localMovedSeq = pendingSegment.localMovedSeq;
                 const overlappingRemove = !pendingSegment.ack(pendingSegmentGroup, opArgs);
-                if (opArgs.op.type === ops_1.MergeTreeDeltaType.OBLITERATE &&
+                if (opArgs.op.type === ops_js_1.MergeTreeDeltaType.OBLITERATE &&
                     localMovedSeq !== undefined) {
                     const locallyMovedSegments = this.locallyMovedSegments.get(localMovedSeq);
                     if (locallyMovedSegments) {
-                        for (const segment of locallyMovedSegments.segments) {
+                        locallyMovedSegments.segments.forEach((segment) => {
                             segment.localMovedSeq = undefined;
                             if (!nodesToUpdate.includes(segment.parent)) {
                                 nodesToUpdate.push(segment.parent);
                             }
-                            if (segment.movedSeq === constants_1.UnassignedSequenceNumber) {
+                            if (segment.movedSeq === constants_js_1.UnassignedSequenceNumber) {
                                 segment.movedSeq = seq;
                             }
-                        }
+                        });
                         this.locallyMovedSegments.delete(localMovedSeq);
                     }
                 }
                 overwrite = overlappingRemove || overwrite;
-                if (opArgs.op.type === ops_1.MergeTreeDeltaType.OBLITERATE) {
+                if (opArgs.op.type === ops_js_1.MergeTreeDeltaType.OBLITERATE) {
                     if (seq !== this.moveSeqs[this.moveSeqs.length - 1]) {
                         this.moveSeqs.push(seq);
                     }
@@ -755,13 +762,13 @@ class MergeTree {
             });
             // Perform slides after all segments have been acked, so that
             // positions after slide are final
-            if (opArgs.op.type === ops_1.MergeTreeDeltaType.REMOVE ||
-                opArgs.op.type === ops_1.MergeTreeDeltaType.OBLITERATE) {
+            if (opArgs.op.type === ops_js_1.MergeTreeDeltaType.REMOVE ||
+                opArgs.op.type === ops_js_1.MergeTreeDeltaType.OBLITERATE) {
                 this.slideAckedRemovedSegmentReferences(pendingSegmentGroup.segments);
             }
             this.mergeTreeMaintenanceCallback?.({
                 deltaSegments,
-                operation: mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.ACKNOWLEDGED,
+                operation: mergeTreeDeltaCallback_js_1.MergeTreeMaintenanceType.ACKNOWLEDGED,
             }, opArgs);
             const clientId = this.collabWindow.clientId;
             for (const node of nodesToUpdate) {
@@ -769,7 +776,7 @@ class MergeTree {
             }
         }
         if (MergeTree.options.zamboniSegments) {
-            (0, zamboni_1.zamboniSegments)(this);
+            (0, zamboni_js_1.zamboniSegments)(this);
         }
     }
     addToPendingList(segment, 
@@ -837,19 +844,24 @@ class MergeTree {
     }
     insertSegments(pos, segments, refSeq, clientId, seq, opArgs) {
         this.ensureIntervalBoundary(pos, refSeq, clientId);
-        const localSeq = seq === constants_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
+        const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
         this.blockInsert(pos, refSeq, clientId, seq, localSeq, segments);
         // opArgs == undefined => loading snapshot or test code
         if (opArgs !== undefined) {
-            this.mergeTreeDeltaCallback?.(opArgs, {
-                operation: ops_1.MergeTreeDeltaType.INSERT,
-                deltaSegments: segments.map((segment) => ({ segment })),
-            });
+            const deltaSegments = segments
+                .filter((segment) => !(0, mergeTreeNodes_js_1.toMoveInfo)(segment))
+                .map((segment) => ({ segment }));
+            if (deltaSegments.length > 0) {
+                this.mergeTreeDeltaCallback?.(opArgs, {
+                    operation: ops_js_1.MergeTreeDeltaType.INSERT,
+                    deltaSegments,
+                });
+            }
         }
         if (this.collabWindow.collaborating &&
             MergeTree.options.zamboniSegments &&
-            seq !== constants_1.UnassignedSequenceNumber) {
-            (0, zamboni_1.zamboniSegments)(this);
+            seq !== constants_js_1.UnassignedSequenceNumber) {
+            (0, zamboni_js_1.zamboniSegments)(this);
         }
     }
     /**
@@ -885,7 +897,7 @@ class MergeTree {
     blockInsert(pos, refSeq, clientId, seq, localSeq, newSegments) {
         const continueFrom = (node) => {
             let siblingExists = false;
-            (0, mergeTreeNodeWalk_1.forwardExcursion)(node, () => {
+            (0, mergeTreeNodeWalk_js_1.forwardExcursion)(node, () => {
                 siblingExists = true;
                 return false;
             });
@@ -896,7 +908,7 @@ class MergeTree {
         const saveIfLocal = (locSegment) => {
             // Save segment so we can assign sequence number when acked by server
             if (this.collabWindow.collaborating) {
-                if (locSegment.seq === constants_1.UnassignedSequenceNumber &&
+                if (locSegment.seq === constants_js_1.UnassignedSequenceNumber &&
                     clientId === this.collabWindow.clientId) {
                     segmentGroup = this.addToPendingList(locSegment, segmentGroup, localSeq);
                 }
@@ -928,7 +940,7 @@ class MergeTree {
                 newSegment.seq = seq;
                 newSegment.localSeq = localSeq;
                 newSegment.clientId = clientId;
-                if (mergeTreeNodes_1.Marker.is(newSegment)) {
+                if (mergeTreeNodes_js_1.Marker.is(newSegment)) {
                     const markerId = newSegment.getId();
                     if (markerId) {
                         this.idToMarker.set(markerId, newSegment);
@@ -1001,7 +1013,7 @@ class MergeTree {
                         const left = leftLocalSegments[localMovedSeq];
                         if (left) {
                             _localMovedSeq = localMovedSeq;
-                            const clientIdIdx = left.movedSeqs?.indexOf(constants_1.UnassignedSequenceNumber) ?? -1;
+                            const clientIdIdx = left.movedSeqs?.indexOf(constants_js_1.UnassignedSequenceNumber) ?? -1;
                             const movedClientId = left.movedClientIds?.[clientIdIdx];
                             (0, core_utils_1.assert)(movedClientId !== undefined, 0x86a /* expected client id to exist */);
                             movedClientIds = [movedClientId];
@@ -1018,17 +1030,17 @@ class MergeTree {
                     // happened, no need to continue.
                     return moveUpperBound >= smallestSeqMoveOp;
                 };
-                (0, mergeTreeNodeWalk_1.backwardExcursion)(newSegment, findLeftMovedSegment);
+                (0, mergeTreeNodeWalk_js_1.backwardExcursion)(newSegment, findLeftMovedSegment);
                 moveUpperBound = Number.POSITIVE_INFINITY;
-                (0, mergeTreeNodeWalk_1.forwardExcursion)(newSegment, findRightMovedSegment);
+                (0, mergeTreeNodeWalk_js_1.forwardExcursion)(newSegment, findRightMovedSegment);
                 if (_localMovedSeq !== undefined || _movedSeq !== undefined) {
                     (0, core_utils_1.assert)(movedClientIds !== undefined, 0x86b /* movedClientIds should be set if local/moved seq is set */);
                     const moveInfo = {
                         movedClientIds,
-                        movedSeq: _movedSeq ?? constants_1.UnassignedSequenceNumber,
-                        movedSeqs: _movedSeq === undefined ? [constants_1.UnassignedSequenceNumber] : [_movedSeq],
+                        movedSeq: _movedSeq ?? constants_js_1.UnassignedSequenceNumber,
+                        movedSeqs: _movedSeq === undefined ? [constants_js_1.UnassignedSequenceNumber] : [_movedSeq],
                         localMovedSeq: _localMovedSeq,
-                        wasMovedOnInsert: (_movedSeq ?? -1) !== constants_1.UnassignedSequenceNumber,
+                        wasMovedOnInsert: (_movedSeq ?? -1) !== constants_js_1.UnassignedSequenceNumber,
                     };
                     markSegmentMoved(newSegment, moveInfo);
                     if (moveInfo.localMovedSeq !== undefined) {
@@ -1044,7 +1056,7 @@ class MergeTree {
         }
     }
     ensureIntervalBoundary(pos, refSeq, clientId) {
-        const splitNode = this.insertingWalk(this.root, pos, refSeq, clientId, constants_1.TreeMaintenanceSequenceNumber, { leaf: this.splitLeafSegment });
+        const splitNode = this.insertingWalk(this.root, pos, refSeq, clientId, constants_js_1.TreeMaintenanceSequenceNumber, { leaf: this.splitLeafSegment });
         this.updateRoot(splitNode);
     }
     // Assume called only when pos == len
@@ -1058,14 +1070,14 @@ class MergeTree {
             // seq for comparison, as it will get a seq higher than any other seq once sequences
             // if the current seg is local (UnassignedSequenceNumber) give it the second highest
             // possible seq, as the highest is reserved for the previous.
-            const newSeq = seq === constants_1.UnassignedSequenceNumber ? Number.MAX_SAFE_INTEGER : seq;
-            const segSeq = node.seq === constants_1.UnassignedSequenceNumber ? Number.MAX_SAFE_INTEGER - 1 : node.seq ?? 0;
+            const newSeq = seq === constants_js_1.UnassignedSequenceNumber ? Number.MAX_SAFE_INTEGER : seq;
+            const segSeq = node.seq === constants_js_1.UnassignedSequenceNumber ? Number.MAX_SAFE_INTEGER - 1 : node.seq ?? 0;
             return (newSeq > segSeq ||
                 (node.movedSeq !== undefined &&
-                    node.movedSeq !== constants_1.UnassignedSequenceNumber &&
+                    node.movedSeq !== constants_js_1.UnassignedSequenceNumber &&
                     node.movedSeq > seq) ||
                 (node.removedSeq !== undefined &&
-                    node.removedSeq !== constants_1.UnassignedSequenceNumber &&
+                    node.removedSeq !== constants_js_1.UnassignedSequenceNumber &&
                     node.removedSeq > seq));
         }
         else {
@@ -1155,7 +1167,7 @@ class MergeTree {
             block.assignChild(newNode, childIndex, false);
             block.childCount++;
             block.setOrdinal(newNode, childIndex);
-            if (block.childCount < mergeTreeNodes_1.MaxNodesInBlock) {
+            if (block.childCount < mergeTreeNodes_js_1.MaxNodesInBlock) {
                 if (fromSplit) {
                     this.nodeUpdateOrdinals(fromSplit);
                 }
@@ -1165,8 +1177,8 @@ class MergeTree {
             else {
                 // Don't update ordinals because higher block will do it
                 const newNodeFromSplit = this.split(block);
-                partialLengths_1.PartialSequenceLengths.options.verifyExpected?.(this, block, refSeq, clientId);
-                partialLengths_1.PartialSequenceLengths.options.verifyExpected?.(this, newNodeFromSplit, refSeq, clientId);
+                partialLengths_js_1.PartialSequenceLengths.options.verifyExpected?.(this, block, refSeq, clientId);
+                partialLengths_js_1.PartialSequenceLengths.options.verifyExpected?.(this, newNodeFromSplit, refSeq, clientId);
                 return newNodeFromSplit;
             }
         }
@@ -1175,7 +1187,7 @@ class MergeTree {
         }
     }
     split(node) {
-        const halfCount = mergeTreeNodes_1.MaxNodesInBlock / 2;
+        const halfCount = mergeTreeNodes_js_1.MaxNodesInBlock / 2;
         const newNode = this.makeBlock(halfCount);
         node.childCount = halfCount;
         // Update ordinals to reflect lowered child count
@@ -1208,21 +1220,21 @@ class MergeTree {
      * @param opArgs - The op args for the annotate op. this is passed to the merge tree callback if there is one
      * @param rollback - Whether this is for a local rollback and what kind
      */
-    annotateRange(start, end, props, refSeq, clientId, seq, opArgs, rollback = segmentPropertiesManager_1.PropertiesRollback.None) {
+    annotateRange(start, end, props, refSeq, clientId, seq, opArgs, rollback = segmentPropertiesManager_js_1.PropertiesRollback.None) {
         this.ensureIntervalBoundary(start, refSeq, clientId);
         this.ensureIntervalBoundary(end, refSeq, clientId);
         const deltaSegments = [];
-        const localSeq = seq === constants_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
+        const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
         // eslint-disable-next-line import/no-deprecated
         let segmentGroup;
         const annotateSegment = (segment) => {
-            (0, core_utils_1.assert)(!mergeTreeNodes_1.Marker.is(segment) ||
-                !(mergeTreeNodes_1.reservedMarkerIdKey in props) ||
+            (0, core_utils_1.assert)(!mergeTreeNodes_js_1.Marker.is(segment) ||
+                !(mergeTreeNodes_js_1.reservedMarkerIdKey in props) ||
                 props.markerId === segment.properties?.markerId, 0x5ad /* Cannot change the markerId of an existing marker */);
             const propertyDeltas = segment.addProperties(props, seq, this.collabWindow.collaborating, rollback);
             deltaSegments.push({ segment, propertyDeltas });
             if (this.collabWindow.collaborating) {
-                if (seq === constants_1.UnassignedSequenceNumber) {
+                if (seq === constants_js_1.UnassignedSequenceNumber) {
                     segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq, propertyDeltas);
                 }
                 else {
@@ -1237,19 +1249,16 @@ class MergeTree {
         // OpArgs == undefined => test code
         if (deltaSegments.length > 0) {
             this.mergeTreeDeltaCallback?.(opArgs, {
-                operation: ops_1.MergeTreeDeltaType.ANNOTATE,
+                operation: ops_js_1.MergeTreeDeltaType.ANNOTATE,
                 deltaSegments,
             });
         }
-        if (this.collabWindow.collaborating && seq !== constants_1.UnassignedSequenceNumber) {
+        if (this.collabWindow.collaborating && seq !== constants_js_1.UnassignedSequenceNumber) {
             if (MergeTree.options.zamboniSegments) {
-                (0, zamboni_1.zamboniSegments)(this);
+                (0, zamboni_js_1.zamboniSegments)(this);
             }
         }
     }
-    /**
-     * @alpha
-     */
     obliterateRange(start, end, refSeq, clientId, seq, overwrite = false, opArgs) {
         if (!this.options?.mergeTreeEnableObliterate) {
             throw new telemetry_utils_1.UsageError("Attempted to send obliterate op without enabling feature flag.");
@@ -1259,26 +1268,26 @@ class MergeTree {
         let _overwrite = overwrite;
         const localOverlapWithRefs = [];
         const movedSegments = [];
-        const localSeq = seq === constants_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
-        if (seq !== constants_1.UnassignedSequenceNumber && seq !== this.moveSeqs[this.moveSeqs.length - 1]) {
+        const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
+        if (seq !== constants_js_1.UnassignedSequenceNumber && seq !== this.moveSeqs[this.moveSeqs.length - 1]) {
             this.moveSeqs.push(seq);
         }
-        else if (seq === constants_1.UnassignedSequenceNumber && localSeq !== undefined) {
+        else if (seq === constants_js_1.UnassignedSequenceNumber && localSeq !== undefined) {
             this.localMoveSeqs.add(localSeq);
         }
         // eslint-disable-next-line import/no-deprecated
         let segmentGroup;
         const markMoved = (segment, pos, _start, _end) => {
-            const existingMoveInfo = (0, mergeTreeNodes_1.toMoveInfo)(segment);
+            const existingMoveInfo = (0, mergeTreeNodes_js_1.toMoveInfo)(segment);
             if (clientId !== segment.clientId &&
                 segment.seq !== undefined &&
-                seq !== constants_1.UnassignedSequenceNumber &&
-                (refSeq < segment.seq || segment.seq === constants_1.UnassignedSequenceNumber)) {
+                seq !== constants_js_1.UnassignedSequenceNumber &&
+                (refSeq < segment.seq || segment.seq === constants_js_1.UnassignedSequenceNumber)) {
                 segment.wasMovedOnInsert = true;
             }
             if (existingMoveInfo !== undefined) {
                 _overwrite = true;
-                if (existingMoveInfo.movedSeq === constants_1.UnassignedSequenceNumber) {
+                if (existingMoveInfo.movedSeq === constants_js_1.UnassignedSequenceNumber) {
                     // we moved this locally, but someone else moved it first
                     // so put them at the head of the list
                     // The list isn't ordered, but we keep the first move at the head
@@ -1301,11 +1310,13 @@ class MergeTree {
                 segment.movedSeq = seq;
                 segment.localMovedSeq = localSeq;
                 segment.movedSeqs = [seq];
-                movedSegments.push({ segment });
+                if (!(0, mergeTreeNodes_js_1.toRemovalInfo)(segment)) {
+                    movedSegments.push({ segment });
+                }
             }
             // Save segment so can assign moved sequence number when acked by server
             if (this.collabWindow.collaborating) {
-                if (segment.movedSeq === constants_1.UnassignedSequenceNumber &&
+                if (segment.movedSeq === constants_js_1.UnassignedSequenceNumber &&
                     clientId === this.collabWindow.clientId) {
                     segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq);
                 }
@@ -1326,12 +1337,12 @@ class MergeTree {
             }
             return true;
         };
-        this.nodeMap(refSeq, clientId, markMoved, undefined, afterMarkMoved, start, end, undefined, seq !== constants_1.UnassignedSequenceNumber ? seq : undefined);
+        this.nodeMap(refSeq, clientId, markMoved, undefined, afterMarkMoved, start, end, undefined, seq !== constants_js_1.UnassignedSequenceNumber ? seq : undefined);
         this.slideAckedRemovedSegmentReferences(localOverlapWithRefs);
         // opArgs == undefined => test code
         if (movedSegments.length > 0) {
             this.mergeTreeDeltaCallback?.(opArgs, {
-                operation: ops_1.MergeTreeDeltaType.OBLITERATE,
+                operation: ops_js_1.MergeTreeDeltaType.OBLITERATE,
                 deltaSegments: movedSegments,
             });
         }
@@ -1344,9 +1355,9 @@ class MergeTree {
         if (!this.collabWindow.collaborating || clientId !== this.collabWindow.clientId) {
             this.slideAckedRemovedSegmentReferences(movedSegments.map(({ segment }) => segment));
         }
-        if (this.collabWindow.collaborating && seq !== constants_1.UnassignedSequenceNumber) {
+        if (this.collabWindow.collaborating && seq !== constants_js_1.UnassignedSequenceNumber) {
             if (MergeTree.options.zamboniSegments) {
-                (0, zamboni_1.zamboniSegments)(this);
+                (0, zamboni_js_1.zamboniSegments)(this);
             }
         }
     }
@@ -1358,12 +1369,12 @@ class MergeTree {
         let segmentGroup;
         const removedSegments = [];
         const localOverlapWithRefs = [];
-        const localSeq = seq === constants_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
+        const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
         const markRemoved = (segment, pos, _start, _end) => {
-            const existingRemovalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
+            const existingRemovalInfo = (0, mergeTreeNodes_js_1.toRemovalInfo)(segment);
             if (existingRemovalInfo !== undefined) {
                 _overwrite = true;
-                if (existingRemovalInfo.removedSeq === constants_1.UnassignedSequenceNumber) {
+                if (existingRemovalInfo.removedSeq === constants_js_1.UnassignedSequenceNumber) {
                     // we removed this locally, but someone else removed it first
                     // so put them at the head of the list
                     // The list isn't ordered, but we keep the first removal at the head
@@ -1383,11 +1394,13 @@ class MergeTree {
                 segment.removedClientIds = [clientId];
                 segment.removedSeq = seq;
                 segment.localRemovedSeq = localSeq;
-                removedSegments.push({ segment });
+                if (!(0, mergeTreeNodes_js_1.toMoveInfo)(segment)) {
+                    removedSegments.push({ segment });
+                }
             }
             // Save segment so we can assign removed sequence number when acked by server
             if (this.collabWindow.collaborating) {
-                if (segment.removedSeq === constants_1.UnassignedSequenceNumber &&
+                if (segment.removedSeq === constants_js_1.UnassignedSequenceNumber &&
                     clientId === this.collabWindow.clientId) {
                     segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq);
                 }
@@ -1415,7 +1428,7 @@ class MergeTree {
         // opArgs == undefined => test code
         if (removedSegments.length > 0) {
             this.mergeTreeDeltaCallback?.(opArgs, {
-                operation: ops_1.MergeTreeDeltaType.REMOVE,
+                operation: ops_js_1.MergeTreeDeltaType.REMOVE,
                 deltaSegments: removedSegments,
             });
         }
@@ -1425,9 +1438,9 @@ class MergeTree {
         if (!this.collabWindow.collaborating || clientId !== this.collabWindow.clientId) {
             this.slideAckedRemovedSegmentReferences(removedSegments.map(({ segment }) => segment));
         }
-        if (this.collabWindow.collaborating && seq !== constants_1.UnassignedSequenceNumber) {
+        if (this.collabWindow.collaborating && seq !== constants_js_1.UnassignedSequenceNumber) {
             if (MergeTree.options.zamboniSegments) {
-                (0, zamboni_1.zamboniSegments)(this);
+                (0, zamboni_js_1.zamboniSegments)(this);
             }
         }
     }
@@ -1436,7 +1449,7 @@ class MergeTree {
      */
     // eslint-disable-next-line import/no-deprecated
     rollback(op, localOpMetadata) {
-        if (op.type === ops_1.MergeTreeDeltaType.REMOVE) {
+        if (op.type === ops_js_1.MergeTreeDeltaType.REMOVE) {
             const pendingSegmentGroup = this.pendingSegments.pop?.()?.data;
             if (pendingSegmentGroup === undefined || pendingSegmentGroup !== localOpMetadata) {
                 throw new Error("Rollback op doesn't match last edit");
@@ -1451,21 +1464,21 @@ class MergeTree {
                 segment.localRemovedSeq = undefined;
                 // Note: optional chaining short-circuits:
                 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Optional_chaining#short-circuiting
-                this.mergeTreeDeltaCallback?.({ op: (0, opBuilder_1.createInsertSegmentOp)(this.findRollbackPosition(segment), segment) }, {
-                    operation: ops_1.MergeTreeDeltaType.INSERT,
+                this.mergeTreeDeltaCallback?.({ op: (0, opBuilder_js_1.createInsertSegmentOp)(this.findRollbackPosition(segment), segment) }, {
+                    operation: ops_js_1.MergeTreeDeltaType.INSERT,
                     deltaSegments: [{ segment }],
                 });
                 for (let updateNode = segment.parent; updateNode !== undefined; updateNode = updateNode.parent) {
-                    this.blockUpdateLength(updateNode, constants_1.UnassignedSequenceNumber, this.collabWindow.clientId);
+                    this.blockUpdateLength(updateNode, constants_js_1.UnassignedSequenceNumber, this.collabWindow.clientId);
                 }
             });
         }
-        else if (op.type === ops_1.MergeTreeDeltaType.INSERT ||
-            op.type === ops_1.MergeTreeDeltaType.ANNOTATE) {
+        else if (op.type === ops_js_1.MergeTreeDeltaType.INSERT ||
+            op.type === ops_js_1.MergeTreeDeltaType.ANNOTATE) {
             const pendingSegmentGroup = this.pendingSegments.pop?.()?.data;
             if (pendingSegmentGroup === undefined ||
                 pendingSegmentGroup !== localOpMetadata ||
-                (op.type === ops_1.MergeTreeDeltaType.ANNOTATE && !pendingSegmentGroup.previousProps)) {
+                (op.type === ops_js_1.MergeTreeDeltaType.ANNOTATE && !pendingSegmentGroup.previousProps)) {
                 throw new Error("Rollback op doesn't match last edit");
             }
             let i = 0;
@@ -1473,16 +1486,16 @@ class MergeTree {
                 const segmentSegmentGroup = segment.segmentGroups.pop?.();
                 (0, core_utils_1.assert)(segmentSegmentGroup === pendingSegmentGroup, 0x3ef /* Unexpected segmentGroup in segment */);
                 const start = this.findRollbackPosition(segment);
-                if (op.type === ops_1.MergeTreeDeltaType.INSERT) {
-                    segment.seq = constants_1.UniversalSequenceNumber;
+                if (op.type === ops_js_1.MergeTreeDeltaType.INSERT) {
+                    segment.seq = constants_js_1.UniversalSequenceNumber;
                     segment.localSeq = undefined;
-                    const removeOp = (0, opBuilder_1.createRemoveRangeOp)(start, start + segment.cachedLength);
-                    this.markRangeRemoved(start, start + segment.cachedLength, constants_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_1.UniversalSequenceNumber, false, { op: removeOp });
+                    const removeOp = (0, opBuilder_js_1.createRemoveRangeOp)(start, start + segment.cachedLength);
+                    this.markRangeRemoved(start, start + segment.cachedLength, constants_js_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_js_1.UniversalSequenceNumber, false, { op: removeOp });
                 } /* op.type === MergeTreeDeltaType.ANNOTATE */
                 else {
                     const props = pendingSegmentGroup.previousProps[i];
-                    const annotateOp = (0, opBuilder_1.createAnnotateRangeOp)(start, start + segment.cachedLength, props);
-                    this.annotateRange(start, start + segment.cachedLength, props, constants_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_1.UniversalSequenceNumber, { op: annotateOp }, segmentPropertiesManager_1.PropertiesRollback.Rollback);
+                    const annotateOp = (0, opBuilder_js_1.createAnnotateRangeOp)(start, start + segment.cachedLength, props);
+                    this.annotateRange(start, start + segment.cachedLength, props, constants_js_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_js_1.UniversalSequenceNumber, { op: annotateOp }, segmentPropertiesManager_js_1.PropertiesRollback.Rollback);
                     i++;
                 }
             }
@@ -1496,7 +1509,7 @@ class MergeTree {
      */
     findRollbackPosition(segment) {
         let segmentPosition = 0;
-        (0, mergeTreeNodeWalk_1.walkAllChildSegments)(this.root, (seg) => {
+        (0, mergeTreeNodeWalk_js_1.walkAllChildSegments)(this.root, (seg) => {
             // If we've found the desired segment, terminate the walk and return 'segmentPosition'.
             if (seg === segment) {
                 return false;
@@ -1513,7 +1526,7 @@ class MergeTree {
         this.blockUpdate(node);
         if (this.collabWindow.collaborating) {
             this.localPartialsComputed = false;
-            node.partialLengths = partialLengths_1.PartialSequenceLengths.combine(node, this.collabWindow, recur);
+            node.partialLengths = partialLengths_js_1.PartialSequenceLengths.combine(node, this.collabWindow, recur);
         }
     }
     removeLocalReferencePosition(lref) {
@@ -1524,7 +1537,7 @@ class MergeTree {
         if (_segment !== "start" &&
             _segment !== "end" &&
             isRemovedAndAckedOrMovedAndAcked(_segment) &&
-            !(0, referencePositions_1.refTypeIncludesFlag)(refType, ops_1.ReferenceType.SlideOnRemove | ops_1.ReferenceType.Transient) &&
+            !(0, referencePositions_js_1.refTypeIncludesFlag)(refType, ops_js_1.ReferenceType.SlideOnRemove | ops_js_1.ReferenceType.Transient) &&
             _segment.endpointType === undefined) {
             throw new telemetry_utils_1.UsageError("Can only create SlideOnRemove or Transient local reference position on a removed or obliterated segment");
         }
@@ -1538,8 +1551,7 @@ class MergeTree {
         else {
             segment = _segment;
         }
-        const localRefs = segment.localRefs ?? new localReference_1.LocalReferenceCollection(segment);
-        segment.localRefs = localRefs;
+        const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(segment);
         const segRef = localRefs.createLocalRef(offset, refType, properties, slidingPreference, canSlideToEndpoint);
         return segRef;
     }
@@ -1645,7 +1657,7 @@ class MergeTree {
      * it can fix up its local state to align with what would be expected of the op it resubmits.
      */
     normalizeSegmentsOnRebase() {
-        let currentRangeToNormalize = new collections_1.DoublyLinkedList();
+        let currentRangeToNormalize = new index_js_1.DoublyLinkedList();
         let rangeContainsLocalSegs = false;
         let rangeContainsRemoteRemovedSegs = false;
         const normalize = () => {
@@ -1655,19 +1667,19 @@ class MergeTree {
                 this.normalizeAdjacentSegments(currentRangeToNormalize);
             }
         };
-        (0, mergeTreeNodeWalk_1.walkAllChildSegments)(this.root, (seg) => {
-            if (isRemoved(seg) || seg.seq === constants_1.UnassignedSequenceNumber) {
+        (0, mergeTreeNodeWalk_js_1.walkAllChildSegments)(this.root, (seg) => {
+            if (isRemoved(seg) || seg.seq === constants_js_1.UnassignedSequenceNumber) {
                 if (isRemovedAndAcked(seg)) {
                     rangeContainsRemoteRemovedSegs = true;
                 }
-                if (seg.seq === constants_1.UnassignedSequenceNumber) {
+                if (seg.seq === constants_js_1.UnassignedSequenceNumber) {
                     rangeContainsLocalSegs = true;
                 }
                 currentRangeToNormalize.push(seg);
             }
             else {
                 normalize();
-                currentRangeToNormalize = new collections_1.DoublyLinkedList();
+                currentRangeToNormalize = new index_js_1.DoublyLinkedList();
                 rangeContainsLocalSegs = false;
                 rangeContainsRemoteRemovedSegs = false;
             }
@@ -1678,14 +1690,14 @@ class MergeTree {
     addNodeReferences(node, rightmostTiles, leftmostTiles) {
         if (node.isLeaf()) {
             const segment = node;
-            if ((this.localNetLength(segment) ?? 0) > 0 && mergeTreeNodes_1.Marker.is(segment)) {
+            if ((this.localNetLength(segment) ?? 0) > 0 && mergeTreeNodes_js_1.Marker.is(segment)) {
                 const markerId = segment.getId();
                 // Also in insertMarker but need for reload segs case
                 // can add option for this only from reload segs
                 if (markerId) {
                     this.idToMarker.set(markerId, segment);
                 }
-                if ((0, referencePositions_1.refTypeIncludesFlag)(segment, ops_1.ReferenceType.Tile)) {
+                if ((0, referencePositions_js_1.refTypeIncludesFlag)(segment, ops_js_1.ReferenceType.Tile)) {
                     addTile(segment, rightmostTiles);
                     addTileIfNotPresent(segment, leftmostTiles);
                 }
@@ -1694,9 +1706,9 @@ class MergeTree {
         else {
             const block = node;
             // eslint-disable-next-line import/no-deprecated
-            (0, properties_1.extend)(rightmostTiles, block.rightmostTiles);
+            (0, properties_js_1.extend)(rightmostTiles, block.rightmostTiles);
             // eslint-disable-next-line import/no-deprecated
-            (0, properties_1.extendIfUndefined)(leftmostTiles, block.leftmostTiles);
+            (0, properties_js_1.extendIfUndefined)(leftmostTiles, block.leftmostTiles);
         }
     }
     blockUpdate(block) {
@@ -1704,9 +1716,9 @@ class MergeTree {
         const hierBlock = block.hierBlock();
         if (hierBlock) {
             // eslint-disable-next-line import/no-deprecated
-            hierBlock.rightmostTiles = (0, properties_1.createMap)();
+            hierBlock.rightmostTiles = (0, properties_js_1.createMap)();
             // eslint-disable-next-line import/no-deprecated
-            hierBlock.leftmostTiles = (0, properties_1.createMap)();
+            hierBlock.leftmostTiles = (0, properties_js_1.createMap)();
         }
         for (let i = 0; i < block.childCount; i++) {
             const child = block.children[i];
@@ -1737,17 +1749,17 @@ class MergeTree {
         this.blockUpdate(node);
         this.localPartialsComputed = false;
         if (this.collabWindow.collaborating &&
-            seq !== constants_1.UnassignedSequenceNumber &&
-            seq !== constants_1.TreeMaintenanceSequenceNumber) {
+            seq !== constants_js_1.UnassignedSequenceNumber &&
+            seq !== constants_js_1.TreeMaintenanceSequenceNumber) {
             if (node.partialLengths !== undefined &&
                 MergeTree.options.incrementalUpdate &&
-                clientId !== constants_1.NonCollabClient) {
+                clientId !== constants_js_1.NonCollabClient) {
                 node.partialLengths.update(node, seq, clientId, this.collabWindow);
             }
             else {
-                node.partialLengths = partialLengths_1.PartialSequenceLengths.combine(node, this.collabWindow);
+                node.partialLengths = partialLengths_js_1.PartialSequenceLengths.combine(node, this.collabWindow);
             }
-            partialLengths_1.PartialSequenceLengths.options.verifyExpected?.(this, node, seq, clientId);
+            partialLengths_js_1.PartialSequenceLengths.options.verifyExpected?.(this, node, seq, clientId);
         }
     }
     /**
@@ -1797,30 +1809,30 @@ class MergeTree {
             return;
         }
         let pos = 0;
-        (0, mergeTreeNodeWalk_1.depthFirstNodeWalk)(this.root, this.root.children[0], (node) => {
+        (0, mergeTreeNodeWalk_js_1.depthFirstNodeWalk)(this.root, this.root.children[0], (node) => {
             if (endPos <= pos) {
-                return mergeTreeNodeWalk_1.NodeAction.Exit;
+                return mergeTreeNodeWalk_js_1.NodeAction.Exit;
             }
             const len = this.nodeLength(node, visibilitySeq, clientId, localSeq);
             const lenAtRefSeq = (visibilitySeq === refSeq
                 ? len
                 : this.nodeLength(node, refSeq, clientId, localSeq)) ?? 0;
             const isUnackedAndInObliterate = visibilitySeq !== refSeq &&
-                (!node.isLeaf() || node.seq === constants_1.UnassignedSequenceNumber);
+                (!node.isLeaf() || node.seq === constants_js_1.UnassignedSequenceNumber);
             if ((len === undefined && lenAtRefSeq === 0) ||
                 (len === 0 && !isUnackedAndInObliterate && lenAtRefSeq === 0)) {
-                return mergeTreeNodeWalk_1.NodeAction.Skip;
+                return mergeTreeNodeWalk_js_1.NodeAction.Skip;
             }
             const nextPos = pos + lenAtRefSeq;
             // start is beyond the current node, so we can skip it
             if (start >= nextPos) {
                 pos = nextPos;
-                return mergeTreeNodeWalk_1.NodeAction.Skip;
+                return mergeTreeNodeWalk_js_1.NodeAction.Skip;
             }
             if (node.isLeaf()) {
                 if (leaf(node, pos, refSeq, clientId, start - pos, endPos - pos, accum) ===
                     false) {
-                    return mergeTreeNodeWalk_1.NodeAction.Exit;
+                    return mergeTreeNodeWalk_js_1.NodeAction.Exit;
                 }
                 pos = nextPos;
             }