@fluidframework/merge-tree 2.0.0-rc.3.0.3 → 2.0.0-rc.4.0.0

package/lib/mergeTree.js

@@ -14,7 +14,7 @@ import { MergeTreeMaintenanceType, } from "./mergeTreeDeltaCallback.js";
 import { NodeAction, backwardExcursion, depthFirstNodeWalk, forwardExcursion, walkAllChildSegments, } from "./mergeTreeNodeWalk.js";
 import { 
 // eslint-disable-next-line import/no-deprecated
-CollaborationWindow, HierMergeBlock, Marker, MaxNodesInBlock, reservedMarkerIdKey, seqLTE, toMoveInfo, toRemovalInfo, } from "./mergeTreeNodes.js";
+CollaborationWindow, Marker, MaxNodesInBlock, MergeBlock, reservedMarkerIdKey, seqLTE, toMoveInfo, toRemovalInfo, } from "./mergeTreeNodes.js";
 import { createAnnotateRangeOp, createInsertSegmentOp, createRemoveRangeOp } from "./opBuilder.js";
 import { MergeTreeDeltaType, ReferenceType } from "./ops.js";
 import { PartialSequenceLengths } from "./partialLengths.js";
@@ -65,24 +65,6 @@ const LRUSegmentComparer = {
     min: { maxSeq: -2 },
     compare: (a, b) => a.maxSeq - b.maxSeq,
 };
-function addTile(tile, tiles) {
-    const tileLabels = refGetTileLabels(tile);
-    if (tileLabels) {
-        for (const tileLabel of tileLabels) {
-            tiles[tileLabel] = tile;
-        }
-    }
-}
-function addTileIfNotPresent(tile, tiles) {
-    const tileLabels = refGetTileLabels(tile);
-    if (tileLabels) {
-        for (const tileLabel of tileLabels) {
-            if (tiles[tileLabel] === undefined) {
-                tiles[tileLabel] = tile;
-            }
-        }
-    }
-}
 export function findRootMergeBlock(segmentOrNode) {
     if (segmentOrNode === undefined) {
         return undefined;
@@ -259,7 +241,7 @@ export class MergeTree {
         value.mergeTree = this;
     }
     makeBlock(childCount) {
-        const block = new HierMergeBlock(childCount);
+        const block = new MergeBlock(childCount);
         block.ordinal = "";
         return block;
     }
@@ -671,7 +653,6 @@ export class MergeTree {
                 }
             }
             else {
-                assert(node.hierBlock(), 0x90b /* must be hierBlock */);
                 const marker = forwards
                     ? node.leftmostTiles[markerLabel]
                     : node.rightmostTiles[markerLabel];
@@ -1217,7 +1198,9 @@ export class MergeTree {
                 !(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 (!isRemovedOrMoved(segment)) {
+                deltaSegments.push({ segment, propertyDeltas });
+            }
             if (this.collabWindow.collaborating) {
                 if (seq === UnassignedSequenceNumber) {
                     segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq, propertyDeltas);
@@ -1672,49 +1655,51 @@ export class MergeTree {
         });
         normalize();
     }
-    addNodeReferences(node, rightmostTiles, leftmostTiles) {
-        if (node.isLeaf()) {
-            const segment = node;
-            if ((this.localNetLength(segment) ?? 0) > 0 && 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 (refTypeIncludesFlag(segment, ReferenceType.Tile)) {
-                    addTile(segment, rightmostTiles);
-                    addTileIfNotPresent(segment, leftmostTiles);
-                }
-            }
-        }
-        else {
-            assert(node.hierBlock(), 0x90c /* must be hier block */);
-            // eslint-disable-next-line import/no-deprecated
-            extend(rightmostTiles, node.rightmostTiles);
-            // eslint-disable-next-line import/no-deprecated
-            extendIfUndefined(leftmostTiles, node.leftmostTiles);
-        }
-    }
     blockUpdate(block) {
         let len;
-        if (block.hierBlock()) {
-            // eslint-disable-next-line import/no-deprecated
-            block.rightmostTiles = createMap();
-            // eslint-disable-next-line import/no-deprecated
-            block.leftmostTiles = createMap();
-        }
+        // eslint-disable-next-line import/no-deprecated
+        const rightmostTiles = createMap();
+        // eslint-disable-next-line import/no-deprecated
+        const leftmostTiles = createMap();
         for (let i = 0; i < block.childCount; i++) {
-            const child = block.children[i];
-            const nodeLength = nodeTotalLength(this, child);
+            const node = block.children[i];
+            const nodeLength = nodeTotalLength(this, node);
             if (nodeLength !== undefined) {
                 len ?? (len = 0);
                 len += nodeLength;
             }
-            if (block.hierBlock()) {
-                this.addNodeReferences(child, block.rightmostTiles, block.leftmostTiles);
+            if (node.isLeaf()) {
+                const segment = node;
+                if ((this.localNetLength(segment) ?? 0) > 0 && 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 (refTypeIncludesFlag(segment, ReferenceType.Tile)) {
+                        const tileLabels = refGetTileLabels(segment);
+                        if (tileLabels) {
+                            for (const tileLabel of tileLabels) {
+                                // this depends on walking children in order
+                                // The later, and right most children overwrite
+                                // whereas early, and left most do not overwrite
+                                rightmostTiles[tileLabel] = segment;
+                                leftmostTiles[tileLabel] ?? (leftmostTiles[tileLabel] = segment);
+                            }
+                        }
+                    }
+                }
+            }
+            else {
+                // eslint-disable-next-line import/no-deprecated
+                extend(rightmostTiles, node.rightmostTiles);
+                // eslint-disable-next-line import/no-deprecated
+                extendIfUndefined(leftmostTiles, node.leftmostTiles);
             }
         }
+        block.leftmostTiles = leftmostTiles;
+        block.rightmostTiles = rightmostTiles;
         block.cachedLength = len;
     }
     blockUpdatePathLengths(startBlock, seq, clientId, newStructure = false) {