@fluidframework/merge-tree 2.0.0-internal.8.0.0 → 2.0.0-rc.1.0.0

package/lib/{client.d.ts → client.d.mts}

@@ -9,14 +9,14 @@ import { IFluidDataStoreRuntime, IChannelStorageService } from "@fluidframework/
 import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions";
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
-import { LocalReferencePosition, SlidingPreference } from "./localReference";
-import { CollaborationWindow, ISegment, ISegmentAction, Marker, SegmentGroup } from "./mergeTreeNodes";
-import { IJSONSegment, IMergeTreeAnnotateMsg, IMergeTreeDeltaOp, IMergeTreeGroupMsg, IMergeTreeInsertMsg, IMergeTreeRemoveMsg, IMergeTreeOp, IRelativePosition, ReferenceType, IMergeTreeObliterateMsg } from "./ops";
-import { PropertySet } from "./properties";
-import { IMergeTreeTextHelper } from "./textSegment";
-import { ReferencePosition } from "./referencePositions";
-import { IMergeTreeOptions } from "./mergeTree";
-import { IMergeTreeDeltaCallbackArgs, IMergeTreeDeltaOpArgs, IMergeTreeMaintenanceCallbackArgs } from "./index";
+import { LocalReferencePosition, SlidingPreference } from "./localReference.mjs";
+import { CollaborationWindow, ISegment, ISegmentAction, Marker, SegmentGroup } from "./mergeTreeNodes.mjs";
+import { IJSONSegment, IMergeTreeAnnotateMsg, IMergeTreeDeltaOp, IMergeTreeGroupMsg, IMergeTreeInsertMsg, IMergeTreeRemoveMsg, IMergeTreeOp, IRelativePosition, ReferenceType, IMergeTreeObliterateMsg } from "./ops.mjs";
+import { PropertySet } from "./properties.mjs";
+import { IMergeTreeTextHelper } from "./textSegment.mjs";
+import { ReferencePosition } from "./referencePositions.mjs";
+import { IMergeTreeOptions } from "./mergeTree.mjs";
+import { IMergeTreeDeltaCallbackArgs, IMergeTreeDeltaOpArgs, IMergeTreeMaintenanceCallbackArgs } from "./index.mjs";
 /**
  * A range [start, end)
  * @internal
@@ -238,13 +238,6 @@ export declare class Client extends TypedEventEmitter<IClientEvents> {
     getClientId(): number;
     getLength(): number;
     startOrUpdateCollaboration(longClientId: string | undefined, minSeq?: number, currentSeq?: number): void;
-    /**
-     * @deprecated Use searchForMarker instead.
-     */
-    findTile(startPos: number, tileLabel: string, preceding?: boolean): {
-        tile: ReferencePosition;
-        pos: number;
-    } | undefined;
     /**
      * Searches a string for the nearest marker in either direction to a given start position.
      * The search will include the start position, so markers at the start position are valid
@@ -256,4 +249,4 @@ export declare class Client extends TypedEventEmitter<IClientEvents> {
      */
     searchForMarker(startPos: number, markerLabel: string, forwards?: boolean): Marker | undefined;
 }
-//# sourceMappingURL=client.d.ts.map
+//# sourceMappingURL=client.d.mts.map

