@fluidframework/merge-tree 2.31.0 → 2.32.0

package/src/mergeTreeNodes.ts

@@ -14,7 +14,7 @@ import {
 	UniversalSequenceNumber,
 } from "./constants.js";
 import { LocalReferenceCollection, type LocalReferencePosition } from "./localReference.js";
-import { TrackingGroupCollection } from "./mergeTreeTracking.js";
+import { TrackingGroupCollection, type ITrackingGroup } from "./mergeTreeTracking.js";
 import { IJSONSegment, IMarkerDef, ReferenceType } from "./ops.js";
 import { computeHierarchicalOrdinal } from "./ordinal.js";
 import type { PartialSequenceLengths } from "./partialLengths.js";
@@ -32,8 +32,11 @@ import {
 	type IMergeNodeInfo,
 	type IHasRemovalInfo,
 	type SegmentWithInfo,
+	ISegmentInsideObliterateInfo,
+	isInsideObliterate,
 } from "./segmentInfos.js";
 import { PropertiesManager } from "./segmentPropertiesManager.js";
+import type { Side } from "./sequencePlace.js";
 import type { OperationStamp, SliceRemoveOperationStamp } from "./stamps.js";
 
 /**
@@ -77,23 +80,6 @@ export interface ISegmentInternal extends ISegment {
 export interface ISegmentPrivate extends ISegmentInternal {
 	segmentGroups?: SegmentGroupCollection;
 	propertyManager?: PropertiesManager;
-	/**
-	 * Populated iff this segment was inserted into a range affected by concurrent obliterates at the time of its insertion.
-	 * Contains information about the 'most recent' (i.e. 'winning' in the sense below) obliterate.
-	 *
-	 * BEWARE: We have opted for a certain form of last-write wins (LWW) semantics for obliterates:
-	 * the client which last obliterated a range is considered to have "won ownership" of that range and may insert into it
-	 * without that insertion being obliterated by other clients' concurrent obliterates.
-	 *
-	 * Therefore, this field can be populated even if the segment has not been obliterated (i.e. is still visible).
-	 * This happens precisely when the segment was inserted by the same client that 'won' the obliterate (in a scenario where
-	 * a client first issues a sided obliterate impacting a range, then inserts into that range before the server has acked the obliterate).
-	 *
-	 * See the test case "obliterate with mismatched final states" for an example of such a scenario.
-	 *
-	 * TODO:AB#29553: This property is not persisted in the summary, but it should be.
-	 */
-	obliteratePrecedingInsertion?: ObliterateInfo;
 }
 /**
  * Segment leafs are segments that have both IMergeNodeInfo and IHasInsertionInfo. This means they
@@ -228,10 +214,24 @@ export interface InsertContext {
 
 export interface ObliterateInfo {
 	start: LocalReferencePosition;
+	startSide: Side;
 	end: LocalReferencePosition;
+	endSide: Side;
 	refSeq: number;
 	stamp: SliceRemoveOperationStamp;
 	segmentGroup: SegmentGroup | undefined;
+	/**
+	 * Defined only for unacked obliterates.
+	 *
+	 * Contains all segments inserted into the range this obliterate affects where at the time of insertion,
+	 * this obliterate was the newest concurrent obliterate that overlapped the insertion point (this information
+	 * is relevant for the tiebreak policy of allowing last-obliterater to insert).
+	 *
+	 * We need to keep this around for unacked ops because on reconnect, outstanding local obliterates may have set `obliteratePrecedingInsertion`
+	 * (tiebreak) on segments they no longer apply to, since the reissued obliterate may affect a smaller range than the original one when content
+	 * near the obliterate's endpoints was removed by another client between the time of the original obliterate and reissuing.
+	 */
+	tiebreakTrackingGroup: ITrackingGroup | undefined;
 }
 
 export interface SegmentGroup {
@@ -423,6 +423,12 @@ export abstract class BaseSegment implements ISegment {
 				removes: [...this.removes],
 			});
 		}
+		if (isInsideObliterate(this)) {
+			overwriteInfo<ISegmentInsideObliterateInfo>(leafSegment, {
+				obliteratePrecedingInsertion: this.obliteratePrecedingInsertion,
+				insertionRefSeqStamp: this.insertionRefSeqStamp,
+			});
+		}
 
 		this.trackingCollection.copyTo(leafSegment);
 		if (this.attribution) {

package/src/perspective.ts

@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  */
 
+import { NonCollabClient } from "./constants.js";
 import { seqLTE, type ISegment } from "./mergeTreeNodes.js";
 import { isInserted, isRemoved } from "./segmentInfos.js";
 import * as opstampUtils from "./stamps.js";
@@ -116,6 +117,21 @@ export class LocalReconnectingPerspective extends PerspectiveBase implements Per
 	}
 }
 
