@fluidframework/merge-tree 0.57.0 → 0.58.0-55983

package/src/mergeTreeDeltaCallback.ts

@@ -75,7 +75,6 @@ export interface IMergeTreeClientSequenceArgs {
 export type MergeTreeDeltaCallback =
     (opArgs: IMergeTreeDeltaOpArgs, deltaArgs: IMergeTreeDeltaCallbackArgs) => void;
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface IMergeTreeMaintenanceCallbackArgs extends IMergeTreeDeltaCallbackArgs<MergeTreeMaintenanceType> { }
 
 export type MergeTreeMaintenanceCallback =

package/src/ops.ts

@@ -14,13 +14,6 @@ export enum ReferenceType {
     Transient = 0x100,
 }
 
-export enum IntervalType {
-    Simple = 0x0,
-    Nest = 0x1,
-    SlideOnRemove = 0x2,
-    Transient = 0x4,
-}
-
 export interface IMarkerDef {
     refType?: ReferenceType;
 }

package/src/partialLengths.ts

@@ -177,8 +177,8 @@ export class PartialSequenceLengths {
                     // Find next earliest sequence number
                     if (indices[k] < childPartialsCounts[k]) {
                         const cpLen = childPartials[k].partialLengths[indices[k]];
-                        // eslint-disable-next-line max-len
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unnecessary-type-assertion
+
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                         if ((outerIndexOfEarliest < 0) || (cpLen.seq < earliestPartialLength!.seq)) {
                             outerIndexOfEarliest = k;
                             earliestPartialLength = cpLen;
@@ -186,8 +186,8 @@ export class PartialSequenceLengths {
                     }
                 }
                 if (outerIndexOfEarliest >= 0) {
-                    // eslint-disable-next-line max-len
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unnecessary-type-assertion
+
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     addNext(earliestPartialLength!);
                     indices[outerIndexOfEarliest]++;
                 }
@@ -198,8 +198,6 @@ export class PartialSequenceLengths {
             }
         }
         // TODO: incremental zamboni during build
-        // console.log(combinedPartialLengths.toString());
-        // console.log(`ZZZ...(min ${segmentWindow.minSeq})`);
         if (PartialSequenceLengths.options.zamboni) {
             combinedPartialLengths.zamboni(collabWindow);
         }
@@ -208,7 +206,6 @@ export class PartialSequenceLengths {
             combinedPartialLengths.verify();
         }
 
-        // console.log(combinedPartialLengths.toString());
         return combinedPartialLengths;
     }
 
@@ -227,9 +224,6 @@ export class PartialSequenceLengths {
             if (child.isLeaf()) {
                 // Leaf segment
                 const segment = child;
-                // eslint-disable-next-line max-len
-                // console.log(`seg br ${segBranchId} cli ${glc(mergeTree, segment.clientId)} me ${glc(mergeTree, mergeTree.collabWindow.clientId)}`);
-
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 if (seqLTE(segment.seq!, collabWindow.minSeq)) {
                     combinedPartialLengths.minLength += segment.cachedLength;
@@ -269,9 +263,9 @@ export class PartialSequenceLengths {
         }
     }
 
-    private static getOverlapClients(overlapClientids: number[], seglen: number) {
+    private static getOverlapClients(overlapClientIds: number[], seglen: number) {
         const bst = new RedBlackTree<number, IOverlapClient>(compareNumbers);
-        for (const clientId of overlapClientids) {
+        for (const clientId of overlapClientIds) {
             bst.put(clientId, { clientId, seglen });
         }
         return bst;
@@ -283,11 +277,11 @@ export class PartialSequenceLengths {
         seglen: number) {
         if (partialLength.overlapRemoveClients) {
             for (const clientId of overlapRemoveClientIds) {
-                const ovlapClientNode = partialLength.overlapRemoveClients.get(clientId);
-                if (!ovlapClientNode) {
+                const overlapClientNode = partialLength.overlapRemoveClients.get(clientId);
+                if (!overlapClientNode) {
                     partialLength.overlapRemoveClients.put(clientId, { clientId, seglen });
                 } else {
-                    ovlapClientNode.data.seglen += seglen;
+                    overlapClientNode.data.seglen += seglen;
                 }
             }
         } else {
@@ -373,7 +367,7 @@ export class PartialSequenceLengths {
             }
         }
         if (seqPartialLen === undefined) {
-            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+
             seqPartialLen = {
                 clientId,
                 seglen: seqSeglen,
@@ -448,28 +442,25 @@ export class PartialSequenceLengths {
             this.clientSeqNumbers[clientId] = [];
         }
         PartialSequenceLengths.addSeq(this.clientSeqNumbers[clientId], seq, seqSeglen);
-        //    console.log(this.toString());
         if (PartialSequenceLengths.options.zamboni) {
             this.zamboni(collabWindow);
         }
         if (PartialSequenceLengths.options.verify) {
             this.verify();
         }
-        //   console.log('ZZZ');
-        //   console.log(this.toString());
     }
 
     public getPartialLength(refSeq: number, clientId: number) {
         let pLen = this.minLength;
         const seqIndex = latestLEQ(this.partialLengths, refSeq);
-        const cliLatestindex = this.cliLatest(clientId);
+        const cliLatestIndex = this.cliLatest(clientId);
         const cliSeq = this.clientSeqNumbers[clientId];
         if (seqIndex >= 0) {
             // Add the partial length up to refSeq
             pLen += this.partialLengths[seqIndex].len;
 
-            if (cliLatestindex >= 0) {
-                const cliLatest = cliSeq[cliLatestindex];
+            if (cliLatestIndex >= 0) {
+                const cliLatest = cliSeq[cliLatestIndex];
 
                 if (cliLatest.seq > refSeq) {
                     // The client has local edits after refSeq, add in the length adjustments
@@ -483,8 +474,8 @@ export class PartialSequenceLengths {
         } else {
             // RefSeq is before any of the partial lengths
             // so just add in all local edits of that client (which should all be after the refSeq)
-            if (cliLatestindex >= 0) {
-                const cliLatest = cliSeq[cliLatestindex];
+            if (cliLatestIndex >= 0) {
+                const cliLatest = cliSeq[cliLatestIndex];
                 pLen += cliLatest.len;
             }
         }
@@ -497,7 +488,7 @@ export class PartialSequenceLengths {
             buf += `(${partial.seq},${partial.len}) `;
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-for-in-array, no-restricted-syntax
+        // eslint-disable-next-line @typescript-eslint/no-for-in-array
         for (const clientId in this.clientSeqNumbers) {
             if (this.clientSeqNumbers[clientId].length > 0) {
                 buf += `Client `;
@@ -522,7 +513,6 @@ export class PartialSequenceLengths {
         function copyDown(partialLengths: PartialSequenceLength[]) {
             const mindex = latestLEQ(partialLengths, segmentWindow.minSeq);
             let minLength = 0;
-            // console.log(`mindex ${mindex}`);
             if (mindex >= 0) {
                 minLength = partialLengths[mindex].len;
                 const seqCount = partialLengths.length;
@@ -540,7 +530,7 @@ export class PartialSequenceLengths {
             return minLength;
         }
         this.minLength += copyDown(this.partialLengths);
-        // eslint-disable-next-line @typescript-eslint/no-for-in-array, guard-for-in, no-restricted-syntax
+        // eslint-disable-next-line @typescript-eslint/no-for-in-array, guard-for-in
         for (const clientId in this.clientSeqNumbers) {
             const cliPartials = this.clientSeqNumbers[clientId];
             if (cliPartials) {

package/src/properties.ts

@@ -28,7 +28,7 @@ export function combine(combiningInfo: ICombiningOp, currentValue: any, newValue
         _currentValue = combiningInfo.defaultValue;
     }
     // Fixed set of operations for now
-    /* eslint-disable default-case */
+
     switch (combiningInfo.name) {
         case "incr":
             _currentValue += newValue as number;
@@ -56,8 +56,7 @@ export function combine(combiningInfo: ICombiningOp, currentValue: any, newValue
             }
             break;
     }
-    /* eslint-enable default-case */
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
     return _currentValue;
 }
 
@@ -67,7 +66,7 @@ export function matchProperties(a: PropertySet | undefined, b: PropertySet | und
             return false;
         } else {
             // For now, straightforward; later use hashing
-            // eslint-disable-next-line no-restricted-syntax
+
             for (const key in a) {
                 if (b[key] === undefined) {
                     return false;
@@ -79,7 +78,7 @@ export function matchProperties(a: PropertySet | undefined, b: PropertySet | und
                     return false;
                 }
             }
-            // eslint-disable-next-line no-restricted-syntax
+
             for (const key in b) {
                 if (a[key] === undefined) {
                     return false;
@@ -101,14 +100,10 @@ export function extend<T>(
     seq?: number,
 ) {
     if (extension !== undefined) {
-        if ((typeof extension !== "object")) {
-            console.log(`oh my ${extension}`);
-        }
-        // eslint-disable-next-line guard-for-in, no-restricted-syntax
+        // eslint-disable-next-line guard-for-in
         for (const key in extension) {
             const v = extension[key];
             if (v === null) {
-                // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                 delete base[key];
             } else {
                 if (combiningOp && (combiningOp.name !== "rewrite")) {
@@ -127,7 +122,7 @@ export function clone<T>(extension: MapLike<T> | undefined) {
         return undefined;
     }
     const cloneMap = createMap<T>();
-    // eslint-disable-next-line guard-for-in, no-restricted-syntax
+    // eslint-disable-next-line guard-for-in
     for (const key in extension) {
         const v = extension[key];
         if (v !== null) {
@@ -153,10 +148,7 @@ export function addProperties(
 
 export function extendIfUndefined<T>(base: MapLike<T>, extension: MapLike<T> | undefined) {
     if (extension !== undefined) {
-        if ((typeof extension !== "object")) {
-            console.log(`oh my ${extension}`);
-        }
-        // eslint-disable-next-line no-restricted-syntax
+
         for (const key in extension) {
             if (base[key] === undefined) {
                 base[key] = extension[key];

package/src/segmentPropertiesManager.ts

@@ -33,7 +33,7 @@ export class PropertiesManager {
                     0x05c /* "Trying to update more annotate props than do exist!" */);
                 this.pendingKeyUpdateCount[key]--;
                 if (this.pendingKeyUpdateCount?.[key] === 0) {
-                    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+
                     delete this.pendingKeyUpdateCount[key];
                 }
             }
@@ -72,12 +72,12 @@ export class PropertiesManager {
             if (collaborating && seq === UnassignedSequenceNumber) {
                 this.pendingRewriteCount++;
             }
-            // We are re-writting so delete all the properties
+            // We are re-writing so delete all the properties
             // not in the new props
             for (const key of Object.keys(oldProps)) {
                 if (!newProps[key] && shouldModifyKey(key)) {
                     deltas[key] = oldProps[key];
-                    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+
                     delete oldProps[key];
                 }
             }
@@ -105,7 +105,7 @@ export class PropertiesManager {
                 newValue = newProps[key];
             }
             if (newValue === null) {
-                // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+
                 delete oldProps[key];
             } else {
                 oldProps[key] = newValue;
@@ -122,7 +122,7 @@ export class PropertiesManager {
     ): PropertySet | undefined {
         if (oldProps) {
             if (!newProps) {
-                // eslint-disable-next-line no-param-reassign
+
                 newProps = createMap<any>();
             }
             if (!newManager) {

package/src/snapshotChunks.ts

@@ -94,7 +94,7 @@ export function serializeAsMinSupportedVersion(
     switch (chunk.version) {
         case undefined:
             targetChuck = chunk as MergeTreeChunkLegacy;
-            targetChuck.headerMetadata = buildHeaderMetadataForLegecyChunk(path, targetChuck, options);
+            targetChuck.headerMetadata = buildHeaderMetadataForLegacyChunk(path, targetChuck, options);
             break;
 
         case "1":
@@ -143,7 +143,7 @@ export function toLatestVersion(
                 version: "1",
                 length: chunkLegacy.chunkLengthChars,
                 segmentCount: chunkLegacy.chunkSegmentCount,
-                headerMetadata: buildHeaderMetadataForLegecyChunk(path, chunkLegacy, options),
+                headerMetadata: buildHeaderMetadataForLegacyChunk(path, chunkLegacy, options),
                 segments: chunkLegacy.segmentTexts,
                 startIndex: chunkLegacy.chunkStartSegmentIndex,
             };
@@ -156,7 +156,7 @@ export function toLatestVersion(
     }
 }
 
-function buildHeaderMetadataForLegecyChunk(
+function buildHeaderMetadataForLegacyChunk(
     path: string, chunk: MergeTreeChunkLegacy, options: PropertySet | undefined): MergeTreeHeaderMetadata | undefined {
     if (path === SnapshotLegacy.header) {
         if (chunk.headerMetadata !== undefined) {

package/src/snapshotV1.ts

@@ -48,6 +48,7 @@ export class SnapshotV1 {
     constructor(
         public mergeTree: MergeTree,
         logger: ITelemetryLogger,
+        private readonly getLongClientId: (id: number) => string,
         public filename?: string,
         public onCompletion?: () => void,
     ) {
@@ -209,8 +210,7 @@ export class SnapshotV1 {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 if (segment.seq! > minSeq) {
                     raw.seq = segment.seq;
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    raw.client = mergeTree.getLongClientId!(segment.clientId);
+                    raw.client = this.getLongClientId(segment.clientId);
                 }
                 // We have already dispensed with removed segments below the MSN and removed segments with unassigned
                 // sequence numbers.  Any remaining removal info should be preserved.
@@ -219,7 +219,7 @@ export class SnapshotV1 {
                         0x065 /* "On removal info preservation, segment has invalid removed sequence number!" */);
                     raw.removedSeq = segment.removedSeq;
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    raw.removedClient = mergeTree.getLongClientId!(segment.removedClientId!);
+                    raw.removedClient = this.getLongClientId(segment.removedClientId!);
                 }
 
             // Sanity check that we are preserving either the seq < minSeq or a removed segment's info.

package/src/snapshotlegacy.ts

@@ -154,10 +154,8 @@ export class SnapshotLegacy {
         const extractSegment =
             // eslint-disable-next-line max-len
             (segment: ISegment, pos: number, refSeq: number, clientId: number, start: number | undefined, end: number | undefined) => {
-                // eslint-disable-next-line eqeqeq
-                if ((segment.seq != UnassignedSequenceNumber) && (segment.seq! <= this.seq!) &&
-                    // eslint-disable-next-line eqeqeq
-                    ((segment.removedSeq === undefined) || (segment.removedSeq == UnassignedSequenceNumber) ||
+                if ((segment.seq !== UnassignedSequenceNumber) && (segment.seq! <= this.seq!) &&
+                    ((segment.removedSeq === undefined) || (segment.removedSeq === UnassignedSequenceNumber) ||
                         (segment.removedSeq > this.seq!))) {
                     if (prev && prev.canAppend(segment)
                         && matchProperties(prev.properties, segment.properties)
@@ -192,8 +190,8 @@ export class SnapshotLegacy {
         // When this condition happens, we might not write out all segments in getSeqLengthSegs()
         // when writing out "body". Issue #1995 tracks following up on the core of the problem.
         // In the meantime, this code makes sure we will write out all segments properly
-        // eslint-disable-next-line eqeqeq
-        if (this.header.segmentsTotalLength != totalLength) {
+
+        if (this.header.segmentsTotalLength !== totalLength) {
             this.logger.sendErrorEvent({
                 eventName: "SegmentsTotalLengthMismatch",
                 totalLength,

package/src/sortedSegmentSet.ts

@@ -10,37 +10,37 @@ import { ISegment } from "./mergeTree";
  *
  * This differs from a normal sorted set in that the keys are not fixed.
  * The segments are sorted via their ordinals which can change as the merge tree is modified.
- * Eventhough the values of the ordinals can change their ordering and uniqueness cannot, so the order of a set of
+ * Even though the values of the ordinals can change their ordering and uniqueness cannot, so the order of a set of
  * segments ordered by their ordinals will always have the same order even if the ordinal values on
- * the segments changes. This invarient allows ensure the segments stay ordered and unique, and that new segments
+ * the segments changes. This invariant allows ensure the segments stay ordered and unique, and that new segments
  * can be inserted into that order.
  */
 export class SortedSegmentSet<T extends ISegment | { readonly segment: ISegment } = ISegment> {
-    private readonly oridinalSortedItems: T[] = [];
+    private readonly ordinalSortedItems: T[] = [];
 
     public get size(): number {
-        return this.oridinalSortedItems.length;
+        return this.ordinalSortedItems.length;
     }
 
     public get items(): readonly T[] {
-        return this.oridinalSortedItems;
+        return this.ordinalSortedItems;
     }
 
     public addOrUpdate(newItem: T, update?: (existingItem: T, newItem: T) => T) {
         const position = this.findOrdinalPosition(this.getOrdinal(newItem));
         if (position.exists) {
             if (update) {
-                update(this.oridinalSortedItems[position.index], newItem);
+                update(this.ordinalSortedItems[position.index], newItem);
             }
         } else {
-            this.oridinalSortedItems.splice(position.index, 0, newItem);
+            this.ordinalSortedItems.splice(position.index, 0, newItem);
         }
     }
 
     public remove(item: T): boolean {
         const position = this.findOrdinalPosition(this.getOrdinal(item));
         if (position.exists) {
-            this.oridinalSortedItems.splice(position.index, 1);
+            this.ordinalSortedItems.splice(position.index, 1);
             return true;
         }
         return false;
@@ -62,19 +62,19 @@ export class SortedSegmentSet<T extends ISegment | { readonly segment: ISegment
     }
 
     private findOrdinalPosition(ordinal: string, start?: number, end?: number): { exists: boolean, index: number } {
-        if (this.oridinalSortedItems.length === 0) {
+        if (this.ordinalSortedItems.length === 0) {
             return { exists: false, index: 0 };
         }
         if (start === undefined || end === undefined) {
-            return this.findOrdinalPosition(ordinal, 0, this.oridinalSortedItems.length - 1);
+            return this.findOrdinalPosition(ordinal, 0, this.ordinalSortedItems.length - 1);
         }
         const index = start + Math.floor((end - start) / 2);
-        if (this.getOrdinal(this.oridinalSortedItems[index]) > ordinal) {
+        if (this.getOrdinal(this.ordinalSortedItems[index]) > ordinal) {
             if (start === index) {
                 return { exists: false, index };
             }
             return this.findOrdinalPosition(ordinal, start, index - 1);
-        } else if (this.getOrdinal(this.oridinalSortedItems[index]) < ordinal) {
+        } else if (this.getOrdinal(this.ordinalSortedItems[index]) < ordinal) {
             if (index === end) {
                 return { exists: false, index: index + 1 };
             }

package/src/textSegment.ts

@@ -4,7 +4,7 @@
  */
 
 import { IIntegerRange } from "./base";
-import { BaseSegment, glc, ISegment, Marker, MergeTree } from "./mergeTree";
+import { BaseSegment, ISegment, Marker, MergeTree } from "./mergeTree";
 import { IJSONSegment } from "./ops";
 import { PropertySet } from "./properties";
 import { LocalReferenceCollection } from "./localReference";
@@ -31,11 +31,11 @@ export class TextSegment extends BaseSegment {
     }
 
     public static make(text: string, props?: PropertySet) {
-        const tseg = new TextSegment(text);
+        const seg = new TextSegment(text);
         if (props) {
-            tseg.addProperties(props);
+            seg.addProperties(props);
         }
-        return tseg;
+        return seg;
     }
 
     public static fromJSONObject(spec: any) {
@@ -154,11 +154,6 @@ export class MergeTreeTextHelper {
             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<ITextAndMarkerAccumulator>(
             { leaf: this.gatherText },
             refSeq,
@@ -175,11 +170,6 @@ export class MergeTreeTextHelper {
 
         const accum: ITextAccumulator = { 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<ITextAccumulator>(
             { leaf: this.gatherText },
             refSeq,
@@ -207,12 +197,7 @@ export class MergeTreeTextHelper {
         end: number, accumText: ITextAccumulatorType) => {
         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)) {

package/dist/text.d.ts

@@ -1,8 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISegment, MergeTree } from "./mergeTree";
-export declare function loadSegments(content: string, segLimit: number, markers?: boolean, withProps?: boolean): ISegment[];
-export declare function loadText(content: string, mergeTree: MergeTree, segLimit: number, markers?: boolean): MergeTree;
-//# sourceMappingURL=text.d.ts.map

package/dist/text.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACH,QAAQ,EAER,SAAS,EAEZ,MAAM,aAAa,CAAC;AAIrB,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,EAAE,SAAS,GAAE,OAAc,cA2DlH;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,UAAQ,aAOhG"}

package/dist/text.js

@@ -1,78 +0,0 @@
-"use strict";
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadText = exports.loadSegments = void 0;
-const mergeTree_1 = require("./mergeTree");
-const ops_1 = require("./ops");
-const textSegment_1 = require("./textSegment");
-function loadSegments(content, segLimit, markers = false, withProps = true) {
-    const BOMFreeContent = content.replace(/^\uFEFF/, "");
-    const paragraphs = BOMFreeContent.split(/\r?\n/);
-    for (let i = 0, len = paragraphs.length; i < len; i++) {
-        paragraphs[i] = paragraphs[i]
-            .replace(/\r?\n/g, " ")
-            .replace(/\u201c|\u201d/g, '"')
-            .replace(/\u2019/g, "'");
-        if (!markers && i !== paragraphs.length - 1) {
-            paragraphs[i] += "\n";
-        }
-    }
-    const segments = [];
-    for (const paragraph of paragraphs) {
-        let pgMarker;
-        if (markers) {
-            pgMarker = mergeTree_1.Marker.make(ops_1.ReferenceType.Tile, { [mergeTree_1.reservedTileLabelsKey]: ["pg"] });
-        }
-        if (withProps) {
-            if ((paragraph.includes("Chapter")) || (paragraph.includes("PRIDE AND PREJ"))) {
-                if (pgMarker) {
-                    pgMarker.addProperties({ header: 2 });
-                    segments.push(new textSegment_1.TextSegment(paragraph));
-                }
-                else {
-                    segments.push(textSegment_1.TextSegment.make(paragraph, { fontSize: "140%", lineHeight: "150%" }));
-                }
-            }
-            else {
-                const emphStrings = paragraph.split("_");
-                for (let i = 0, len = emphStrings.length; i < len; i++) {
-                    // eslint-disable-next-line no-bitwise
-                    if (i & 1) {
-                        if (emphStrings[i].length > 0) {
-                            segments.push(textSegment_1.TextSegment.make(emphStrings[i], { fontStyle: "italic" }));
-                        }
-                    }
-                    else {
-                        if (emphStrings[i].length > 0) {
-                            segments.push(new textSegment_1.TextSegment(emphStrings[i]));
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            segments.push(new textSegment_1.TextSegment(paragraph));
-        }
-        if (pgMarker) {
-            segments.push(pgMarker);
-        }
-    }
-    if (segLimit > 0) {
-        segments.length = segLimit;
-    }
-    return segments;
-}
-exports.loadSegments = loadSegments;
-function loadText(content, mergeTree, segLimit, markers = false) {
-    const segments = loadSegments(content, segLimit, markers);
-    mergeTree.reloadFromSegments(segments);
-    // console.log(`Number of Segments: ${segments.length}`);
-    // console.log(`Height: ${mergeTree.getStats().maxHeight}`);
-    // console.log(segTree.toString());
-    return mergeTree;
-}
-exports.loadText = loadText;
-//# sourceMappingURL=text.js.map

package/dist/text.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"text.js","sourceRoot":"","sources":["../src/text.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 {\n    ISegment,\n    Marker,\n    MergeTree,\n    reservedTileLabelsKey,\n} from \"./mergeTree\";\nimport { ReferenceType } from \"./ops\";\nimport { TextSegment } from \"./textSegment\";\n\nexport function loadSegments(content: string, segLimit: number, markers: boolean = false, withProps: boolean = true) {\n    const BOMFreeContent = content.replace(/^\\uFEFF/, \"\");\n\n    const paragraphs = BOMFreeContent.split(/\\r?\\n/);\n    for (let i = 0, len = paragraphs.length; i < len; i++) {\n        paragraphs[i] = paragraphs[i]\n            .replace(/\\r?\\n/g, \" \")\n            .replace(/\\u201c|\\u201d/g, '\"')\n            .replace(/\\u2019/g, \"'\");\n        if (!markers && i !== paragraphs.length - 1) {\n            paragraphs[i] += \"\\n\";\n        }\n    }\n\n    const segments = [] as ISegment[];\n    for (const paragraph of paragraphs) {\n        let pgMarker: Marker | undefined;\n        if (markers) {\n            pgMarker = Marker.make(ReferenceType.Tile,\n                { [reservedTileLabelsKey]: [\"pg\"] });\n        }\n        if (withProps) {\n            if ((paragraph.includes(\"Chapter\")) || (paragraph.includes(\"PRIDE AND PREJ\"))) {\n                if (pgMarker) {\n                    pgMarker.addProperties({ header: 2 });\n                    segments.push(new TextSegment(paragraph));\n                } else {\n                    segments.push(\n                        TextSegment.make(paragraph, { fontSize: \"140%\", lineHeight: \"150%\" }));\n                }\n            } else {\n                const emphStrings = paragraph.split(\"_\");\n                for (let i = 0, len = emphStrings.length; i < len; i++) {\n                    // eslint-disable-next-line no-bitwise\n                    if (i & 1) {\n                        if (emphStrings[i].length > 0) {\n                            segments.push(\n                                TextSegment.make(emphStrings[i], { fontStyle: \"italic\" }));\n                        }\n                    } else {\n                        if (emphStrings[i].length > 0) {\n                            segments.push(new TextSegment(emphStrings[i]));\n                        }\n                    }\n                }\n            }\n        } else {\n            segments.push(new TextSegment(paragraph));\n        }\n        if (pgMarker) {\n            segments.push(pgMarker);\n        }\n    }\n\n    if (segLimit > 0) {\n        segments.length = segLimit;\n    }\n\n    return segments;\n}\n\nexport function loadText(content: string, mergeTree: MergeTree, segLimit: number, markers = false) {\n    const segments = loadSegments(content, segLimit, markers);\n    mergeTree.reloadFromSegments(segments);\n    // console.log(`Number of Segments: ${segments.length}`);\n    // console.log(`Height: ${mergeTree.getStats().maxHeight}`);\n    // console.log(segTree.toString());\n    return mergeTree;\n}\n"]}

package/lib/text.d.ts

@@ -1,8 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISegment, MergeTree } from "./mergeTree";
-export declare function loadSegments(content: string, segLimit: number, markers?: boolean, withProps?: boolean): ISegment[];
-export declare function loadText(content: string, mergeTree: MergeTree, segLimit: number, markers?: boolean): MergeTree;
-//# sourceMappingURL=text.d.ts.map

package/lib/text.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACH,QAAQ,EAER,SAAS,EAEZ,MAAM,aAAa,CAAC;AAIrB,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,EAAE,SAAS,GAAE,OAAc,cA2DlH;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,UAAQ,aAOhG"}