@fluidframework/merge-tree 1.2.1 → 2.0.0-internal.1.0.0

package/dist/mergeTree.js

@@ -4,7 +4,7 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MergeTree = exports.clientSeqComparer = exports.internedSpaces = exports.compareStrings = exports.compareNumbers = exports.CollaborationWindow = exports.IncrementalMapState = exports.IncrementalExecOp = exports.Marker = exports.reservedMarkerSimpleTypeKey = exports.reservedMarkerIdKey = exports.BaseSegment = exports.MergeBlock = exports.MaxNodesInBlock = exports.ordinalToArray = exports.MergeNode = exports.toRemovalInfo = void 0;
+exports.MergeTree = exports.clientSeqComparer = void 0;
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/consistent-type-assertions */
 /* eslint-disable @typescript-eslint/prefer-optional-chain, no-bitwise */
@@ -13,39 +13,104 @@ const container_utils_1 = require("@fluidframework/container-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 mergeTreeTracking_1 = require("./mergeTreeTracking");
 const ops_1 = require("./ops");
 const partialLengths_1 = require("./partialLengths");
 const properties_1 = require("./properties");
 const referencePositions_1 = require("./referencePositions");
-const segmentGroupCollection_1 = require("./segmentGroupCollection");
 const segmentPropertiesManager_1 = require("./segmentPropertiesManager");
-function toRemovalInfo(maybe) {
-    if ((maybe === null || maybe === void 0 ? void 0 : maybe.removedClientIds) !== undefined && (maybe === null || maybe === void 0 ? void 0 : maybe.removedSeq) !== undefined) {
-        return maybe;
-    }
-    (0, common_utils_1.assert)((maybe === null || maybe === void 0 ? void 0 : maybe.removedClientIds) === undefined && (maybe === null || maybe === void 0 ? void 0 : maybe.removedSeq) === undefined, 0x2bf /* "both removedClientIds and removedSeq should be set or not set" */);
-}
-exports.toRemovalInfo = toRemovalInfo;
+const minListenerComparer = {
+    min: { minRequired: Number.MIN_VALUE, onMinGE: () => { (0, common_utils_1.assert)(false, 0x048 /* "onMinGE()" */); } },
+    compare: (a, b) => a.minRequired - b.minRequired,
+};
 function isRemoved(segment) {
-    return toRemovalInfo(segment) !== undefined;
+    return (0, mergeTreeNodes_1.toRemovalInfo)(segment) !== undefined;
 }
 function isRemovedAndAcked(segment) {
-    const removalInfo = toRemovalInfo(segment);
+    const removalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
     return removalInfo !== undefined && removalInfo.removedSeq !== constants_1.UnassignedSequenceNumber;
 }
-class MergeNode {
-    constructor() {
-        this.index = 0;
-        this.ordinal = "";
-        this.cachedLength = 0;
+function nodeTotalLength(mergeTree, node) {
+    if (!node.isLeaf()) {
+        return node.cachedLength;
     }
-    isLeaf() {
-        return false;
+    return mergeTree.localNetLength(node);
+}
+const LRUSegmentComparer = {
+    min: { maxSeq: -2 },
+    compare: (a, b) => a.maxSeq - b.maxSeq,
+};
+function applyLeafRangeMarker(marker, searchInfo) {
+    for (const rangeLabel of searchInfo.rangeLabels) {
+        if ((0, referencePositions_1.refHasRangeLabel)(marker, rangeLabel)) {
+            let currentStack = searchInfo.stacks[rangeLabel];
+            if (currentStack === undefined) {
+                currentStack = new collections_1.Stack();
+                searchInfo.stacks[rangeLabel] = currentStack;
+            }
+            applyRangeReference(currentStack, marker);
+        }
+    }
+}
+function recordRangeLeaf(segment, segpos, refSeq, clientId, start, end, searchInfo) {
+    if (mergeTreeNodes_1.Marker.is(segment)) {
+        if (segment.refType &
+            (ops_1.ReferenceType.NestBegin | ops_1.ReferenceType.NestEnd)) {
+            applyLeafRangeMarker(segment, searchInfo);
+        }
+    }
+    return false;
+}
+function rangeShift(node, segpos, refSeq, clientId, offset, end, searchInfo) {
+    var _a;
+    if (node.isLeaf()) {
+        const seg = node;
+        if ((((_a = searchInfo.mergeTree.localNetLength(seg)) !== null && _a !== void 0 ? _a : 0) > 0) && mergeTreeNodes_1.Marker.is(seg)) {
+            if (seg.refType &
+                (ops_1.ReferenceType.NestBegin | ops_1.ReferenceType.NestEnd)) {
+                applyLeafRangeMarker(seg, searchInfo);
+            }
+        }
+    }
+    else {
+        const block = node;
+        applyStackDelta(searchInfo.stacks, block.rangeStacks);
+    }
+    return true;
+}
+function recordTileStart(segment, segpos, refSeq, clientId, start, end, searchInfo) {
+    if (mergeTreeNodes_1.Marker.is(segment)) {
+        if ((0, referencePositions_1.refHasTileLabel)(segment, searchInfo.tileLabel)) {
+            searchInfo.tile = segment;
+        }
+    }
+    return false;
+}
+function tileShift(node, segpos, refSeq, clientId, offset, end, searchInfo) {
+    if (node.isLeaf()) {
+        const seg = node;
+        if ((searchInfo.mergeTree.localNetLength(seg) > 0) && mergeTreeNodes_1.Marker.is(seg)) {
+            if ((0, referencePositions_1.refHasTileLabel)(seg, searchInfo.tileLabel)) {
+                searchInfo.tile = seg;
+            }
+        }
+    }
+    else {
+        const block = node;
+        let marker;
+        if (searchInfo.posPrecedesTile) {
+            marker = block.rightmostTiles[searchInfo.tileLabel];
+        }
+        else {
+            marker = block.leftmostTiles[searchInfo.tileLabel];
+        }
+        if (marker !== undefined) {
+            searchInfo.tile = marker;
+        }
     }
+    return true;
 }
-exports.MergeNode = MergeNode;
 function addTile(tile, tiles) {
     const tileLabels = (0, referencePositions_1.refGetTileLabels)(tile);
     if (tileLabels) {
@@ -111,7 +176,7 @@ function addNodeReferences(mergeTree, node, rightmostTiles, leftmostTiles, range
     if (node.isLeaf()) {
         const segment = node;
         if (((_a = mergeTree.localNetLength(segment)) !== null && _a !== void 0 ? _a : 0) > 0) {
-            if (Marker.is(segment)) {
+            if (mergeTreeNodes_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
@@ -154,72 +219,31 @@ function addNodeReferences(mergeTree, node, rightmostTiles, leftmostTiles, range
         const block = node;
         applyStackDelta(rangeStacks, block.rangeStacks);
         (0, properties_1.extend)(rightmostTiles, block.rightmostTiles);
-        (0, properties_1.extendIfUndefined)(leftmostTiles, block.leftmostTiles);
+        extendIfUndefined(leftmostTiles, block.leftmostTiles);
     }
 }
-function ordinalToArray(ord) {
-    const a = [];
-    if (ord) {
-        for (let i = 0, len = ord.length; i < len; i++) {
-            a.push(ord.charCodeAt(i));
-        }
-    }
-    return a;
-}
-exports.ordinalToArray = ordinalToArray;
-// Note that the actual branching factor of the MergeTree is `MaxNodesInBlock - 1`.  This is because
-// the MergeTree always inserts first, then checks for overflow and splits if the child count equals
-// `MaxNodesInBlock`.  (i.e., `MaxNodesInBlock` contains 1 extra slot for temporary storage to
-// facilitate splits.)
-exports.MaxNodesInBlock = 8;
-class MergeBlock extends MergeNode {
-    constructor(childCount) {
-        super();
-        this.childCount = childCount;
-        this.children = new Array(exports.MaxNodesInBlock);
-    }
-    hierBlock() {
-        return undefined;
-    }
-    setOrdinal(child, index) {
-        let childCount = this.childCount;
-        if (childCount === 8) {
-            childCount = 7;
-        }
-        (0, common_utils_1.assert)((childCount >= 1) && (childCount <= 7), 0x040 /* "Child count is not within [1,7] range!" */);
-        let localOrdinal;
-        const ordinalWidth = 1 << (exports.MaxNodesInBlock - (childCount + 1));
-        if (index === 0) {
-            localOrdinal = ordinalWidth - 1;
-        }
-        else {
-            const prevOrd = this.children[index - 1].ordinal;
-            const prevOrdCode = prevOrd.charCodeAt(prevOrd.length - 1);
-            localOrdinal = prevOrdCode + ordinalWidth;
-        }
-        child.ordinal = this.ordinal + String.fromCharCode(localOrdinal);
-        (0, common_utils_1.assert)(child.ordinal.length === (this.ordinal.length + 1), 0x041 /* "Unexpected child ordinal length!" */);
-        if (index > 0) {
-            (0, common_utils_1.assert)(child.ordinal > this.children[index - 1].ordinal, 0x042);
-        }
-    }
-    assignChild(child, index, updateOrdinal = true) {
-        child.parent = this;
-        child.index = index;
-        if (updateOrdinal) {
-            this.setOrdinal(child, index);
+function extendIfUndefined(base, extension) {
+    if (extension !== undefined) {
+        // eslint-disable-next-line no-restricted-syntax
+        for (const key in extension) {
+            if (base[key] === undefined) {
+                base[key] = extension[key];
+            }
         }
-        this.children[index] = child;
     }
+    return base;
 }
-exports.MergeBlock = MergeBlock;
-class HierMergeBlock extends MergeBlock {
+class HierMergeBlock extends mergeTreeNodes_1.MergeBlock {
     constructor(childCount) {
         super(childCount);
         this.rightmostTiles = (0, properties_1.createMap)();
         this.leftmostTiles = (0, properties_1.createMap)();
         this.rangeStacks = (0, properties_1.createMap)();
     }
+    /**
+     * @deprecated  for internal use only. public export will be removed.
+     * @internal
+     */
     addNodeReferences(mergeTree, node) {
         addNodeReferences(mergeTree, node, this.rightmostTiles, this.leftmostTiles, this.rangeStacks);
     }
@@ -231,7 +255,7 @@ class HierMergeBlock extends MergeBlock {
         // eslint-disable-next-line guard-for-in, no-restricted-syntax
         for (const key in this.rangeStacks) {
             const stack = this.rangeStacks[key];
-            strbuf += internedSpaces(indentCount);
+            strbuf += (0, mergeTreeNodes_1.internedSpaces)(indentCount);
             strbuf += `${key}: `;
             for (const item of stack.items) {
                 strbuf += `${item.toString()} `;
@@ -241,424 +265,24 @@ class HierMergeBlock extends MergeBlock {
         return strbuf;
     }
 }
-function nodeTotalLength(mergeTree, node) {
-    if (!node.isLeaf()) {
-        return node.cachedLength;
-    }
-    return mergeTree.localNetLength(node);
-}
-class BaseSegment extends MergeNode {
-    constructor() {
-        super(...arguments);
-        this.clientId = constants_1.LocalClientId;
-        this.seq = constants_1.UniversalSequenceNumber;
-        this.segmentGroups = new segmentGroupCollection_1.SegmentGroupCollection(this);
-        this.trackingCollection = new mergeTreeTracking_1.TrackingGroupCollection(this);
-    }
-    addProperties(newProps, op, seq, collabWindow) {
-        if (!this.propertyManager) {
-            this.propertyManager = new segmentPropertiesManager_1.PropertiesManager();
-        }
-        if (!this.properties) {
-            this.properties = (0, properties_1.createMap)();
-        }
-        return this.propertyManager.addProperties(this.properties, newProps, op, seq, collabWindow && collabWindow.collaborating);
-    }
-    hasProperty(key) {
-        return !!this.properties && (this.properties[key] !== undefined);
-    }
-    isLeaf() {
-        return true;
-    }
-    cloneInto(b) {
-        var _a;
-        b.clientId = this.clientId;
-        // TODO: deep clone properties
-        b.properties = (0, properties_1.clone)(this.properties);
-        b.removedClientIds = (_a = this.removedClientIds) === null || _a === void 0 ? void 0 : _a.slice();
-        // TODO: copy removed client overlap and branch removal info
-        b.removedSeq = this.removedSeq;
-        b.seq = this.seq;
-    }
-    canAppend(segment) {
-        return false;
-    }
-    addSerializedProps(jseg) {
-        if (this.properties) {
-            jseg.props = this.properties;
-        }
-    }
-    ack(segmentGroup, opArgs, mergeTree) {
-        const currentSegmentGroup = this.segmentGroups.dequeue();
-        (0, common_utils_1.assert)(currentSegmentGroup === segmentGroup, 0x043 /* "On ack, unexpected segmentGroup!" */);
-        switch (opArgs.op.type) {
-            case ops_1.MergeTreeDeltaType.ANNOTATE:
-                (0, common_utils_1.assert)(!!this.propertyManager, 0x044 /* "On annotate ack, missing segment property manager!" */);
-                this.propertyManager.ackPendingProperties(opArgs.op);
-                return true;
-            case ops_1.MergeTreeDeltaType.INSERT:
-                (0, common_utils_1.assert)(this.seq === constants_1.UnassignedSequenceNumber, 0x045 /* "On insert, seq number already assigned!" */);
-                this.seq = opArgs.sequencedMessage.sequenceNumber;
-                this.localSeq = undefined;
-                return true;
-            case ops_1.MergeTreeDeltaType.REMOVE:
-                const removalInfo = toRemovalInfo(this);
-                (0, common_utils_1.assert)(removalInfo !== undefined, 0x046 /* "On remove ack, missing removal info!" */);
-                this.localRemovedSeq = undefined;
-                if (removalInfo.removedSeq === constants_1.UnassignedSequenceNumber) {
-                    removalInfo.removedSeq = opArgs.sequencedMessage.sequenceNumber;
-                    return true;
-                }
-                return false;
-            default:
-                throw new Error(`${opArgs.op.type} is in unrecognized operation type`);
-        }
-    }
-    splitAt(pos) {
-        var _a;
-        if (pos > 0) {
-            const leafSegment = this.createSplitSegmentAt(pos);
-            if (leafSegment) {
-                this.copyPropertiesTo(leafSegment);
-                leafSegment.parent = this.parent;
-                // Give the leaf a temporary yet valid ordinal.
-                // when this segment is put in the tree, it will get it's real ordinal,
-                // but this ordinal meets all the necessary invariants for now.
-                leafSegment.ordinal = this.ordinal + String.fromCharCode(0);
-                leafSegment.removedClientIds = (_a = this.removedClientIds) === null || _a === void 0 ? void 0 : _a.slice();
-                leafSegment.removedSeq = this.removedSeq;
-                leafSegment.localRemovedSeq = this.localRemovedSeq;
-                leafSegment.seq = this.seq;
-                leafSegment.localSeq = this.localSeq;
-                leafSegment.clientId = this.clientId;
-                this.segmentGroups.copyTo(leafSegment);
-                this.trackingCollection.copyTo(leafSegment);
-                if (this.localRefs) {
-                    this.localRefs.split(pos, leafSegment);
-                }
-            }
-            return leafSegment;
-        }
-    }
-    copyPropertiesTo(other) {
-        if (this.propertyManager) {
-            if (this.properties) {
-                other.propertyManager = new segmentPropertiesManager_1.PropertiesManager();
-                other.properties = this.propertyManager.copyTo(this.properties, other.properties, other.propertyManager);
-            }
-        }
-    }
-}
-exports.BaseSegment = BaseSegment;
-exports.reservedMarkerIdKey = "markerId";
-exports.reservedMarkerSimpleTypeKey = "markerSimpleType";
-class Marker extends BaseSegment {
-    constructor(refType) {
-        super();
-        this.refType = refType;
-        this.type = Marker.type;
-        this.cachedLength = 1;
-    }
-    static is(segment) {
-        return segment.type === Marker.type;
-    }
-    static make(refType, props) {
-        const marker = new Marker(refType);
-        if (props) {
-            marker.addProperties(props);
-        }
-        return marker;
-    }
-    toJSONObject() {
-        const obj = { marker: { refType: this.refType } };
-        super.addSerializedProps(obj);
-        return obj;
-    }
-    static fromJSONObject(spec) {
-        if (spec && typeof spec === "object" && "marker" in spec) {
-            return Marker.make(spec.marker.refType, spec.props);
-        }
-        return undefined;
-    }
-    clone() {
-        const b = Marker.make(this.refType, this.properties);
-        this.cloneInto(b);
-        return b;
-    }
-    getSegment() {
-        return this;
-    }
-    getOffset() {
-        return 0;
-    }
-    hasSimpleType(simpleTypeName) {
-        return !!this.properties &&
-            this.properties[exports.reservedMarkerSimpleTypeKey] === simpleTypeName;
-    }
-    getProperties() {
-        return this.properties;
-    }
-    getId() {
-        if (this.properties && this.properties[exports.reservedMarkerIdKey]) {
-            return this.properties[exports.reservedMarkerIdKey];
-        }
-    }
-    /**
-     * @deprecated - use refHasTileLabels
-     */
-    hasTileLabels() {
-        return (0, referencePositions_1.refHasTileLabels)(this);
-    }
-    /**
-     * @deprecated - use refHasRangeLabels
-     */
-    hasRangeLabels() {
-        return (0, referencePositions_1.refHasRangeLabels)(this);
-    }
-    /**
-     * @deprecated - use refHasTileLabel
-     */
-    hasTileLabel(label) {
-        return (0, referencePositions_1.refHasTileLabel)(this, label);
-    }
-    /**
-     * @deprecated - use refHasRangeLabel
-     */
-    hasRangeLabel(label) {
-        return (0, referencePositions_1.refHasRangeLabel)(this, label);
-    }
-    /**
-     * @deprecated - use refGetTileLabels
-     */
-    getTileLabels() {
-        return (0, referencePositions_1.refGetTileLabels)(this);
-    }
-    /**
-     * @deprecated - use refGetRangeLabels
-     */
-    getRangeLabels() {
-        return (0, referencePositions_1.refGetRangeLabels)(this);
-    }
-    toString() {
-        let bbuf = "";
-        if ((0, referencePositions_1.refTypeIncludesFlag)(this, ops_1.ReferenceType.Tile)) {
-            bbuf += "Tile";
-        }
-        if ((0, referencePositions_1.refTypeIncludesFlag)(this, ops_1.ReferenceType.NestBegin)) {
-            if (bbuf.length > 0) {
-                bbuf += "; ";
-            }
-            bbuf += "RangeBegin";
-        }
-        if ((0, referencePositions_1.refTypeIncludesFlag)(this, ops_1.ReferenceType.NestEnd)) {
-            if (bbuf.length > 0) {
-                bbuf += "; ";
-            }
-            bbuf += "RangeEnd";
-        }
-        let lbuf = "";
-        const id = this.getId();
-        if (id) {
-            bbuf += ` (${id}) `;
-        }
-        const tileLabels = (0, referencePositions_1.refGetTileLabels)(this);
-        if (tileLabels) {
-            lbuf += "tile -- ";
-            for (let i = 0, len = tileLabels.length; i < len; i++) {
-                const tileLabel = tileLabels[i];
-                if (i > 0) {
-                    lbuf += "; ";
-                }
-                lbuf += tileLabel;
-            }
-        }
-        const rangeLabels = (0, referencePositions_1.refGetRangeLabels)(this);
-        if (rangeLabels) {
-            let rangeKind = "begin";
-            if ((0, referencePositions_1.refTypeIncludesFlag)(this, ops_1.ReferenceType.NestEnd)) {
-                rangeKind = "end";
-            }
-            if (tileLabels) {
-                lbuf += " ";
-            }
-            lbuf += `range ${rangeKind} -- `;
-            const labels = rangeLabels;
-            for (let i = 0, len = labels.length; i < len; i++) {
-                const rangeLabel = labels[i];
-                if (i > 0) {
-                    lbuf += "; ";
-                }
-                lbuf += rangeLabel;
-            }
-        }
-        let pbuf = "";
-        if (this.properties) {
-            pbuf += JSON.stringify(this.properties, (key, value) => {
-                // Avoid circular reference when stringifying makers containing handles.
-                // (Substitute a debug string instead.)
-                const handle = !!value && value.IFluidHandle;
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                return handle
-                    ? `#Handle(${handle.routeContext.path}/${handle.path})`
-                    : value;
-            });
-        }
-        return `M ${bbuf}: ${lbuf} ${pbuf}`;
-    }
-    createSplitSegmentAt(pos) {
-        return undefined;
-    }
-    canAppend(segment) {
-        return false;
-    }
-    append() { throw new Error("Can not append to marker"); }
-}
-exports.Marker = Marker;
-Marker.type = "Marker";
-var IncrementalExecOp;
-(function (IncrementalExecOp) {
-    IncrementalExecOp[IncrementalExecOp["Go"] = 0] = "Go";
-    IncrementalExecOp[IncrementalExecOp["Stop"] = 1] = "Stop";
-    IncrementalExecOp[IncrementalExecOp["Yield"] = 2] = "Yield";
-})(IncrementalExecOp = exports.IncrementalExecOp || (exports.IncrementalExecOp = {}));
-class IncrementalMapState {
-    constructor(block, actions, pos, refSeq, clientId, context, start, end, childIndex = 0) {
-        this.block = block;
-        this.actions = actions;
-        this.pos = pos;
-        this.refSeq = refSeq;
-        this.clientId = clientId;
-        this.context = context;
-        this.start = start;
-        this.end = end;
-        this.childIndex = childIndex;
-        this.op = IncrementalExecOp.Go;
-    }
-}
-exports.IncrementalMapState = IncrementalMapState;
-class CollaborationWindow {
-    constructor() {
-        this.clientId = constants_1.LocalClientId;
-        this.collaborating = false;
-        // Lowest-numbered segment in window; no client can reference a state before this one
-        this.minSeq = 0;
-        // Highest-numbered segment in window and current
-        // reference segment for this client
-        this.currentSeq = 0;
-        this.localSeq = 0;
-    }
-    loadFrom(a) {
-        this.clientId = a.clientId;
-        this.collaborating = a.collaborating;
-        this.minSeq = a.minSeq;
-        this.currentSeq = a.currentSeq;
-    }
-}
-exports.CollaborationWindow = CollaborationWindow;
-const compareNumbers = (a, b) => a - b;
-exports.compareNumbers = compareNumbers;
-const compareStrings = (a, b) => a.localeCompare(b);
-exports.compareStrings = compareStrings;
-const indentStrings = ["", " ", "  "];
-function internedSpaces(n) {
-    if (indentStrings[n] === undefined) {
-        indentStrings[n] = "";
-        for (let i = 0; i < n; i++) {
-            indentStrings[n] += " ";
-        }
-    }
-    return indentStrings[n];
-}
-exports.internedSpaces = internedSpaces;
+/**
+ * @deprecated  for internal use only. public export will be removed.
+ * @internal
+ */
 exports.clientSeqComparer = {
     min: { refSeq: -1, clientId: "" },
     compare: (a, b) => a.refSeq - b.refSeq,
 };
-const LRUSegmentComparer = {
-    min: { maxSeq: -2 },
-    compare: (a, b) => a.maxSeq - b.maxSeq,
-};
-function applyLeafRangeMarker(marker, searchInfo) {
-    for (const rangeLabel of searchInfo.rangeLabels) {
-        if ((0, referencePositions_1.refHasRangeLabel)(marker, rangeLabel)) {
-            let currentStack = searchInfo.stacks[rangeLabel];
-            if (currentStack === undefined) {
-                currentStack = new collections_1.Stack();
-                searchInfo.stacks[rangeLabel] = currentStack;
-            }
-            applyRangeReference(currentStack, marker);
-        }
-    }
-}
-function recordRangeLeaf(segment, segpos, refSeq, clientId, start, end, searchInfo) {
-    if (Marker.is(segment)) {
-        if (segment.refType &
-            (ops_1.ReferenceType.NestBegin | ops_1.ReferenceType.NestEnd)) {
-            applyLeafRangeMarker(segment, searchInfo);
-        }
-    }
-    return false;
-}
-function rangeShift(node, segpos, refSeq, clientId, offset, end, searchInfo) {
-    var _a;
-    if (node.isLeaf()) {
-        const seg = node;
-        if ((((_a = searchInfo.mergeTree.localNetLength(seg)) !== null && _a !== void 0 ? _a : 0) > 0) && Marker.is(seg)) {
-            if (seg.refType &
-                (ops_1.ReferenceType.NestBegin | ops_1.ReferenceType.NestEnd)) {
-                applyLeafRangeMarker(seg, searchInfo);
-            }
-        }
-    }
-    else {
-        const block = node;
-        applyStackDelta(searchInfo.stacks, block.rangeStacks);
-    }
-    return true;
-}
-function recordTileStart(segment, segpos, refSeq, clientId, start, end, searchInfo) {
-    if (Marker.is(segment)) {
-        if ((0, referencePositions_1.refHasTileLabel)(segment, searchInfo.tileLabel)) {
-            searchInfo.tile = segment;
-        }
-    }
-    return false;
-}
-function tileShift(node, segpos, refSeq, clientId, offset, end, searchInfo) {
-    if (node.isLeaf()) {
-        const seg = node;
-        if ((searchInfo.mergeTree.localNetLength(seg) > 0) && Marker.is(seg)) {
-            if ((0, referencePositions_1.refHasTileLabel)(seg, searchInfo.tileLabel)) {
-                searchInfo.tile = seg;
-            }
-        }
-    }
-    else {
-        const block = node;
-        let marker;
-        if (searchInfo.posPrecedesTile) {
-            marker = block.rightmostTiles[searchInfo.tileLabel];
-        }
-        else {
-            marker = block.leftmostTiles[searchInfo.tileLabel];
-        }
-        if (marker !== undefined) {
-            searchInfo.tile = marker;
-        }
-    }
-    return true;
-}
-const minListenerComparer = {
-    min: { minRequired: Number.MIN_VALUE, onMinGE: () => { (0, common_utils_1.assert)(false, 0x048 /* "onMinGE()" */); } },
-    compare: (a, b) => a.minRequired - b.minRequired,
-};
-// Represents a sequence of text segments
+/**
+ * @deprecated  for internal use only. public export will be removed.
+ * @internal
+ */
 class MergeTree {
     // TODO: make and use interface describing options
     constructor(options) {
         this.options = options;
         this.blockUpdateActions = MergeTree.initBlockUpdateActions;
-        this.collabWindow = new CollaborationWindow();
+        this.collabWindow = new mergeTreeNodes_1.CollaborationWindow();
         // TODO: add remove on segment remove
         // for now assume only markers have ids and so point directly at the Segment
         // if we need to have pointers to non-markers, we can change to point at local refs
@@ -712,7 +336,7 @@ class MergeTree {
         return b;
     }
     localNetLength(segment) {
-        const removalInfo = toRemovalInfo(segment);
+        const removalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
         if (removalInfo !== undefined) {
             return 0;
         }
@@ -733,7 +357,7 @@ class MergeTree {
     reloadFromSegments(segments) {
         // This code assumes that a later call to `startCollaboration()` will initialize partial lengths.
         (0, common_utils_1.assert)(!this.collabWindow.collaborating, 0x049 /* "Trying to reload from segments while collaborating!" */);
-        const maxChildren = exports.MaxNodesInBlock - 1;
+        const maxChildren = mergeTreeNodes_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
@@ -792,7 +416,7 @@ class MergeTree {
         }
     }
     underflow(node) {
-        return node.childCount < (exports.MaxNodesInBlock / 2);
+        return node.childCount < (mergeTreeNodes_1.MaxNodesInBlock / 2);
     }
     scourNode(node, holdNodes) {
         let prevSegment;
@@ -879,14 +503,14 @@ class MergeTree {
             childBlock.parent = undefined;
         }
         const totalNodeCount = holdNodes.length;
-        const halfCount = exports.MaxNodesInBlock / 2;
-        let childCount = Math.min(exports.MaxNodesInBlock - 1, Math.floor(totalNodeCount / halfCount));
+        const halfCount = mergeTreeNodes_1.MaxNodesInBlock / 2;
+        let childCount = Math.min(mergeTreeNodes_1.MaxNodesInBlock - 1, Math.floor(totalNodeCount / halfCount));
         if (childCount < 1) {
             childCount = 1;
         }
         const baseCount = Math.floor(totalNodeCount / childCount);
         let extraCount = totalNodeCount % childCount;
-        const packedBlocks = new Array(exports.MaxNodesInBlock);
+        const packedBlocks = new Array(mergeTreeNodes_1.MaxNodesInBlock);
         let readCount = 0;
         for (let nodeIndex = 0; nodeIndex < childCount; nodeIndex++) {
             let nodeCount = baseCount;
@@ -965,7 +589,7 @@ class MergeTree {
                 liveCount: 0,
                 histo: [],
             };
-            for (let k = 0; k < exports.MaxNodesInBlock; k++) {
+            for (let k = 0; k < mergeTreeNodes_1.MaxNodesInBlock; k++) {
                 stats.histo[k] = 0;
             }
             for (let i = 0; i < block.childCount; i++) {
@@ -978,7 +602,7 @@ class MergeTree {
                     stats.leafCount += childStats.leafCount;
                     stats.removedLeafCount += childStats.removedLeafCount;
                     stats.liveCount += childStats.liveCount;
-                    for (let j = 0; j < exports.MaxNodesInBlock; j++) {
+                    for (let j = 0; j < mergeTreeNodes_1.MaxNodesInBlock; j++) {
                         stats.histo[j] += childStats.histo[j];
                     }
                 }
@@ -1040,12 +664,12 @@ class MergeTree {
     }
     /**
      * @internal must only be used by client
-     * @param segoff - The segment and offset to slide from
-     * @returns The segment and offset to slide to
+     * @param segment - The segment to slide from
+     * @returns The segment to
      */
-    _getSlideToSegment(segoff) {
-        if (!segoff.segment || !isRemovedAndAcked(segoff.segment)) {
-            return segoff;
+    _getSlideToSegment(segment) {
+        if (!segment || !isRemovedAndAcked(segment)) {
+            return segment;
         }
         let slideToSegment;
         const goFurtherToFindSlideToSegment = (seg) => {
@@ -1056,19 +680,13 @@ class MergeTree {
             return true;
         };
         // Slide to the next farthest valid segment in the tree.
-        this.rightExcursion(segoff.segment, goFurtherToFindSlideToSegment);
+        this.rightExcursion(segment, goFurtherToFindSlideToSegment);
         if (slideToSegment) {
-            return { segment: slideToSegment, offset: 0 };
+            return slideToSegment;
         }
         // If no such segment is found, slide to the last valid segment.
-        this.leftExcursion(segoff.segment, goFurtherToFindSlideToSegment);
-        // Workaround TypeScript issue (https://github.com/microsoft/TypeScript/issues/9998)
-        slideToSegment = slideToSegment;
-        if (slideToSegment) {
-            // If slid nearer then offset should be at the end of the segment
-            return { segment: slideToSegment, offset: slideToSegment.cachedLength - 1 };
-        }
-        return { segment: undefined, offset: 0 };
+        this.leftExcursion(segment, goFurtherToFindSlideToSegment);
+        return slideToSegment;
     }
     /**
      * This method should only be called when the current client sequence number is
@@ -1080,27 +698,23 @@ class MergeTree {
         var _a, _b, _c, _d, _e;
         (0, common_utils_1.assert)(isRemovedAndAcked(segment), 0x2f1 /* slideReferences from a segment which has not been removed and acked */);
         (0, common_utils_1.assert)(!!segment.localRefs, 0x2f2 /* Ref not in the segment localRefs */);
-        const newSegoff = this._getSlideToSegment({ segment, offset: 0 });
-        const newSegment = newSegoff.segment;
-        if (newSegment && !newSegment.localRefs) {
-            newSegment.localRefs = new localReference_1.LocalReferenceCollection(newSegment);
-        }
-        for (const ref of refsToSlide) {
-            (_b = (_a = ref.callbacks) === null || _a === void 0 ? void 0 : _a.beforeSlide) === null || _b === void 0 ? void 0 : _b.call(_a);
-            const removedRef = segment.localRefs.removeLocalRef(ref);
-            (0, common_utils_1.assert)(ref === removedRef, 0x2f3 /* Ref not in the segment localRefs */);
-            if (!newSegment) {
-                // No valid segments (all nodes removed or not yet created)
-                ref.segment = undefined;
-                ref.offset = 0;
+        const newSegment = this._getSlideToSegment(segment);
+        if (newSegment) {
+            const localRefs = (_a = newSegment.localRefs) !== null && _a !== void 0 ? _a : (newSegment.localRefs = new localReference_1.LocalReferenceCollection(newSegment));
+            if (newSegment.ordinal < segment.ordinal) {
+                localRefs.addAfterTombstones(refsToSlide);
             }
             else {
-                ref.segment = newSegment;
-                ref.offset = (_c = newSegoff.offset) !== null && _c !== void 0 ? _c : 0;
-                (0, common_utils_1.assert)(!!newSegment.localRefs, 0x2f4 /* localRefs must be allocated */);
-                newSegment.localRefs.addLocalRef(ref);
+                localRefs.addBeforeTombstones(refsToSlide);
+            }
+        }
+        else {
+            for (const ref of refsToSlide) {
+                (_c = (_b = ref.callbacks) === null || _b === void 0 ? void 0 : _b.beforeSlide) === null || _c === void 0 ? void 0 : _c.call(_b);
+                (0, localReference_1.assertLocalReferences)(ref);
+                ref.link(undefined, 0, undefined);
+                (_e = (_d = ref.callbacks) === null || _d === void 0 ? void 0 : _d.afterSlide) === null || _e === void 0 ? void 0 : _e.call(_d);
             }
-            (_e = (_d = ref.callbacks) === null || _d === void 0 ? void 0 : _d.afterSlide) === null || _e === void 0 ? void 0 : _e.call(_d);
         }
         // TODO is it required to update the path lengths?
         if (newSegment) {
@@ -1112,30 +726,24 @@ class MergeTree {
             return;
         }
         const refsToSlide = [];
-        const refsToStay = [];
         for (const lref of segment.localRefs) {
             if ((0, referencePositions_1.refTypeIncludesFlag)(lref, ops_1.ReferenceType.StayOnRemove)) {
-                refsToStay.push(lref);
+                continue;
             }
-            else if ((0, referencePositions_1.refTypeIncludesFlag)(lref, ops_1.ReferenceType.SlideOnRemove)) {
-                if (pending) {
-                    refsToStay.push(lref);
-                }
-                else {
+            if ((0, referencePositions_1.refTypeIncludesFlag)(lref, ops_1.ReferenceType.SlideOnRemove)) {
+                if (!pending) {
                     refsToSlide.push(lref);
                 }
             }
+            else {
+                segment.localRefs.removeLocalRef(lref);
+            }
         }
         // Rethink implementation of keeping and sliding refs once other reference
         // changes are complete. This works but is fragile and possibly slow.
         if (!pending) {
             this.slideReferences(segment, refsToSlide);
         }
-        segment.localRefs.clear();
-        for (const lref of refsToStay) {
-            lref.segment = segment;
-            segment.localRefs.addLocalRef(lref);
-        }
     }
     blockLength(node, refSeq, clientId) {
         if ((this.collabWindow.collaborating) && (clientId !== this.collabWindow.clientId)) {
@@ -1162,7 +770,7 @@ class MergeTree {
             }
             else {
                 const segment = node;
-                const removalInfo = toRemovalInfo(segment);
+                const removalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
                 if (removalInfo !== undefined
                     && removalInfo.removedSeq !== constants_1.UnassignedSequenceNumber
                     && removalInfo.removedSeq <= refSeq) {
@@ -1228,13 +836,25 @@ class MergeTree {
         }
     }
     referencePositionToLocalPosition(refPos, refSeq = this.collabWindow.currentSeq, clientId = this.collabWindow.clientId) {
+        var _a;
         const seg = refPos.getSegment();
-        if (seg && seg.parent) {
-            const offset = !seg.removedSeq ? refPos.getOffset() : 0;
+        if ((seg === null || seg === void 0 ? void 0 : seg.parent) === undefined) {
+            return referencePositions_1.DetachedReferencePosition;
+        }
+        if (refPos.isLeaf()) {
+            return this.getPosition(refPos, refSeq, clientId);
+        }
+        if ((0, referencePositions_1.refTypeIncludesFlag)(refPos, ops_1.ReferenceType.Transient)
+            || ((_a = seg.localRefs) === null || _a === void 0 ? void 0 : _a.has(refPos))) {
+            const offset = isRemoved(seg) ? 0 : refPos.getOffset();
             return offset + this.getPosition(seg, refSeq, clientId);
         }
-        return localReference_1.LocalReference.DetachedPosition;
+        return referencePositions_1.DetachedReferencePosition;
     }
+    /**
+     * @deprecated  for internal use only. public export will be removed.
+     * @internal
+     */
     getStackContext(startPos, clientId, rangeLabels) {
         const searchInfo = {
             mergeTree: this,
@@ -1265,7 +885,7 @@ class MergeTree {
             }
             else {
                 const localRef = searchInfo.tile;
-                pos = localRef.toPosition();
+                pos = this.referencePositionToLocalPosition(localRef, constants_1.UniversalSequenceNumber, clientId);
             }
             return { tile: searchInfo.tile, pos };
         }
@@ -1406,13 +1026,23 @@ class MergeTree {
             this.zamboniSegments();
         }
     }
-    addToPendingList(segment, segmentGroup, localSeq) {
+    addToPendingList(segment, segmentGroup, localSeq, previousProps) {
         let _segmentGroup = segmentGroup;
         if (_segmentGroup === undefined) {
             // TODO: review the cast
             _segmentGroup = { segments: [], localSeq };
+            if (previousProps) {
+                _segmentGroup.previousProps = [];
+            }
             this.pendingSegments.enqueue(_segmentGroup);
         }
+        if ((!_segmentGroup.previousProps && previousProps) ||
+            (_segmentGroup.previousProps && !previousProps)) {
+            throw new Error("All segments in group should have previousProps or none");
+        }
+        if (previousProps) {
+            _segmentGroup.previousProps.push(previousProps);
+        }
         segment.segmentGroups.enqueue(_segmentGroup);
         return _segmentGroup;
     }
@@ -1483,7 +1113,7 @@ class MergeTree {
             let block = segment.parent;
             let ordinalUpdateNode = block;
             while (block !== undefined) {
-                if (block.childCount >= exports.MaxNodesInBlock) {
+                if (block.childCount >= mergeTreeNodes_1.MaxNodesInBlock) {
                     const splitNode = this.split(block);
                     if (block === this.root) {
                         this.updateRoot(splitNode);
@@ -1548,7 +1178,7 @@ class MergeTree {
             insertSegment.seq = constants_1.UniversalSequenceNumber;
         }
         insertSegment.clientId = clientId;
-        if (Marker.is(insertSegment)) {
+        if (mergeTreeNodes_1.Marker.is(insertSegment)) {
             const markerId = insertSegment.getId();
             if (markerId) {
                 this.mapIdToSegment(markerId, insertSegment);
@@ -1597,7 +1227,7 @@ class MergeTree {
         }
     }
     insertChildNode(block, child, childIndex) {
-        (0, common_utils_1.assert)(block.childCount < exports.MaxNodesInBlock, 0x051 /* "Too many children on merge block!" */);
+        (0, common_utils_1.assert)(block.childCount < mergeTreeNodes_1.MaxNodesInBlock, 0x051 /* "Too many children on merge block!" */);
         for (let i = block.childCount; i > childIndex; i--) {
             block.children[i] = block.children[i - 1];
             block.children[i].index = i;
@@ -1656,7 +1286,7 @@ class MergeTree {
                 newSegment.seq = seq;
                 newSegment.localSeq = localSeq;
                 newSegment.clientId = clientId;
-                if (Marker.is(newSegment)) {
+                if (mergeTreeNodes_1.Marker.is(newSegment)) {
                     const markerId = newSegment.getId();
                     if (markerId) {
                         this.mapIdToSegment(markerId, newSegment);
@@ -1853,7 +1483,7 @@ class MergeTree {
             block.assignChild(newNode, childIndex, false);
             block.childCount++;
             block.setOrdinal(newNode, childIndex);
-            if (block.childCount < exports.MaxNodesInBlock) {
+            if (block.childCount < mergeTreeNodes_1.MaxNodesInBlock) {
                 if (fromSplit) {
                     this.nodeUpdateOrdinals(fromSplit);
                 }
@@ -1875,7 +1505,7 @@ class MergeTree {
         }
     }
     split(node) {
-        const halfCount = exports.MaxNodesInBlock / 2;
+        const halfCount = mergeTreeNodes_1.MaxNodesInBlock / 2;
         const newNode = this.makeBlock(halfCount);
         node.childCount = halfCount;
         // Update ordinals to reflect lowered child count
@@ -1907,19 +1537,20 @@ class MergeTree {
      * @param clientId - The id of the client making the annotate
      * @param seq - The sequence number of the annotate operation
      * @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, combiningOp, refSeq, clientId, seq, opArgs) {
+    annotateRange(start, end, props, combiningOp, refSeq, clientId, seq, opArgs, rollback = segmentPropertiesManager_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;
         let segmentGroup;
         const annotateSegment = (segment) => {
-            const propertyDeltas = segment.addProperties(props, combiningOp, seq, this.collabWindow);
+            const propertyDeltas = segment.addProperties(props, combiningOp, seq, this.collabWindow, rollback);
             deltaSegments.push({ segment, propertyDeltas });
             if (this.collabWindow.collaborating) {
                 if (seq === constants_1.UnassignedSequenceNumber) {
-                    segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq);
+                    segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq, propertyDeltas ? propertyDeltas : {});
                 }
                 else {
                     if (MergeTree.options.zamboniSegments) {
@@ -1949,10 +1580,11 @@ class MergeTree {
         this.ensureIntervalBoundary(end, refSeq, clientId);
         let segmentGroup;
         const removedSegments = [];
-        const segmentsWithRefs = [];
+        const localOverlapWithRefs = [];
         const localSeq = seq === constants_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
         const markRemoved = (segment, pos, _start, _end) => {
-            const existingRemovalInfo = toRemovalInfo(segment);
+            var _a;
+            const existingRemovalInfo = (0, mergeTreeNodes_1.toRemovalInfo)(segment);
             if (existingRemovalInfo !== undefined) {
                 _overwrite = true;
                 if (existingRemovalInfo.removedSeq === constants_1.UnassignedSequenceNumber) {
@@ -1962,7 +1594,9 @@ class MergeTree {
                     // keep first removal at the head.
                     existingRemovalInfo.removedClientIds.unshift(clientId);
                     existingRemovalInfo.removedSeq = seq;
-                    segment.localRemovedSeq = undefined;
+                    if (((_a = segment.localRefs) === null || _a === void 0 ? void 0 : _a.empty) === false) {
+                        localOverlapWithRefs.push(segment);
+                    }
                 }
                 else {
                     // Do not replace earlier sequence number for remove
@@ -1975,9 +1609,6 @@ class MergeTree {
                 segment.localRemovedSeq = localSeq;
                 removedSegments.push({ segment });
             }
-            if (segment.localRefs && !segment.localRefs.empty) {
-                segmentsWithRefs.push(segment);
-            }
             // Save segment so can assign removed sequence number when acked by server
             if (this.collabWindow.collaborating) {
                 if (segment.removedSeq === constants_1.UnassignedSequenceNumber && clientId === this.collabWindow.clientId) {
@@ -2001,10 +1632,10 @@ class MergeTree {
             return true;
         };
         this.mapRange({ leaf: markRemoved, post: afterMarkRemoved }, refSeq, clientId, undefined, start, end);
-        const pending = this.collabWindow.collaborating && clientId === this.collabWindow.clientId;
-        for (const segment of segmentsWithRefs) {
-            this.updateSegmentRefsAfterMarkRemoved(segment, pending);
-        }
+        // these segments are already viewed as being removed locally and are not event-ed
+        // so can slide non-StayOnRemove refs immediately
+        localOverlapWithRefs.forEach((s) => this.slideReferences(s, Array.from(s.localRefs)
+            .filter((localRef) => !(0, referencePositions_1.refTypeIncludesFlag)(localRef, ops_1.ReferenceType.StayOnRemove))));
         // opArgs == undefined => test code
         if (this.mergeTreeDeltaCallback && removedSegments.length > 0) {
             this.mergeTreeDeltaCallback(opArgs, {
@@ -2012,6 +1643,11 @@ class MergeTree {
                 deltaSegments: removedSegments,
             });
         }
+        const pending = this.collabWindow.collaborating && clientId === this.collabWindow.clientId;
+        // these events are newly removed
+        // so we slide after eventing in case the consumer wants to make reference
+        // changes at remove time, like add a ref to track undo redo.
+        removedSegments.forEach((rSeg) => this.updateSegmentRefsAfterMarkRemoved(rSeg.segment, pending));
         if (this.collabWindow.collaborating && (seq !== constants_1.UnassignedSequenceNumber)) {
             if (MergeTree.options.zamboniSegments) {
                 this.zamboniSegments();
@@ -2021,7 +1657,7 @@ class MergeTree {
     nodeUpdateLengthNewStructure(node, recur = false) {
         this.blockUpdate(node);
         if (this.collabWindow.collaborating) {
-            node.partialLengths = partialLengths_1.PartialSequenceLengths.combine(this, node, this.collabWindow, recur);
+            node.partialLengths = partialLengths_1.PartialSequenceLengths.combine(node, this.collabWindow, recur);
         }
     }
     removeLocalReferencePosition(lref) {
@@ -2035,7 +1671,7 @@ class MergeTree {
             return removedRefs;
         }
     }
-    createLocalReferencePosition(segment, offset, refType, properties, client) {
+    createLocalReferencePosition(segment, offset, refType, properties) {
         var _a;
         if (isRemoved(segment)) {
             if (!(0, referencePositions_1.refTypeIncludesFlag)(refType, ops_1.ReferenceType.SlideOnRemove | ops_1.ReferenceType.Transient)) {
@@ -2044,34 +1680,10 @@ class MergeTree {
         }
         const localRefs = (_a = segment.localRefs) !== null && _a !== void 0 ? _a : new localReference_1.LocalReferenceCollection(segment);
         segment.localRefs = localRefs;
-        const segRef = localRefs.createLocalRef(offset, refType, properties, client);
+        const segRef = localRefs.createLocalRef(offset, refType, properties);
         this.blockUpdatePathLengths(segment.parent, constants_1.TreeMaintenanceSequenceNumber, constants_1.LocalClientId);
         return segRef;
     }
-    /**
-     * @deprecated - use removeLocalReferencePosition
-     */
-    removeLocalReference(segment, lref) {
-        if (segment.localRefs) {
-            const removedRef = segment.localRefs.removeLocalRef(lref);
-            if (removedRef) {
-                this.blockUpdatePathLengths(segment.parent, constants_1.TreeMaintenanceSequenceNumber, constants_1.LocalClientId);
-            }
-        }
-    }
-    /**
-     * @deprecated - use createLocalReference
-     */
-    addLocalReference(lref) {
-        const segment = lref.segment;
-        let localRefs = segment.localRefs;
-        if (!localRefs) {
-            localRefs = new localReference_1.LocalReferenceCollection(segment);
-            segment.localRefs = localRefs;
-        }
-        localRefs.addLocalRef(lref);
-        this.blockUpdatePathLengths(segment.parent, constants_1.TreeMaintenanceSequenceNumber, constants_1.LocalClientId);
-    }
     blockUpdate(block) {
         var _a;
         let len = 0;
@@ -2085,7 +1697,7 @@ class MergeTree {
             const child = block.children[i];
             len += (_a = nodeTotalLength(this, child)) !== null && _a !== void 0 ? _a : 0;
             if (hierBlock) {
-                hierBlock.addNodeReferences(this, child);
+                addNodeReferences(this, child, hierBlock.rightmostTiles, hierBlock.leftmostTiles, hierBlock.rangeStacks);
             }
             if (this.blockUpdateActions) {
                 this.blockUpdateActions.child(block, i);
@@ -2113,10 +1725,10 @@ class MergeTree {
             if (node.partialLengths !== undefined
                 && MergeTree.options.incrementalUpdate
                 && clientId !== constants_1.NonCollabClient) {
-                node.partialLengths.update(this, node, seq, clientId, this.collabWindow);
+                node.partialLengths.update(node, seq, clientId, this.collabWindow);
             }
             else {
-                node.partialLengths = partialLengths_1.PartialSequenceLengths.combine(this, node, this.collabWindow);
+                node.partialLengths = partialLengths_1.PartialSequenceLengths.combine(node, this.collabWindow);
             }
         }
     }
@@ -2135,12 +1747,16 @@ class MergeTree {
         }
         this.nodeMap(this.root, actions, 0, refSeq, clientId, accum, start, end);
     }
+    /**
+     * @deprecated  for internal use only. public export will be removed.
+     * @internal
+     */
     incrementalBlockMap(stateStack) {
         var _a;
         while (!stateStack.empty()) {
             // We already check the stack is not empty
             const state = stateStack.top();
-            if (state.op !== IncrementalExecOp.Go) {
+            if (state.op !== mergeTreeNodes_1.IncrementalExecOp.Go) {
                 return;
             }
             if (state.childIndex === 0) {
@@ -2154,12 +1770,12 @@ class MergeTree {
                     state.actions.pre(state);
                 }
             }
-            if ((state.op === IncrementalExecOp.Go) && (state.childIndex < state.block.childCount)) {
+            if ((state.op === mergeTreeNodes_1.IncrementalExecOp.Go) && (state.childIndex < state.block.childCount)) {
                 const child = state.block.children[state.childIndex];
                 const len = (_a = this.nodeLength(child, state.refSeq, state.clientId)) !== null && _a !== void 0 ? _a : 0;
                 if ((len > 0) && (state.start < len) && (state.end > 0)) {
                     if (!child.isLeaf()) {
-                        const childState = new IncrementalMapState(child, state.actions, state.pos, state.refSeq, state.clientId, state.context, state.start, state.end, 0);
+                        const childState = new mergeTreeNodes_1.IncrementalMapState(child, state.actions, state.pos, state.refSeq, state.clientId, state.context, state.start, state.end, 0);
                         stateStack.push(childState);
                     }
                     else {
@@ -2173,7 +1789,7 @@ class MergeTree {
             }
             else {
                 if (state.childIndex === state.block.childCount) {
-                    if ((state.op === IncrementalExecOp.Go) && state.actions.post) {
+                    if ((state.op === mergeTreeNodes_1.IncrementalExecOp.Go) && state.actions.post) {
                         state.actions.post(state);
                     }
                     stateStack.pop();