+/**
+ * A perspective which includes edits which were either:
+ * - acked and at or before some reference sequence number
+ * - unacked, but at or before some local sequence number
+ *
+ * @internal
+ */
+export function createLocalReconnectingPerspective(
+	refSeq: number,
+	clientId: number,
+	localSeq: number,
+): Perspective {
+	return new LocalReconnectingPerspective(refSeq, clientId, localSeq);
+}
+
 /**
  * A perspective which includes all known edits.
  *
@@ -169,3 +185,8 @@ function isRemoveOperationStamp(stamp: OperationStamp): stamp is RemoveOperation
 	const { type } = stamp as unknown as RemoveOperationStamp;
 	return type === "setRemove" || type === "sliceRemove";
 }
+
+export const allAckedChangesPerspective = new PriorPerspective(
+	Number.MAX_SAFE_INTEGER,
+	NonCollabClient,
+);

package/src/segmentInfos.ts

@@ -6,8 +6,13 @@
 import { assert, isObject } from "@fluidframework/core-utils/internal";
 
 import { UnassignedSequenceNumber } from "./constants.js";
-import { ISegmentInternal, ISegmentPrivate, MergeBlock } from "./mergeTreeNodes.js";
-import type { InsertOperationStamp, RemoveOperationStamp } from "./stamps.js";
+import {
+	ISegmentInternal,
+	ISegmentPrivate,
+	MergeBlock,
+	type ObliterateInfo,
+} from "./mergeTreeNodes.js";
+import type { InsertOperationStamp, OperationStamp, RemoveOperationStamp } from "./stamps.js";
 
 export interface StringToType {
 	"string": string;
@@ -50,6 +55,34 @@ export interface IHasInsertionInfo {
 	insert: InsertOperationStamp;
 }
 
+export interface ISegmentInsideObliterateInfo {
+	/**
+	 * Populated iff this segment was inserted into a range affected by concurrent obliterates at the time of its insertion.
+	 * Contains information about the 'most recent' (i.e. 'winning' in the sense below) obliterate.
+	 *
+	 * BEWARE: We have opted for a certain form of last-write wins (LWW) semantics for obliterates:
+	 * the client which last obliterated a range is considered to have "won ownership" of that range and may insert into it
+	 * without that insertion being obliterated by other clients' concurrent obliterates.
+	 *
+	 * Therefore, this field can be populated even if the segment has not been obliterated (i.e. is still visible).
+	 * This happens precisely when the segment was inserted by the same client that 'won' the obliterate (in a scenario where
+	 * a client first issues a sided obliterate impacting a range, then inserts into that range before the server has acked the obliterate).
+	 *
+	 * See the test case "obliterate with mismatched final states" for an example of such a scenario.
+	 *
+	 * TODO:AB#29553: This property is not persisted in the V1 summary, but it should be.
+	 */
+	obliteratePrecedingInsertion?: ObliterateInfo;
+	/**
+	 * Populated iff this segment was inserted into a range concurrently removed by a local obliterate operation.
+	 * This field is unset once the newest such overlapping obliterate is acked, and allows recomputing {@link obliteratePrecedingInsertion}
+	 * if that local obliterate is resubmitted.
+	 *
+	 * TODO:AB#29553: This property is not persisted in the V1 summary, but it should be.
+	 */
+	insertionRefSeqStamp?: OperationStamp;
+}
+
 /**
  * Converts a segment-like object to an insertion info object if possible.
  *
@@ -75,6 +108,11 @@ export const toInsertionInfo = (segmentLike: unknown): IHasInsertionInfo | undef
 export const isInserted = (segmentLike: unknown): segmentLike is IHasInsertionInfo =>
 	toInsertionInfo(segmentLike) !== undefined;
 
+export const isInsideObliterate = (
+	segmentLike: unknown,
+): segmentLike is ISegmentInsideObliterateInfo =>
+	segmentLike !== undefined && hasProp(segmentLike, "obliteratePrecedingInsertion", "object");
+
 /**
  * Asserts that the segment has insertion info. Usage of this function should not produce a user facing error.
  *
@@ -227,9 +265,9 @@ export const assertRemoved: <T extends Partial<IHasRemovalInfo> | undefined>(
  * ensures no further usage of the removed removal info is allowed. if continued use is required other
  * type coercion methods should be use to correctly re-type the variable.
  */
-export const removeRemovalInfo: (nodeLike: IHasRemovalInfo) => asserts nodeLike is never = (
-	nodeLike,
-) =>
+export const removeRemovalInfo: (
+	nodeLike: IHasRemovalInfo,
+) => asserts nodeLike is Record<keyof IHasRemovalInfo, never> = (nodeLike) =>
 	Object.assign<IHasRemovalInfo, Record<keyof IHasRemovalInfo, undefined>>(nodeLike, {
 		removes: undefined,
 	});
@@ -257,7 +295,11 @@ export function wasRemovedOnInsert(segment: IHasInsertionInfo & ISegmentPrivate)
 /**
  * A union type representing any segment info.
  */
-export type SegmentInfo = IMergeNodeInfo | IHasInsertionInfo | IHasRemovalInfo;
+export type SegmentInfo =
+	| IMergeNodeInfo
+	| IHasInsertionInfo
+	| IHasRemovalInfo
+	| ISegmentInsideObliterateInfo;
 
 /**
  * A type representing a segment with additional info.

package/src/sortedSegmentSet.ts

@@ -57,6 +57,10 @@ export class SortedSegmentSet<
 		return 0;
 	}
 
+	public onSortOrderChange(): void {
+		this.sortedItems.sort((a, b) => this.compare(a, b));
+	}
+
 	protected compare(a: T, b: T): number {
 		const aOrdinal = this.getOrdinal(a);
 		const bOrdinal = this.getOrdinal(b);

package/dist/test/partialSyncHelper.d.ts

@@ -1,42 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
-import type { IMergeTreeOptions, InteriorSequencePlace } from "../index.js";
-import type { TestClient } from "./testClient.js";
-import { TestClientLogger } from "./testClientLogger.js";
-declare const ClientIds: readonly ["A", "B", "C", "D"];
-type ClientName = (typeof ClientIds)[number];
-/**
- * Like `ReconnectHelper`, but:
- * - does not support reconnecting clients
- * - supports advancing only some clients to a given sequence number (not all clients must be synchronized at the same time).
- *
- * This allows testing sequences of operations where clients have varying refSeqs, rather than having all clients advance refSeq
- * in lockstep.
- */
-export declare class PartialSyncTestHelper {
-    clients: Record<ClientName, TestClient> & {
-        all: TestClient[];
-    };
-    idxFromName(name: ClientName): number;
-    logger: TestClientLogger;
-    ops: ISequencedDocumentMessage[];
-    clientToLastAppliedSeq: Map<"A" | "C" | "B" | "D", number>;
-    perClientOps: ISequencedDocumentMessage[][];
-    private seq;
-    constructor(options?: IMergeTreeOptions);
-    private addMessage;
-    insertText(clientName: ClientName, pos: number, text: string): void;
-    removeRange(clientName: ClientName, start: number, end: number): void;
-    obliterateRange(clientName: ClientName, start: number | InteriorSequencePlace, end: number | InteriorSequencePlace): void;
-    advanceClientToSeq(clientName: ClientName, seq: number): void;
-    /**
-     * Sends all known ops to the procieded client ids.
-     */
-    advanceClients(...clientNames: ClientName[]): void;
-    processAllOps(): void;
-}
-export {};
-//# sourceMappingURL=partialSyncHelper.d.ts.map

