@fluidframework/merge-tree 2.20.0 → 2.22.0

package/dist/sortedSegmentSet.js

@@ -20,7 +20,7 @@ const sortedSet_js_1 = require("./sortedSet.js");
  * @internal
  */
 class SortedSegmentSet extends sortedSet_js_1.SortedSet {
-    getKey(item) {
+    getOrdinal(item) {
         const maybeRef = item;
         if (maybeRef.getSegment !== undefined && maybeRef.isLeaf?.() === false) {
             const lref = maybeRef;
@@ -35,48 +35,40 @@ class SortedSegmentSet extends sortedSet_js_1.SortedSet {
         }
         return (0, segmentInfos_js_1.toMergeNodeInfo)(item)?.ordinal ?? "";
     }
-    findItemPosition(item) {
-        if (this.keySortedItems.length === 0) {
-            return { exists: false, index: 0 };
+    getOffset(item) {
+        const maybeRef = item;
+        if (maybeRef.getSegment !== undefined && maybeRef.isLeaf?.() === false) {
+            const lref = maybeRef;
+            return lref.getOffset();
         }
-        let start = 0;
-        let end = this.keySortedItems.length - 1;
-        const itemKey = this.getKey(item);
-        let index = -1;
-        while (start <= end) {
-            index = start + Math.floor((end - start) / 2);
-            const indexKey = this.getKey(this.keySortedItems[index]);
-            if (indexKey > itemKey) {
-                if (start === index) {
-                    return { exists: false, index };
-                }
-                end = index - 1;
-            }
-            else if (indexKey < itemKey) {
-                if (index === end) {
-                    return { exists: false, index: index + 1 };
-                }
-                start = index + 1;
+        return 0;
+    }
+    compare(a, b) {
+        const aOrdinal = this.getOrdinal(a);
+        const bOrdinal = this.getOrdinal(b);
+        if (aOrdinal < bOrdinal) {
+            return -1;
+        }
+        if (aOrdinal > bOrdinal) {
+            return 1;
+        }
+        return this.getOffset(a) - this.getOffset(b);
+    }
+    onFindEquivalent(item, startIndex) {
+        // SortedSegmentSet may contain multiple items with the same key (e.g. a local ref at offset 0 and the segment it is on).
+        // Items should compare as reference-equal, so we do a linear walk to find the actual item in this case.
+        let index = startIndex;
+        if (item === this.sortedItems[index]) {
+            return { exists: true, index };
+        }
+        for (let b = index - 1; b >= 0 && this.compare(item, this.sortedItems[b]) === 0; b--) {
+            if (this.sortedItems[b] === item) {
+                return { exists: true, index: b };
             }
-            else if (indexKey === itemKey) {
-                // at this point we've found the key of the item
-                // so we need to find the index of the item instance
-                //
-                if (item === this.keySortedItems[index]) {
-                    return { exists: true, index };
-                }
-                for (let b = index - 1; b >= 0 && this.getKey(this.keySortedItems[b]) === itemKey; b--) {
-                    if (this.keySortedItems[b] === item) {
-                        return { exists: true, index: b };
-                    }
-                }
-                for (index + 1; index < this.keySortedItems.length &&
-                    this.getKey(this.keySortedItems[index]) === itemKey; index++) {
-                    if (this.keySortedItems[index] === item) {
-                        return { exists: true, index };
-                    }
-                }
-                return { exists: false, index };
+        }
+        for (index + 1; index < this.sortedItems.length && this.compare(item, this.sortedItems[index]) === 0; index++) {
+            if (this.sortedItems[index] === item) {
+                return { exists: true, index };
             }
         }
         return { exists: false, index };

package/dist/sortedSegmentSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortedSegmentSet.js","sourceRoot":"","sources":["../src/sortedSegmentSet.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAIH,uDAA6D;AAC7D,iDAA2C;AAU3C;;;;;;;;;;;GAWG;AAEH,MAAa,gBAEX,SAAQ,wBAAoB;IACnB,MAAM,CAAC,IAAO;QACvB,MAAM,QAAQ,GAAG,IAAuC,CAAC;QACzD,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YACxE,MAAM,IAAI,GAAG,QAAkC,CAAC;YAChD,mFAAmF;YACnF,0FAA0F;YAC1F,uGAAuG;YACvG,4CAA4C;YAC5C,OAAO,IAAA,iCAAe,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;QAC1D,CAAC;QACD,IAAI,IAAA,yBAAO,EAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxC,OAAO,IAAA,iCAAe,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;QACrD,CAAC;QAED,OAAO,IAAA,iCAAe,EAAC,IAAI,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;IAC7C,CAAC;IAES,gBAAgB,CAAC,IAAO;QACjC,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QACpC,CAAC;QACD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;QAEf,OAAO,KAAK,IAAI,GAAG,EAAE,CAAC;YACrB,KAAK,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YACzD,IAAI,QAAQ,GAAG,OAAO,EAAE,CAAC;gBACxB,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;oBACrB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBACjC,CAAC;gBACD,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC;YACjB,CAAC;iBAAM,IAAI,QAAQ,GAAG,OAAO,EAAE,CAAC;gBAC/B,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;oBACnB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC;gBAC5C,CAAC;gBACD,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;YACnB,CAAC;iBAAM,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,gDAAgD;gBAChD,oDAAoD;gBACpD,EAAE;gBACF,IAAI,IAAI,KAAK,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;gBAChC,CAAC;gBACD,KACC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,EACjB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,EACzD,CAAC,EAAE,EACF,CAAC;oBACF,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;wBACrC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;oBACnC,CAAC;gBACF,CAAC;gBACD,KACC,KAAK,GAAG,CAAC,EACT,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM;oBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,KAAK,OAAO,EACnD,KAAK,EAAE,EACN,CAAC;oBACF,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;wBACzC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;oBAChC,CAAC;gBACF,CAAC;gBACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACjC,CAAC;QACF,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACjC,CAAC;CACD;AAzED,4CAyEC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { LocalReferencePosition } from \"./localReference.js\";\nimport { ISegmentInternal } from \"./mergeTreeNodes.js\";\nimport { hasProp, toMergeNodeInfo } from \"./segmentInfos.js\";\nimport { SortedSet } from \"./sortedSet.js\";\n\n/**\n * @internal\n */\nexport type SortedSegmentSetItem =\n\t| ISegmentInternal\n\t| LocalReferencePosition\n\t| { readonly segment: ISegmentInternal };\n\n/**\n * Stores a unique and sorted set of segments, or objects with segments\n *\n * This differs from a normal sorted set in that the keys are not fixed.\n * The segments are sorted via their ordinals which can change as the merge tree is modified.\n * Even though the values of the ordinals can change their ordering and uniqueness cannot, so the order of a set of\n * segments ordered by their ordinals will always have the same order even if the ordinal values on\n * the segments changes. This invariant allows us to ensure the segments stay\n * ordered and unique, and that new segments can be inserted into that order.\n *\n * @internal\n */\n\nexport class SortedSegmentSet<\n\tT extends SortedSegmentSetItem = ISegmentInternal,\n> extends SortedSet<T, string> {\n\tprotected getKey(item: T): string {\n\t\tconst maybeRef = item as Partial<LocalReferencePosition>;\n\t\tif (maybeRef.getSegment !== undefined && maybeRef.isLeaf?.() === false) {\n\t\t\tconst lref = maybeRef as LocalReferencePosition;\n\t\t\t// If the reference position has no associated segment, assign it a sentinel value.\n\t\t\t// The particular value for comparison doesn't matter because `findItemPosition` tolerates\n\t\t\t// elements with duplicate keys (as it must, since local references use the same key as their segment).\n\t\t\t// All that matters is that it's consistent.\n\t\t\treturn toMergeNodeInfo(lref.getSegment())?.ordinal ?? \"\";\n\t\t}\n\t\tif (hasProp(item, \"segment\", \"object\")) {\n\t\t\treturn toMergeNodeInfo(item.segment)?.ordinal ?? \"\";\n\t\t}\n\n\t\treturn toMergeNodeInfo(item)?.ordinal ?? \"\";\n\t}\n\n\tprotected findItemPosition(item: T): { exists: boolean; index: number } {\n\t\tif (this.keySortedItems.length === 0) {\n\t\t\treturn { exists: false, index: 0 };\n\t\t}\n\t\tlet start = 0;\n\t\tlet end = this.keySortedItems.length - 1;\n\t\tconst itemKey = this.getKey(item);\n\t\tlet index = -1;\n\n\t\twhile (start <= end) {\n\t\t\tindex = start + Math.floor((end - start) / 2);\n\t\t\tconst indexKey = this.getKey(this.keySortedItems[index]);\n\t\t\tif (indexKey > itemKey) {\n\t\t\t\tif (start === index) {\n\t\t\t\t\treturn { exists: false, index };\n\t\t\t\t}\n\t\t\t\tend = index - 1;\n\t\t\t} else if (indexKey < itemKey) {\n\t\t\t\tif (index === end) {\n\t\t\t\t\treturn { exists: false, index: index + 1 };\n\t\t\t\t}\n\t\t\t\tstart = index + 1;\n\t\t\t} else if (indexKey === itemKey) {\n\t\t\t\t// at this point we've found the key of the item\n\t\t\t\t// so we need to find the index of the item instance\n\t\t\t\t//\n\t\t\t\tif (item === this.keySortedItems[index]) {\n\t\t\t\t\treturn { exists: true, index };\n\t\t\t\t}\n\t\t\t\tfor (\n\t\t\t\t\tlet b = index - 1;\n\t\t\t\t\tb >= 0 && this.getKey(this.keySortedItems[b]) === itemKey;\n\t\t\t\t\tb--\n\t\t\t\t) {\n\t\t\t\t\tif (this.keySortedItems[b] === item) {\n\t\t\t\t\t\treturn { exists: true, index: b };\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tfor (\n\t\t\t\t\tindex + 1;\n\t\t\t\t\tindex < this.keySortedItems.length &&\n\t\t\t\t\tthis.getKey(this.keySortedItems[index]) === itemKey;\n\t\t\t\t\tindex++\n\t\t\t\t) {\n\t\t\t\t\tif (this.keySortedItems[index] === item) {\n\t\t\t\t\t\treturn { exists: true, index };\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn { exists: false, index };\n\t\t\t}\n\t\t}\n\t\treturn { exists: false, index };\n\t}\n}\n"]}
+{"version":3,"file":"sortedSegmentSet.js","sourceRoot":"","sources":["../src/sortedSegmentSet.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { LocalReferencePosition } from \"./localReference.js\";\nimport { ISegmentInternal } from \"./mergeTreeNodes.js\";\nimport { hasProp, toMergeNodeInfo } from \"./segmentInfos.js\";\nimport { SortedSet } from \"./sortedSet.js\";\n\n/**\n * @internal\n */\nexport type SortedSegmentSetItem =\n\t| ISegmentInternal\n\t| LocalReferencePosition\n\t| { readonly segment: ISegmentInternal };\n\n/**\n * Stores a unique and sorted set of segments, or objects with segments\n *\n * This differs from a normal sorted set in that the keys are not fixed.\n * The segments are sorted via their ordinals which can change as the merge tree is modified.\n * Even though the values of the ordinals can change their ordering and uniqueness cannot, so the order of a set of\n * segments ordered by their ordinals will always have the same order even if the ordinal values on\n * the segments changes. This invariant allows us to ensure the segments stay\n * ordered and unique, and that new segments can be inserted into that order.\n *\n * @internal\n */\nexport class SortedSegmentSet<\n\tT extends SortedSegmentSetItem = ISegmentInternal,\n> extends SortedSet<T> {\n\tprivate getOrdinal(item: T): string {\n\t\tconst maybeRef = item as Partial<LocalReferencePosition>;\n\t\tif (maybeRef.getSegment !== undefined && maybeRef.isLeaf?.() === false) {\n\t\t\tconst lref = maybeRef as LocalReferencePosition;\n\t\t\t// If the reference position has no associated segment, assign it a sentinel value.\n\t\t\t// The particular value for comparison doesn't matter because `findItemPosition` tolerates\n\t\t\t// elements with duplicate keys (as it must, since local references use the same key as their segment).\n\t\t\t// All that matters is that it's consistent.\n\t\t\treturn toMergeNodeInfo(lref.getSegment())?.ordinal ?? \"\";\n\t\t}\n\t\tif (hasProp(item, \"segment\", \"object\")) {\n\t\t\treturn toMergeNodeInfo(item.segment)?.ordinal ?? \"\";\n\t\t}\n\n\t\treturn toMergeNodeInfo(item)?.ordinal ?? \"\";\n\t}\n\n\tprivate getOffset(item: T): number {\n\t\tconst maybeRef = item as Partial<LocalReferencePosition>;\n\t\tif (maybeRef.getSegment !== undefined && maybeRef.isLeaf?.() === false) {\n\t\t\tconst lref = maybeRef as LocalReferencePosition;\n\t\t\treturn lref.getOffset();\n\t\t}\n\t\treturn 0;\n\t}\n\n\tprotected compare(a: T, b: T): number {\n\t\tconst aOrdinal = this.getOrdinal(a);\n\t\tconst bOrdinal = this.getOrdinal(b);\n\n\t\tif (aOrdinal < bOrdinal) {\n\t\t\treturn -1;\n\t\t}\n\t\tif (aOrdinal > bOrdinal) {\n\t\t\treturn 1;\n\t\t}\n\t\treturn this.getOffset(a) - this.getOffset(b);\n\t}\n\n\tprotected onFindEquivalent(item: T, startIndex: number): { exists: boolean; index: number } {\n\t\t// SortedSegmentSet may contain multiple items with the same key (e.g. a local ref at offset 0 and the segment it is on).\n\t\t// Items should compare as reference-equal, so we do a linear walk to find the actual item in this case.\n\t\tlet index = startIndex;\n\t\tif (item === this.sortedItems[index]) {\n\t\t\treturn { exists: true, index };\n\t\t}\n\t\tfor (let b = index - 1; b >= 0 && this.compare(item, this.sortedItems[b]) === 0; b--) {\n\t\t\tif (this.sortedItems[b] === item) {\n\t\t\t\treturn { exists: true, index: b };\n\t\t\t}\n\t\t}\n\t\tfor (\n\t\t\tindex + 1;\n\t\t\tindex < this.sortedItems.length && this.compare(item, this.sortedItems[index]) === 0;\n\t\t\tindex++\n\t\t) {\n\t\t\tif (this.sortedItems[index] === item) {\n\t\t\t\treturn { exists: true, index };\n\t\t\t}\n\t\t}\n\t\treturn { exists: false, index };\n\t}\n}\n"]}

package/dist/sortedSet.d.ts

@@ -5,9 +5,15 @@
 /**
  * @internal
  */
-export declare abstract class SortedSet<T, U extends string | number> {
-    protected abstract getKey(t: T): U;
-    protected readonly keySortedItems: T[];
+export declare abstract class SortedSet<T> {
+    /**
+     * Standard comparator semantics:
+     * - If a \< b, return a negative number
+     * - If a \> b, return a positive number
+     * - If a and b are equivalent, return 0
+     */
+    protected abstract compare(a: T, b: T): number;
+    protected readonly sortedItems: T[];
     get size(): number;
     get items(): readonly T[];
     addOrUpdate(newItem: T, update?: (existingItem: T, newItem: T) => void): void;
@@ -17,5 +23,16 @@ export declare abstract class SortedSet<T, U extends string | number> {
         exists: boolean;
         index: number;
     };
+    /**
+     * Invoked when `findItemPosition` finds an equivalent item (i.e. `compare` returns 0 between that item and the search item).
+     *
+     * By default, `SortedSet` assumes that equivalent items are equal and returns the found index.
+     * @param item - The item that is being searched for (argument to `findItemPosition`)
+     * @param index - The index of the equivalent item in the sorted set
+     */
+    protected onFindEquivalent(item: T, index: number): {
+        exists: boolean;
+        index: number;
+    };
 }
 //# sourceMappingURL=sortedSet.d.ts.map

package/dist/sortedSet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sortedSet.d.ts","sourceRoot":"","sources":["../src/sortedSet.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,8BAAsB,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM;IAC3D,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC;IAElC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,EAAE,CAAM;IAE5C,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,KAAK,IAAI,SAAS,CAAC,EAAE,CAE/B;IAEM,WAAW,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,IAAI,GAAG,IAAI;IAS7E,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO;IASxB,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO;IAK5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,GAAG;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;CA4BvE"}
+{"version":3,"file":"sortedSet.d.ts","sourceRoot":"","sources":["../src/sortedSet.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,8BAAsB,SAAS,CAAC,CAAC;IAChC;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM;IAE9C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,EAAE,CAAM;IAEzC,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,KAAK,IAAI,SAAS,CAAC,EAAE,CAE/B;IAEM,WAAW,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,IAAI,GAAG,IAAI;IAS7E,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO;IASxB,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO;IAK5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,GAAG;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IA4BvE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;CAGtF"}

package/dist/sortedSet.js

@@ -10,27 +10,27 @@ exports.SortedSet = void 0;
  */
 class SortedSet {
     constructor() {
-        this.keySortedItems = [];
+        this.sortedItems = [];
     }
     get size() {
-        return this.keySortedItems.length;
+        return this.sortedItems.length;
     }
     get items() {
-        return this.keySortedItems;
+        return this.sortedItems;
     }
     addOrUpdate(newItem, update) {
         const position = this.findItemPosition(newItem);
         if (position.exists) {
-            update?.(this.keySortedItems[position.index], newItem);
+            update?.(this.sortedItems[position.index], newItem);
         }
         else {
-            this.keySortedItems.splice(position.index, 0, newItem);
+            this.sortedItems.splice(position.index, 0, newItem);
         }
     }
     remove(item) {
         const position = this.findItemPosition(item);
         if (position.exists) {
-            this.keySortedItems.splice(position.index, 1);
+            this.sortedItems.splice(position.index, 1);
             return true;
         }
         return false;
@@ -40,34 +40,43 @@ class SortedSet {
         return position.exists;
     }
     findItemPosition(item) {
-        if (this.keySortedItems.length === 0) {
+        if (this.sortedItems.length === 0) {
             return { exists: false, index: 0 };
         }
         let start = 0;
-        let end = this.keySortedItems.length - 1;
-        const itemKey = this.getKey(item);
+        let end = this.sortedItems.length - 1;
         let index = -1;
         while (start <= end) {
             index = start + Math.floor((end - start) / 2);
-            const indexKey = this.getKey(this.keySortedItems[index]);
-            if (indexKey > itemKey) {
+            const compareResult = this.compare(item, this.sortedItems[index]);
+            if (compareResult < 0) {
                 if (start === index) {
                     return { exists: false, index };
                 }
                 end = index - 1;
             }
-            else if (indexKey < itemKey) {
+            else if (compareResult > 0) {
                 if (index === end) {
                     return { exists: false, index: index + 1 };
                 }
                 start = index + 1;
             }
-            else if (indexKey === itemKey) {
-                return { exists: true, index };
+            else if (compareResult === 0) {
+                return this.onFindEquivalent(item, index);
             }
         }
         return { exists: false, index };
     }
+    /**
+     * Invoked when `findItemPosition` finds an equivalent item (i.e. `compare` returns 0 between that item and the search item).
+     *
+     * By default, `SortedSet` assumes that equivalent items are equal and returns the found index.
+     * @param item - The item that is being searched for (argument to `findItemPosition`)
+     * @param index - The index of the equivalent item in the sorted set
+     */
+    onFindEquivalent(item, index) {
+        return { exists: true, index };
+    }
 }
 exports.SortedSet = SortedSet;
 //# sourceMappingURL=sortedSet.js.map

package/dist/sortedSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortedSet.js","sourceRoot":"","sources":["../src/sortedSet.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/**\n * @internal\n */\nexport abstract class SortedSet<T, U extends string | number> {\n\tprotected abstract getKey(t: T): U;\n\n\tprotected readonly keySortedItems: T[] = [];\n\n\tpublic get size(): number {\n\t\treturn this.keySortedItems.length;\n\t}\n\n\tpublic get items(): readonly T[] {\n\t\treturn this.keySortedItems;\n\t}\n\n\tpublic addOrUpdate(newItem: T, update?: (existingItem: T, newItem: T) => void): void {\n\t\tconst position = this.findItemPosition(newItem);\n\t\tif (position.exists) {\n\t\t\tupdate?.(this.keySortedItems[position.index], newItem);\n\t\t} else {\n\t\t\tthis.keySortedItems.splice(position.index, 0, newItem);\n\t\t}\n\t}\n\n\tpublic remove(item: T): boolean {\n\t\tconst position = this.findItemPosition(item);\n\t\tif (position.exists) {\n\t\t\tthis.keySortedItems.splice(position.index, 1);\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tpublic has(item: T): boolean {\n\t\tconst position = this.findItemPosition(item);\n\t\treturn position.exists;\n\t}\n\n\tprotected findItemPosition(item: T): { exists: boolean; index: number } {\n\t\tif (this.keySortedItems.length === 0) {\n\t\t\treturn { exists: false, index: 0 };\n\t\t}\n\t\tlet start = 0;\n\t\tlet end = this.keySortedItems.length - 1;\n\t\tconst itemKey = this.getKey(item);\n\t\tlet index = -1;\n\n\t\twhile (start <= end) {\n\t\t\tindex = start + Math.floor((end - start) / 2);\n\t\t\tconst indexKey = this.getKey(this.keySortedItems[index]);\n\t\t\tif (indexKey > itemKey) {\n\t\t\t\tif (start === index) {\n\t\t\t\t\treturn { exists: false, index };\n\t\t\t\t}\n\t\t\t\tend = index - 1;\n\t\t\t} else if (indexKey < itemKey) {\n\t\t\t\tif (index === end) {\n\t\t\t\t\treturn { exists: false, index: index + 1 };\n\t\t\t\t}\n\t\t\t\tstart = index + 1;\n\t\t\t} else if (indexKey === itemKey) {\n\t\t\t\treturn { exists: true, index };\n\t\t\t}\n\t\t}\n\t\treturn { exists: false, index };\n\t}\n}\n"]}
+{"version":3,"file":"sortedSet.js","sourceRoot":"","sources":["../src/sortedSet.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/**\n * @internal\n */\nexport abstract class SortedSet<T> {\n\t/**\n\t * Standard comparator semantics:\n\t * - If a \\< b, return a negative number\n\t * - If a \\> b, return a positive number\n\t * - If a and b are equivalent, return 0\n\t */\n\tprotected abstract compare(a: T, b: T): number;\n\n\tprotected readonly sortedItems: T[] = [];\n\n\tpublic get size(): number {\n\t\treturn this.sortedItems.length;\n\t}\n\n\tpublic get items(): readonly T[] {\n\t\treturn this.sortedItems;\n\t}\n\n\tpublic addOrUpdate(newItem: T, update?: (existingItem: T, newItem: T) => void): void {\n\t\tconst position = this.findItemPosition(newItem);\n\t\tif (position.exists) {\n\t\t\tupdate?.(this.sortedItems[position.index], newItem);\n\t\t} else {\n\t\t\tthis.sortedItems.splice(position.index, 0, newItem);\n\t\t}\n\t}\n\n\tpublic remove(item: T): boolean {\n\t\tconst position = this.findItemPosition(item);\n\t\tif (position.exists) {\n\t\t\tthis.sortedItems.splice(position.index, 1);\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tpublic has(item: T): boolean {\n\t\tconst position = this.findItemPosition(item);\n\t\treturn position.exists;\n\t}\n\n\tprotected findItemPosition(item: T): { exists: boolean; index: number } {\n\t\tif (this.sortedItems.length === 0) {\n\t\t\treturn { exists: false, index: 0 };\n\t\t}\n\t\tlet start = 0;\n\t\tlet end = this.sortedItems.length - 1;\n\t\tlet index = -1;\n\n\t\twhile (start <= end) {\n\t\t\tindex = start + Math.floor((end - start) / 2);\n\t\t\tconst compareResult = this.compare(item, this.sortedItems[index]);\n\t\t\tif (compareResult < 0) {\n\t\t\t\tif (start === index) {\n\t\t\t\t\treturn { exists: false, index };\n\t\t\t\t}\n\t\t\t\tend = index - 1;\n\t\t\t} else if (compareResult > 0) {\n\t\t\t\tif (index === end) {\n\t\t\t\t\treturn { exists: false, index: index + 1 };\n\t\t\t\t}\n\t\t\t\tstart = index + 1;\n\t\t\t} else if (compareResult === 0) {\n\t\t\t\treturn this.onFindEquivalent(item, index);\n\t\t\t}\n\t\t}\n\t\treturn { exists: false, index };\n\t}\n\n\t/**\n\t * Invoked when `findItemPosition` finds an equivalent item (i.e. `compare` returns 0 between that item and the search item).\n\t *\n\t * By default, `SortedSet` assumes that equivalent items are equal and returns the found index.\n\t * @param item - The item that is being searched for (argument to `findItemPosition`)\n\t * @param index - The index of the equivalent item in the sorted set\n\t */\n\tprotected onFindEquivalent(item: T, index: number): { exists: boolean; index: number } {\n\t\treturn { exists: true, index };\n\t}\n}\n"]}

package/dist/test/Snapshot.perf.spec.js

@@ -8,7 +8,7 @@ const benchmark_1 = require("@fluid-tools/benchmark");
 const snapshot_utils_js_1 = require("./snapshot.utils.js");
 describe("MergeTree snapshots", () => {
     let summary;
-    for (const summarySize of [10, 50, 100, 500, 1000, 5000, 10000]) {
+    for (const summarySize of [10, 50, 100, 500, 1000, 5000, 10_000]) {
         (0, benchmark_1.benchmark)({
             type: benchmark_1.BenchmarkType.Measurement,
             title: `load snapshot with ${summarySize} segments`,

package/dist/test/Snapshot.perf.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"Snapshot.perf.spec.js","sourceRoot":"","sources":["../../src/test/Snapshot.perf.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,sDAAkE;AAGlE,2DAA+D;AAE/D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACpC,IAAI,OAAiC,CAAC;IAEtC,KAAK,MAAM,WAAW,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAM,CAAC,EAAE,CAAC;QAClE,IAAA,qBAAS,EAAC;YACT,IAAI,EAAE,yBAAa,CAAC,WAAW;YAC/B,KAAK,EAAE,sBAAsB,WAAW,WAAW;YACnD,QAAQ,EAAE,kBAAkB;YAC5B,MAAM,EAAE,GAAG,EAAE;gBACZ,MAAM,GAAG,GAAG,IAAI,8BAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;oBACtC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACxB,CAAC;gBAED,GAAG,CAAC,eAAe,EAAE,CAAC;gBACtB,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;YAC5B,CAAC;YACD,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5B,oEAAoE;gBACpE,MAAM,IAAA,gCAAY,EAAC,OAAQ,CAAC,CAAC;YAC9B,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACX,OAAO,GAAG,SAAS,CAAC;YACrB,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { BenchmarkType, benchmark } from \"@fluid-tools/benchmark\";\nimport type { ISummaryTree } from \"@fluidframework/driver-definitions\";\n\nimport { TestString, loadSnapshot } from \"./snapshot.utils.js\";\n\ndescribe(\"MergeTree snapshots\", () => {\n\tlet summary: ISummaryTree | undefined;\n\n\tfor (const summarySize of [10, 50, 100, 500, 1000, 5000, 10_000]) {\n\t\tbenchmark({\n\t\t\ttype: BenchmarkType.Measurement,\n\t\t\ttitle: `load snapshot with ${summarySize} segments`,\n\t\t\tcategory: \"snapshot loading\",\n\t\t\tbefore: () => {\n\t\t\t\tconst str = new TestString(\"id\", {});\n\t\t\t\tfor (let i = 0; i < summarySize; i++) {\n\t\t\t\t\tstr.append(\"a\", false);\n\t\t\t\t}\n\n\t\t\t\tstr.applyPendingOps();\n\t\t\t\tsummary = str.getSummary();\n\t\t\t},\n\t\t\tbenchmarkFnAsync: async () => {\n\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n\t\t\t\tawait loadSnapshot(summary!);\n\t\t\t},\n\t\t\tafter: () => {\n\t\t\t\tsummary = undefined;\n\t\t\t},\n\t\t});\n\t}\n});\n"]}
+{"version":3,"file":"Snapshot.perf.spec.js","sourceRoot":"","sources":["../../src/test/Snapshot.perf.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,sDAAkE;AAGlE,2DAA+D;AAE/D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACpC,IAAI,OAAiC,CAAC;IAEtC,KAAK,MAAM,WAAW,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;QAClE,IAAA,qBAAS,EAAC;YACT,IAAI,EAAE,yBAAa,CAAC,WAAW;YAC/B,KAAK,EAAE,sBAAsB,WAAW,WAAW;YACnD,QAAQ,EAAE,kBAAkB;YAC5B,MAAM,EAAE,GAAG,EAAE;gBACZ,MAAM,GAAG,GAAG,IAAI,8BAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;oBACtC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACxB,CAAC;gBAED,GAAG,CAAC,eAAe,EAAE,CAAC;gBACtB,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;YAC5B,CAAC;YACD,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5B,oEAAoE;gBACpE,MAAM,IAAA,gCAAY,EAAC,OAAQ,CAAC,CAAC;YAC9B,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACX,OAAO,GAAG,SAAS,CAAC;YACrB,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { BenchmarkType, benchmark } from \"@fluid-tools/benchmark\";\nimport type { ISummaryTree } from \"@fluidframework/driver-definitions\";\n\nimport { TestString, loadSnapshot } from \"./snapshot.utils.js\";\n\ndescribe(\"MergeTree snapshots\", () => {\n\tlet summary: ISummaryTree | undefined;\n\n\tfor (const summarySize of [10, 50, 100, 500, 1000, 5000, 10_000]) {\n\t\tbenchmark({\n\t\t\ttype: BenchmarkType.Measurement,\n\t\t\ttitle: `load snapshot with ${summarySize} segments`,\n\t\t\tcategory: \"snapshot loading\",\n\t\t\tbefore: () => {\n\t\t\t\tconst str = new TestString(\"id\", {});\n\t\t\t\tfor (let i = 0; i < summarySize; i++) {\n\t\t\t\t\tstr.append(\"a\", false);\n\t\t\t\t}\n\n\t\t\t\tstr.applyPendingOps();\n\t\t\t\tsummary = str.getSummary();\n\t\t\t},\n\t\t\tbenchmarkFnAsync: async () => {\n\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n\t\t\t\tawait loadSnapshot(summary!);\n\t\t\t},\n\t\t\tafter: () => {\n\t\t\t\tsummary = undefined;\n\t\t\t},\n\t\t});\n\t}\n});\n"]}

package/dist/test/client.applyMsg.spec.js

@@ -729,6 +729,26 @@ describe("client.applyMsg", () => {
                 }
             logger.validate({ baseText: "BBBBBB B" });
         });
+        it("obliterate with mismatched final states", () => {
+            const clients = (0, testClientLogger_js_1.createClientsAtInitialState)({
+                initialState: "0{zzzzzzz}123{yyyyyy}45",
+                options: {
+                    mergeTreeEnableObliterate: true,
+                    mergeTreeEnableSidedObliterate: true,
+                    mergeTreeEnableAnnotateAdjust: true,
+                },
+            }, "A", "B");
+            let seq = 0;
+            const logger = new testClientLogger_js_1.TestClientLogger(clients.all);
+            const ops = [];
+            const b = clients.B;
+            ops.push(b.makeOpMessage(b.obliterateRangeLocal({ pos: 1, side: sequencePlace_js_1.Side.After }, { pos: 9, side: sequencePlace_js_1.Side.Before }), ++seq), b.makeOpMessage(b.insertTextLocal(2, "xx"), ++seq), b.makeOpMessage(b.insertTextLocal(8, "BB"), ++seq), b.makeOpMessage(b.obliterateRangeLocal({ pos: 1, side: sequencePlace_js_1.Side.After }, { pos: 4, side: sequencePlace_js_1.Side.Before }), ++seq), b.makeOpMessage(b.insertTextLocal(2, "6666666666"), ++seq));
+            for (const op of ops.splice(0))
+                for (const c of clients.all) {
+                    c.applyMsg(op);
+                }
+            logger.validate({ baseText: "0{6666666666}123BB{yyyyyy}45" });
+        });
     });
     describe("updates minSeq", () => {
         it("to the message's minSeq with no ops in flight", () => {