@fluidframework/merge-tree 2.4.0-297385 → 2.4.0-299707

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "2.4.0-297385",
+  "version": "2.4.0-299707",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -63,12 +63,14 @@
     "cache-dir": "nyc/.cache",
     "exclude": [
       "src/test/**/*.*ts",
-      "dist/test/**/*.*js"
+      "dist/test/**/*.*js",
+      "lib/test/**/*.*js"
     ],
     "exclude-after-remap": false,
     "include": [
       "src/**/*.*ts",
-      "dist/**/*.*js"
+      "dist/**/*.*js",
+      "lib/**/*.*js"
     ],
     "report-dir": "nyc/report",
     "reporter": [
@@ -79,30 +81,30 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.4.0-297385",
-    "@fluidframework/container-definitions": "2.4.0-297385",
-    "@fluidframework/core-interfaces": "2.4.0-297385",
-    "@fluidframework/core-utils": "2.4.0-297385",
-    "@fluidframework/datastore-definitions": "2.4.0-297385",
-    "@fluidframework/driver-definitions": "2.4.0-297385",
-    "@fluidframework/runtime-definitions": "2.4.0-297385",
-    "@fluidframework/runtime-utils": "2.4.0-297385",
-    "@fluidframework/shared-object-base": "2.4.0-297385",
-    "@fluidframework/telemetry-utils": "2.4.0-297385"
+    "@fluid-internal/client-utils": "2.4.0-299707",
+    "@fluidframework/container-definitions": "2.4.0-299707",
+    "@fluidframework/core-interfaces": "2.4.0-299707",
+    "@fluidframework/core-utils": "2.4.0-299707",
+    "@fluidframework/datastore-definitions": "2.4.0-299707",
+    "@fluidframework/driver-definitions": "2.4.0-299707",
+    "@fluidframework/runtime-definitions": "2.4.0-299707",
+    "@fluidframework/runtime-utils": "2.4.0-299707",
+    "@fluidframework/shared-object-base": "2.4.0-299707",
+    "@fluidframework/telemetry-utils": "2.4.0-299707"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.15.2",
+    "@arethetypeswrong/cli": "^0.16.4",
     "@biomejs/biome": "~1.8.3",
-    "@fluid-internal/mocha-test-setup": "2.4.0-297385",
-    "@fluid-private/stochastic-test-utils": "2.4.0-297385",
-    "@fluid-private/test-pairwise-generator": "2.4.0-297385",
+    "@fluid-internal/mocha-test-setup": "2.4.0-299707",
+    "@fluid-private/stochastic-test-utils": "2.4.0-299707",
+    "@fluid-private/test-pairwise-generator": "2.4.0-299707",
     "@fluid-tools/benchmark": "^0.50.0",
-    "@fluid-tools/build-cli": "^0.46.0",
+    "@fluid-tools/build-cli": "^0.48.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.46.0",
+    "@fluidframework/build-tools": "^0.48.0",
     "@fluidframework/eslint-config-fluid": "^5.4.0",
     "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@~2.3.0",
-    "@fluidframework/test-runtime-utils": "2.4.0-297385",
+    "@fluidframework/test-runtime-utils": "2.4.0-299707",
     "@microsoft/api-extractor": "7.47.8",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^9.1.1",
@@ -114,7 +116,6 @@
     "diff": "^3.5.0",
     "eslint": "~8.55.0",
     "mocha": "^10.2.0",
-    "mocha-json-output-reporter": "^2.0.1",
     "mocha-multi-reporters": "^1.5.1",
     "moment": "^2.21.0",
     "prettier": "~3.0.3",
@@ -186,7 +187,7 @@
     "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
     "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "test:stress": "cross-env FUZZ_STRESS_RUN=1 FUZZ_TEST_COUNT=1 npm run test:mocha",
+    "test:stress": "cross-env FUZZ_STRESS_RUN=1 FUZZ_TEST_COUNT=normal npm run test:mocha",
     "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
     "typetests:gen": "flub generate typetests --dir . -v",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"

package/src/client.ts

@@ -501,7 +501,6 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 				clientArgs.referenceSequenceNumber,
 				clientArgs.clientId,
 				clientArgs.sequenceNumber,
-				false,
 				opArgs,
 			);
 		} else {
@@ -516,7 +515,6 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 				clientArgs.referenceSequenceNumber,
 				clientArgs.clientId,
 				clientArgs.sequenceNumber,
-				false,
 				opArgs,
 			);
 		}