package/dist/test/partialSyncHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"partialSyncHelper.d.ts","sourceRoot":"","sources":["../../src/test/partialSyncHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAExF,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA+B,MAAM,uBAAuB,CAAC;AAEtF,QAAA,MAAM,SAAS,+BAAgC,CAAC;AAChD,KAAK,UAAU,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7C;;;;;;;GAOG;AACH,qBAAa,qBAAqB;IACjC,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;QAAE,GAAG,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;IAEhE,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM;IAIrC,MAAM,EAAE,gBAAgB,CAAC;IAEzB,GAAG,EAAE,yBAAyB,EAAE,CAAM;IACtC,sBAAsB,qCAAiC;IAEvD,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC;IAE5C,OAAO,CAAC,GAAG,CAAa;gBAEL,OAAO,GAAE,iBAAsB;IAgBlD,OAAO,CAAC,UAAU;IAUX,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKnE,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAKrE,eAAe,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,GAAG,qBAAqB,EACrC,GAAG,EAAE,MAAM,GAAG,qBAAqB,GACjC,IAAI;IAWA,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAwBpE;;OAEG;IACI,cAAc,CAAC,GAAG,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAOlD,aAAa,IAAI,IAAI;CAM5B"}

package/dist/test/partialSyncHelper.js

@@ -1,96 +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.PartialSyncTestHelper = void 0;
-const node_assert_1 = require("node:assert");
-const testClientLogger_js_1 = require("./testClientLogger.js");
-const ClientIds = ["A", "B", "C", "D"];
-/**
- * Like `ReconnectHelper`, but:
- * - does not support reconnecting clients
- * - supports advancing only some clients to a given sequence number (not all clients must be synchronized at the same time).
- *
- * This allows testing sequences of operations where clients have varying refSeqs, rather than having all clients advance refSeq
- * in lockstep.
- */
-class PartialSyncTestHelper {
-    idxFromName(name) {
-        return (name.codePointAt(0) ?? 0) - ("A".codePointAt(0) ?? 0);
-    }
-    constructor(options = {}) {
-        this.ops = [];
-        this.clientToLastAppliedSeq = new Map();
-        this.seq = 0;
-        this.clients = (0, testClientLogger_js_1.createClientsAtInitialState)({
-            initialState: "",
-            options: {
-                mergeTreeEnableObliterate: true,
-                mergeTreeEnableSidedObliterate: true,
-                ...options,
-            },
-        }, ...ClientIds);
-        this.logger = new testClientLogger_js_1.TestClientLogger(this.clients.all);
-        this.perClientOps = this.clients.all.map(() => []);
-    }
-    addMessage(message) {
-        this.ops.push(message);
-        // This implementation (specifically, that of applying ops / synchronizing clients) assumes messages
-        // are pushed sequentially starting with seq 1.
-        (0, node_assert_1.strict)(message.sequenceNumber === this.ops.length, "Partial sync test helper invariant violated");
-    }
-    insertText(clientName, pos, text) {
-        const client = this.clients[clientName];
-        this.addMessage(client.makeOpMessage(client.insertTextLocal(pos, text), ++this.seq));
-    }
-    removeRange(clientName, start, end) {
-        const client = this.clients[clientName];
-        this.addMessage(client.makeOpMessage(client.removeRangeLocal(start, end), ++this.seq));
-    }
-    obliterateRange(clientName, start, end) {
-        const client = this.clients[clientName];
-        this.addMessage(client.makeOpMessage(
-        // TODO: remove type assertions when sidedness is enabled
-        client.obliterateRangeLocal(start, end), ++this.seq));
-    }
-    advanceClientToSeq(clientName, seq) {
-        const client = this.clients[clientName];
-        const lastApplied = this.clientToLastAppliedSeq.get(clientName);
-        (0, node_assert_1.strict)(seq > 0, "Can only advance clients to sequence numbers that exist");
-        (0, node_assert_1.strict)(this.ops.length >= seq, "Cannot attempt to advance clients to sequence numbers that don't yet exist");
-        let startIndex;
-        if (lastApplied === undefined) {
-            startIndex = 0;
-        }
-        else {
-            if (lastApplied >= seq) {
-                return;
-            }
-            startIndex = lastApplied;
-        }
-        for (let i = startIndex; i < seq; i++) {
-            const nextMessage = this.ops[i];
-            client.applyMsg(nextMessage);
-            this.clientToLastAppliedSeq.set(clientName, nextMessage.sequenceNumber);
-        }
-    }
-    /**
-     * Sends all known ops to the procieded client ids.
-     */
-    advanceClients(...clientNames) {
-        const latestSeq = this.ops[this.ops.length - 1].sequenceNumber;
-        for (const name of clientNames) {
-            this.advanceClientToSeq(name, latestSeq);
-        }
-    }
-    processAllOps() {
-        const latestSeq = this.ops[this.ops.length - 1].sequenceNumber;
-        for (const name of ClientIds) {
-            this.advanceClientToSeq(name, latestSeq);
-        }
-    }
-}
-exports.PartialSyncTestHelper = PartialSyncTestHelper;
-//# sourceMappingURL=partialSyncHelper.js.map

