@fluidframework/merge-tree 2.30.0 → 2.31.0

package/lib/MergeTreeTextHelper.js

@@ -7,15 +7,15 @@ export class MergeTreeTextHelper {
     constructor(mergeTree) {
         this.mergeTree = mergeTree;
     }
-    getText(refSeq, clientId, placeholder = "", start, end) {
-        const range = this.getValidRange(start, end, refSeq, clientId);
+    getText(perspective, placeholder = "", start, end) {
+        const range = this.getValidRange(start, end, perspective);
         const accum = { textSegment: new TextSegment(""), placeholder };
-        this.mergeTree.mapRange(gatherText, refSeq, clientId, accum, range.start, range.end);
+        this.mergeTree.mapRange(gatherText, perspective, accum, range.start, range.end);
         return accum.textSegment.text;
     }
-    getValidRange(start, end, refSeq, clientId) {
+    getValidRange(start, end, perspective) {
         const range = {
-            end: end ?? this.mergeTree.getLength(refSeq, clientId),
+            end: end ?? this.mergeTree.getLength(perspective),
             start: start ?? 0,
         };
         return range;

package/lib/MergeTreeTextHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"MergeTreeTextHelper.js","sourceRoot":"","sources":["../src/MergeTreeTextHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAwB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAQrE,MAAM,OAAO,mBAAmB;IAC/B,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAE9C,OAAO,CACb,MAAc,EACd,QAAgB,EAChB,WAAW,GAAG,EAAE,EAChB,KAAc,EACd,GAAY;QAEZ,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,CAAC,SAAS,CAAC,QAAQ,CACtB,UAAU,EACV,MAAM,EACN,QAAQ,EACR,KAAK,EACL,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,GAAG,CACT,CAAC;QACF,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;IAEO,aAAa,CACpB,KAAyB,EACzB,GAAuB,EACvB,MAAc,EACd,QAAgB;QAEhB,MAAM,KAAK,GAAkB;YAC5B,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC;YACtD,KAAK,EAAE,KAAK,IAAI,CAAC;SACjB,CAAC;QACF,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,SAAS,UAAU,CAClB,OAAwB,EACxB,GAAW,EACX,MAAc,EACd,QAAgB,EAChB,KAAa,EACb,GAAW,EACX,EAAE,WAAW,EAAE,WAAW,EAAoB;IAE9C,IAAI,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,IAAI,KAAK,IAAI,CAAC,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9C,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;QAClC,CAAC;aAAM,CAAC;YACP,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACnC,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACrC,MAAM,IAAI,GAAG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;YAC7C,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;IACF,CAAC;SAAM,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,MAAM,eAAe;QACpB,gEAAgE;QAChE,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjF,WAAW,CAAC,IAAI,IAAI,eAAe,CAAC;IACrC,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IIntegerRange } from \"./client.js\";\nimport { MergeTree } from \"./mergeTree.js\";\nimport { ISegmentPrivate } from \"./mergeTreeNodes.js\";\nimport { IMergeTreeTextHelper, TextSegment } from \"./textSegment.js\";\n\ninterface ITextAccumulator {\n\ttextSegment: TextSegment;\n\tplaceholder?: string;\n\tparallelArrays?: boolean;\n}\n\nexport class MergeTreeTextHelper implements IMergeTreeTextHelper {\n\tconstructor(private readonly mergeTree: MergeTree) {}\n\n\tpublic getText(\n\t\trefSeq: number,\n\t\tclientId: number,\n\t\tplaceholder = \"\",\n\t\tstart?: number,\n\t\tend?: number,\n\t): string {\n\t\tconst range = this.getValidRange(start, end, refSeq, clientId);\n\n\t\tconst accum: ITextAccumulator = { textSegment: new TextSegment(\"\"), placeholder };\n\n\t\tthis.mergeTree.mapRange<ITextAccumulator>(\n\t\t\tgatherText,\n\t\t\trefSeq,\n\t\t\tclientId,\n\t\t\taccum,\n\t\t\trange.start,\n\t\t\trange.end,\n\t\t);\n\t\treturn accum.textSegment.text;\n\t}\n\n\tprivate getValidRange(\n\t\tstart: number | undefined,\n\t\tend: number | undefined,\n\t\trefSeq: number,\n\t\tclientId: number,\n\t): IIntegerRange {\n\t\tconst range: IIntegerRange = {\n\t\t\tend: end ?? this.mergeTree.getLength(refSeq, clientId),\n\t\t\tstart: start ?? 0,\n\t\t};\n\t\treturn range;\n\t}\n}\n\nfunction gatherText(\n\tsegment: ISegmentPrivate,\n\tpos: number,\n\trefSeq: number,\n\tclientId: number,\n\tstart: number,\n\tend: number,\n\t{ textSegment, placeholder }: ITextAccumulator,\n): boolean {\n\tif (TextSegment.is(segment)) {\n\t\tif (start <= 0 && end >= segment.text.length) {\n\t\t\ttextSegment.text += segment.text;\n\t\t} else {\n\t\t\tconst seglen = segment.text.length;\n\t\t\tconst _start = start < 0 ? 0 : start;\n\t\t\tconst _end = end >= seglen ? undefined : end;\n\t\t\ttextSegment.text += segment.text.slice(_start, _end);\n\t\t}\n\t} else if (placeholder && placeholder.length > 0) {\n\t\tconst placeholderText =\n\t\t\t// eslint-disable-next-line @typescript-eslint/no-base-to-string\n\t\t\tplaceholder === \"*\" ? `\\n${segment}` : placeholder.repeat(segment.cachedLength);\n\t\ttextSegment.text += placeholderText;\n\t}\n\n\treturn true;\n}\n"]}
+{"version":3,"file":"MergeTreeTextHelper.js","sourceRoot":"","sources":["../src/MergeTreeTextHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAe/C,MAAM,OAAO,mBAAmB;IAC/B,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAE9C,OAAO,CACb,WAAwB,EACxB,WAAW,GAAG,EAAE,EAChB,KAAc,EACd,GAAY;QAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;QAE1D,MAAM,KAAK,GAAqB,EAAE,WAAW,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC;QAElF,IAAI,CAAC,SAAS,CAAC,QAAQ,CACtB,UAAU,EACV,WAAW,EACX,KAAK,EACL,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,GAAG,CACT,CAAC;QACF,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;IAEO,aAAa,CACpB,KAAyB,EACzB,GAAuB,EACvB,WAAwB;QAExB,MAAM,KAAK,GAAkB;YAC5B,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC;YACjD,KAAK,EAAE,KAAK,IAAI,CAAC;SACjB,CAAC;QACF,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,SAAS,UAAU,CAClB,OAAwB,EACxB,GAAW,EACX,MAAc,EACd,QAAgB,EAChB,KAAa,EACb,GAAW,EACX,EAAE,WAAW,EAAE,WAAW,EAAoB;IAE9C,IAAI,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,IAAI,KAAK,IAAI,CAAC,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9C,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;QAClC,CAAC;aAAM,CAAC;YACP,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACnC,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACrC,MAAM,IAAI,GAAG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;YAC7C,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;IACF,CAAC;SAAM,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,MAAM,eAAe;QACpB,gEAAgE;QAChE,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjF,WAAW,CAAC,IAAI,IAAI,eAAe,CAAC;IACrC,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { IIntegerRange } from \"./client.js\";\nimport type { MergeTree } from \"./mergeTree.js\";\nimport type { ISegmentPrivate } from \"./mergeTreeNodes.js\";\nimport type { Perspective } from \"./perspective.js\";\nimport { TextSegment } from \"./textSegment.js\";\n\ninterface ITextAccumulator {\n\ttextSegment: TextSegment;\n\tplaceholder?: string;\n\tparallelArrays?: boolean;\n}\n\n/**\n * @internal\n */\nexport interface IMergeTreeTextHelper {\n\tgetText(perspective: Perspective, placeholder: string, start?: number, end?: number): string;\n}\n\nexport class MergeTreeTextHelper implements IMergeTreeTextHelper {\n\tconstructor(private readonly mergeTree: MergeTree) {}\n\n\tpublic getText(\n\t\tperspective: Perspective,\n\t\tplaceholder = \"\",\n\t\tstart?: number,\n\t\tend?: number,\n\t): string {\n\t\tconst range = this.getValidRange(start, end, perspective);\n\n\t\tconst accum: ITextAccumulator = { textSegment: new TextSegment(\"\"), placeholder };\n\n\t\tthis.mergeTree.mapRange<ITextAccumulator>(\n\t\t\tgatherText,\n\t\t\tperspective,\n\t\t\taccum,\n\t\t\trange.start,\n\t\t\trange.end,\n\t\t);\n\t\treturn accum.textSegment.text;\n\t}\n\n\tprivate getValidRange(\n\t\tstart: number | undefined,\n\t\tend: number | undefined,\n\t\tperspective: Perspective,\n\t): IIntegerRange {\n\t\tconst range: IIntegerRange = {\n\t\t\tend: end ?? this.mergeTree.getLength(perspective),\n\t\t\tstart: start ?? 0,\n\t\t};\n\t\treturn range;\n\t}\n}\n\nfunction gatherText(\n\tsegment: ISegmentPrivate,\n\tpos: number,\n\trefSeq: number,\n\tclientId: number,\n\tstart: number,\n\tend: number,\n\t{ textSegment, placeholder }: ITextAccumulator,\n): boolean {\n\tif (TextSegment.is(segment)) {\n\t\tif (start <= 0 && end >= segment.text.length) {\n\t\t\ttextSegment.text += segment.text;\n\t\t} else {\n\t\t\tconst seglen = segment.text.length;\n\t\t\tconst _start = start < 0 ? 0 : start;\n\t\t\tconst _end = end >= seglen ? undefined : end;\n\t\t\ttextSegment.text += segment.text.slice(_start, _end);\n\t\t}\n\t} else if (placeholder && placeholder.length > 0) {\n\t\tconst placeholderText =\n\t\t\t// eslint-disable-next-line @typescript-eslint/no-base-to-string\n\t\t\tplaceholder === \"*\" ? `\\n${segment}` : placeholder.repeat(segment.cachedLength);\n\t\ttextSegment.text += placeholderText;\n\t}\n\n\treturn true;\n}\n"]}

package/lib/client.d.ts

@@ -9,6 +9,7 @@ import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/in
 import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal";
 import { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import { type IMergeTreeTextHelper } from "./MergeTreeTextHelper.js";
 import { LocalReferencePosition, SlidingPreference } from "./localReference.js";
 import { type IMergeTreeOptionsInternal } from "./mergeTree.js";
 import type { IMergeTreeDeltaCallbackArgs, IMergeTreeDeltaOpArgs, IMergeTreeMaintenanceCallbackArgs } from "./mergeTreeDeltaCallback.js";
@@ -17,7 +18,6 @@ import { IJSONSegment, IMergeTreeAnnotateMsg, IMergeTreeGroupMsg, IMergeTreeInse
 import { PropertySet, type MapLike } from "./properties.js";
 import { ReferencePosition } from "./referencePositions.js";
 import { type InteriorSequencePlace } from "./sequencePlace.js";
-import { IMergeTreeTextHelper } from "./textSegment.js";
 /**
  * A range [start, end)
  * @internal
@@ -175,8 +175,13 @@ export declare class Client extends TypedEventEmitter<IClientEvents> {
     /**
      * Revert an op
      */
-    rollback?(op: unknown, localOpMetadata: unknown): void;
+    rollback(op: unknown, localOpMetadata: unknown): void;
     private applyObliterateRangeOp;
+    private getOperationPerspective;
+    /**
+     * Returns the operation stamp to apply for a change, minting a new one local one if necessary.
+     */
+    private getOperationStamp;
     /**
      * Performs the remove based on the provided op
      * @param opArgs - The ops args for the op
@@ -206,16 +211,6 @@ export declare class Client extends TypedEventEmitter<IClientEvents> {
      * @param clientArgs - The client args for the op
      */
     private getValidOpRange;
-    /**
-     * Gets the client args from the op if remote, otherwise uses the local clients info
-     * @param sequencedMessage - The sequencedMessage to get the client sequence args for
-     */
-    private getClientSequenceArgsForMessage;
-    /**
-     * Gets the client args from the op if remote, otherwise uses the local clients info
-     * @param opArgs - The op arg to get the client sequence args for
-     */
-    private getClientSequenceArgs;
     private ackPendingSegment;
     getOrAddShortClientId(longClientId: string): number;
     protected getShortClientId(longClientId: string): number;
@@ -260,7 +255,6 @@ export declare class Client extends TypedEventEmitter<IClientEvents> {
     load(runtime: IFluidDataStoreRuntime, storage: IChannelStorageService, serializer: IFluidSerializer): Promise<{
         catchupOpsP: Promise<ISequencedDocumentMessage[]>;
     }>;
-    private getLocalSequenceNumber;
     localTransaction(groupOp: IMergeTreeGroupMsg): void;
     updateMinSeq(minSeq: number): void;
     getContainingSegment<T extends ISegment>(pos: number, sequenceArgs?: Pick<ISequencedDocumentMessage, "referenceSequenceNumber" | "clientId">, localSeq?: number): {

package/lib/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,KAAK,qBAAqB,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE3F,OAAO,EACN,sBAAsB,EACtB,sBAAsB,EACtB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAEN,yBAAyB,EACzB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAErF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EACN,mBAAmB,EAGnB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAG1F,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAIN,KAAK,yBAAyB,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,2BAA2B,EAC3B,qBAAqB,EACrB,iCAAiC,EACjC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACN,mBAAmB,EACnB,QAAQ,EACR,cAAc,EAEd,MAAM,EAIN,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EACN,YAAY,EACZ,qBAAqB,EAGrB,kBAAkB,EAClB,mBAAmB,EAEnB,uBAAuB,EACvB,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAEjB,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,2BAA2B,EAChC,KAAK,4BAA4B,EACjC,MAAM,UAAU,CAAC;AAMlB,OAAO,EAAE,WAAW,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAA6B,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAQvF,OAAO,EAAQ,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAUtE;;;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;AAID;;;;;;;GAOG;AACH,qBAAa,MAAO,SAAQ,iBAAiB,CAAC,aAAa,CAAC;aAwB1C,aAAa,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,QAAQ;aAC/C,MAAM,EAAE,mBAAmB;IAE3C,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IA1B/B,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;IAEjD;;;;;;;;;;;;;;OAcG;gBAEc,aAAa,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,QAAQ,EAC/C,MAAM,EAAE,mBAAmB,EAC3C,OAAO,CAAC,EAAE,yBAAyB,GAAG,WAAW,EAChC,oBAAoB,GAAE,MAAM,MAAM,GAAG,SAC5C;IAsBX;;;;;;OAMG;IAEI,wBAAwB,CAAC,KAAK,GAAE,MAAU,GAAG,OAAO;IAe3D;;;;;OAKG;IACI,cAAc,CACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAChB,qBAAqB,GAAG,SAAS;IAMpC;;;;;;OAMG;IACI,kBAAkB,CACxB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,GAChB,qBAAqB,GAAG,SAAS;IAMpC;;OAEG;IACI,wBAAwB,CAC9B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAC3B,2BAA2B;IAa9B;;;;;OAKG;IACI,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB;IAMxE;;;;;;;OAOG;IACI,oBAAoB,CAC1B,KAAK,EAAE,MAAM,GAAG,qBAAqB,EACrC,GAAG,EAAE,MAAM,GAAG,qBAAqB,GAEjC,uBAAuB,GAAG,4BAA4B;IAgBzD;;;;OAIG;IACI,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,mBAAmB,GAAG,SAAS;IAS1F;;;;OAIG;IACI,8BAA8B,CACpC,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,QAAQ,GACf,mBAAmB,GAAG,SAAS;IAa3B,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,CAClB,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;IAkBP,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;IAgCA,eAAe,IAAI,mBAAmB;IAI7C;;;;OAIG;IACI,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAY5E;;;;;;;;;;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;IAczB;;OAEG;IACI,4BAA4B,CAClC,IAAI,EAAE,sBAAsB,GAC1B,sBAAsB,GAAG,SAAS;IAIrC;;;;;;;OAOG;IACI,gCAAgC,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM;IAIxE;;;;OAIG;IACI,kBAAkB,CAAC,WAAW,EAAE,iBAAiB,GAAG,MAAM;IAI1D,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAIxD;;OAEG;IACI,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,GAAG,IAAI;IAI5D,OAAO,CAAC,sBAAsB;IAuB9B,OAAO,CAAC,uBAAuB;IAY/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAa5B;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAgBrB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAsE1B;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAoEvB,OAAO,CAAC,iBAAiB;IAczB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAOnD,SAAS,CAAC,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAIxD,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAI9C,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAK3C,OAAO,CAAC,gCAAgC;IAMxC;;;;;;;;OAQG;IACI,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAa5E,OAAO,CAAC,sBAAsB;IAoL9B,OAAO,CAAC,aAAa;IAsCd,cAAc,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI;IA6BtC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,EAAE,KAAK,GAAE,OAAe,GAAG,IAAI;IAuB7E,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;IAEpC,OAAO,CAAC,aAAa,CAA6C;IAElE;;;;;OAKG;IACI,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,GAAG,YAAY;IAkElF,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;IAOjE,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IA+BnD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAIlC,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,GACf;QACF,OAAO,EAAE,CAAC,GAAG,SAAS,CAAC;QACvB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;KAC3B;IAqBD,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAU7D,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG;QACvC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC;IAaD,aAAa,IAAI,MAAM;IAIvB,WAAW,IAAI,MAAM;IAIrB,SAAS,IAAI,MAAM;IAInB,0BAA0B,CACzB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,MAAM,SAAI,EACV,UAAU,SAAI,GACZ,IAAI;IAyBP;;;;;;;;OAQG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,UAAO,GAAG,MAAM,GAAG,SAAS;CAG3F"}

package/lib/client.js

@@ -10,20 +10,20 @@ import { toDeltaManagerInternal } from "@fluidframework/runtime-utils/internal";
 import { LoggingError, UsageError, } from "@fluidframework/telemetry-utils/internal";
 import { MergeTreeTextHelper } from "./MergeTreeTextHelper.js";
 import { RedBlackTree } from "./collections/index.js";
-import { NonCollabClient, UnassignedSequenceNumber, UniversalSequenceNumber, } from "./constants.js";
-import { MergeTree, errorIfOptionNotTrue, } from "./mergeTree.js";
+import { NonCollabClient, UniversalSequenceNumber } from "./constants.js";
+import { MergeTree, errorIfOptionNotTrue, isRemovedAndAcked, } from "./mergeTree.js";
 import { walkAllChildSegments } from "./mergeTreeNodeWalk.js";
 import { compareStrings, isSegmentLeaf, } from "./mergeTreeNodes.js";
-import { createAdjustRangeOp, createAnnotateMarkerOp, createAnnotateRangeOp, 
-// eslint-disable-next-line import/no-deprecated
-createGroupOp, createInsertSegmentOp, createObliterateRangeOp, createObliterateRangeOpSided, createRemoveRangeOp, } from "./opBuilder.js";
+import { createAdjustRangeOp, createAnnotateMarkerOp, createAnnotateRangeOp, createGroupOp, createInsertSegmentOp, createObliterateRangeOp, createObliterateRangeOpSided, createRemoveRangeOp, } from "./opBuilder.js";
 import { MergeTreeDeltaType, } from "./ops.js";
+import { LocalReconnectingPerspective, PriorPerspective, } from "./perspective.js";
 import { DetachedReferencePosition } from "./referencePositions.js";
-import { isInserted, isMoved, isRemoved, overwriteInfo, toMoveInfo, } from "./segmentInfos.js";
+import { isInserted, isRemoved, overwriteInfo, toRemovalInfo, } from "./segmentInfos.js";
 import { Side } from "./sequencePlace.js";
 import { SnapshotLoader } from "./snapshotLoader.js";
 import { SnapshotV1 } from "./snapshotV1.js";
 import { SnapshotLegacy } from "./snapshotlegacy.js";
+import * as opstampUtils from "./stamps.js";
 const UNBOUND_SEGMENT_ERROR = "The provided segment is not bound to this DDS.";
 /**
  * This class encapsulates a merge-tree, and provides a local client specific view over it and
@@ -186,7 +186,7 @@ export class Client extends TypedEventEmitter {
         return this.insertSegmentLocal(pos, segment);
     }
     walkSegments(handler, start, end, accum, splitRange = false) {
-        this._mergeTree.mapRange(handler, this.getCurrentSeq(), this.getClientId(), accum, start, end, splitRange);
+        this._mergeTree.mapRange(handler, this._mergeTree.localPerspective, accum, start, end, splitRange);
     }
     walkAllSegments(action, accum) {
         return walkAllChildSegments(this._mergeTree.root, accum === undefined ? action : (seg) => action(seg, accum));
@@ -199,12 +199,18 @@ export class Client extends TypedEventEmitter {
     serializeGCData(handle, handleCollectingSerializer) {
         let localInserts = 0;
         let localRemoves = 0;
+        let localObliterates = 0;
         walkAllChildSegments(this._mergeTree.root, (seg) => {
-            if (isInserted(seg) && seg.seq === UnassignedSequenceNumber) {
+            if (isInserted(seg) && opstampUtils.isLocal(seg.insert)) {
                 localInserts++;
             }
-            if (isRemoved(seg) && seg.removedSeq === UnassignedSequenceNumber) {
-                localRemoves++;
+            if (isRemoved(seg) && opstampUtils.isLocal(seg.removes[seg.removes.length - 1])) {
+                if (seg.removes[seg.removes.length - 1].type === "setRemove") {
+                    localRemoves++;
+                }
+                else {
+                    localObliterates++;
+                }
             }
             // Only serialize segments that have not been removed.
             if (!isRemoved(seg)) {
@@ -217,6 +223,7 @@ export class Client extends TypedEventEmitter {
                 eventName: "LocalEditsInProcessGCData",
                 localInserts,
                 localRemoves,
+                localObliterates,
             });
         }
     }
@@ -232,7 +239,10 @@ export class Client extends TypedEventEmitter {
         if (!isSegmentLeaf(segment)) {
             return -1;
         }
-        return this._mergeTree.getPosition(segment, this.getCurrentSeq(), this.getClientId(), localSeq);
+        const perspective = localSeq === undefined
+            ? this._mergeTree.localPerspective
+            : new LocalReconnectingPerspective(this.getCurrentSeq(), this.getClientId(), localSeq);
+        return this._mergeTree.getPosition(segment, perspective);
     }
     /**
      * Creates a `LocalReferencePosition` on this client. If the refType does not include ReferenceType.Transient,
@@ -274,7 +284,7 @@ export class Client extends TypedEventEmitter {
      * @param relativePos - Id of marker (may be indirect) and whether position is before or after marker.
      */
     posFromRelativePos(relativePos) {
-        return this._mergeTree.posFromRelativePos(relativePos);
+        return this._mergeTree.posFromRelativePos(relativePos, this._mergeTree.localPerspective);
     }
     getMarkerFromId(id) {
         return this._mergeTree.getMarkerFromId(id);
@@ -286,41 +296,66 @@ export class Client extends TypedEventEmitter {
         this._mergeTree.rollback(op, localOpMetadata);
     }
     applyObliterateRangeOp(opArgs) {
-        assert(opArgs.op.type === MergeTreeDeltaType.OBLITERATE ||
-            opArgs.op.type === MergeTreeDeltaType.OBLITERATE_SIDED, 0x866 /* Unexpected op type on range obliterate! */);
-        const op = opArgs.op;
-        const clientArgs = this.getClientSequenceArgs(opArgs);
+        const { op, sequencedMessage } = opArgs;
+        assert(op.type === MergeTreeDeltaType.OBLITERATE ||
+            op.type === MergeTreeDeltaType.OBLITERATE_SIDED, 0x866 /* Unexpected op type on range obliterate! */);
+        const perspective = this.getOperationPerspective(sequencedMessage);
+        const stamp = this.getOperationStamp(sequencedMessage);
         if (this._mergeTree.options?.mergeTreeEnableSidedObliterate) {
-            const { start, end } = this.getValidSidedRange(op, clientArgs);
-            this._mergeTree.obliterateRange(start, end, clientArgs.referenceSequenceNumber, clientArgs.clientId, clientArgs.sequenceNumber, opArgs);
+            const { start, end } = this.getValidSidedRange(op, perspective);
+            this._mergeTree.obliterateRange(start, end, perspective, stamp, opArgs);
         }
         else {
             assert(op.type === MergeTreeDeltaType.OBLITERATE, 0xa43 /* Unexpected sided obliterate while mergeTreeEnableSidedObliterate is disabled */);
-            const range = this.getValidOpRange(op, clientArgs);
-            this._mergeTree.obliterateRange(range.start, range.end, clientArgs.referenceSequenceNumber, clientArgs.clientId, clientArgs.sequenceNumber, opArgs);
+            const { start, end } = this.getValidOpRange(op, perspective);
+            this._mergeTree.obliterateRange(start, end, perspective, stamp, opArgs);
         }
     }
+    getOperationPerspective(sequencedMessage) {
+        if (!sequencedMessage) {
+            return this._mergeTree.localPerspective;
+        }
+        const clientId = this.getOrAddShortClientIdFromMessage(sequencedMessage);
+        const { referenceSequenceNumber: refSeq } = sequencedMessage;
+        return new PriorPerspective(refSeq, clientId);
+    }
+    /**
+     * Returns the operation stamp to apply for a change, minting a new one local one if necessary.
+     */
+    getOperationStamp(sequencedMessage) {
+        if (!sequencedMessage) {
+            return this.getCollabWindow().mintNextLocalOperationStamp();
+        }
+        const { sequenceNumber: seq } = sequencedMessage;
+        const clientId = this.getOrAddShortClientIdFromMessage(sequencedMessage);
+        return {
+            seq,
+            clientId,
+        };
+    }
     /**
      * Performs the remove based on the provided op
      * @param opArgs - The ops args for the op
      */
     applyRemoveRangeOp(opArgs) {
-        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);
-        this._mergeTree.markRangeRemoved(range.start, range.end, clientArgs.referenceSequenceNumber, clientArgs.clientId, clientArgs.sequenceNumber, opArgs);
+        const { op, sequencedMessage } = opArgs;
+        assert(op.type === MergeTreeDeltaType.REMOVE, 0x02d /* "Unexpected op type on range remove!" */);
+        const perspective = this.getOperationPerspective(sequencedMessage);
+        const stamp = this.getOperationStamp(sequencedMessage);
+        const range = this.getValidOpRange(op, perspective);
+        this._mergeTree.markRangeRemoved(range.start, range.end, perspective, stamp, opArgs);
     }
     /**
      * Performs the annotate based on the provided op
      * @param opArgs - The ops args for the op
      */
     applyAnnotateRangeOp(opArgs) {
-        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);
-        this._mergeTree.annotateRange(range.start, range.end, op, clientArgs.referenceSequenceNumber, clientArgs.clientId, clientArgs.sequenceNumber, opArgs);
+        const { op, sequencedMessage } = opArgs;
+        assert(op.type === MergeTreeDeltaType.ANNOTATE, 0x02e /* "Unexpected op type on range annotate!" */);
+        const perspective = this.getOperationPerspective(sequencedMessage);
+        const stamp = this.getOperationStamp(sequencedMessage);
+        const range = this.getValidOpRange(op, perspective);
+        this._mergeTree.annotateRange(range.start, range.end, op, perspective, stamp, opArgs);
     }
     /**
      * Performs the insert based on the provided op
@@ -328,13 +363,14 @@ export class Client extends TypedEventEmitter {
      * @returns True if the insert was applied. False if it could not be.
      */
     applyInsertOp(opArgs) {
-        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);
+        const { op, sequencedMessage } = opArgs;
+        assert(op.type === MergeTreeDeltaType.INSERT, 0x02f /* "Unexpected op type on range insert!" */);
+        const perspective = this.getOperationPerspective(sequencedMessage);
+        const stamp = this.getOperationStamp(sequencedMessage);
+        const range = this.getValidOpRange(op, perspective);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         const segments = [this.specToSegment(op.seg)];
-        this._mergeTree.insertSegments(range.start, segments, clientArgs.referenceSequenceNumber, clientArgs.clientId, clientArgs.sequenceNumber, opArgs);
+        this._mergeTree.insertSegments(range.start, segments, perspective, stamp, opArgs);
     }
     /**
      * Returns a valid range for the op, or throws if the range is invalid
@@ -344,7 +380,7 @@ export class Client extends TypedEventEmitter {
      */
     getValidSidedRange(
     // eslint-disable-next-line import/no-deprecated
-    op, clientArgs) {
+    op, perspective) {
         const invalidPositions = [];
         let start;
         let end;
@@ -367,8 +403,8 @@ export class Client extends TypedEventEmitter {
                     : { pos: op.pos2 - 1, side: Side.After };
         }
         // Validate if local op
-        if (clientArgs.clientId === this.getClientId()) {
-            const length = this._mergeTree.getLength(this.getCollabWindow().currentSeq, this.getClientId());
+        if (perspective.clientId === this.getClientId()) {
+            const length = this._mergeTree.getLength(this._mergeTree.localPerspective);
             if (start !== undefined && (start.pos >= length || start.pos < 0)) {
                 // start out of bounds
                 invalidPositions.push("start");
@@ -406,17 +442,17 @@ export class Client extends TypedEventEmitter {
      * @param op - The op to generate the range for
      * @param clientArgs - The client args for the op
      */
-    getValidOpRange(op, clientArgs) {
+    getValidOpRange(op, perspective) {
         let start = op.pos1;
         if (start === undefined && op.relativePos1) {
-            start = this._mergeTree.posFromRelativePos(op.relativePos1, clientArgs.referenceSequenceNumber, clientArgs.clientId);
+            start = this._mergeTree.posFromRelativePos(op.relativePos1, perspective);
         }
         let end = op.pos2;
         if (end === undefined && op.relativePos2) {
-            end = this._mergeTree.posFromRelativePos(op.relativePos2, clientArgs.referenceSequenceNumber, clientArgs.clientId);
+            end = this._mergeTree.posFromRelativePos(op.relativePos2, perspective);
         }
         // Validate if local op
-        if (clientArgs.clientId === this.getClientId()) {
+        if (perspective.clientId === this.getClientId()) {
             const length = this.getLength();
             const invalidPositions = [];
             // Validate start position
@@ -453,39 +489,6 @@ export class Client extends TypedEventEmitter {
         // start and end are guaranteed to be non-null here, otherwise we throw above.
         return { start: start, end: end };
     }
-    /**
-     * Gets the client args from the op if remote, otherwise uses the local clients info
-     * @param sequencedMessage - The sequencedMessage to get the client sequence args for
-     */
-    getClientSequenceArgsForMessage(sequencedMessage) {
-        // If there this no sequenced message, then the op is local
-        // and unacked, so use this clients sequenced args
-        //
-        if (sequencedMessage) {
-            return {
-                clientId: this.getOrAddShortClientIdFromMessage(sequencedMessage),
-                referenceSequenceNumber: sequencedMessage.referenceSequenceNumber,
-                // Note: return value satisfies overload signatures despite the cast, as if input argument doesn't contain sequenceNumber,
-                // return value isn't expected to have it either.
-                sequenceNumber: sequencedMessage.sequenceNumber,
-            };
-        }
-        else {
-            const segWindow = this.getCollabWindow();
-            return {
-                clientId: segWindow.clientId,
-                referenceSequenceNumber: segWindow.currentSeq,
-                sequenceNumber: this.getLocalSequenceNumber(),
-            };
-        }
-    }
-    /**
-     * Gets the client args from the op if remote, otherwise uses the local clients info
-     * @param opArgs - The op arg to get the client sequence args for
-     */
-    getClientSequenceArgs(opArgs) {
-        return this.getClientSequenceArgsForMessage(opArgs.sequencedMessage);
-    }
     ackPendingSegment(opArgs) {
         if (opArgs.op.type === MergeTreeDeltaType.GROUP) {
             for (const memberOp of opArgs.op.ops) {
@@ -534,7 +537,8 @@ export class Client extends TypedEventEmitter {
         if (!isSegmentLeaf(segment)) {
             throw new UsageError(UNBOUND_SEGMENT_ERROR);
         }
-        return this._mergeTree.getPosition(segment, currentSeq, clientId, localSeq);
+        const perspective = new LocalReconnectingPerspective(currentSeq, clientId, localSeq);
+        return this._mergeTree.getPosition(segment, perspective);
     }
     resetPendingDeltaToOps(resetOp, segmentGroup) {
         assert(!!segmentGroup, 0x033 /* "Segment group undefined" */);
@@ -570,12 +574,7 @@ export class Client extends TypedEventEmitter {
                     // 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 ((!isRemoved(segment) ||
-                        (segment.localRemovedSeq !== undefined &&
-                            segment.removedSeq === UnassignedSequenceNumber)) &&
-                        (!isMoved(segment) ||
-                            (segment.localMovedSeq !== undefined &&
-                                segment.movedSeq === UnassignedSequenceNumber))) {
+                    if (!isRemovedAndAcked(segment)) {
                         newOp =
                             resetOp.props === undefined
                                 ? createAdjustRangeOp(segmentPosition, segmentPosition + segment.cachedLength, resetOp.adjust)
@@ -584,22 +583,24 @@ export class Client extends TypedEventEmitter {
                     break;
                 }
                 case MergeTreeDeltaType.INSERT: {
-                    assert(isInserted(segment) && segment.seq === UnassignedSequenceNumber, 0x037 /* "Segment already has assigned sequence number" */);
-                    const moveInfo = toMoveInfo(segment);
-                    if (moveInfo !== undefined) {
+                    assert(isInserted(segment) && opstampUtils.isLocal(segment.insert), 0x037 /* "Segment already has assigned sequence number" */);
+                    const removeInfo = toRemovalInfo(segment);
+                    if (removeInfo !== undefined && opstampUtils.isAcked(removeInfo.removes[0])) {
+                        assert(removeInfo.removes[0].type === "sliceRemove", 0xb5c /* Remove on insertion must be caused by obliterate. */);
                         errorIfOptionNotTrue(this._mergeTree.options, "mergeTreeEnableObliterateReconnect");
-                        if (moveInfo.movedSeq !== UnassignedSequenceNumber) {
-                            // the segment was remotely obliterated, so is considered removed
-                            // we set the seq to the universal seq and remove the local seq,
-                            // so its length is not considered for subsequent local changes
-                            // this allows us to not send the op as even the local client will ignore the segment
-                            overwriteInfo(segment, {
+                        // the segment was remotely obliterated, so is considered removed
+                        // we set the seq to the universal seq and remove the local seq,
+                        // so its length is not considered for subsequent local changes
+                        // this allows us to not send the op as even the local client will ignore the segment
+                        overwriteInfo(segment, {
+                            insert: {
+                                type: "insert",
                                 seq: UniversalSequenceNumber,
                                 localSeq: undefined,
                                 clientId: NonCollabClient,
-                            });
-                            break;
-                        }
+                            },
+                        });
+                        break;
                     }
                     const segInsertOp = segment.clone();
                     const opProps = isObject(resetOp.seg) && "props" in resetOp.seg && isObject(resetOp.seg.props)
@@ -610,24 +611,18 @@ export class Client extends TypedEventEmitter {
                     break;
                 }
                 case MergeTreeDeltaType.REMOVE: {
-                    if (isRemoved(segment) &&
-                        segment.localRemovedSeq !== undefined &&
-                        segment.removedSeq === UnassignedSequenceNumber &&
-                        (!isMoved(segment) ||
-                            (segment.localMovedSeq !== undefined &&
-                                segment.movedSeq === UnassignedSequenceNumber))) {
+                    // Only bother resubmitting if nobody else has removed it in the meantime.
+                    // When that happens, the first removal will have been acked.
+                    if (isRemoved(segment) && opstampUtils.isLocal(segment.removes[0])) {
                         newOp = createRemoveRangeOp(segmentPosition, segmentPosition + segment.cachedLength);
                     }
                     break;
                 }
                 case MergeTreeDeltaType.OBLITERATE: {
                     errorIfOptionNotTrue(this._mergeTree.options, "mergeTreeEnableObliterateReconnect");
-                    if (isMoved(segment) &&
-                        segment.localMovedSeq !== undefined &&
-                        segment.movedSeq === UnassignedSequenceNumber &&
-                        (!isRemoved(segment) ||
-                            (segment.localRemovedSeq !== undefined &&
-                                segment.removedSeq === UnassignedSequenceNumber))) {
+                    // Only bother resubmitting if nobody else has removed it in the meantime.
+                    // When that happens, the first removal will have been acked.
+                    if (isRemoved(segment) && opstampUtils.isLocal(segment.removes[0])) {
                         newOp = createObliterateRangeOp(segmentPosition, segmentPosition + segment.cachedLength);
                     }
                     break;
@@ -783,7 +778,6 @@ export class Client extends TypedEventEmitter {
             if (Array.isArray(segmentGroup)) {
                 if (segmentGroup.length === 0) {
                     // sometimes we rebase to an empty op
-                    // eslint-disable-next-line import/no-deprecated
                     return createGroupOp();
                 }
                 firstGroup = segmentGroup[0];
@@ -821,7 +815,6 @@ export class Client extends TypedEventEmitter {
             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] : createGroupOp(...opList);
     }
     createTextHelper() {
@@ -855,10 +848,6 @@ export class Client extends TypedEventEmitter {
         const loader = new SnapshotLoader(runtime, this, this._mergeTree, this.logger, serializer);
         return loader.initialize(storage);
     }
-    getLocalSequenceNumber() {
-        const segWindow = this.getCollabWindow();
-        return segWindow.collaborating ? UnassignedSequenceNumber : UniversalSequenceNumber;
-    }
     // eslint-disable-next-line import/no-deprecated
     localTransaction(groupOp) {
         for (const op of groupOp.ops) {
@@ -894,8 +883,21 @@ export class Client extends TypedEventEmitter {
         this._mergeTree.setMinSeq(minSeq);
     }
     getContainingSegment(pos, sequenceArgs, localSeq) {
-        const { referenceSequenceNumber, clientId } = this.getClientSequenceArgsForMessage(sequenceArgs);
-        return this._mergeTree.getContainingSegment(pos, referenceSequenceNumber, clientId, localSeq);
+        let perspective;
+        const clientId = sequenceArgs === undefined
+            ? this.getClientId()
+            : this.getOrAddShortClientIdFromMessage(sequenceArgs);
+        const refSeq = sequenceArgs?.referenceSequenceNumber ?? this.getCollabWindow().currentSeq;
+        if (localSeq !== undefined) {
+            perspective = new LocalReconnectingPerspective(refSeq, clientId, localSeq);
+        }
+        else if (sequenceArgs === undefined) {
+            perspective = this._mergeTree.localPerspective;
+        }
+        else {
+            perspective = new PriorPerspective(refSeq, clientId);
+        }
+        return this._mergeTree.getContainingSegment(pos, perspective);
     }
     getPropertiesAtPosition(pos) {
         let propertiesAtPosition;
@@ -957,8 +959,7 @@ export class Client extends TypedEventEmitter {
      * @param forwards - Whether the desired marker comes before (false) or after (true) `startPos`
      */
     searchForMarker(startPos, markerLabel, forwards = true) {
-        const clientId = this.getClientId();
-        return this._mergeTree.searchForMarker(startPos, clientId, markerLabel, forwards);
+        return this._mergeTree.searchForMarker(startPos, markerLabel, forwards);
     }
 }
 //# sourceMappingURL=client.js.map