package/lib/client.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.mts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;OAII,EAAE,YAAY,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC;OACnF,EAAE,gBAAgB,EAAE,MAAM,oCAAoC;OAC9D,EAAE,yBAAyB,EAAe,MAAM,sCAAsC;OACtF,EACN,sBAAsB,EACtB,sBAAsB,EACtB,MAAM,uCAAuC;OACvC,EAAE,qBAAqB,EAAE,MAAM,qCAAqC;OAEpE,EAAE,iBAAiB,EAAE,MAAM,8BAA8B;OACzD,EAAE,mBAAmB,EAA4B,MAAM,iCAAiC;OAGxF,EAAE,sBAAsB,EAAE,iBAAiB,EAAE;OAC7C,EAEN,mBAAmB,EAInB,QAAQ,EACR,cAAc,EACd,MAAM,EAEN,YAAY,EACZ;OAUM,EACN,YAAY,EACZ,qBAAqB,EACrB,iBAAiB,EAEjB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EAEjB,aAAa,EAEb,uBAAuB,EACvB;OACM,EAAE,WAAW,EAAE;OAIf,EAAE,oBAAoB,EAAE;OAExB,EAAE,iBAAiB,EAA6B;OAChD,EAAE,iBAAiB,EAAa;OAGhC,EAEN,2BAA2B,EAC3B,qBAAqB,EACrB,iCAAiC,EACjC;AAaD;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACZ;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC7B,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9E,CACC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,CACT,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,2BAA2B,EACtC,MAAM,EAAE,qBAAqB,KACzB,IAAI,GACP,IAAI,CAAC;IACR,CACC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,CACT,IAAI,EAAE,iCAAiC,EACvC,SAAS,EAAE,qBAAqB,GAAG,SAAS,EAC5C,MAAM,EAAE,qBAAqB,KACzB,IAAI,GACP,IAAI,CAAC;CACR;AAED;;;GAGG;AACH,qBAAa,MAAO,SAAQ,iBAAiB,CAAC,aAAa,CAAC;aAU1C,aAAa,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,QAAQ;aAC/C,MAAM,EAAE,mBAAmB;IAVrC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAExC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IAEvC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoD;IACpF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAgB;gBAIhC,aAAa,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,QAAQ,EAC/C,MAAM,EAAE,mBAAmB,EAC3C,OAAO,CAAC,EAAE,iBAAiB,GAAG,WAAW;IAsB1C;;;;;;OAMG;IAEI,wBAAwB,CAAC,KAAK,GAAE,MAAU,GAAG,YAAY,GAAG,YAAY,EAAE,GAAG,SAAS;IAe7F;;;;;OAKG;IACI,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,qBAAqB,GAAG,SAAS;IAM5F;;;;;;OAMG;IACI,kBAAkB,CACxB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,GAChB,qBAAqB,GAAG,SAAS;IAMpC;;;;;OAKG;IACI,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB;IAMxE;;;;;;OAMG;IAEI,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,uBAAuB;IAMhF;;;OAGG;IACI,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,mBAAmB,GAAG,SAAS;IAW1F;;;OAGG;IACI,8BAA8B,CACpC,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,QAAQ,GACf,mBAAmB,GAAG,SAAS;IAiB3B,YAAY,CAAC,WAAW,EAC9B,OAAO,EAAE,cAAc,CAAC,WAAW,CAAC,EACpC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,OAAO,GAClB,IAAI;IACA,YAAY,CAAC,SAAS,EAC5B,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,KAAK,CAAC,EAAE,MAAM,EACd,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,SAAS,EACjB,UAAU,CAAC,EAAE,OAAO,GAClB,IAAI;IAmBP,SAAS,CAAC,eAAe,CAAC,WAAW,EACpC,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,WAAW,KAAK,OAAO,EAC3D,KAAK,CAAC,EAAE,WAAW,GACjB,OAAO;IAOV;;;;OAIG;IACI,eAAe,CACrB,MAAM,EAAE,YAAY,EACpB,0BAA0B,EAAE,gBAAgB,GAC1C,IAAI;IA2BA,eAAe,IAAI,mBAAmB;IAI7C;;;;OAIG;IACI,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAa5E;;;;;;;;;;OAUG;IACI,4BAA4B,CAClC,OAAO,EAAE,QAAQ,GAAG,OAAO,GAAG,KAAK,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,kBAAkB,CAAC,EAAE,OAAO,GAC1B,sBAAsB;IAWzB;;OAEG;IACI,4BAA4B,CAAC,IAAI,EAAE,sBAAsB;IAIhE;;OAEG;IACI,gCAAgC,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM;IAIxE;;;;OAIG;IACI,kBAAkB,CAAC,WAAW,EAAE,iBAAiB;IAIjD,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAIxD;;OAEG;IACI,QAAQ,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO;IAKlD,OAAO,CAAC,sBAAsB;IAoB9B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAoB1B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAoB5B;;;;OAIG;IACH,OAAO,CAAC,aAAa;IA8BrB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IA2EvB;;;OAGG;IACH,OAAO,CAAC,+BAA+B;IA2BvC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,iBAAiB;IAczB,qBAAqB,CAAC,YAAY,EAAE,MAAM;IAO1C,SAAS,CAAC,gBAAgB,CAAC,YAAY,EAAE,MAAM;IAI/C,eAAe,CAAC,aAAa,EAAE,MAAM;IAIrC,eAAe,CAAC,YAAY,EAAE,MAAM;IAKpC,OAAO,CAAC,gCAAgC;IAIxC;;;;;;;;OAQG;IACI,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM;IASnE,OAAO,CAAC,sBAAsB;IAuJ9B,OAAO,CAAC,aAAa;IAiCd,cAAc,CAAC,EAAE,EAAE,iBAAiB,GAAG,YAAY;IAEnD,cAAc,CAAC,EAAE,EAAE,kBAAkB,GAAG,YAAY,EAAE;IAEtD,cAAc,CAAC,EAAE,EAAE,YAAY,GAAG,YAAY,GAAG,YAAY,EAAE;IAgC/D,QAAQ,CAAC,GAAG,EAAE,yBAAyB,EAAE,KAAK,GAAE,OAAe;IAmBtE,OAAO,CAAC,gBAAgB;IAYxB;;;;;;;OAOG;IACI,2BAA2B,CACjC,oBAAoB,EAAE,MAAM,EAC5B,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS;IASrB,OAAO,CAAC,uBAAuB,CAAK;IAGpC,OAAO,CAAC,aAAa,CAA6C;IAElE;;;;;OAKG;IACI,mBAAmB,CACzB,OAAO,EAAE,YAAY,EAErB,YAAY,EAAE,YAAY,GAAG,YAAY,EAAE,GACzC,YAAY;IAmER,gBAAgB,IAAI,oBAAoB;IAIxC,SAAS,CACf,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAC5B,WAAW,EAAE,yBAAyB,EAAE,GACtC,qBAAqB;IAoCX,IAAI,CAChB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC/B,UAAU,EAAE,gBAAgB,GAC1B,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAA;KAAE,CAAC;IAMjE,OAAO,CAAC,sBAAsB;IAM9B,gBAAgB,CAAC,OAAO,EAAE,kBAAkB;IAyB5C,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,oBAAoB,CAAC,CAAC,SAAS,QAAQ,EACtC,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,IAAI,CAAC,yBAAyB,EAAE,yBAAyB,GAAG,UAAU,CAAC,EACtF,QAAQ,CAAC,EAAE,MAAM;;;;IAYlB,uBAAuB,CAAC,GAAG,EAAE,MAAM;IAUnC,yBAAyB,CAAC,GAAG,EAAE,MAAM;;;;IAarC,aAAa;IAIb,WAAW;IAIX,SAAS;IAIT,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,SAAI,EAAE,UAAU,SAAI;IAyBvF;;;;;;;;OAQG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,UAAO;CAItE"}