package/dist/test/partialSyncHelper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"partialSyncHelper.js","sourceRoot":"","sources":["../../src/test/partialSyncHelper.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,6CAA+C;AAO/C,+DAAsF;AAEtF,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAU,CAAC;AAGhD;;;;;;;GAOG;AACH,MAAa,qBAAqB;IAGjC,WAAW,CAAC,IAAgB;QAC3B,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/D,CAAC;IAWD,YAAmB,UAA6B,EAAE;QAPlD,QAAG,GAAgC,EAAE,CAAC;QACtC,2BAAsB,GAAG,IAAI,GAAG,EAAsB,CAAC;QAI/C,QAAG,GAAW,CAAC,CAAC;QAGvB,IAAI,CAAC,OAAO,GAAG,IAAA,iDAA2B,EACzC;YACC,YAAY,EAAE,EAAE;YAChB,OAAO,EAAE;gBACR,yBAAyB,EAAE,IAAI;gBAC/B,8BAA8B,EAAE,IAAI;gBACpC,GAAG,OAAO;aACV;SACD,EACD,GAAG,SAAS,CACZ,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,sCAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;IAEO,UAAU,CAAC,OAAkC;QACpD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,oGAAoG;QACpG,+CAA+C;QAC/C,IAAA,oBAAM,EACL,OAAO,CAAC,cAAc,KAAK,IAAI,CAAC,GAAG,CAAC,MAAM,EAC1C,6CAA6C,CAC7C,CAAC;IACH,CAAC;IAEM,UAAU,CAAC,UAAsB,EAAE,GAAW,EAAE,IAAY;QAClE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACtF,CAAC;IAEM,WAAW,CAAC,UAAsB,EAAE,KAAa,EAAE,GAAW;QACpE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxF,CAAC;IAEM,eAAe,CACrB,UAAsB,EACtB,KAAqC,EACrC,GAAmC;QAEnC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,UAAU,CACd,MAAM,CAAC,aAAa;QACnB,yDAAyD;QACzD,MAAM,CAAC,oBAAoB,CAAC,KAAe,EAAE,GAAa,CAAC,EAC3D,EAAE,IAAI,CAAC,GAAG,CACV,CACD,CAAC;IACH,CAAC;IAEM,kBAAkB,CAAC,UAAsB,EAAE,GAAW;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChE,IAAA,oBAAM,EAAC,GAAG,GAAG,CAAC,EAAE,yDAAyD,CAAC,CAAC;QAC3E,IAAA,oBAAM,EACL,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,EACtB,4EAA4E,CAC5E,CAAC;QACF,IAAI,UAAkB,CAAC;QACvB,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/B,UAAU,GAAG,CAAC,CAAC;QAChB,CAAC;aAAM,CAAC;YACP,IAAI,WAAW,IAAI,GAAG,EAAE,CAAC;gBACxB,OAAO;YACR,CAAC;YACD,UAAU,GAAG,WAAW,CAAC;QAC1B,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC7B,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;QACzE,CAAC;IACF,CAAC;IAED;;OAEG;IACI,cAAc,CAAC,GAAG,WAAyB;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC;QAC/D,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAChC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,CAAC;IACF,CAAC;IAEM,aAAa;QACnB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC;QAC/D,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC9B,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,CAAC;IACF,CAAC;CACD;AA3GD,sDA2GC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"node:assert\";\n\nimport { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport type { IMergeTreeOptions, InteriorSequencePlace } from \"../index.js\";\n\nimport type { TestClient } from \"./testClient.js\";\nimport { TestClientLogger, createClientsAtInitialState } from \"./testClientLogger.js\";\n\nconst ClientIds = [\"A\", \"B\", \"C\", \"D\"] as const;\ntype ClientName = (typeof ClientIds)[number];\n\n/**\n * Like `ReconnectHelper`, but:\n * - does not support reconnecting clients\n * - supports advancing only some clients to a given sequence number (not all clients must be synchronized at the same time).\n *\n * This allows testing sequences of operations where clients have varying refSeqs, rather than having all clients advance refSeq\n * in lockstep.\n */\nexport class PartialSyncTestHelper {\n\tclients: Record<ClientName, TestClient> & { all: TestClient[] };\n\n\tidxFromName(name: ClientName): number {\n\t\treturn (name.codePointAt(0) ?? 0) - (\"A\".codePointAt(0) ?? 0);\n\t}\n\n\tlogger: TestClientLogger;\n\n\tops: ISequencedDocumentMessage[] = [];\n\tclientToLastAppliedSeq = new Map<ClientName, number>();\n\n\tperClientOps: ISequencedDocumentMessage[][];\n\n\tprivate seq: number = 0;\n\n\tpublic constructor(options: IMergeTreeOptions = {}) {\n\t\tthis.clients = createClientsAtInitialState(\n\t\t\t{\n\t\t\t\tinitialState: \"\",\n\t\t\t\toptions: {\n\t\t\t\t\tmergeTreeEnableObliterate: true,\n\t\t\t\t\tmergeTreeEnableSidedObliterate: true,\n\t\t\t\t\t...options,\n\t\t\t\t},\n\t\t\t},\n\t\t\t...ClientIds,\n\t\t);\n\t\tthis.logger = new TestClientLogger(this.clients.all);\n\t\tthis.perClientOps = this.clients.all.map(() => []);\n\t}\n\n\tprivate addMessage(message: ISequencedDocumentMessage): void {\n\t\tthis.ops.push(message);\n\t\t// This implementation (specifically, that of applying ops / synchronizing clients) assumes messages\n\t\t// are pushed sequentially starting with seq 1.\n\t\tassert(\n\t\t\tmessage.sequenceNumber === this.ops.length,\n\t\t\t\"Partial sync test helper invariant violated\",\n\t\t);\n\t}\n\n\tpublic insertText(clientName: ClientName, pos: number, text: string): void {\n\t\tconst client = this.clients[clientName];\n\t\tthis.addMessage(client.makeOpMessage(client.insertTextLocal(pos, text), ++this.seq));\n\t}\n\n\tpublic removeRange(clientName: ClientName, start: number, end: number): void {\n\t\tconst client = this.clients[clientName];\n\t\tthis.addMessage(client.makeOpMessage(client.removeRangeLocal(start, end), ++this.seq));\n\t}\n\n\tpublic obliterateRange(\n\t\tclientName: ClientName,\n\t\tstart: number | InteriorSequencePlace,\n\t\tend: number | InteriorSequencePlace,\n\t): void {\n\t\tconst client = this.clients[clientName];\n\t\tthis.addMessage(\n\t\t\tclient.makeOpMessage(\n\t\t\t\t// TODO: remove type assertions when sidedness is enabled\n\t\t\t\tclient.obliterateRangeLocal(start as number, end as number),\n\t\t\t\t++this.seq,\n\t\t\t),\n\t\t);\n\t}\n\n\tpublic advanceClientToSeq(clientName: ClientName, seq: number): void {\n\t\tconst client = this.clients[clientName];\n\t\tconst lastApplied = this.clientToLastAppliedSeq.get(clientName);\n\t\tassert(seq > 0, \"Can only advance clients to sequence numbers that exist\");\n\t\tassert(\n\t\t\tthis.ops.length >= seq,\n\t\t\t\"Cannot attempt to advance clients to sequence numbers that don't yet exist\",\n\t\t);\n\t\tlet startIndex: number;\n\t\tif (lastApplied === undefined) {\n\t\t\tstartIndex = 0;\n\t\t} else {\n\t\t\tif (lastApplied >= seq) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tstartIndex = lastApplied;\n\t\t}\n\t\tfor (let i = startIndex; i < seq; i++) {\n\t\t\tconst nextMessage = this.ops[i];\n\t\t\tclient.applyMsg(nextMessage);\n\t\t\tthis.clientToLastAppliedSeq.set(clientName, nextMessage.sequenceNumber);\n\t\t}\n\t}\n\n\t/**\n\t * Sends all known ops to the procieded client ids.\n\t */\n\tpublic advanceClients(...clientNames: ClientName[]): void {\n\t\tconst latestSeq = this.ops[this.ops.length - 1].sequenceNumber;\n\t\tfor (const name of clientNames) {\n\t\t\tthis.advanceClientToSeq(name, latestSeq);\n\t\t}\n\t}\n\n\tpublic processAllOps(): void {\n\t\tconst latestSeq = this.ops[this.ops.length - 1].sequenceNumber;\n\t\tfor (const name of ClientIds) {\n\t\t\tthis.advanceClientToSeq(name, latestSeq);\n\t\t}\n\t}\n}\n"]}

