@fluidframework/merge-tree 2.0.0-internal.3.3.2 → 2.0.0-internal.3.4.0
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/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +5 -0
- package/dist/mergeTree.js.map +1 -1
- package/lib/mergeTree.d.ts.map +1 -1
- package/lib/mergeTree.js +5 -0
- package/lib/mergeTree.js.map +1 -1
- package/package.json +23 -30
- package/src/mergeTree.ts +7 -2
package/dist/mergeTree.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.d.ts","sourceRoot":"","sources":["../src/mergeTree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,OAAO,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAY,KAAK,EAAE,MAAM,eAAe,CAAC;AAQtE,OAAO,EAA4B,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAIN,mBAAmB,EAEnB,WAAW,EAGX,mBAAmB,EAGnB,QAAQ,EACR,cAAc,EAId,UAAU,EACV,SAAS,EAGT,YAAY,EAEZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACN,qBAAqB,EAErB,sBAAsB,EACtB,4BAA4B,EAE5B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACN,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EAEjB,aAAa,EACb,MAAM,OAAO,CAAC;AAEf,OAAO,EAA8B,WAAW,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAEN,iBAAiB,EAEjB,aAAa,EAKb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAUhE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"mergeTree.d.ts","sourceRoot":"","sources":["../src/mergeTree.ts"],"names":[],"mappings":"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"}
|
package/dist/mergeTree.js
CHANGED
|
@@ -23,6 +23,7 @@ const referencePositions_1 = require("./referencePositions");
|
|
|
23
23
|
const segmentPropertiesManager_1 = require("./segmentPropertiesManager");
|
|
24
24
|
const mergeTreeNodeWalk_1 = require("./mergeTreeNodeWalk");
|
|
25
25
|
const zamboni_1 = require("./zamboni");
|
|
26
|
+
const _1 = require(".");
|
|
26
27
|
const minListenerComparer = {
|
|
27
28
|
min: {
|
|
28
29
|
minRequired: Number.MIN_VALUE,
|
|
@@ -1376,6 +1377,10 @@ class MergeTree {
|
|
|
1376
1377
|
const localSeq = seq === constants_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
|
|
1377
1378
|
let segmentGroup;
|
|
1378
1379
|
const annotateSegment = (segment) => {
|
|
1380
|
+
var _a;
|
|
1381
|
+
(0, common_utils_1.assert)(!mergeTreeNodes_1.Marker.is(segment) ||
|
|
1382
|
+
!(_1.reservedMarkerIdKey in props) ||
|
|
1383
|
+
props.markerId === ((_a = segment.properties) === null || _a === void 0 ? void 0 : _a.markerId), 0x5ad /* Cannot change the markerId of an existing marker */);
|
|
1379
1384
|
const propertyDeltas = segment.addProperties(props, combiningOp, seq, this.collabWindow, rollback);
|
|
1380
1385
|
deltaSegments.push({ segment, propertyDeltas });
|
|
1381
1386
|
if (this.collabWindow.collaborating) {
|