package/lib/{client.js → client.mjs}

@@ -1,26 +1,25 @@
-"use strict";
 /*!
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Client = void 0;
-const protocol_definitions_1 = require("@fluidframework/protocol-definitions");
-const core_utils_1 = require("@fluidframework/core-utils");
-const client_utils_1 = require("@fluid-internal/client-utils");
-const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
-const collections_1 = require("./collections");
-const constants_1 = require("./constants");
-const mergeTreeNodes_1 = require("./mergeTreeNodes");
-const opBuilder_1 = require("./opBuilder");
-const ops_1 = require("./ops");
-const snapshotlegacy_1 = require("./snapshotlegacy");
-const snapshotLoader_1 = require("./snapshotLoader");
-const snapshotV1_1 = require("./snapshotV1");
-const referencePositions_1 = require("./referencePositions");
-const mergeTree_1 = require("./mergeTree");
-const MergeTreeTextHelper_1 = require("./MergeTreeTextHelper");
-const mergeTreeNodeWalk_1 = require("./mergeTreeNodeWalk");
+import { MessageType } from "@fluidframework/protocol-definitions";
+import { assert, unreachableCase } from "@fluidframework/core-utils";
+import { TypedEventEmitter } from "@fluid-internal/client-utils";
+import { LoggingError, UsageError } from "@fluidframework/telemetry-utils";
+import { RedBlackTree } from "./collections/index.mjs";
+import { UnassignedSequenceNumber, UniversalSequenceNumber } from "./constants.mjs";
+import { compareStrings, } from "./mergeTreeNodes.mjs";
+import { createAnnotateMarkerOp, createAnnotateRangeOp, 
+// eslint-disable-next-line import/no-deprecated
+createGroupOp, createInsertSegmentOp, createObliterateRangeOp, createRemoveRangeOp, } from "./opBuilder.mjs";
+import { MergeTreeDeltaType, } from "./ops.mjs";
+import { SnapshotLegacy } from "./snapshotlegacy.mjs";
+import { SnapshotLoader } from "./snapshotLoader.mjs";
+import { SnapshotV1 } from "./snapshotV1.mjs";
+import { DetachedReferencePosition } from "./referencePositions.mjs";
+import { MergeTree } from "./mergeTree.mjs";
+import { MergeTreeTextHelper } from "./MergeTreeTextHelper.mjs";
+import { walkAllChildSegments } from "./mergeTreeNodeWalk.mjs";
 function removeMoveInfo(segment) {
     delete segment.movedSeq;
     delete segment.movedSeqs;
@@ -32,17 +31,17 @@ function removeMoveInfo(segment) {
  * @deprecated This functionality was not meant to be exported and will be removed in a future release
  * @alpha
  */