package/dist/test/reconnectHelper.d.ts

@@ -1,50 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
-import { type IMergeTreeOptions, type InteriorSequencePlace, type SequencePlace } from "../index.js";
-import type { SegmentGroup } from "../mergeTreeNodes.js";
-import { IMergeTreeDeltaOp, type IMergeTreeInsertMsg, type IMergeTreeObliterateMsg, type IMergeTreeObliterateSidedMsg, type IMergeTreeRemoveMsg } from "../ops.js";
-import type { TestClient } from "./testClient.js";
-import { TestClientLogger } from "./testClientLogger.js";
-declare const ClientIds: readonly ["A", "B", "C", "D"];
-type ClientName = (typeof ClientIds)[number];
-export declare class ReconnectTestHelper {
-    clients: Record<ClientName, TestClient> & {
-        all: TestClient[];
-    };
-    idxFromName(name: ClientName): number;
-    logger: TestClientLogger;
-    ops: ISequencedDocumentMessage[];
-    perClientOps: ISequencedDocumentMessage[][];
-    seq: number;
-    constructor(options?: IMergeTreeOptions);
-    insertText(clientName: ClientName, pos: number, text: string): void;
-    removeRange(clientName: ClientName, start: number, end: number): void;
-    obliterateRange(clientName: ClientName, start: number | InteriorSequencePlace, end: number | InteriorSequencePlace): void;
-    insertTextLocal(clientName: ClientName, pos: number, text: string): {
-        op: IMergeTreeInsertMsg;
-        seg: SegmentGroup;
-        refSeq: number;
-    };
-    removeRangeLocal(clientName: ClientName, start: number, end: number): {
-        op: IMergeTreeRemoveMsg;
-        seg: SegmentGroup;
-        refSeq: number;
-    };
-    obliterateRangeLocal(clientName: ClientName, start: SequencePlace, end: SequencePlace): {
-        op: IMergeTreeObliterateMsg | IMergeTreeObliterateSidedMsg;
-        seg: SegmentGroup;
-        refSeq: number;
-    };
-    disconnect(clientNames: ClientName[]): void;
-    processAllOps(): void;
-    reconnect(clientNames: ClientName[]): void;
-    submitDisconnectedOp(clientName: ClientName, op: {
-        op: IMergeTreeDeltaOp;
-        seg: SegmentGroup | SegmentGroup[];
-    }): void;
-}
-export {};
-//# sourceMappingURL=reconnectHelper.d.ts.map

