@fluidframework/merge-tree 2.10.0-305357 → 2.10.0-307060

package/lib/mergeTree.js

@@ -69,15 +69,17 @@ const LRUSegmentComparer = {
 function ackSegment(segment, segmentGroup, opArgs) {
     const currentSegmentGroup = segment.segmentGroups?.dequeue();
     assert(currentSegmentGroup === segmentGroup, 0x043 /* "On ack, unexpected segmentGroup!" */);
-    switch (opArgs.op.type) {
+    assert(opArgs.sequencedMessage !== undefined, "must have sequencedMessage");
+    const { op, sequencedMessage: { sequenceNumber, minimumSequenceNumber }, } = opArgs;
+    switch (op.type) {
         case MergeTreeDeltaType.ANNOTATE: {
             assert(!!segment.propertyManager, 0x044 /* "On annotate ack, missing segment property manager!" */);
-            segment.propertyManager.ackPendingProperties(opArgs.op);
+            segment.propertyManager.ack(sequenceNumber, minimumSequenceNumber, op);
             return true;
         }
         case MergeTreeDeltaType.INSERT: {
             assert(segment.seq === UnassignedSequenceNumber, 0x045 /* "On insert, seq number already assigned!" */);
-            segment.seq = opArgs.sequencedMessage.sequenceNumber;
+            segment.seq = sequenceNumber;
             segment.localSeq = undefined;
             return true;
         }
@@ -86,7 +88,7 @@ function ackSegment(segment, segmentGroup, opArgs) {
             assert(removalInfo !== undefined, 0x046 /* "On remove ack, missing removal info!" */);
             segment.localRemovedSeq = undefined;
             if (removalInfo.removedSeq === UnassignedSequenceNumber) {
-                removalInfo.removedSeq = opArgs.sequencedMessage.sequenceNumber;
+                removalInfo.removedSeq = sequenceNumber;
                 return true;
             }
             return false;
@@ -100,16 +102,15 @@ function ackSegment(segment, segmentGroup, opArgs) {
             segment.localMovedSeq = obliterateInfo.localSeq = undefined;
             const seqIdx = moveInfo.movedSeqs.indexOf(UnassignedSequenceNumber);
             assert(seqIdx !== -1, 0x86f /* expected movedSeqs to contain unacked seq */);
-            moveInfo.movedSeqs[seqIdx] = obliterateInfo.seq =
-                opArgs.sequencedMessage.sequenceNumber;
+            moveInfo.movedSeqs[seqIdx] = sequenceNumber;
             if (moveInfo.movedSeq === UnassignedSequenceNumber) {
-                moveInfo.movedSeq = opArgs.sequencedMessage.sequenceNumber;
+                moveInfo.movedSeq = sequenceNumber;
                 return true;
             }
             return false;
         }
         default: {
-            throw new Error(`${opArgs.op.type} is in unrecognized operation type`);
+            throw new Error(`${op.type} is in unrecognized operation type`);
         }
     }
 }
@@ -820,8 +821,8 @@ export class MergeTree {
                     segment: pendingSegment,
                 });
             });
-            if (opArgs.op.type === MergeTreeDeltaType.OBLITERATE ||
-                opArgs.op.type === MergeTreeDeltaType.OBLITERATE_SIDED) {
+            if (pendingSegmentGroup.obliterateInfo !== undefined) {
+                pendingSegmentGroup.obliterateInfo.seq = seq;
                 this.obliterates.addOrUpdate(pendingSegmentGroup.obliterateInfo);
             }
             // Perform slides after all segments have been acked, so that
@@ -1264,8 +1265,7 @@ export class MergeTree {
                 !(reservedMarkerIdKey in props) ||
                 props.markerId === segment.properties?.markerId, 0x5ad /* Cannot change the markerId of an existing marker */);
             const propertyManager = (segment.propertyManager ?? (segment.propertyManager = new PropertiesManager()));
-            const properties = (segment.properties ?? (segment.properties = createMap()));
-            const propertyDeltas = propertyManager.addProperties(properties, props, seq, this.collabWindow.collaborating, rollback);
+            const propertyDeltas = propertyManager.handleProperties({ props }, segment, seq, this.collabWindow.minSeq, this.collabWindow.collaborating, rollback);
             if (!isRemovedOrMoved(segment)) {
                 deltaSegments.push({ segment, propertyDeltas });
             }
@@ -1416,7 +1416,7 @@ export class MergeTree {
         undefined, seq === UnassignedSequenceNumber ? undefined : seq);
         this.slideAckedRemovedSegmentReferences(localOverlapWithRefs);
         // opArgs == undefined => test code
-        if (movedSegments.length > 0) {
+        if (start.pos !== end.pos || start.side !== end.side) {
             this.mergeTreeDeltaCallback?.(opArgs, {
                 operation: MergeTreeDeltaType.OBLITERATE,
                 deltaSegments: movedSegments,