@fluidframework/merge-tree 0.57.1 → 0.58.0-55561

package/lib/textSegment.js

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BaseSegment, glc, MergeTree } from "./mergeTree";
+import { BaseSegment } from "./mergeTree";
 import { LocalReferenceCollection } from "./localReference";
 // Maximum length of text segment to be considered to be merged with other segment.
 // Maximum segment length is at least 2x of it (not taking into account initial segment creation).
@@ -109,12 +109,6 @@ export class MergeTreeTextHelper {
         this.gatherText = (segment, pos, refSeq, clientId, start, end, accumText) => {
             let _start = start;
             if (TextSegment.is(segment)) {
-                if (MergeTree.traceGatherText) {
-                    console.log(
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    `@cli ${this.mergeTree.getLongClientId(this.mergeTree.collabWindow.clientId)} ` +
-                        `gather seg seq ${segment.seq} rseq ${segment.removedSeq} text ${segment.text}`);
-                }
                 let beginTags = "";
                 let endTags = "";
                 if (isTextAndMarkerAccumulator(accumText)) {
@@ -209,20 +203,12 @@ export class MergeTreeTextHelper {
             tagsInProgress: [],
             textSegment: new TextSegment(""),
         };
-        if (MergeTree.traceGatherText) {
-            console.log(`get text on cli ${glc(this.mergeTree, this.mergeTree.collabWindow.clientId)} ` +
-                `ref cli ${glc(this.mergeTree, clientId)} refSeq ${refSeq}`);
-        }
         this.mergeTree.mapRange({ leaf: this.gatherText }, refSeq, clientId, accum, range.start, range.end);
         return { parallelText: accum.parallelText, parallelMarkers: accum.parallelMarkers };
     }
     getText(refSeq, clientId, placeholder = "", start, end) {
         const range = this.getValidRange(start, end, refSeq, clientId);
         const accum = { textSegment: new TextSegment(""), placeholder };
-        if (MergeTree.traceGatherText) {
-            console.log(`get text on cli ${glc(this.mergeTree, this.mergeTree.collabWindow.clientId)} ` +
-                `ref cli ${glc(this.mergeTree, clientId)} refSeq ${refSeq}`);
-        }
         this.mergeTree.mapRange({ leaf: this.gatherText }, refSeq, clientId, accum, range.start, range.end);
         return accum.textSegment.text;
     }

package/lib/textSegment.js.map

@@ -1 +1 @@
-{"version":3,"file":"textSegment.js","sourceRoot":"","sources":["../src/textSegment.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,GAAG,EAAoB,SAAS,EAAE,MAAM,aAAa,CAAC;AAG5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,mFAAmF;AACnF,kGAAkG;AAClG,2FAA2F;AAC3F,qHAAqH;AACrH,8GAA8G;AAC9G,kHAAkH;AAClH,qHAAqH;AACrH,yCAAyC;AACzC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAMnC,MAAM,OAAO,WAAY,SAAQ,WAAW;IA2BxC,YAAmB,IAAY;QAC3B,KAAK,EAAE,CAAC;QADO,SAAI,GAAJ,IAAI,CAAQ;QAFf,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAIpC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;IACpC,CAAC;IA3BM,MAAM,CAAC,EAAE,CAAC,OAAiB;QAC9B,OAAO,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,IAAY,EAAE,KAAmB;QAChD,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC7B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,IAAS;QAClC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;SAChC;aAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,IAAI,IAAI,EAAE;YAC3D,MAAM,QAAQ,GAAG,IAAwB,CAAC;YAC1C,OAAO,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAoB,CAAC,CAAC;SACzE;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IASM,YAAY;QACf,uFAAuF;QACvF,iBAAiB;QACjB,OAAO,IAAI,CAAC,UAAU;YAClB,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;YAC7C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,GAAY;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClB,OAAO,CAAC,CAAC;IACb,CAAC;IAEM,SAAS,CAAC,OAAiB;QAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;eACzB,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC;eACvB,CAAC,IAAI,CAAC,YAAY,IAAI,sBAAsB;gBAC3C,OAAO,CAAC,YAAY,IAAI,sBAAsB,CAAC,CAAC;IAC5D,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,OAAiB;QAC3B,IAAI,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;YACzB,8EAA8E;YAC9E,uEAAuE;YACvE,wBAAwB,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE/C,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAC1B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;SACxC;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACnD;IACL,CAAC;IAED,qCAAqC;IACrC,wCAAwC;IACjC,WAAW,CAAC,KAAa,EAAE,GAAW;QACzC,IAAI,aAAa,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7B,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SAClD;QACD,IAAI,GAAG,GAAG,GAAG,EAAE;YACX,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SAC7C;QACD,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC;QACzC,OAAO,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;IACxC,CAAC;IAES,oBAAoB,CAAC,GAAW;QACtC,IAAI,GAAG,GAAG,CAAC,EAAE;YACT,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YACrC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,aAAa,CAAC,CAAC;YACnD,OAAO,WAAW,CAAC;SACtB;IACL,CAAC;;AA9FsB,gBAAI,GAAG,aAAa,CAAC;AA+GhD,SAAS,0BAA0B,CAAC,KAAuB;IACvD,OAAO,KAAK,CAAC,cAAc,KAAK,IAAI,CAAC;AACzC,CAAC;AAGD,MAAM,OAAO,mBAAmB;IAC5B,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;QA8DhC,eAAU,GAAG,CAAC,OAAiB,EAAE,GAAW,EAAE,MAAc,EAAE,QAAgB,EAAE,KAAa,EAC1G,GAAW,EAAE,SAA+B,EAAE,EAAE;YAChD,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;gBACzB,IAAI,SAAS,CAAC,eAAe,EAAE;oBAC3B,OAAO,CAAC,GAAG;oBACP,oEAAoE;oBACpE,QAAQ,IAAI,CAAC,SAAS,CAAC,eAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG;wBAChF,kBAAkB,OAAO,CAAC,GAAG,SAAS,OAAO,CAAC,UAAU,SAAS,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;iBACxF;gBACD,IAAI,SAAS,GAAG,EAAE,CAAC;gBACnB,IAAI,OAAO,GAAG,EAAE,CAAC;gBACjB,IAAI,0BAA0B,CAAC,SAAS,CAAC,EAAE;oBACvC,gDAAgD;oBAChD,MAAM,IAAI,GAAG,EAAc,CAAC;oBAC5B,MAAM,QAAQ,GAAG,EAAc,CAAC;oBAEhC,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAAE;wBAC3D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBAClB;oBACD,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,EAAE;wBAC/D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBAClB;oBACD,MAAM,OAAO,GAAG,EAAc,CAAC;oBAC/B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;wBACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;4BACpB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gCACzC,SAAS,IAAI,IAAI,GAAG,GAAG,CAAC;gCACxB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;6BACtB;yBACJ;wBACD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,cAAc,EAAE;4BAC7C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gCAC1B,OAAO,IAAI,KAAK,QAAQ,GAAG,CAAC;gCAC5B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;6BAC1B;yBACJ;wBACD,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;4BACtC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;yBAC1C;qBACJ;yBAAM;wBACH,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,cAAc,EAAE;4BAC7C,OAAO,IAAI,KAAK,QAAQ,GAAG,CAAC;4BAC5B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBAC1B;qBACJ;oBACD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;wBAC1B,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;wBACxD,IAAI,MAAM,IAAI,CAAC,EAAE;4BACb,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;yBAC9C;qBACJ;iBACJ;gBACD,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC;gBACtC,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,SAAS,CAAC;gBACxC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBAC/C,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;iBAC9C;qBAAM;oBACH,IAAI,MAAM,GAAG,CAAC,EAAE;wBACZ,MAAM,GAAG,CAAC,CAAC;qBACd;oBACD,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;wBAC5B,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;qBAChE;yBAAM;wBACH,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;qBACrE;iBACJ;aACJ;iBAAM;gBACH,IAAI,SAAS,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;oBAC7D,IAAI,SAAS,CAAC,WAAW,KAAK,GAAG,EAAE;wBAC/B,MAAM,MAAM,GAAG,OAAiB,CAAC;wBACjC,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,KAAK,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;qBAC1D;yBAAM;wBACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE;4BAC3C,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,SAAS,CAAC,WAAW,CAAC;yBACvD;qBACJ;iBACJ;qBAAM,IAAI,0BAA0B,CAAC,SAAS,CAAC,EAAE;oBAC9C,MAAM,MAAM,GAAG,OAAiB,CAAC;oBACjC,IAAI,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE;wBACpD,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBACvC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;wBACxD,SAAS,CAAC,WAAW,CAAC,IAAI,GAAG,EAAE,CAAC;qBACnC;iBACJ;aACJ;YAED,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;IAtJmD,CAAC;IAE/C,iBAAiB,CAAC,MAAc,EAAE,QAAgB,EAAE,KAAa,EAAE,KAAc,EAAE,GAAY;QAClG,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC/D,MAAM,KAAK,GAA8B;YACrC,cAAc,EAAE,IAAI;YACpB,mBAAmB,EAAE,KAAK;YAC1B,eAAe,EAAE,EAAE;YACnB,YAAY,EAAE,EAAE;YAChB,cAAc,EAAE,EAAE;YAClB,WAAW,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC;SACnC,CAAC;QAEF,IAAI,SAAS,CAAC,eAAe,EAAE;YAC3B,OAAO,CAAC,GAAG,CACP,mBAAmB,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG;gBAC/E,WAAW,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;SACpE;QACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CACnB,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,EACzB,MAAM,EACN,QAAQ,EACR,KAAK,EACL,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,GAAG,CAAC,CAAC;QAEf,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC;IACxF,CAAC;IAEM,OAAO,CAAC,MAAc,EAAE,QAAgB,EAAE,WAAW,GAAG,EAAE,EAAE,KAAc,EAAE,GAAY;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE/D,MAAM,KAAK,GAAqB,EAAE,WAAW,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC;QAElF,IAAI,SAAS,CAAC,eAAe,EAAE;YAC3B,OAAO,CAAC,GAAG,CACP,mBAAmB,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG;gBAC/E,WAAW,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;SACpE;QACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CACnB,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,EACzB,MAAM,EACN,QAAQ,EACR,KAAK,EACL,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;IAClC,CAAC;IAEO,aAAa,CACjB,KAAyB,EACzB,GAAuB,EACvB,MAAc,EACd,QAAgB;QAEhB,MAAM,KAAK,GAAkB;YACzB,GAAG,EAAE,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC;YACtD,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC;SACpB,CAAC;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;CA2FJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IIntegerRange } from \"./base\";\nimport { BaseSegment, glc, ISegment, Marker, MergeTree } from \"./mergeTree\";\nimport { IJSONSegment } from \"./ops\";\nimport { PropertySet } from \"./properties\";\nimport { LocalReferenceCollection } from \"./localReference\";\n\n// Maximum length of text segment to be considered to be merged with other segment.\n// Maximum segment length is at least 2x of it (not taking into account initial segment creation).\n// The bigger it is, the more expensive it is to break segment into sub-segments (on edits)\n// The smaller it is, the more segments we have in snapshots (and in memory) - it's more expensive to load snapshots.\n// Small number also makes ReplayTool produce false positives (\"same\" snapshots have slightly different binary\n// representations).  More measurements needs to be done, but it's very likely the right spot is somewhere between\n// 1K-2K mark.  That said, we also break segments on newline and there are very few segments that are longer than 256\n// because of it.  Must be an even number\nconst TextSegmentGranularity = 256;\n\nexport interface IJSONTextSegment extends IJSONSegment {\n    text: string;\n}\n\nexport class TextSegment extends BaseSegment {\n    public static readonly type = \"TextSegment\";\n\n    public static is(segment: ISegment): segment is TextSegment {\n        return segment.type === TextSegment.type;\n    }\n\n    public static make(text: string, props?: PropertySet) {\n        const tseg = new TextSegment(text);\n        if (props) {\n            tseg.addProperties(props);\n        }\n        return tseg;\n    }\n\n    public static fromJSONObject(spec: any) {\n        if (typeof spec === \"string\") {\n            return new TextSegment(spec);\n        } else if (spec && typeof spec === \"object\" && \"text\" in spec) {\n            const textSpec = spec as IJSONTextSegment;\n            return TextSegment.make(textSpec.text, textSpec.props as PropertySet);\n        }\n        return undefined;\n    }\n\n    public readonly type = TextSegment.type;\n\n    constructor(public text: string) {\n        super();\n        this.cachedLength = text.length;\n    }\n\n    public toJSONObject() {\n        // To reduce snapshot/ops size, we serialize a TextSegment as a plain 'string' if it is\n        // not annotated.\n        return this.properties\n            ? { text: this.text, props: this.properties }\n            : this.text;\n    }\n\n    public clone(start = 0, end?: number) {\n        const text = this.text.substring(start, end);\n        const b = TextSegment.make(text, this.properties);\n        this.cloneInto(b);\n        return b;\n    }\n\n    public canAppend(segment: ISegment): boolean {\n        return !this.text.endsWith(\"\\n\")\n            && TextSegment.is(segment)\n            && (this.cachedLength <= TextSegmentGranularity ||\n                segment.cachedLength <= TextSegmentGranularity);\n    }\n\n    public toString() {\n        return this.text;\n    }\n\n    public append(segment: ISegment) {\n        if (TextSegment.is(segment)) {\n            // Note: Must call 'appendLocalRefs' before modifying this segment's length as\n            // 'this.cachedLength' is used to adjust the offsets of the local refs.\n            LocalReferenceCollection.append(this, segment);\n\n            this.text += segment.text;\n            this.cachedLength = this.text.length;\n        } else {\n            throw new Error(\"can only append text segment\");\n        }\n    }\n\n    // TODO: retain removed text for undo\n    // returns true if entire string removed\n    public removeRange(start: number, end: number) {\n        let remnantString = \"\";\n        const len = this.text.length;\n        if (start > 0) {\n            remnantString += this.text.substring(0, start);\n        }\n        if (end < len) {\n            remnantString += this.text.substring(end);\n        }\n        this.text = remnantString;\n        this.cachedLength = remnantString.length;\n        return (remnantString.length === 0);\n    }\n\n    protected createSplitSegmentAt(pos: number) {\n        if (pos > 0) {\n            const remainingText = this.text.substring(pos);\n            this.text = this.text.substring(0, pos);\n            this.cachedLength = this.text.length;\n            const leafSegment = new TextSegment(remainingText);\n            return leafSegment;\n        }\n    }\n}\n\ninterface ITextAccumulator {\n    textSegment: TextSegment;\n    placeholder?: string;\n    parallelArrays?: boolean;\n}\n\ninterface ITextAndMarkerAccumulator extends ITextAccumulator {\n    parallelArrays: true;\n    parallelText: string[];\n    parallelMarkers: Marker[];\n    parallelMarkerLabel: string;\n    tagsInProgress: string[];\n}\n\nfunction isTextAndMarkerAccumulator(accum: ITextAccumulator): accum is ITextAndMarkerAccumulator {\n    return accum.parallelArrays === true;\n}\n\ntype ITextAccumulatorType = ITextAccumulator | ITextAndMarkerAccumulator;\nexport class MergeTreeTextHelper {\n    constructor(private readonly mergeTree: MergeTree) { }\n\n    public getTextAndMarkers(refSeq: number, clientId: number, label: string, start?: number, end?: number) {\n        const range = this.getValidRange(start, end, refSeq, clientId);\n        const accum: ITextAndMarkerAccumulator = {\n            parallelArrays: true,\n            parallelMarkerLabel: label,\n            parallelMarkers: [],\n            parallelText: [],\n            tagsInProgress: [],\n            textSegment: new TextSegment(\"\"),\n        };\n\n        if (MergeTree.traceGatherText) {\n            console.log(\n                `get text on cli ${glc(this.mergeTree, this.mergeTree.collabWindow.clientId)} ` +\n                `ref cli ${glc(this.mergeTree, clientId)} refSeq ${refSeq}`);\n        }\n        this.mergeTree.mapRange<ITextAndMarkerAccumulator>(\n            { leaf: this.gatherText },\n            refSeq,\n            clientId,\n            accum,\n            range.start,\n            range.end);\n\n        return { parallelText: accum.parallelText, parallelMarkers: accum.parallelMarkers };\n    }\n\n    public getText(refSeq: number, clientId: number, placeholder = \"\", start?: number, end?: number) {\n        const range = this.getValidRange(start, end, refSeq, clientId);\n\n        const accum: ITextAccumulator = { textSegment: new TextSegment(\"\"), placeholder };\n\n        if (MergeTree.traceGatherText) {\n            console.log(\n                `get text on cli ${glc(this.mergeTree, this.mergeTree.collabWindow.clientId)} ` +\n                `ref cli ${glc(this.mergeTree, clientId)} refSeq ${refSeq}`);\n        }\n        this.mergeTree.mapRange<ITextAccumulator>(\n            { leaf: this.gatherText },\n            refSeq,\n            clientId,\n            accum,\n            range.start,\n            range.end);\n        return accum.textSegment.text;\n    }\n\n    private getValidRange(\n        start: number | undefined,\n        end: number | undefined,\n        refSeq: number,\n        clientId: number,\n    ): IIntegerRange {\n        const range: IIntegerRange = {\n            end: end ?? this.mergeTree.getLength(refSeq, clientId),\n            start: start ?? 0,\n        };\n        return range;\n    }\n\n    private readonly gatherText = (segment: ISegment, pos: number, refSeq: number, clientId: number, start: number,\n        end: number, accumText: ITextAccumulatorType) => {\n        let _start = start;\n        if (TextSegment.is(segment)) {\n            if (MergeTree.traceGatherText) {\n                console.log(\n                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n                    `@cli ${this.mergeTree.getLongClientId!(this.mergeTree.collabWindow.clientId)} ` +\n                    `gather seg seq ${segment.seq} rseq ${segment.removedSeq} text ${segment.text}`);\n            }\n            let beginTags = \"\";\n            let endTags = \"\";\n            if (isTextAndMarkerAccumulator(accumText)) {\n                // TODO: let clients pass in function to get tag\n                const tags = [] as string[];\n                const initTags = [] as string[];\n\n                if (segment.properties && (segment.properties[\"font-weight\"])) {\n                    tags.push(\"b\");\n                }\n                if (segment.properties && (segment.properties[\"text-decoration\"])) {\n                    tags.push(\"u\");\n                }\n                const remTags = [] as string[];\n                if (tags.length > 0) {\n                    for (const tag of tags) {\n                        if (!accumText.tagsInProgress.includes(tag)) {\n                            beginTags += `<${tag}>`;\n                            initTags.push(tag);\n                        }\n                    }\n                    for (const accumTag of accumText.tagsInProgress) {\n                        if (!tags.includes(accumTag)) {\n                            endTags += `</${accumTag}>`;\n                            remTags.push(accumTag);\n                        }\n                    }\n                    for (const initTag of initTags.reverse()) {\n                        accumText.tagsInProgress.push(initTag);\n                    }\n                } else {\n                    for (const accumTag of accumText.tagsInProgress) {\n                        endTags += `</${accumTag}>`;\n                        remTags.push(accumTag);\n                    }\n                }\n                for (const remTag of remTags) {\n                    const remdex = accumText.tagsInProgress.indexOf(remTag);\n                    if (remdex >= 0) {\n                        accumText.tagsInProgress.splice(remdex, 1);\n                    }\n                }\n            }\n            accumText.textSegment.text += endTags;\n            accumText.textSegment.text += beginTags;\n            if ((_start <= 0) && (end >= segment.text.length)) {\n                accumText.textSegment.text += segment.text;\n            } else {\n                if (_start < 0) {\n                    _start = 0;\n                }\n                if (end >= segment.text.length) {\n                    accumText.textSegment.text += segment.text.substring(_start);\n                } else {\n                    accumText.textSegment.text += segment.text.substring(_start, end);\n                }\n            }\n        } else {\n            if (accumText.placeholder && (accumText.placeholder.length > 0)) {\n                if (accumText.placeholder === \"*\") {\n                    const marker = segment as Marker;\n                    accumText.textSegment.text += `\\n${marker.toString()}`;\n                } else {\n                    for (let i = 0; i < segment.cachedLength; i++) {\n                        accumText.textSegment.text += accumText.placeholder;\n                    }\n                }\n            } else if (isTextAndMarkerAccumulator(accumText)) {\n                const marker = segment as Marker;\n                if (marker.hasTileLabel(accumText.parallelMarkerLabel)) {\n                    accumText.parallelMarkers.push(marker);\n                    accumText.parallelText.push(accumText.textSegment.text);\n                    accumText.textSegment.text = \"\";\n                }\n            }\n        }\n\n        return true;\n    };\n}\n"]}
+{"version":3,"file":"textSegment.js","sourceRoot":"","sources":["../src/textSegment.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 { IIntegerRange } from \"./base\";\nimport { BaseSegment, ISegment, Marker, MergeTree } from \"./mergeTree\";\nimport { IJSONSegment } from \"./ops\";\nimport { PropertySet } from \"./properties\";\nimport { LocalReferenceCollection } from \"./localReference\";\n\n// Maximum length of text segment to be considered to be merged with other segment.\n// Maximum segment length is at least 2x of it (not taking into account initial segment creation).\n// The bigger it is, the more expensive it is to break segment into sub-segments (on edits)\n// The smaller it is, the more segments we have in snapshots (and in memory) - it's more expensive to load snapshots.\n// Small number also makes ReplayTool produce false positives (\"same\" snapshots have slightly different binary\n// representations).  More measurements needs to be done, but it's very likely the right spot is somewhere between\n// 1K-2K mark.  That said, we also break segments on newline and there are very few segments that are longer than 256\n// because of it.  Must be an even number\nconst TextSegmentGranularity = 256;\n\nexport interface IJSONTextSegment extends IJSONSegment {\n    text: string;\n}\n\nexport class TextSegment extends BaseSegment {\n    public static readonly type = \"TextSegment\";\n\n    public static is(segment: ISegment): segment is TextSegment {\n        return segment.type === TextSegment.type;\n    }\n\n    public static make(text: string, props?: PropertySet) {\n        const tseg = new TextSegment(text);\n        if (props) {\n            tseg.addProperties(props);\n        }\n        return tseg;\n    }\n\n    public static fromJSONObject(spec: any) {\n        if (typeof spec === \"string\") {\n            return new TextSegment(spec);\n        } else if (spec && typeof spec === \"object\" && \"text\" in spec) {\n            const textSpec = spec as IJSONTextSegment;\n            return TextSegment.make(textSpec.text, textSpec.props as PropertySet);\n        }\n        return undefined;\n    }\n\n    public readonly type = TextSegment.type;\n\n    constructor(public text: string) {\n        super();\n        this.cachedLength = text.length;\n    }\n\n    public toJSONObject() {\n        // To reduce snapshot/ops size, we serialize a TextSegment as a plain 'string' if it is\n        // not annotated.\n        return this.properties\n            ? { text: this.text, props: this.properties }\n            : this.text;\n    }\n\n    public clone(start = 0, end?: number) {\n        const text = this.text.substring(start, end);\n        const b = TextSegment.make(text, this.properties);\n        this.cloneInto(b);\n        return b;\n    }\n\n    public canAppend(segment: ISegment): boolean {\n        return !this.text.endsWith(\"\\n\")\n            && TextSegment.is(segment)\n            && (this.cachedLength <= TextSegmentGranularity ||\n                segment.cachedLength <= TextSegmentGranularity);\n    }\n\n    public toString() {\n        return this.text;\n    }\n\n    public append(segment: ISegment) {\n        if (TextSegment.is(segment)) {\n            // Note: Must call 'appendLocalRefs' before modifying this segment's length as\n            // 'this.cachedLength' is used to adjust the offsets of the local refs.\n            LocalReferenceCollection.append(this, segment);\n\n            this.text += segment.text;\n            this.cachedLength = this.text.length;\n        } else {\n            throw new Error(\"can only append text segment\");\n        }\n    }\n\n    // TODO: retain removed text for undo\n    // returns true if entire string removed\n    public removeRange(start: number, end: number) {\n        let remnantString = \"\";\n        const len = this.text.length;\n        if (start > 0) {\n            remnantString += this.text.substring(0, start);\n        }\n        if (end < len) {\n            remnantString += this.text.substring(end);\n        }\n        this.text = remnantString;\n        this.cachedLength = remnantString.length;\n        return (remnantString.length === 0);\n    }\n\n    protected createSplitSegmentAt(pos: number) {\n        if (pos > 0) {\n            const remainingText = this.text.substring(pos);\n            this.text = this.text.substring(0, pos);\n            this.cachedLength = this.text.length;\n            const leafSegment = new TextSegment(remainingText);\n            return leafSegment;\n        }\n    }\n}\n\ninterface ITextAccumulator {\n    textSegment: TextSegment;\n    placeholder?: string;\n    parallelArrays?: boolean;\n}\n\ninterface ITextAndMarkerAccumulator extends ITextAccumulator {\n    parallelArrays: true;\n    parallelText: string[];\n    parallelMarkers: Marker[];\n    parallelMarkerLabel: string;\n    tagsInProgress: string[];\n}\n\nfunction isTextAndMarkerAccumulator(accum: ITextAccumulator): accum is ITextAndMarkerAccumulator {\n    return accum.parallelArrays === true;\n}\n\ntype ITextAccumulatorType = ITextAccumulator | ITextAndMarkerAccumulator;\nexport class MergeTreeTextHelper {\n    constructor(private readonly mergeTree: MergeTree) { }\n\n    public getTextAndMarkers(refSeq: number, clientId: number, label: string, start?: number, end?: number) {\n        const range = this.getValidRange(start, end, refSeq, clientId);\n        const accum: ITextAndMarkerAccumulator = {\n            parallelArrays: true,\n            parallelMarkerLabel: label,\n            parallelMarkers: [],\n            parallelText: [],\n            tagsInProgress: [],\n            textSegment: new TextSegment(\"\"),\n        };\n\n        this.mergeTree.mapRange<ITextAndMarkerAccumulator>(\n            { leaf: this.gatherText },\n            refSeq,\n            clientId,\n            accum,\n            range.start,\n            range.end);\n\n        return { parallelText: accum.parallelText, parallelMarkers: accum.parallelMarkers };\n    }\n\n    public getText(refSeq: number, clientId: number, placeholder = \"\", start?: number, end?: number) {\n        const range = this.getValidRange(start, end, refSeq, clientId);\n\n        const accum: ITextAccumulator = { textSegment: new TextSegment(\"\"), placeholder };\n\n        this.mergeTree.mapRange<ITextAccumulator>(\n            { leaf: this.gatherText },\n            refSeq,\n            clientId,\n            accum,\n            range.start,\n            range.end);\n        return accum.textSegment.text;\n    }\n\n    private getValidRange(\n        start: number | undefined,\n        end: number | undefined,\n        refSeq: number,\n        clientId: number,\n    ): IIntegerRange {\n        const range: IIntegerRange = {\n            end: end ?? this.mergeTree.getLength(refSeq, clientId),\n            start: start ?? 0,\n        };\n        return range;\n    }\n\n    private readonly gatherText = (segment: ISegment, pos: number, refSeq: number, clientId: number, start: number,\n        end: number, accumText: ITextAccumulatorType) => {\n        let _start = start;\n        if (TextSegment.is(segment)) {\n\n            let beginTags = \"\";\n            let endTags = \"\";\n            if (isTextAndMarkerAccumulator(accumText)) {\n                // TODO: let clients pass in function to get tag\n                const tags = [] as string[];\n                const initTags = [] as string[];\n\n                if (segment.properties && (segment.properties[\"font-weight\"])) {\n                    tags.push(\"b\");\n                }\n                if (segment.properties && (segment.properties[\"text-decoration\"])) {\n                    tags.push(\"u\");\n                }\n                const remTags = [] as string[];\n                if (tags.length > 0) {\n                    for (const tag of tags) {\n                        if (!accumText.tagsInProgress.includes(tag)) {\n                            beginTags += `<${tag}>`;\n                            initTags.push(tag);\n                        }\n                    }\n                    for (const accumTag of accumText.tagsInProgress) {\n                        if (!tags.includes(accumTag)) {\n                            endTags += `</${accumTag}>`;\n                            remTags.push(accumTag);\n                        }\n                    }\n                    for (const initTag of initTags.reverse()) {\n                        accumText.tagsInProgress.push(initTag);\n                    }\n                } else {\n                    for (const accumTag of accumText.tagsInProgress) {\n                        endTags += `</${accumTag}>`;\n                        remTags.push(accumTag);\n                    }\n                }\n                for (const remTag of remTags) {\n                    const remdex = accumText.tagsInProgress.indexOf(remTag);\n                    if (remdex >= 0) {\n                        accumText.tagsInProgress.splice(remdex, 1);\n                    }\n                }\n            }\n            accumText.textSegment.text += endTags;\n            accumText.textSegment.text += beginTags;\n            if ((_start <= 0) && (end >= segment.text.length)) {\n                accumText.textSegment.text += segment.text;\n            } else {\n                if (_start < 0) {\n                    _start = 0;\n                }\n                if (end >= segment.text.length) {\n                    accumText.textSegment.text += segment.text.substring(_start);\n                } else {\n                    accumText.textSegment.text += segment.text.substring(_start, end);\n                }\n            }\n        } else {\n            if (accumText.placeholder && (accumText.placeholder.length > 0)) {\n                if (accumText.placeholder === \"*\") {\n                    const marker = segment as Marker;\n                    accumText.textSegment.text += `\\n${marker.toString()}`;\n                } else {\n                    for (let i = 0; i < segment.cachedLength; i++) {\n                        accumText.textSegment.text += accumText.placeholder;\n                    }\n                }\n            } else if (isTextAndMarkerAccumulator(accumText)) {\n                const marker = segment as Marker;\n                if (marker.hasTileLabel(accumText.parallelMarkerLabel)) {\n                    accumText.parallelMarkers.push(marker);\n                    accumText.parallelText.push(accumText.textSegment.text);\n                    accumText.textSegment.text = \"\";\n                }\n            }\n        }\n\n        return true;\n    };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "0.57.1",
+  "version": "0.58.0-55561",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -56,20 +56,20 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/container-definitions": "^0.46.0",
+    "@fluidframework/container-definitions": "^0.46.0-0",
     "@fluidframework/core-interfaces": "^0.42.0",
-    "@fluidframework/datastore-definitions": "^0.57.1",
+    "@fluidframework/datastore-definitions": "0.58.0-55561",
     "@fluidframework/protocol-definitions": "^0.1026.0",
-    "@fluidframework/runtime-definitions": "^0.57.1",
-    "@fluidframework/runtime-utils": "^0.57.1",
-    "@fluidframework/shared-object-base": "^0.57.1",
-    "@fluidframework/telemetry-utils": "^0.57.1"
+    "@fluidframework/runtime-definitions": "0.58.0-55561",
+    "@fluidframework/runtime-utils": "0.58.0-55561",
+    "@fluidframework/shared-object-base": "0.58.0-55561",
+    "@fluidframework/telemetry-utils": "0.58.0-55561"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0",
-    "@fluidframework/mocha-test-setup": "^0.57.1",
-    "@fluidframework/test-runtime-utils": "^0.57.1",
+    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/mocha-test-setup": "0.58.0-55561",
+    "@fluidframework/test-runtime-utils": "0.58.0-55561",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/diff": "^3.5.1",

package/src/base.ts

@@ -26,7 +26,6 @@ export interface Dictionary<TKey, TData> {
     put(key: TKey, data: TData, conflict?: ConflictAction<TKey, TData>): void;
     remove(key: TKey): void;
     map<TAccum>(action: PropertyAction<TKey, TData>, accum?: TAccum): void;
-    diag(): void;
 }
 
 export interface SortedDictionary<TKey, TData> extends Dictionary<TKey, TData> {

package/src/client.ts

@@ -20,7 +20,6 @@ import { LocalReference } from "./localReference";
 import {
     CollaborationWindow,
     compareStrings,
-    elapsedMicroseconds,
     IConsensusInfo,
     ISegment,
     ISegmentAction,
@@ -61,9 +60,11 @@ import {
     ReferencePosition,
 } from "./index";
 
+function elapsedMicroseconds(trace: Trace) {
+    return trace.trace().duration * 1000;
+}
+
 export class Client {
-    public verboseOps = false;
-    public noVerboseRemoteAnnotate = false;
     public measureOps = false;
     public accumTime = 0;
     public localTime = 0;
@@ -478,13 +479,6 @@ export class Client {
                 this.accumWindow += (this.getCurrentSeq() - this.getCollabWindow().minSeq);
             }
         }
-        if (this.verboseOps && (!opArgs.sequencedMessage || !this.noVerboseRemoteAnnotate)) {
-            console.log(
-                `@cli ${this.getLongClientId(this.getCollabWindow().clientId)} ` +
-                `seq ${clientArgs.sequenceNumber} ${opArgs.op.type} local ${!opArgs.sequencedMessage} ` +
-                `start ${range.start} end ${range.end} refseq ${clientArgs.referenceSequenceNumber} ` +
-                `cli ${clientArgs.clientId}`);
-        }
     }
 
     /**
@@ -552,7 +546,6 @@ export class Client {
             }
         }
 
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         return { start, end } as IIntegerRange;
     }
 
@@ -587,7 +580,7 @@ export class Client {
                 trace = Trace.start();
             }
 
-            this.mergeTree.ackPendingSegment(deltaOpArgs, this.verboseOps);
+            this.mergeTree.ackPendingSegment(deltaOpArgs);
             if (deltaOpArgs.op.type === MergeTreeDeltaType.ANNOTATE) {
                 if (deltaOpArgs.op.combiningOp && (deltaOpArgs.op.combiningOp.name === "consensus")) {
                     this.updateConsensusProperty(deltaOpArgs.op, deltaOpArgs.sequencedMessage!);
@@ -599,11 +592,6 @@ export class Client {
                 this.accumOps++;
                 this.accumWindow += (this.getCurrentSeq() - this.getCollabWindow().minSeq);
             }
-
-            if (this.verboseOps) {
-                console.log(`@cli ${this.getLongClientId(this.getCollabWindow().clientId)} ` +
-                    `ack seq # ${deltaOpArgs.sequencedMessage?.sequenceNumber}`);
-            }
         };
 
         if (opArgs.op.type === MergeTreeDeltaType.GROUP) {
@@ -985,12 +973,6 @@ export class Client {
     }
 
     getPropertiesAtPosition(pos: number) {
-        const segWindow = this.getCollabWindow();
-        if (this.verboseOps) {
-            // eslint-disable-next-line max-len
-            console.log(`getPropertiesAtPosition cli ${this.getLongClientId(segWindow.clientId)} ref seq ${segWindow.currentSeq}`);
-        }
-
         let propertiesAtPosition: PropertySet | undefined;
         const segoff = this.getContainingSegment(pos);
         const seg = segoff.segment;
@@ -1000,12 +982,6 @@ export class Client {
         return propertiesAtPosition;
     }
     getRangeExtentsOfPosition(pos: number) {
-        const segWindow = this.getCollabWindow();
-        if (this.verboseOps) {
-            // eslint-disable-next-line max-len
-            console.log(`getRangeExtentsOfPosition cli ${this.getLongClientId(segWindow.clientId)} ref seq ${segWindow.currentSeq}`);
-        }
-
         let posStart: number | undefined;
         let posAfterEnd: number | undefined;
 

package/src/collections.ts

@@ -3,8 +3,7 @@
  * Licensed under the MIT License.
  */
 
-/* eslint-disable @typescript-eslint/consistent-type-assertions, eqeqeq */
-/* eslint-disable no-bitwise */
+/* eslint-disable @typescript-eslint/consistent-type-assertions */
 
 /* Remove once strictNullCheck is enabled */
 
@@ -61,7 +60,6 @@ export class List<T> {
     public next: List<T>;
     public prev: List<T>;
 
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly
     constructor(public isHead: boolean, private data: T | undefined) {
         this.prev = this;
         this.next = this;
@@ -262,7 +260,7 @@ export class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData>
     }
 
     private isRed(node: RBNode<TKey, TData> | undefined) {
-        return !!node && (node.color == RBColor.RED);
+        return !!node && (node.color === RBColor.RED);
     }
 
     private nodeSize(node: RBNode<TKey, TData> | undefined) {
@@ -508,14 +506,14 @@ export class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData>
             if (this.isRed(_node.left)) {
                 _node = this.rotateRight(_node);
             }
-            if ((this.compareKeys(key, _node.key) == 0) && (!_node.right)) {
+            if ((this.compareKeys(key, _node.key) === 0) && (!_node.right)) {
                 return undefined;
             }
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             if ((!this.isRed(_node.right)) && (!this.isRed(_node.right!.left))) {
                 _node = this.moveRedRight(_node);
             }
-            if (this.compareKeys(key, _node.key) == 0) {
+            if (this.compareKeys(key, _node.key) === 0) {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 const subtreeMin = this.nodeMin(_node.right!);
                 _node.key = subtreeMin.key;
@@ -530,17 +528,6 @@ export class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData>
         }
         return this.balance(_node);
     }
-    private height() {
-        return this.nodeHeight(this.root);
-    }
-    private nodeHeight(node: RBNode<TKey, TData> | undefined): number {
-        if (node === undefined) {
-            return -1;
-        }
-        else {
-            return 1 + Math.max(this.nodeHeight(node.left), this.nodeHeight(node.right));
-        }
-    }
 
     public floor(key: TKey) {
         if (!this.isEmpty()) {
@@ -551,7 +538,7 @@ export class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData>
     private nodeFloor(node: RBNode<TKey, TData> | undefined, key: TKey): RBNode<TKey, TData> | undefined {
         if (node) {
             const cmp = this.compareKeys(key, node.key);
-            if (cmp == 0) {
+            if (cmp === 0) {
                 return node;
             }
             else if (cmp < 0) {
@@ -578,7 +565,7 @@ export class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData>
     private nodeCeil(node: RBNode<TKey, TData> | undefined, key: TKey): RBNode<TKey, TData> | undefined {
         if (node) {
             const cmp = this.compareKeys(key, node.key);
-            if (cmp == 0) {
+            if (cmp === 0) {
                 return node;
             }
             else if (cmp > 0) {
@@ -659,7 +646,7 @@ export class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData>
     }
 
     private oppositeColor(c: RBColor) {
-        return (c == RBColor.BLACK) ? RBColor.RED : RBColor.BLACK;
+        return (c === RBColor.BLACK) ? RBColor.RED : RBColor.BLACK;
     }
 
     private flipColors(node: RBNode<TKey, TData>) {
@@ -837,9 +824,6 @@ export class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData>
         }
         return go;
     }
-    public diag() {
-        console.log(`Height is ${this.height()}`);
-    }
 }
 
 export interface AugmentedIntervalNode {
@@ -1013,7 +997,6 @@ export class TST<T> {
             this.n++;
         }
         this.root = this.nodePut(this.root, key, val, 0);
-        // console.log(`put ${key}`);
     }
 
     private nodePut(x: TSTNode<T> | undefined, key: string, val: T, d: number) {

package/src/index.ts

@@ -18,5 +18,4 @@ export * from "./segmentGroupCollection";
 export * from "./segmentPropertiesManager";
 export * from "./snapshotlegacy";
 export * from "./sortedSegmentSet";
-export { loadSegments } from "./text";
 export * from "./textSegment";