package/dist/test/reconnectHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"reconnectHelper.d.ts","sourceRoot":"","sources":["../../src/test/reconnectHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAExF,OAAO,EAEN,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACN,iBAAiB,EACjB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,4BAA4B,EACjC,KAAK,mBAAmB,EACxB,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA+B,MAAM,uBAAuB,CAAC;AAEtF,QAAA,MAAM,SAAS,+BAAgC,CAAC;AAChD,KAAK,UAAU,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7C,qBAAa,mBAAmB;IAC/B,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;QAAE,GAAG,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;IAEhE,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM;IAIrC,MAAM,EAAE,gBAAgB,CAAC;IAEzB,GAAG,EAAE,yBAAyB,EAAE,CAAM;IACtC,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC;IAE5C,GAAG,EAAE,MAAM,CAAK;gBAEG,OAAO,GAAE,iBAAsB;IAgB3C,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKnE,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAKrE,eAAe,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,GAAG,qBAAqB,EACrC,GAAG,EAAE,MAAM,GAAG,qBAAqB,GACjC,IAAI;IAWA,eAAe,CACrB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GACV;QACF,EAAE,EAAE,mBAAmB,CAAC;QACxB,GAAG,EAAE,YAAY,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KACf;IASM,gBAAgB,CACtB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GACT;QACF,EAAE,EAAE,mBAAmB,CAAC;QACxB,GAAG,EAAE,YAAY,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KACf;IASM,oBAAoB,CAC1B,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,aAAa,GAChB;QACF,EAAE,EAAE,uBAAuB,GAAG,4BAA4B,CAAC;QAC3D,GAAG,EAAE,YAAY,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KACf;IAoBM,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAY3C,aAAa,IAAI,IAAI;IAOrB,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAS1C,oBAAoB,CAC1B,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE;QAAE,EAAE,EAAE,iBAAiB,CAAC;QAAC,GAAG,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;KAAE,GAC/D,IAAI;CAIP"}

package/dist/test/reconnectHelper.js

@@ -1,106 +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.ReconnectTestHelper = void 0;
-const node_assert_1 = require("node:assert");
-const index_js_1 = require("../index.js");
-const testClientLogger_js_1 = require("./testClientLogger.js");
-const ClientIds = ["A", "B", "C", "D"];
-class ReconnectTestHelper {
-    idxFromName(name) {
-        return (name.codePointAt(0) ?? 0) - ("A".codePointAt(0) ?? 0);
-    }
-    constructor(options = {}) {
-        this.ops = [];
-        this.seq = 0;
-        this.clients = (0, testClientLogger_js_1.createClientsAtInitialState)({
-            initialState: "",
-            options: {
-                mergeTreeEnableObliterate: true,
-                mergeTreeEnableObliterateReconnect: true,
-                ...options,
-            },
-        }, ...ClientIds);
-        this.logger = new testClientLogger_js_1.TestClientLogger(this.clients.all);
-        this.perClientOps = this.clients.all.map(() => []);
-    }
-    insertText(clientName, pos, text) {
-        const client = this.clients[clientName];
-        this.ops.push(client.makeOpMessage(client.insertTextLocal(pos, text), ++this.seq));
-    }
-    removeRange(clientName, start, end) {
-        const client = this.clients[clientName];
-        this.ops.push(client.makeOpMessage(client.removeRangeLocal(start, end), ++this.seq));
-    }
-    obliterateRange(clientName, start, end) {
-        const client = this.clients[clientName];
-        this.ops.push(client.makeOpMessage(
-        // TODO: remove type assertions when sidedness is enabled
-        client.obliterateRangeLocal(start, end), ++this.seq));
-    }
-    insertTextLocal(clientName, pos, text) {
-        const client = this.clients[clientName];
-        const op = client.insertTextLocal(pos, text);
-        (0, node_assert_1.strict)(op);
-        const seg = client.peekPendingSegmentGroups();
-        (0, node_assert_1.strict)(seg);
-        return { op, seg, refSeq: client.getCollabWindow().currentSeq };
-    }
-    removeRangeLocal(clientName, start, end) {
-        const client = this.clients[clientName];
-        const op = client.removeRangeLocal(start, end);
-        (0, node_assert_1.strict)(op);
-        const seg = client.peekPendingSegmentGroups();
-        (0, node_assert_1.strict)(seg);
-        return { op, seg, refSeq: client.getCollabWindow().currentSeq };
-    }
-    obliterateRangeLocal(clientName, start, end) {
-        const client = this.clients[clientName];
-        let { startPos, endPos } = (0, index_js_1.endpointPosAndSide)(start, end);
-        (0, node_assert_1.strict)(startPos !== undefined && endPos !== undefined, "start and end positions must be defined");
-        startPos = startPos === "start" ? 0 : startPos;
-        endPos = endPos === "end" ? client.getLength() : endPos;
-        (0, node_assert_1.strict)(startPos !== "end" && endPos !== "start", "start cannot be end and end cannot be start");
-        const op = client.obliterateRangeLocal(startPos, endPos);
-        (0, node_assert_1.strict)(op);
-        const seg = client.peekPendingSegmentGroups();
-        (0, node_assert_1.strict)(seg);
-        return { op, seg, refSeq: client.getCollabWindow().currentSeq };
-    }
-    disconnect(clientNames) {
-        const clientIdxs = new Set(clientNames.map((element) => this.idxFromName(element)));
-        for (const op of this.ops.splice(0))
-            for (const [i, c] of this.clients.all.entries()) {
-                if (clientIdxs.has(i)) {
-                    this.perClientOps[i].push(op);
-                }
-                else {
-                    c.applyMsg(op);
-                }
-            }
-    }
-    processAllOps() {
-        for (const op of this.ops.splice(0))
-            for (const c of this.clients.all) {
-                c.applyMsg(op);
-            }
-    }
-    reconnect(clientNames) {
-        const clientIdxs = new Set(clientNames.map((element) => this.idxFromName(element)));
-        for (const [i, clientOps] of this.perClientOps.entries()) {
-            if (clientIdxs.has(i)) {
-                for (const op of clientOps.splice(0))
-                    this.clients.all[i].applyMsg(op);
-            }
-        }
-    }
-    submitDisconnectedOp(clientName, op) {
-        const client = this.clients[clientName];
-        this.ops.push(client.makeOpMessage(client.regeneratePendingOp(op.op, op.seg), ++this.seq));
-    }
-}
-exports.ReconnectTestHelper = ReconnectTestHelper;
-//# sourceMappingURL=reconnectHelper.js.map

