@fluidframework/merge-tree 2.50.0 → 2.51.0-347100

package/dist/mergeTree.js

@@ -1554,6 +1554,13 @@ class MergeTree {
      * Revert an unacked local op
      */
     rollback(op, localOpMetadata) {
+        if (op.type === ops_js_1.MergeTreeDeltaType.GROUP) {
+            (0, internal_1.assert)(Array.isArray(localOpMetadata), "metadata must be array for group ops");
+            for (let i = op.ops.length - 1; i >= 0; i--) {
+                this.rollback(op.ops[i], localOpMetadata[i]);
+            }
+            return;
+        }
         const rollbackStamp = {
             seq: constants_js_1.TreeMaintenanceSequenceNumber,
             clientId: constants_js_1.NonCollabClient,
@@ -1568,22 +1575,23 @@ class MergeTree {
             pendingSegmentGroup.segments.forEach((segment) => {
                 const segmentSegmentGroup = segment?.segmentGroups?.pop();
                 (0, internal_1.assert)(segmentSegmentGroup === pendingSegmentGroup, 0x3ee /* Unexpected segmentGroup in segment */);
-                (0, internal_1.assert)((0, segmentInfos_js_1.isRemoved)(segment) &&
-                    segment.removes[0].clientId === this.collabWindow.clientId &&
-                    segment.removes[0].type === "setRemove", 0x39d /* Rollback segment removedClientId does not match local client */);
-                // This also removes obliterates, but that should be ok as we can only remove a segment once.
-                // If we were able to remove it locally, that also means there are no remote removals (since rollback is synchronous).
-                (0, segmentInfos_js_1.removeRemovalInfo)(segment);
-                this.blockUpdatePathLengths(segment.parent, rollbackStamp);
-                // 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_js_1.createInsertSegmentOp)(this.findRollbackPosition(segment), segment),
-                    rollback: true,
-                }, {
-                    operation: ops_js_1.MergeTreeDeltaType.INSERT,
-                    deltaSegments: [{ segment }],
-                });
+                (0, internal_1.assert)((0, segmentInfos_js_1.isRemoved)(segment) && segment.removes[0].type === "setRemove", 0x39d /* Rollback segment removedClientId does not match local client */);
+                // if a peer client concurrently deleted the segment, don't revive it on rollback
+                if (segment.removes[0].clientId === this.collabWindow.clientId) {
+                    // This also removes obliterates, but that should be ok as we can only remove a segment once.
+                    // If we were able to remove it locally, that also means there are no remote removals (since rollback is synchronous).
+                    (0, segmentInfos_js_1.removeRemovalInfo)(segment);
+                    this.blockUpdatePathLengths(segment.parent, rollbackStamp);
+                    // 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_js_1.createInsertSegmentOp)(this.findRollbackPosition(segment), segment),
+                        rollback: true,
+                    }, {
+                        operation: ops_js_1.MergeTreeDeltaType.INSERT,
+                        deltaSegments: [{ segment }],
+                    });
+                }
             });
         }
         else if (op.type === ops_js_1.MergeTreeDeltaType.INSERT ||