@fluidframework/merge-tree 2.10.0-305357 → 2.10.0-306579
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/.eslintrc.cjs +1 -0
- package/dist/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +4 -5
- package/dist/mergeTree.js.map +1 -1
- package/lib/mergeTree.d.ts.map +1 -1
- package/lib/mergeTree.js +4 -5
- package/lib/mergeTree.js.map +1 -1
- package/package.json +15 -15
- package/src/mergeTree.ts +5 -8
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluidframework/merge-tree",
|
|
3
|
-
"version": "2.10.0-
|
|
3
|
+
"version": "2.10.0-306579",
|
|
4
4
|
"description": "Merge tree",
|
|
5
5
|
"homepage": "https://fluidframework.com",
|
|
6
6
|
"repository": {
|
|
@@ -81,30 +81,30 @@
|
|
|
81
81
|
"temp-directory": "nyc/.nyc_output"
|
|
82
82
|
},
|
|
83
83
|
"dependencies": {
|
|
84
|
-
"@fluid-internal/client-utils": "2.10.0-
|
|
85
|
-
"@fluidframework/container-definitions": "2.10.0-
|
|
86
|
-
"@fluidframework/core-interfaces": "2.10.0-
|
|
87
|
-
"@fluidframework/core-utils": "2.10.0-
|
|
88
|
-
"@fluidframework/datastore-definitions": "2.10.0-
|
|
89
|
-
"@fluidframework/driver-definitions": "2.10.0-
|
|
90
|
-
"@fluidframework/runtime-definitions": "2.10.0-
|
|
91
|
-
"@fluidframework/runtime-utils": "2.10.0-
|
|
92
|
-
"@fluidframework/shared-object-base": "2.10.0-
|
|
93
|
-
"@fluidframework/telemetry-utils": "2.10.0-
|
|
84
|
+
"@fluid-internal/client-utils": "2.10.0-306579",
|
|
85
|
+
"@fluidframework/container-definitions": "2.10.0-306579",
|
|
86
|
+
"@fluidframework/core-interfaces": "2.10.0-306579",
|
|
87
|
+
"@fluidframework/core-utils": "2.10.0-306579",
|
|
88
|
+
"@fluidframework/datastore-definitions": "2.10.0-306579",
|
|
89
|
+
"@fluidframework/driver-definitions": "2.10.0-306579",
|
|
90
|
+
"@fluidframework/runtime-definitions": "2.10.0-306579",
|
|
91
|
+
"@fluidframework/runtime-utils": "2.10.0-306579",
|
|
92
|
+
"@fluidframework/shared-object-base": "2.10.0-306579",
|
|
93
|
+
"@fluidframework/telemetry-utils": "2.10.0-306579"
|
|
94
94
|
},
|
|
95
95
|
"devDependencies": {
|
|
96
96
|
"@arethetypeswrong/cli": "^0.16.4",
|
|
97
97
|
"@biomejs/biome": "~1.9.3",
|
|
98
|
-
"@fluid-internal/mocha-test-setup": "2.10.0-
|
|
99
|
-
"@fluid-private/stochastic-test-utils": "2.10.0-
|
|
100
|
-
"@fluid-private/test-pairwise-generator": "2.10.0-
|
|
98
|
+
"@fluid-internal/mocha-test-setup": "2.10.0-306579",
|
|
99
|
+
"@fluid-private/stochastic-test-utils": "2.10.0-306579",
|
|
100
|
+
"@fluid-private/test-pairwise-generator": "2.10.0-306579",
|
|
101
101
|
"@fluid-tools/benchmark": "^0.50.0",
|
|
102
102
|
"@fluid-tools/build-cli": "^0.50.0",
|
|
103
103
|
"@fluidframework/build-common": "^2.0.3",
|
|
104
104
|
"@fluidframework/build-tools": "^0.50.0",
|
|
105
105
|
"@fluidframework/eslint-config-fluid": "^5.4.0",
|
|
106
106
|
"@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.5.0",
|
|
107
|
-
"@fluidframework/test-runtime-utils": "2.10.0-
|
|
107
|
+
"@fluidframework/test-runtime-utils": "2.10.0-306579",
|
|
108
108
|
"@microsoft/api-extractor": "7.47.8",
|
|
109
109
|
"@types/diff": "^3.5.1",
|
|
110
110
|
"@types/mocha": "^9.1.1",
|
package/src/mergeTree.ts
CHANGED
|
@@ -193,8 +193,7 @@ function ackSegment(
|
|
|
193
193
|
segment.localMovedSeq = obliterateInfo.localSeq = undefined;
|
|
194
194
|
const seqIdx = moveInfo.movedSeqs.indexOf(UnassignedSequenceNumber);
|
|
195
195
|
assert(seqIdx !== -1, 0x86f /* expected movedSeqs to contain unacked seq */);
|
|
196
|
-
moveInfo.movedSeqs[seqIdx] =
|
|
197
|
-
opArgs.sequencedMessage!.sequenceNumber;
|
|
196
|
+
moveInfo.movedSeqs[seqIdx] = opArgs.sequencedMessage!.sequenceNumber;
|
|
198
197
|
|
|
199
198
|
if (moveInfo.movedSeq === UnassignedSequenceNumber) {
|
|
200
199
|
moveInfo.movedSeq = opArgs.sequencedMessage!.sequenceNumber;
|
|
@@ -1317,11 +1316,9 @@ export class MergeTree {
|
|
|
1317
1316
|
});
|
|
1318
1317
|
});
|
|
1319
1318
|
|
|
1320
|
-
if (
|
|
1321
|
-
|
|
1322
|
-
|
|
1323
|
-
) {
|
|
1324
|
-
this.obliterates.addOrUpdate(pendingSegmentGroup.obliterateInfo!);
|
|
1319
|
+
if (pendingSegmentGroup.obliterateInfo !== undefined) {
|
|
1320
|
+
pendingSegmentGroup.obliterateInfo.seq = seq;
|
|
1321
|
+
this.obliterates.addOrUpdate(pendingSegmentGroup.obliterateInfo);
|
|
1325
1322
|
}
|
|
1326
1323
|
|
|
1327
1324
|
// Perform slides after all segments have been acked, so that
|
|
@@ -2157,7 +2154,7 @@ export class MergeTree {
|
|
|
2157
2154
|
|
|
2158
2155
|
this.slideAckedRemovedSegmentReferences(localOverlapWithRefs);
|
|
2159
2156
|
// opArgs == undefined => test code
|
|
2160
|
-
if (
|
|
2157
|
+
if (start.pos !== end.pos || start.side !== end.side) {
|
|
2161
2158
|
this.mergeTreeDeltaCallback?.(opArgs, {
|
|
2162
2159
|
operation: MergeTreeDeltaType.OBLITERATE,
|
|
2163
2160
|
deltaSegments: movedSegments,
|