package/dist/test/reconnectHelper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"reconnectHelper.js","sourceRoot":"","sources":["../../src/test/reconnectHelper.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 { strict as assert } from \"node:assert\";\n\nimport { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport {\n\tendpointPosAndSide,\n\ttype IMergeTreeOptions,\n\ttype InteriorSequencePlace,\n\ttype SequencePlace,\n} from \"../index.js\";\nimport type { SegmentGroup } from \"../mergeTreeNodes.js\";\nimport {\n\tIMergeTreeDeltaOp,\n\ttype IMergeTreeInsertMsg,\n\ttype IMergeTreeObliterateMsg,\n\ttype IMergeTreeObliterateSidedMsg,\n\ttype IMergeTreeRemoveMsg,\n} from \"../ops.js\";\n\nimport type { TestClient } from \"./testClient.js\";\nimport { TestClientLogger, createClientsAtInitialState } from \"./testClientLogger.js\";\n\nconst ClientIds = [\"A\", \"B\", \"C\", \"D\"] as const;\ntype ClientName = (typeof ClientIds)[number];\n\nexport class ReconnectTestHelper {\n\tclients: Record<ClientName, TestClient> & { all: TestClient[] };\n\n\tidxFromName(name: ClientName): number {\n\t\treturn (name.codePointAt(0) ?? 0) - (\"A\".codePointAt(0) ?? 0);\n\t}\n\n\tlogger: TestClientLogger;\n\n\tops: ISequencedDocumentMessage[] = [];\n\tperClientOps: ISequencedDocumentMessage[][];\n\n\tseq: number = 0;\n\n\tpublic constructor(options: IMergeTreeOptions = {}) {\n\t\tthis.clients = createClientsAtInitialState(\n\t\t\t{\n\t\t\t\tinitialState: \"\",\n\t\t\t\toptions: {\n\t\t\t\t\tmergeTreeEnableObliterate: true,\n\t\t\t\t\tmergeTreeEnableObliterateReconnect: true,\n\t\t\t\t\t...options,\n\t\t\t\t},\n\t\t\t},\n\t\t\t...ClientIds,\n\t\t);\n\t\tthis.logger = new TestClientLogger(this.clients.all);\n\t\tthis.perClientOps = this.clients.all.map(() => []);\n\t}\n\n\tpublic insertText(clientName: ClientName, pos: number, text: string): void {\n\t\tconst client = this.clients[clientName];\n\t\tthis.ops.push(client.makeOpMessage(client.insertTextLocal(pos, text), ++this.seq));\n\t}\n\n\tpublic removeRange(clientName: ClientName, start: number, end: number): void {\n\t\tconst client = this.clients[clientName];\n\t\tthis.ops.push(client.makeOpMessage(client.removeRangeLocal(start, end), ++this.seq));\n\t}\n\n\tpublic obliterateRange(\n\t\tclientName: ClientName,\n\t\tstart: number | InteriorSequencePlace,\n\t\tend: number | InteriorSequencePlace,\n\t): void {\n\t\tconst client = this.clients[clientName];\n\t\tthis.ops.push(\n\t\t\tclient.makeOpMessage(\n\t\t\t\t// TODO: remove type assertions when sidedness is enabled\n\t\t\t\tclient.obliterateRangeLocal(start as number, end as number),\n\t\t\t\t++this.seq,\n\t\t\t),\n\t\t);\n\t}\n\n\tpublic insertTextLocal(\n\t\tclientName: ClientName,\n\t\tpos: number,\n\t\ttext: string,\n\t): {\n\t\top: IMergeTreeInsertMsg;\n\t\tseg: SegmentGroup;\n\t\trefSeq: number;\n\t} {\n\t\tconst client = this.clients[clientName];\n\t\tconst op = client.insertTextLocal(pos, text);\n\t\tassert(op);\n\t\tconst seg = client.peekPendingSegmentGroups();\n\t\tassert(seg);\n\t\treturn { op, seg, refSeq: client.getCollabWindow().currentSeq };\n\t}\n\n\tpublic removeRangeLocal(\n\t\tclientName: ClientName,\n\t\tstart: number,\n\t\tend: number,\n\t): {\n\t\top: IMergeTreeRemoveMsg;\n\t\tseg: SegmentGroup;\n\t\trefSeq: number;\n\t} {\n\t\tconst client = this.clients[clientName];\n\t\tconst op = client.removeRangeLocal(start, end);\n\t\tassert(op);\n\t\tconst seg = client.peekPendingSegmentGroups();\n\t\tassert(seg);\n\t\treturn { op, seg, refSeq: client.getCollabWindow().currentSeq };\n\t}\n\n\tpublic obliterateRangeLocal(\n\t\tclientName: ClientName,\n\t\tstart: SequencePlace,\n\t\tend: SequencePlace,\n\t): {\n\t\top: IMergeTreeObliterateMsg | IMergeTreeObliterateSidedMsg;\n\t\tseg: SegmentGroup;\n\t\trefSeq: number;\n\t} {\n\t\tconst client = this.clients[clientName];\n\t\tlet { startPos, endPos } = endpointPosAndSide(start, end);\n\t\tassert(\n\t\t\tstartPos !== undefined && endPos !== undefined,\n\t\t\t\"start and end positions must be defined\",\n\t\t);\n\t\tstartPos = startPos === \"start\" ? 0 : startPos;\n\t\tendPos = endPos === \"end\" ? client.getLength() : endPos;\n\t\tassert(\n\t\t\tstartPos !== \"end\" && endPos !== \"start\",\n\t\t\t\"start cannot be end and end cannot be start\",\n\t\t);\n\t\tconst op = client.obliterateRangeLocal(startPos, endPos);\n\t\tassert(op);\n\t\tconst seg = client.peekPendingSegmentGroups();\n\t\tassert(seg);\n\t\treturn { op, seg, refSeq: client.getCollabWindow().currentSeq };\n\t}\n\n\tpublic disconnect(clientNames: ClientName[]): void {\n\t\tconst clientIdxs = new Set(clientNames.map((element) => this.idxFromName(element)));\n\t\tfor (const op of this.ops.splice(0))\n\t\t\tfor (const [i, c] of this.clients.all.entries()) {\n\t\t\t\tif (clientIdxs.has(i)) {\n\t\t\t\t\tthis.perClientOps[i].push(op);\n\t\t\t\t} else {\n\t\t\t\t\tc.applyMsg(op);\n\t\t\t\t}\n\t\t\t}\n\t}\n\n\tpublic processAllOps(): void {\n\t\tfor (const op of this.ops.splice(0))\n\t\t\tfor (const c of this.clients.all) {\n\t\t\t\tc.applyMsg(op);\n\t\t\t}\n\t}\n\n\tpublic reconnect(clientNames: ClientName[]): void {\n\t\tconst clientIdxs = new Set(clientNames.map((element) => this.idxFromName(element)));\n\t\tfor (const [i, clientOps] of this.perClientOps.entries()) {\n\t\t\tif (clientIdxs.has(i)) {\n\t\t\t\tfor (const op of clientOps.splice(0)) this.clients.all[i].applyMsg(op);\n\t\t\t}\n\t\t}\n\t}\n\n\tpublic submitDisconnectedOp(\n\t\tclientName: ClientName,\n\t\top: { op: IMergeTreeDeltaOp; seg: SegmentGroup | SegmentGroup[] },\n\t): void {\n\t\tconst client = this.clients[clientName];\n\t\tthis.ops.push(client.makeOpMessage(client.regeneratePendingOp(op.op, op.seg), ++this.seq));\n\t}\n}\n"]}

