@fluidframework/merge-tree 2.81.1 → 2.83.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "2.81.1",
+  "version": "2.83.0",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -81,34 +81,34 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.81.1",
-    "@fluidframework/container-definitions": "~2.81.1",
-    "@fluidframework/core-interfaces": "~2.81.1",
-    "@fluidframework/core-utils": "~2.81.1",
-    "@fluidframework/datastore-definitions": "~2.81.1",
-    "@fluidframework/driver-definitions": "~2.81.1",
-    "@fluidframework/runtime-definitions": "~2.81.1",
-    "@fluidframework/runtime-utils": "~2.81.1",
-    "@fluidframework/shared-object-base": "~2.81.1",
-    "@fluidframework/telemetry-utils": "~2.81.1"
+    "@fluid-internal/client-utils": "~2.83.0",
+    "@fluidframework/container-definitions": "~2.83.0",
+    "@fluidframework/core-interfaces": "~2.83.0",
+    "@fluidframework/core-utils": "~2.83.0",
+    "@fluidframework/datastore-definitions": "~2.83.0",
+    "@fluidframework/driver-definitions": "~2.83.0",
+    "@fluidframework/runtime-definitions": "~2.83.0",
+    "@fluidframework/runtime-utils": "~2.83.0",
+    "@fluidframework/shared-object-base": "~2.83.0",
+    "@fluidframework/telemetry-utils": "~2.83.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.2",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.81.1",
-    "@fluid-private/stochastic-test-utils": "~2.81.1",
-    "@fluid-private/test-pairwise-generator": "~2.81.1",
+    "@fluid-internal/mocha-test-setup": "~2.83.0",
+    "@fluid-private/stochastic-test-utils": "~2.83.0",
+    "@fluid-private/test-pairwise-generator": "~2.83.0",
     "@fluid-tools/benchmark": "^0.52.0",
     "@fluid-tools/build-cli": "^0.63.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.63.0",
-    "@fluidframework/eslint-config-fluid": "~2.81.1",
-    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.81.0",
-    "@fluidframework/test-runtime-utils": "~2.81.1",
+    "@fluidframework/eslint-config-fluid": "~2.83.0",
+    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.82.0",
+    "@fluidframework/test-runtime-utils": "~2.83.0",
     "@microsoft/api-extractor": "7.52.11",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^18.19.0",
+    "@types/node": "~20.19.30",
     "c8": "^10.1.3",
     "concurrently": "^9.2.1",
     "copyfiles": "^2.4.1",

package/src/attributionCollection.ts

@@ -392,8 +392,6 @@ export class AttributionCollection implements IAttributionCollection<Attribution
 	): void {
 		const { channels } = summary;
 		assert(
-			// Destructuring here would require renaming the variables, since seqs is declared below
-			// eslint-disable-next-line unicorn/consistent-destructuring
 			summary.seqs.length === summary.posBreakpoints.length,
 			0x445 /* Invalid attribution summary blob provided */,
 		);

package/src/client.ts

@@ -1479,6 +1479,7 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 
 		const collabWindow = this.getCollabWindow();
 		if (
+			// eslint-disable-next-line @typescript-eslint/prefer-optional-chain -- TODO: ADO#58520 Code owners should verify if this code change is safe and make it if so or update this comment otherwise
 			this.lastNormalization === undefined ||
 			collabWindow.currentSeq !== this.lastNormalization.refSeq ||
 			collabWindow.localSeq !== this.lastNormalization.localRefSeq

package/src/mergeTree.ts

@@ -2477,16 +2477,34 @@ export class MergeTree {
 					);
 				} /* op.type === MergeTreeDeltaType.ANNOTATE */ else {
 					const props = pendingSegmentGroup.previousProps![i];
-					const annotateOp = createAnnotateRangeOp(start, start + segment.cachedLength, props);
 
-					this.annotateRange(
-						start,
-						start + segment.cachedLength,
-						{ props },
-						this.localPerspective,
-						rollbackStamp,
-						{ op: annotateOp, rollback: true },
-					);
+					// If the segment has been removed by a concurrent operation, we can't use
+					// position-based annotateRange because findRollbackPosition returns a position
+					// that doesn't account for the removed segment, causing the rollback to target
+					// the wrong segment. Instead, directly roll back the properties on the segment.
+					if (isRemoved(segment)) {
+						const propertyManager = (segment.propertyManager ??= new PropertiesManager());
+						propertyManager.rollbackProperties(
+							{ props },
+							segment,
+							this.collabWindow.collaborating,
+						);
+					} else {
+						const annotateOp = createAnnotateRangeOp(
+							start,
+							start + segment.cachedLength,
+							props,
+						);
+
+						this.annotateRange(
+							start,
+							start + segment.cachedLength,
+							{ props },
+							this.localPerspective,
+							rollbackStamp,
+							{ op: annotateOp, rollback: true },
+						);
+					}
 					i++;
 				}
 			}

package/src/mergeTreeDeltaCallback.ts

@@ -151,7 +151,7 @@ export type MergeTreeDeltaCallback = (
 /**
  * @legacy @beta
  */
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type, @typescript-eslint/no-empty-interface
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface IMergeTreeMaintenanceCallbackArgs
 	extends IMergeTreeDeltaCallbackArgs<MergeTreeMaintenanceType> {}
 

package/src/mergeTreeNodeWalk.ts

@@ -53,7 +53,6 @@ export function depthFirstNodeWalk(
 	let childCount = block.childCount;
 	let start: IMergeNode | undefined = startChild;
 
-	// eslint-disable-next-line no-constant-condition
 	while (true) {
 		// go down to the leaf level
 		let blockResult: NodeAction;

package/src/mergeTreeTracking.ts

@@ -153,6 +153,7 @@ export class TrackingGroupCollection {
 
 	public matches(trackingCollection: TrackingGroupCollection): boolean {
 		if (
+			// eslint-disable-next-line @typescript-eslint/prefer-optional-chain -- TODO: ADO#58520 Code owners should verify if this code change is safe and make it if so or update this comment otherwise
 			!trackingCollection ||
 			this._trackingGroups.size !== trackingCollection._trackingGroups.size
 		) {

package/src/partialLengths.ts

@@ -1091,7 +1091,11 @@ export class PartialSequenceLengths {
 		refSeq,
 		localSeq,
 		seglen,
-	}: { refSeq: number; localSeq: number; seglen: number }): void {
+	}: {
+		refSeq: number;
+		localSeq: number;
+		seglen: number;
+	}): void {
 		assert(
 			this.unsequencedRecords !== undefined,
 			0xabb /* Local adjustment computed without partials */,

package/src/segmentPropertiesManager.ts

@@ -86,7 +86,6 @@ export type PropsOrAdjust =
 
 const opToChanges = (op: PropsOrAdjust, seq: number): [string, PropertyChange][] => [
 	...Object.entries(op.props ?? {})
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		.map<[string, PropertyChange]>(([k, raw]) => [k, { raw, seq }])
 		.filter(([_, v]) => v.raw !== undefined),
 	...Object.entries(op.adjust ?? {}).map<[string, PropertyChange]>(([k, adjust]) => [

package/api-extractor-lint.json

@@ -1,4 +0,0 @@
-{
-	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-	"extends": "../../../common/build/build-common/api-extractor-lint.esm.primary.json"
-}

package/biome.jsonc

@@ -1,4 +0,0 @@
-{
-	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
-	"extends": ["../../../biome.jsonc"]
-}