-class Client extends client_utils_1.TypedEventEmitter {
+export class Client extends TypedEventEmitter {
     constructor(
     // Passing this callback would be unnecessary if Client were merged with SharedSegmentSequence
     specToSegment, logger, options) {
         super();
         this.specToSegment = specToSegment;
         this.logger = logger;
-        this.clientNameToIds = new collections_1.RedBlackTree(mergeTreeNodes_1.compareStrings);
+        this.clientNameToIds = new RedBlackTree(compareStrings);
         this.shortClientIdMap = [];
         this.lastNormalizationRefSeq = 0;
-        this._mergeTree = new mergeTree_1.MergeTree(options);
+        this._mergeTree = new MergeTree(options);
         this._mergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {
             this.emit("delta", opArgs, deltaArgs, this);
         };
@@ -52,7 +51,7 @@ class Client extends client_utils_1.TypedEventEmitter {
         if (options?.attribution?.track) {
             const policy = this._mergeTree?.attributionPolicy;
             if (policy === undefined) {
-                throw new telemetry_utils_1.UsageError("Attribution policy must be provided when attribution tracking is requested.");
+                throw new UsageError("Attribution policy must be provided when attribution tracking is requested.");
             }
             policy.attach(this);
         }
@@ -86,7 +85,7 @@ class Client extends client_utils_1.TypedEventEmitter {
      * @returns The annotate op if valid, otherwise undefined
      */
     annotateMarker(marker, props) {
-        const annotateOp = (0, opBuilder_1.createAnnotateMarkerOp)(marker, props);
+        const annotateOp = createAnnotateMarkerOp(marker, props);
         this.applyAnnotateRangeOp({ op: annotateOp });
         return annotateOp;
     }
@@ -98,7 +97,7 @@ class Client extends client_utils_1.TypedEventEmitter {
      * @returns The annotate op if valid, otherwise undefined
      */
     annotateRangeLocal(start, end, props) {
-        const annotateOp = (0, opBuilder_1.createAnnotateRangeOp)(start, end, props);
+        const annotateOp = createAnnotateRangeOp(start, end, props);
         this.applyAnnotateRangeOp({ op: annotateOp });
         return annotateOp;
     }
@@ -109,7 +108,7 @@ class Client extends client_utils_1.TypedEventEmitter {
      * @param end - The exclusive end of the range to remove
      */
     removeRangeLocal(start, end) {
-        const removeOp = (0, opBuilder_1.createRemoveRangeOp)(start, end);
+        const removeOp = createRemoveRangeOp(start, end);
         this.applyRemoveRangeOp({ op: removeOp });
         return removeOp;
     }
@@ -122,7 +121,7 @@ class Client extends client_utils_1.TypedEventEmitter {
      */
     // eslint-disable-next-line import/no-deprecated
     obliterateRangeLocal(start, end) {
-        const obliterateOp = (0, opBuilder_1.createObliterateRangeOp)(start, end);
+        const obliterateOp = createObliterateRangeOp(start, end);
         this.applyObliterateRangeOp({ op: obliterateOp });
         return obliterateOp;
     }
@@ -134,7 +133,7 @@ class Client extends client_utils_1.TypedEventEmitter {
         if (segment.cachedLength <= 0) {
             return undefined;
         }
-        const insertOp = (0, opBuilder_1.createInsertSegmentOp)(pos, segment);
+        const insertOp = createInsertSegmentOp(pos, segment);
         if (this.applyInsertOp({ op: insertOp })) {
             return insertOp;
         }
@@ -146,10 +145,10 @@ class Client extends client_utils_1.TypedEventEmitter {
      */
     insertAtReferencePositionLocal(refPos, segment) {
         const pos = this._mergeTree.referencePositionToLocalPosition(refPos, this.getCurrentSeq(), this.getClientId());
-        if (pos === referencePositions_1.DetachedReferencePosition) {
+        if (pos === DetachedReferencePosition) {
             return undefined;
         }
-        const op = (0, opBuilder_1.createInsertSegmentOp)(pos, segment);
+        const op = createInsertSegmentOp(pos, segment);
         if (this.applyInsertOp({ op })) {
             return op;
         }
@@ -158,7 +157,7 @@ class Client extends client_utils_1.TypedEventEmitter {
         this._mergeTree.mapRange(handler, this.getCurrentSeq(), this.getClientId(), accum, start, end, splitRange);
     }
     walkAllSegments(action, accum) {
-        return (0, mergeTreeNodeWalk_1.walkAllChildSegments)(this._mergeTree.root, accum === undefined ? action : (seg) => action(seg, accum));
+        return walkAllChildSegments(this._mergeTree.root, accum === undefined ? action : (seg) => action(seg, accum));
     }
     /**
      * Serializes the data required for garbage collection. The IFluidHandles stored in all segments that haven't
@@ -168,11 +167,11 @@ class Client extends client_utils_1.TypedEventEmitter {
     serializeGCData(handle, handleCollectingSerializer) {
         let localInserts = 0;
         let localRemoves = 0;
-        (0, mergeTreeNodeWalk_1.walkAllChildSegments)(this._mergeTree.root, (seg) => {
-            if (seg.seq === constants_1.UnassignedSequenceNumber) {
+        walkAllChildSegments(this._mergeTree.root, (seg) => {
+            if (seg.seq === UnassignedSequenceNumber) {
                 localInserts++;
             }
-            if (seg.removedSeq === constants_1.UnassignedSequenceNumber) {
+            if (seg.removedSeq === UnassignedSequenceNumber) {
                 localRemoves++;
             }
             // Only serialize segments that have not been removed.
@@ -250,7 +249,7 @@ class Client extends client_utils_1.TypedEventEmitter {
         this._mergeTree.rollback(op, localOpMetadata);
     }
     applyObliterateRangeOp(opArgs) {
-        (0, core_utils_1.assert)(opArgs.op.type === ops_1.MergeTreeDeltaType.OBLITERATE, 0x866 /* Unexpected op type on range obliterate! */);
+        assert(opArgs.op.type === MergeTreeDeltaType.OBLITERATE, 0x866 /* Unexpected op type on range obliterate! */);
         const op = opArgs.op;
         const clientArgs = this.getClientSequenceArgs(opArgs);
         const range = this.getValidOpRange(op, clientArgs);
@@ -261,7 +260,7 @@ class Client extends client_utils_1.TypedEventEmitter {
      * @param opArgs - The ops args for the op
      */
     applyRemoveRangeOp(opArgs) {
-        (0, core_utils_1.assert)(opArgs.op.type === ops_1.MergeTreeDeltaType.REMOVE, 0x02d /* "Unexpected op type on range remove!" */);
+        assert(opArgs.op.type === MergeTreeDeltaType.REMOVE, 0x02d /* "Unexpected op type on range remove!" */);
         const op = opArgs.op;
         const clientArgs = this.getClientSequenceArgs(opArgs);
         const range = this.getValidOpRange(op, clientArgs);
@@ -272,7 +271,7 @@ class Client extends client_utils_1.TypedEventEmitter {
      * @param opArgs - The ops args for the op
      */
     applyAnnotateRangeOp(opArgs) {
-        (0, core_utils_1.assert)(opArgs.op.type === ops_1.MergeTreeDeltaType.ANNOTATE, 0x02e /* "Unexpected op type on range annotate!" */);
+        assert(opArgs.op.type === MergeTreeDeltaType.ANNOTATE, 0x02e /* "Unexpected op type on range annotate!" */);
         const op = opArgs.op;
         const clientArgs = this.getClientSequenceArgs(opArgs);
         const range = this.getValidOpRange(op, clientArgs);
@@ -284,7 +283,7 @@ class Client extends client_utils_1.TypedEventEmitter {
      * @returns True if the insert was applied. False if it could not be.
      */
     applyInsertOp(opArgs) {
-        (0, core_utils_1.assert)(opArgs.op.type === ops_1.MergeTreeDeltaType.INSERT, 0x02f /* "Unexpected op type on range insert!" */);
+        assert(opArgs.op.type === MergeTreeDeltaType.INSERT, 0x02f /* "Unexpected op type on range insert!" */);
         const op = opArgs.op;
         const clientArgs = this.getClientSequenceArgs(opArgs);
         const range = this.getValidOpRange(op, clientArgs);
@@ -321,21 +320,21 @@ class Client extends client_utils_1.TypedEventEmitter {
             if (start === undefined ||
                 start < 0 ||
                 start > length ||
-                (start === length && op.type !== ops_1.MergeTreeDeltaType.INSERT)) {
+                (start === length && op.type !== MergeTreeDeltaType.INSERT)) {
                 invalidPositions.push("start");
             }
             // Validate end if not insert, or insert has end
             //
-            if (op.type !== ops_1.MergeTreeDeltaType.INSERT || end !== undefined) {
+            if (op.type !== MergeTreeDeltaType.INSERT || end !== undefined) {
                 if (end === undefined || end <= start) {
                     invalidPositions.push("end");
                 }
             }
-            if (op.type === ops_1.MergeTreeDeltaType.OBLITERATE && end !== undefined && end > length) {
+            if (op.type === MergeTreeDeltaType.OBLITERATE && end !== undefined && end > length) {
                 invalidPositions.push("end");
             }
             if (invalidPositions.length > 0) {
-                throw new telemetry_utils_1.LoggingError("RangeOutOfBounds", {
+                throw new LoggingError("RangeOutOfBounds", {
                     usageError: true,
                     end,
                     invalidPositions: invalidPositions.toString(),
@@ -386,7 +385,7 @@ class Client extends client_utils_1.TypedEventEmitter {
         return this.getClientSequenceArgsForMessage(opArgs.sequencedMessage);
     }
     ackPendingSegment(opArgs) {
-        if (opArgs.op.type === ops_1.MergeTreeDeltaType.GROUP) {
+        if (opArgs.op.type === MergeTreeDeltaType.GROUP) {
             for (const memberOp of opArgs.op.ops) {
                 this._mergeTree.ackPendingSegment({
                     groupOp: opArgs.op,
@@ -428,16 +427,16 @@ class Client extends client_utils_1.TypedEventEmitter {
      * @param localSeq - The localSeq to find the position of the segment at
      */
     findReconnectionPosition(segment, localSeq) {
-        (0, core_utils_1.assert)(localSeq <= this._mergeTree.collabWindow.localSeq, 0x032 /* "localSeq greater than collab window" */);
+        assert(localSeq <= this._mergeTree.collabWindow.localSeq, 0x032 /* "localSeq greater than collab window" */);
         const { currentSeq, clientId } = this.getCollabWindow();
         return this._mergeTree.getPosition(segment, currentSeq, clientId, localSeq);
     }
     resetPendingDeltaToOps(resetOp, 
     // eslint-disable-next-line import/no-deprecated
     segmentGroup) {
-        (0, core_utils_1.assert)(!!segmentGroup, 0x033 /* "Segment group undefined" */);
+        assert(!!segmentGroup, 0x033 /* "Segment group undefined" */);
         const NACKedSegmentGroup = this.pendingRebase?.shift()?.data;
-        (0, core_utils_1.assert)(segmentGroup === NACKedSegmentGroup, 0x034 /* "Segment group not at head of pending rebase queue" */);
+        assert(segmentGroup === NACKedSegmentGroup, 0x034 /* "Segment group not at head of pending rebase queue" */);
         if (this.pendingRebase?.empty) {
             this.pendingRebase = undefined;
         }
@@ -456,59 +455,59 @@ class Client extends client_utils_1.TypedEventEmitter {
         // so their recalculated positions will be correct.
         for (const segment of segmentGroup.segments.sort((a, b) => a.ordinal < b.ordinal ? -1 : 1)) {
             const segmentSegGroup = segment.segmentGroups.dequeue();
-            (0, core_utils_1.assert)(segmentGroup === segmentSegGroup, 0x035 /* "Segment group not at head of segment pending queue" */);
-            (0, core_utils_1.assert)(segmentGroup.localSeq !== undefined, 0x867 /* expected segment group localSeq to be defined */);
+            assert(segmentGroup === segmentSegGroup, 0x035 /* "Segment group not at head of segment pending queue" */);
+            assert(segmentGroup.localSeq !== undefined, 0x867 /* expected segment group localSeq to be defined */);
             const segmentPosition = this.findReconnectionPosition(segment, segmentGroup.localSeq);
             let newOp;
             switch (resetOp.type) {
-                case ops_1.MergeTreeDeltaType.ANNOTATE:
-                    (0, core_utils_1.assert)(segment.propertyManager?.hasPendingProperties() === true, 0x036 /* "Segment has no pending properties" */);
+                case MergeTreeDeltaType.ANNOTATE:
+                    assert(segment.propertyManager?.hasPendingProperties() === true, 0x036 /* "Segment has no pending properties" */);
                     // if the segment has been removed or obliterated, there's no need to send the annotate op
                     // unless the remove was local, in which case the annotate must have come
                     // before the remove
                     if ((segment.removedSeq === undefined ||
                         (segment.localRemovedSeq !== undefined &&
-                            segment.removedSeq === constants_1.UnassignedSequenceNumber)) &&
+                            segment.removedSeq === UnassignedSequenceNumber)) &&
                         (segment.movedSeq === undefined ||
                             (segment.localMovedSeq !== undefined &&
-                                segment.movedSeq === constants_1.UnassignedSequenceNumber))) {
-                        newOp = (0, opBuilder_1.createAnnotateRangeOp)(segmentPosition, segmentPosition + segment.cachedLength, resetOp.props);
+                                segment.movedSeq === UnassignedSequenceNumber))) {
+                        newOp = createAnnotateRangeOp(segmentPosition, segmentPosition + segment.cachedLength, resetOp.props);
                     }
                     break;
-                case ops_1.MergeTreeDeltaType.INSERT:
-                    (0, core_utils_1.assert)(segment.seq === constants_1.UnassignedSequenceNumber, 0x037 /* "Segment already has assigned sequence number" */);
+                case MergeTreeDeltaType.INSERT:
+                    assert(segment.seq === UnassignedSequenceNumber, 0x037 /* "Segment already has assigned sequence number" */);
                     let segInsertOp = segment;
                     if (typeof resetOp.seg === "object" && resetOp.seg.props !== undefined) {
                         segInsertOp = segment.clone();
                         segInsertOp.properties = resetOp.seg.props;
                     }
-                    if (segment.movedSeq !== constants_1.UnassignedSequenceNumber) {
+                    if (segment.movedSeq !== UnassignedSequenceNumber) {
                         removeMoveInfo(segment);
                     }
-                    newOp = (0, opBuilder_1.createInsertSegmentOp)(segmentPosition, segInsertOp);
+                    newOp = createInsertSegmentOp(segmentPosition, segInsertOp);
                     break;
-                case ops_1.MergeTreeDeltaType.REMOVE:
+                case MergeTreeDeltaType.REMOVE:
                     if (segment.localRemovedSeq !== undefined &&
-                        segment.removedSeq === constants_1.UnassignedSequenceNumber &&
+                        segment.removedSeq === UnassignedSequenceNumber &&
                         (segment.movedSeq === undefined ||
                             (segment.localMovedSeq !== undefined &&
-                                segment.movedSeq === constants_1.UnassignedSequenceNumber))) {
-                        newOp = (0, opBuilder_1.createRemoveRangeOp)(segmentPosition, segmentPosition + segment.cachedLength);
+                                segment.movedSeq === UnassignedSequenceNumber))) {
+                        newOp = createRemoveRangeOp(segmentPosition, segmentPosition + segment.cachedLength);
                     }
                     break;
-                case ops_1.MergeTreeDeltaType.OBLITERATE:
+                case MergeTreeDeltaType.OBLITERATE:
                     if (segment.localMovedSeq !== undefined &&
-                        segment.movedSeq === constants_1.UnassignedSequenceNumber &&
+                        segment.movedSeq === UnassignedSequenceNumber &&
                         (segment.removedSeq === undefined ||
                             (segment.localRemovedSeq !== undefined &&
-                                segment.removedSeq === constants_1.UnassignedSequenceNumber))) {
-                        newOp = (0, opBuilder_1.createObliterateRangeOp)(segmentPosition, segmentPosition + segment.cachedLength);
+                                segment.removedSeq === UnassignedSequenceNumber))) {
+                        newOp = createObliterateRangeOp(segmentPosition, segmentPosition + segment.cachedLength);
                     }
                     break;
                 default:
                     throw new Error(`Invalid op type`);
             }
-            if (newOp && resetOp.type === ops_1.MergeTreeDeltaType.OBLITERATE) {
+            if (newOp && resetOp.type === MergeTreeDeltaType.OBLITERATE) {
                 segment.segmentGroups.enqueue(obliterateSegmentGroup);
                 const first = opList[0];
                 if (!!first && first.pos2 !== undefined) {
@@ -530,7 +529,7 @@ class Client extends client_utils_1.TypedEventEmitter {
                 opList.push(newOp);
             }
         }
-        if (resetOp.type === ops_1.MergeTreeDeltaType.OBLITERATE &&
+        if (resetOp.type === MergeTreeDeltaType.OBLITERATE &&
             obliterateSegmentGroup.segments.length > 0) {
             this._mergeTree.pendingSegments.push(obliterateSegmentGroup);
         }
@@ -541,19 +540,19 @@ class Client extends client_utils_1.TypedEventEmitter {
         const msg = opArgs.sequencedMessage;
         this.getOrAddShortClientIdFromMessage(msg);
         switch (op.type) {
-            case ops_1.MergeTreeDeltaType.INSERT:
+            case MergeTreeDeltaType.INSERT:
                 this.applyInsertOp(opArgs);
                 break;
-            case ops_1.MergeTreeDeltaType.REMOVE:
+            case MergeTreeDeltaType.REMOVE:
                 this.applyRemoveRangeOp(opArgs);
                 break;
-            case ops_1.MergeTreeDeltaType.ANNOTATE:
+            case MergeTreeDeltaType.ANNOTATE:
                 this.applyAnnotateRangeOp(opArgs);
                 break;
-            case ops_1.MergeTreeDeltaType.OBLITERATE:
+            case MergeTreeDeltaType.OBLITERATE:
                 this.applyObliterateRangeOp(opArgs);
                 break;
-            case ops_1.MergeTreeDeltaType.GROUP: {
+            case MergeTreeDeltaType.GROUP: {
                 for (const memberOp of op.ops) {
                     this.applyRemoteOp({
                         op: memberOp,
@@ -573,35 +572,35 @@ class Client extends client_utils_1.TypedEventEmitter {
         let metadata;
         const stashed = true;
         switch (op.type) {
-            case ops_1.MergeTreeDeltaType.INSERT:
+            case MergeTreeDeltaType.INSERT:
                 this.applyInsertOp({ op, stashed });
                 metadata = this.peekPendingSegmentGroups();
                 break;
-            case ops_1.MergeTreeDeltaType.REMOVE:
+            case MergeTreeDeltaType.REMOVE:
                 this.applyRemoveRangeOp({ op, stashed });
                 metadata = this.peekPendingSegmentGroups();
                 break;
-            case ops_1.MergeTreeDeltaType.ANNOTATE:
+            case MergeTreeDeltaType.ANNOTATE:
                 this.applyAnnotateRangeOp({ op, stashed });
                 metadata = this.peekPendingSegmentGroups();
                 break;
-            case ops_1.MergeTreeDeltaType.OBLITERATE:
+            case MergeTreeDeltaType.OBLITERATE:
                 this.applyObliterateRangeOp({ op });
                 metadata = this.peekPendingSegmentGroups();
                 break;
-            case ops_1.MergeTreeDeltaType.GROUP:
+            case MergeTreeDeltaType.GROUP:
                 return op.ops.map((o) => this.applyStashedOp(o));
             default:
-                (0, core_utils_1.unreachableCase)(op, "unrecognized op type");
+                unreachableCase(op, "unrecognized op type");
         }
-        (0, core_utils_1.assert)(!!metadata, 0x2db /* "Applying op must generate a pending segment" */);
+        assert(!!metadata, 0x2db /* "Applying op must generate a pending segment" */);
         return metadata;
     }
     applyMsg(msg, local = false) {
         // Ensure client ID is registered
         this.getOrAddShortClientIdFromMessage(msg);
         // Apply if an operation message
-        if (msg.type === protocol_definitions_1.MessageType.Operation) {
+        if (msg.type === MessageType.Operation) {
             const opArgs = {
                 op: msg.contents,
                 sequencedMessage: msg,
@@ -618,9 +617,9 @@ class Client extends client_utils_1.TypedEventEmitter {
     updateSeqNumbers(min, seq) {
         const collabWindow = this.getCollabWindow();
         // Equal is fine here due to SharedSegmentSequence<>.snapshotContent() potentially updating with same #
-        (0, core_utils_1.assert)(collabWindow.currentSeq <= seq, 0x038 /* "Incoming op sequence# < local collabWindow's currentSequence#" */);
+        assert(collabWindow.currentSeq <= seq, 0x038 /* "Incoming op sequence# < local collabWindow's currentSequence#" */);
         collabWindow.currentSeq = seq;
-        (0, core_utils_1.assert)(min <= seq, 0x039 /* "Incoming op sequence# < minSequence#" */);
+        assert(min <= seq, 0x039 /* "Incoming op sequence# < minSequence#" */);
         this.updateMinSeq(min);
     }
     /**
@@ -651,7 +650,7 @@ class Client extends client_utils_1.TypedEventEmitter {
                 if (segmentGroup.length === 0) {
                     // sometimes we rebase to an empty op
                     // eslint-disable-next-line import/no-deprecated
-                    return (0, opBuilder_1.createGroupOp)();
+                    return createGroupOp();
                 }
                 firstGroup = segmentGroup[0];
             }
@@ -659,7 +658,7 @@ class Client extends client_utils_1.TypedEventEmitter {
                 firstGroup = segmentGroup;
             }
             const firstGroupNode = this._mergeTree.pendingSegments.find((node) => node.data === firstGroup);
-            (0, core_utils_1.assert)(firstGroupNode !== undefined, 0x70e /* segment group must exist in pending list */);
+            assert(firstGroupNode !== undefined, 0x70e /* segment group must exist in pending list */);
             this.pendingRebase = this._mergeTree.pendingSegments.splice(firstGroupNode);
         }
         const rebaseTo = this.getCollabWindow().currentSeq;
@@ -669,9 +668,9 @@ class Client extends client_utils_1.TypedEventEmitter {
             this.lastNormalizationRefSeq = rebaseTo;
         }
         const opList = [];
-        if (resetOp.type === ops_1.MergeTreeDeltaType.GROUP) {
+        if (resetOp.type === MergeTreeDeltaType.GROUP) {
             if (Array.isArray(segmentGroup)) {
-                (0, core_utils_1.assert)(resetOp.ops.length === segmentGroup.length, 0x03a /* "Number of ops in 'resetOp' must match the number of segment groups provided." */);
+                assert(resetOp.ops.length === segmentGroup.length, 0x03a /* "Number of ops in 'resetOp' must match the number of segment groups provided." */);
                 for (let i = 0; i < resetOp.ops.length; i++) {
                     opList.push(...this.resetPendingDeltaToOps(resetOp.ops[i], segmentGroup[i]));
                 }
@@ -679,21 +678,21 @@ class Client extends client_utils_1.TypedEventEmitter {
             else {
                 // A group op containing a single op will pass a direct reference to 'segmentGroup'
                 // rather than an array of segment groups.  (See 'peekPendingSegmentGroups()')
-                (0, core_utils_1.assert)(resetOp.ops.length === 1, 0x03b /* "Number of ops in 'resetOp' must match the number of segment groups provided." */);
+                assert(resetOp.ops.length === 1, 0x03b /* "Number of ops in 'resetOp' must match the number of segment groups provided." */);
                 opList.push(...this.resetPendingDeltaToOps(resetOp.ops[0], segmentGroup));
             }
         }
         else {
-            (0, core_utils_1.assert)(resetOp.type !== ops_1.MergeTreeDeltaType.GROUP, 0x03c /* "Reset op has 'group' delta type!" */);
-            (0, core_utils_1.assert)(!Array.isArray(segmentGroup), 0x03d /* "segmentGroup is array rather than singleton!" */);
+            assert(resetOp.type !== MergeTreeDeltaType.GROUP, 0x03c /* "Reset op has 'group' delta type!" */);
+            assert(!Array.isArray(segmentGroup), 0x03d /* "segmentGroup is array rather than singleton!" */);
             opList.push(...this.resetPendingDeltaToOps(resetOp, segmentGroup));
         }
         // eslint-disable-next-line import/no-deprecated
-        return opList.length === 1 ? opList[0] : (0, opBuilder_1.createGroupOp)(...opList);
+        return opList.length === 1 ? opList[0] : createGroupOp(...opList);
     }
     // eslint-disable-next-line import/no-deprecated
     createTextHelper() {
-        return new MergeTreeTextHelper_1.MergeTreeTextHelper(this._mergeTree);
+        return new MergeTreeTextHelper(this._mergeTree);
     }
     summarize(runtime, handle, serializer, catchUpMsgs) {
         const deltaManager = runtime.deltaManager;
@@ -704,28 +703,28 @@ class Client extends client_utils_1.TypedEventEmitter {
         this.updateSeqNumbers(minSeq, deltaManager.lastSequenceNumber);
         // One of the summaries (from SPO) I observed to have chunk.chunkSequenceNumber > minSeq!
         // Not sure why - need to catch it sooner
-        (0, core_utils_1.assert)(this.getCollabWindow().minSeq === minSeq, 0x03e /* "minSeq mismatch between collab window and delta manager!" */);
+        assert(this.getCollabWindow().minSeq === minSeq, 0x03e /* "minSeq mismatch between collab window and delta manager!" */);
         // Must continue to support legacy
         //       (See https://github.com/microsoft/FluidFramework/issues/84)
         if (this._mergeTree.options?.newMergeTreeSnapshotFormat === true) {
-            (0, core_utils_1.assert)(catchUpMsgs === undefined || catchUpMsgs.length === 0, 0x03f /* "New format should not emit catchup ops" */);
-            const snap = new snapshotV1_1.SnapshotV1(this._mergeTree, this.logger, (id) => this.getLongClientId(id));
+            assert(catchUpMsgs === undefined || catchUpMsgs.length === 0, 0x03f /* "New format should not emit catchup ops" */);
+            const snap = new SnapshotV1(this._mergeTree, this.logger, (id) => this.getLongClientId(id));
             snap.extractSync();
             return snap.emit(serializer, handle);
         }
         else {
-            const snap = new snapshotlegacy_1.SnapshotLegacy(this._mergeTree, this.logger);
+            const snap = new SnapshotLegacy(this._mergeTree, this.logger);
             snap.extractSync();
             return snap.emit(catchUpMsgs, serializer, handle);
         }
     }
     async load(runtime, storage, serializer) {
-        const loader = new snapshotLoader_1.SnapshotLoader(runtime, this, this._mergeTree, this.logger, serializer);
+        const loader = new SnapshotLoader(runtime, this, this._mergeTree, this.logger, serializer);
         return loader.initialize(storage);
     }
     getLocalSequenceNumber() {
         const segWindow = this.getCollabWindow();
-        return segWindow.collaborating ? constants_1.UnassignedSequenceNumber : constants_1.UniversalSequenceNumber;
+        return segWindow.collaborating ? UnassignedSequenceNumber : UniversalSequenceNumber;
     }
     // eslint-disable-next-line import/no-deprecated
     localTransaction(groupOp) {
@@ -735,16 +734,16 @@ class Client extends client_utils_1.TypedEventEmitter {
                 groupOp,
             };
             switch (op.type) {
-                case ops_1.MergeTreeDeltaType.INSERT:
+                case MergeTreeDeltaType.INSERT:
                     this.applyInsertOp(opArgs);
                     break;
-                case ops_1.MergeTreeDeltaType.ANNOTATE:
+                case MergeTreeDeltaType.ANNOTATE:
                     this.applyAnnotateRangeOp(opArgs);
                     break;
-                case ops_1.MergeTreeDeltaType.REMOVE:
+                case MergeTreeDeltaType.REMOVE:
                     this.applyRemoveRangeOp(opArgs);
                     break;
-                case ops_1.MergeTreeDeltaType.OBLITERATE:
+                case MergeTreeDeltaType.OBLITERATE:
                     this.applyObliterateRangeOp(opArgs);
                     break;
                 default:
@@ -809,13 +808,6 @@ class Client extends client_utils_1.TypedEventEmitter {
             }
         }
     }
-    /**
-     * @deprecated Use searchForMarker instead.
-     */
-    findTile(startPos, tileLabel, preceding = true) {
-        const clientId = this.getClientId();
-        return this._mergeTree.findTile(startPos, clientId, tileLabel, preceding);
-    }
     /**
      * Searches a string for the nearest marker in either direction to a given start position.
      * The search will include the start position, so markers at the start position are valid
@@ -830,5 +822,4 @@ class Client extends client_utils_1.TypedEventEmitter {
         return this._mergeTree.searchForMarker(startPos, clientId, markerLabel, forwards);
     }
 }
-exports.Client = Client;
-//# sourceMappingURL=client.js.map
+//# sourceMappingURL=client.mjs.map