package/lib/test/partialSyncHelper.d.ts

@@ -1,42 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
-import type { IMergeTreeOptions, InteriorSequencePlace } from "../index.js";
-import type { TestClient } from "./testClient.js";
-import { TestClientLogger } from "./testClientLogger.js";
-declare const ClientIds: readonly ["A", "B", "C", "D"];
-type ClientName = (typeof ClientIds)[number];
-/**
- * Like `ReconnectHelper`, but:
- * - does not support reconnecting clients
- * - supports advancing only some clients to a given sequence number (not all clients must be synchronized at the same time).
- *
- * This allows testing sequences of operations where clients have varying refSeqs, rather than having all clients advance refSeq
- * in lockstep.
- */
-export declare class PartialSyncTestHelper {
-    clients: Record<ClientName, TestClient> & {
-        all: TestClient[];
-    };
-    idxFromName(name: ClientName): number;
-    logger: TestClientLogger;
-    ops: ISequencedDocumentMessage[];
-    clientToLastAppliedSeq: Map<"A" | "C" | "B" | "D", number>;
-    perClientOps: ISequencedDocumentMessage[][];
-    private seq;
-    constructor(options?: IMergeTreeOptions);
-    private addMessage;
-    insertText(clientName: ClientName, pos: number, text: string): void;
-    removeRange(clientName: ClientName, start: number, end: number): void;
-    obliterateRange(clientName: ClientName, start: number | InteriorSequencePlace, end: number | InteriorSequencePlace): void;
-    advanceClientToSeq(clientName: ClientName, seq: number): void;
-    /**
-     * Sends all known ops to the procieded client ids.
-     */
-    advanceClients(...clientNames: ClientName[]): void;
-    processAllOps(): void;
-}
-export {};
-//# sourceMappingURL=partialSyncHelper.d.ts.map

package/lib/test/partialSyncHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"partialSyncHelper.d.ts","sourceRoot":"","sources":["../../src/test/partialSyncHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAExF,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA+B,MAAM,uBAAuB,CAAC;AAEtF,QAAA,MAAM,SAAS,+BAAgC,CAAC;AAChD,KAAK,UAAU,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7C;;;;;;;GAOG;AACH,qBAAa,qBAAqB;IACjC,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;QAAE,GAAG,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;IAEhE,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM;IAIrC,MAAM,EAAE,gBAAgB,CAAC;IAEzB,GAAG,EAAE,yBAAyB,EAAE,CAAM;IACtC,sBAAsB,qCAAiC;IAEvD,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC;IAE5C,OAAO,CAAC,GAAG,CAAa;gBAEL,OAAO,GAAE,iBAAsB;IAgBlD,OAAO,CAAC,UAAU;IAUX,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKnE,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAKrE,eAAe,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,GAAG,qBAAqB,EACrC,GAAG,EAAE,MAAM,GAAG,qBAAqB,GACjC,IAAI;IAWA,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAwBpE;;OAEG;IACI,cAAc,CAAC,GAAG,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAOlD,aAAa,IAAI,IAAI;CAM5B"}