@fluidframework/merge-tree 2.4.0-297385 → 2.4.0-299374
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +3 -3
- package/dist/client.js.map +1 -1
- package/dist/collections/list.d.ts +1 -0
- package/dist/collections/list.d.ts.map +1 -1
- package/dist/collections/list.js +4 -1
- package/dist/collections/list.js.map +1 -1
- package/dist/mergeTree.d.ts +2 -2
- package/dist/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +8 -8
- package/dist/mergeTree.js.map +1 -1
- package/dist/test/beastTest.spec.d.ts.map +1 -1
- package/dist/test/beastTest.spec.js +3 -3
- package/dist/test/beastTest.spec.js.map +1 -1
- package/dist/test/client.applyMsg.spec.js +76 -0
- package/dist/test/client.applyMsg.spec.js.map +1 -1
- package/dist/test/client.conflictFarm.spec.js +17 -4
- package/dist/test/client.conflictFarm.spec.js.map +1 -1
- package/dist/test/mergeTree.insertingWalk.spec.js +2 -2
- package/dist/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.d.ts +1 -0
- package/dist/test/mergeTreeOperationRunner.d.ts.map +1 -1
- package/dist/test/mergeTreeOperationRunner.js +22 -1
- package/dist/test/mergeTreeOperationRunner.js.map +1 -1
- package/dist/test/obliterate.partialLength.spec.js +0 -4
- package/dist/test/obliterate.partialLength.spec.js.map +1 -1
- package/dist/test/obliterate.spec.js +0 -6
- package/dist/test/obliterate.spec.js.map +1 -1
- package/dist/test/testUtils.d.ts +2 -3
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +4 -4
- package/dist/test/testUtils.js.map +1 -1
- package/lib/client.d.ts.map +1 -1
- package/lib/client.js +3 -3
- package/lib/client.js.map +1 -1
- package/lib/collections/list.d.ts +1 -0
- package/lib/collections/list.d.ts.map +1 -1
- package/lib/collections/list.js +4 -1
- package/lib/collections/list.js.map +1 -1
- package/lib/mergeTree.d.ts +2 -2
- package/lib/mergeTree.d.ts.map +1 -1
- package/lib/mergeTree.js +8 -8
- package/lib/mergeTree.js.map +1 -1
- package/lib/test/beastTest.spec.d.ts.map +1 -1
- package/lib/test/beastTest.spec.js +3 -3
- package/lib/test/beastTest.spec.js.map +1 -1
- package/lib/test/client.applyMsg.spec.js +76 -0
- package/lib/test/client.applyMsg.spec.js.map +1 -1
- package/lib/test/client.conflictFarm.spec.js +18 -5
- package/lib/test/client.conflictFarm.spec.js.map +1 -1
- package/lib/test/mergeTree.insertingWalk.spec.js +2 -2
- package/lib/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/lib/test/mergeTreeOperationRunner.d.ts +1 -0
- package/lib/test/mergeTreeOperationRunner.d.ts.map +1 -1
- package/lib/test/mergeTreeOperationRunner.js +20 -0
- package/lib/test/mergeTreeOperationRunner.js.map +1 -1
- package/lib/test/obliterate.partialLength.spec.js +0 -4
- package/lib/test/obliterate.partialLength.spec.js.map +1 -1
- package/lib/test/obliterate.spec.js +0 -6
- package/lib/test/obliterate.spec.js.map +1 -1
- package/lib/test/testUtils.d.ts +2 -3
- package/lib/test/testUtils.d.ts.map +1 -1
- package/lib/test/testUtils.js +4 -4
- package/lib/test/testUtils.js.map +1 -1
- package/package.json +18 -19
- package/src/client.ts +0 -3
- package/src/collections/list.ts +6 -0
- package/src/mergeTree.ts +3 -9
package/lib/mergeTree.js
CHANGED
|
@@ -1262,12 +1262,12 @@ export class MergeTree {
|
|
|
1262
1262
|
zamboniSegments(this);
|
|
1263
1263
|
}
|
|
1264
1264
|
}
|
|
1265
|
-
obliterateRangeSided(start, end, refSeq, clientId, seq,
|
|
1265
|
+
obliterateRangeSided(start, end, refSeq, clientId, seq, opArgs) {
|
|
1266
1266
|
const startPos = start.side === Side.Before ? start.pos : start.pos + 1;
|
|
1267
1267
|
const endPos = end.side === Side.Before ? end.pos : end.pos + 1;
|
|
1268
1268
|
this.ensureIntervalBoundary(startPos, refSeq, clientId);
|
|
1269
1269
|
this.ensureIntervalBoundary(endPos, refSeq, clientId);
|
|
1270
|
-
let _overwrite =
|
|
1270
|
+
let _overwrite = false;
|
|
1271
1271
|
const localOverlapWithRefs = [];
|
|
1272
1272
|
const movedSegments = [];
|
|
1273
1273
|
const localSeq = seq === UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
|
|
@@ -1401,19 +1401,19 @@ export class MergeTree {
|
|
|
1401
1401
|
zamboniSegments(this);
|
|
1402
1402
|
}
|
|
1403
1403
|
}
|
|
1404
|
-
obliterateRange(start, end, refSeq, clientId, seq,
|
|
1404
|
+
obliterateRange(start, end, refSeq, clientId, seq, opArgs) {
|
|
1405
1405
|
errorIfOptionNotTrue(this.options, "mergeTreeEnableObliterate");
|
|
1406
1406
|
if (this.options?.mergeTreeEnableSidedObliterate) {
|
|
1407
1407
|
assert(typeof start === "object" && typeof end === "object", "Start and end must be of type InteriorSequencePlace if mergeTreeEnableSidedObliterate is enabled.");
|
|
1408
|
-
this.obliterateRangeSided(start, end, refSeq, clientId, seq,
|
|
1408
|
+
this.obliterateRangeSided(start, end, refSeq, clientId, seq, opArgs);
|
|
1409
1409
|
}
|
|
1410
1410
|
else {
|
|
1411
1411
|
assert(typeof start === "number" && typeof end === "number", "Start and end must be numbers if mergeTreeEnableSidedObliterate is not enabled.");
|
|
1412
|
-
this.obliterateRangeSided({ pos: start, side: Side.Before }, { pos: end - 1, side: Side.After }, refSeq, clientId, seq,
|
|
1412
|
+
this.obliterateRangeSided({ pos: start, side: Side.Before }, { pos: end - 1, side: Side.After }, refSeq, clientId, seq, opArgs);
|
|
1413
1413
|
}
|
|
1414
1414
|
}
|
|
1415
|
-
markRangeRemoved(start, end, refSeq, clientId, seq,
|
|
1416
|
-
let _overwrite =
|
|
1415
|
+
markRangeRemoved(start, end, refSeq, clientId, seq, opArgs) {
|
|
1416
|
+
let _overwrite = false;
|
|
1417
1417
|
this.ensureIntervalBoundary(start, refSeq, clientId);
|
|
1418
1418
|
this.ensureIntervalBoundary(end, refSeq, clientId);
|
|
1419
1419
|
// eslint-disable-next-line import/no-deprecated
|
|
@@ -1543,7 +1543,7 @@ export class MergeTree {
|
|
|
1543
1543
|
segment.seq = UniversalSequenceNumber;
|
|
1544
1544
|
segment.localSeq = undefined;
|
|
1545
1545
|
const removeOp = createRemoveRangeOp(start, start + segment.cachedLength);
|
|
1546
|
-
this.markRangeRemoved(start, start + segment.cachedLength, UniversalSequenceNumber, this.collabWindow.clientId, UniversalSequenceNumber,
|
|
1546
|
+
this.markRangeRemoved(start, start + segment.cachedLength, UniversalSequenceNumber, this.collabWindow.clientId, UniversalSequenceNumber, { op: removeOp });
|
|
1547
1547
|
} /* op.type === MergeTreeDeltaType.ANNOTATE */
|
|
1548
1548
|
else {
|
|
1549
1549
|
const props = pendingSegmentGroup.previousProps[i];
|