@@ -541,7 +539,6 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 			clientArgs.referenceSequenceNumber,
 			clientArgs.clientId,
 			clientArgs.sequenceNumber,
-			false,
 			opArgs,
 		);
 	}

package/src/collections/list.ts

@@ -87,6 +87,12 @@ export class DoublyLinkedList<T>
 		// try to match array signature and semantics where possible
 		Pick<ListNode<T>[], "pop" | "shift" | "length" | "includes">
 {
+	constructor(values?: Iterable<T>) {
+		if (values !== undefined) {
+			this.push(...values);
+		}
+	}
+
 	find(
 		predicate: (value: ListNode<T>, obj: DoublyLinkedList<T>) => unknown,
 	): ListNode<T> | undefined {

package/src/mergeTree.ts

@@ -1487,7 +1487,6 @@ export class MergeTree {
 			_pos: number,
 			context: InsertContext,
 			// Keeping this function within the scope of blockInsert for readability.
-			// eslint-disable-next-line unicorn/consistent-function-scoping
 		): ISegmentChanges => {
 			const segmentChanges: ISegmentChanges = {};
 			if (segment) {
@@ -1932,7 +1931,6 @@ export class MergeTree {
 		refSeq: number,
 		clientId: number,
 		seq: number,
-		overwrite: boolean = false,
 		opArgs: IMergeTreeDeltaOpArgs,
 	): void {
 		const startPos = start.side === Side.Before ? start.pos : start.pos + 1;
@@ -1941,7 +1939,7 @@ export class MergeTree {
 		this.ensureIntervalBoundary(startPos, refSeq, clientId);
 		this.ensureIntervalBoundary(endPos, refSeq, clientId);
 
-		let _overwrite = overwrite;
+		let _overwrite = false;
 		const localOverlapWithRefs: ISegmentLeaf[] = [];
 		const movedSegments: IMergeTreeSegmentDelta[] = [];
 		const localSeq =
@@ -2138,7 +2136,6 @@ export class MergeTree {
 		refSeq: number,
 		clientId: number,
 		seq: number,
-		overwrite: boolean = false,
 		opArgs: IMergeTreeDeltaOpArgs,
 	): void {
 		errorIfOptionNotTrue(this.options, "mergeTreeEnableObliterate");
@@ -2147,7 +2144,7 @@ export class MergeTree {
 				typeof start === "object" && typeof end === "object",
 				"Start and end must be of type InteriorSequencePlace if mergeTreeEnableSidedObliterate is enabled.",
 			);
-			this.obliterateRangeSided(start, end, refSeq, clientId, seq, overwrite, opArgs);
+			this.obliterateRangeSided(start, end, refSeq, clientId, seq, opArgs);
 		} else {
 			assert(
 				typeof start === "number" && typeof end === "number",
@@ -2159,7 +2156,6 @@ export class MergeTree {
 				refSeq,
 				clientId,
 				seq,
-				overwrite,
 				opArgs,
 			);
 		}
@@ -2171,10 +2167,9 @@ export class MergeTree {
 		refSeq: number,
 		clientId: number,
 		seq: number,
-		overwrite = false,
 		opArgs: IMergeTreeDeltaOpArgs,
 	): void {
-		let _overwrite = overwrite;
+		let _overwrite = false;
 		this.ensureIntervalBoundary(start, refSeq, clientId);
 		this.ensureIntervalBoundary(end, refSeq, clientId);
 		// eslint-disable-next-line import/no-deprecated
@@ -2354,7 +2349,6 @@ export class MergeTree {
 						UniversalSequenceNumber,
 						this.collabWindow.clientId,
 						UniversalSequenceNumber,
-						false,
 						{ op: removeOp },
 					);
 				} /* op.type === MergeTreeDeltaType.ANNOTATE */ else {