@fluidframework/merge-tree 2.4.0-297385 → 2.4.0-299707
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 +23 -22
- package/src/client.ts +0 -3
- package/src/collections/list.ts +6 -0
- package/src/mergeTree.ts +3 -9
package/dist/mergeTree.js
CHANGED
|
@@ -1266,12 +1266,12 @@ class MergeTree {
|
|
|
1266
1266
|
(0, zamboni_js_1.zamboniSegments)(this);
|
|
1267
1267
|
}
|
|
1268
1268
|
}
|
|
1269
|
-
obliterateRangeSided(start, end, refSeq, clientId, seq,
|
|
1269
|
+
obliterateRangeSided(start, end, refSeq, clientId, seq, opArgs) {
|
|
1270
1270
|
const startPos = start.side === sequencePlace_js_1.Side.Before ? start.pos : start.pos + 1;
|
|
1271
1271
|
const endPos = end.side === sequencePlace_js_1.Side.Before ? end.pos : end.pos + 1;
|
|
1272
1272
|
this.ensureIntervalBoundary(startPos, refSeq, clientId);
|
|
1273
1273
|
this.ensureIntervalBoundary(endPos, refSeq, clientId);
|
|
1274
|
-
let _overwrite =
|
|
1274
|
+
let _overwrite = false;
|
|
1275
1275
|
const localOverlapWithRefs = [];
|
|
1276
1276
|
const movedSegments = [];
|
|
1277
1277
|
const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
|
|
@@ -1405,19 +1405,19 @@ class MergeTree {
|
|
|
1405
1405
|
(0, zamboni_js_1.zamboniSegments)(this);
|
|
1406
1406
|
}
|
|
1407
1407
|
}
|
|
1408
|
-
obliterateRange(start, end, refSeq, clientId, seq,
|
|
1408
|
+
obliterateRange(start, end, refSeq, clientId, seq, opArgs) {
|
|
1409
1409
|
errorIfOptionNotTrue(this.options, "mergeTreeEnableObliterate");
|
|
1410
1410
|
if (this.options?.mergeTreeEnableSidedObliterate) {
|
|
1411
1411
|
(0, internal_1.assert)(typeof start === "object" && typeof end === "object", "Start and end must be of type InteriorSequencePlace if mergeTreeEnableSidedObliterate is enabled.");
|
|
1412
|
-
this.obliterateRangeSided(start, end, refSeq, clientId, seq,
|
|
1412
|
+
this.obliterateRangeSided(start, end, refSeq, clientId, seq, opArgs);
|
|
1413
1413
|
}
|
|
1414
1414
|
else {
|
|
1415
1415
|
(0, internal_1.assert)(typeof start === "number" && typeof end === "number", "Start and end must be numbers if mergeTreeEnableSidedObliterate is not enabled.");
|
|
1416
|
-
this.obliterateRangeSided({ pos: start, side: sequencePlace_js_1.Side.Before }, { pos: end - 1, side: sequencePlace_js_1.Side.After }, refSeq, clientId, seq,
|
|
1416
|
+
this.obliterateRangeSided({ pos: start, side: sequencePlace_js_1.Side.Before }, { pos: end - 1, side: sequencePlace_js_1.Side.After }, refSeq, clientId, seq, opArgs);
|
|
1417
1417
|
}
|
|
1418
1418
|
}
|
|
1419
|
-
markRangeRemoved(start, end, refSeq, clientId, seq,
|
|
1420
|
-
let _overwrite =
|
|
1419
|
+
markRangeRemoved(start, end, refSeq, clientId, seq, opArgs) {
|
|
1420
|
+
let _overwrite = false;
|
|
1421
1421
|
this.ensureIntervalBoundary(start, refSeq, clientId);
|
|
1422
1422
|
this.ensureIntervalBoundary(end, refSeq, clientId);
|
|
1423
1423
|
// eslint-disable-next-line import/no-deprecated
|
|
@@ -1547,7 +1547,7 @@ class MergeTree {
|
|
|
1547
1547
|
segment.seq = constants_js_1.UniversalSequenceNumber;
|
|
1548
1548
|
segment.localSeq = undefined;
|
|
1549
1549
|
const removeOp = (0, opBuilder_js_1.createRemoveRangeOp)(start, start + segment.cachedLength);
|
|
1550
|
-
this.markRangeRemoved(start, start + segment.cachedLength, constants_js_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_js_1.UniversalSequenceNumber,
|
|
1550
|
+
this.markRangeRemoved(start, start + segment.cachedLength, constants_js_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_js_1.UniversalSequenceNumber, { op: removeOp });
|
|
1551
1551
|
} /* op.type === MergeTreeDeltaType.ANNOTATE */
|
|
1552
1552
|
else {
|
|
1553
1553
|
const props = pendingSegmentGroup.previousProps[i];
|