@fluidframework/tree 2.116.0 → 2.116.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/tree",
-  "version": "2.116.0",
+  "version": "2.116.1",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -101,17 +101,17 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.116.0",
-    "@fluidframework/core-interfaces": "~2.116.0",
-    "@fluidframework/core-utils": "~2.116.0",
-    "@fluidframework/datastore-definitions": "~2.116.0",
-    "@fluidframework/driver-definitions": "~2.116.0",
-    "@fluidframework/id-compressor": "~2.116.0",
-    "@fluidframework/runtime-definitions": "~2.116.0",
-    "@fluidframework/runtime-utils": "~2.116.0",
-    "@fluidframework/shared-object-base": "~2.116.0",
-    "@fluidframework/telemetry-utils": "~2.116.0",
-    "@fluidframework/type-factory": "~2.116.0",
+    "@fluid-internal/client-utils": "~2.116.1",
+    "@fluidframework/core-interfaces": "~2.116.1",
+    "@fluidframework/core-utils": "~2.116.1",
+    "@fluidframework/datastore-definitions": "~2.116.1",
+    "@fluidframework/driver-definitions": "~2.116.1",
+    "@fluidframework/id-compressor": "~2.116.1",
+    "@fluidframework/runtime-definitions": "~2.116.1",
+    "@fluidframework/runtime-utils": "~2.116.1",
+    "@fluidframework/shared-object-base": "~2.116.1",
+    "@fluidframework/telemetry-utils": "~2.116.1",
+    "@fluidframework/type-factory": "~2.116.1",
     "@sinclair/typebox": "^0.34.13",
     "@tylerbu/sorted-btree-es6": "^2.1.1",
     "semver-ts": "^1.0.3",
@@ -121,22 +121,22 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.5",
     "@biomejs/biome": "~2.4.5",
-    "@fluid-internal/mocha-test-setup": "~2.116.0",
-    "@fluid-private/stochastic-test-utils": "~2.116.0",
-    "@fluid-private/test-dds-utils": "~2.116.0",
-    "@fluid-private/test-drivers": "~2.116.0",
+    "@fluid-internal/mocha-test-setup": "~2.116.1",
+    "@fluid-private/stochastic-test-utils": "~2.116.1",
+    "@fluid-private/test-dds-utils": "~2.116.1",
+    "@fluid-private/test-drivers": "~2.116.1",
     "@fluid-tools/benchmark": "^0.59.0",
     "@fluid-tools/build-cli": "^0.67.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.67.0",
-    "@fluidframework/container-definitions": "~2.116.0",
-    "@fluidframework/container-loader": "~2.116.0",
-    "@fluidframework/container-runtime": "~2.116.0",
+    "@fluidframework/container-definitions": "~2.116.1",
+    "@fluidframework/container-loader": "~2.116.1",
+    "@fluidframework/container-runtime": "~2.116.1",
     "@fluidframework/eslint-config-fluid": "^14.0.0",
-    "@fluidframework/local-driver": "~2.116.0",
-    "@fluidframework/test-runtime-utils": "~2.116.0",
-    "@fluidframework/test-utils": "~2.116.0",
-    "@fluidframework/tree-previous": "npm:@fluidframework/tree@2.114.0",
+    "@fluidframework/local-driver": "~2.116.1",
+    "@fluidframework/test-runtime-utils": "~2.116.1",
+    "@fluidframework/test-utils": "~2.116.1",
+    "@fluidframework/tree-previous": "npm:@fluidframework/tree@2.116.0",
     "@microsoft/api-extractor": "7.58.1",
     "@types/diff": "^3.5.1",
     "@types/easy-table": "^0.0.32",

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/tree";
-export const pkgVersion = "2.116.0";
+export const pkgVersion = "2.116.1";

package/src/shared-tree/treeCheckout.ts

@@ -850,7 +850,7 @@ export class TreeCheckout implements ITreeCheckout {
 							);
 							this.revertibleCommitBranches.set(
 								revision,
-								this.#transaction.activeBranch.fork(commit),
+								this.#transaction.branch.fork(commit),
 							);
 							this.revertibles.set(revision, revertible);
 							return revertible;
@@ -1207,9 +1207,9 @@ export class TreeCheckout implements ITreeCheckout {
 				}
 
 				const commitToRevert = revertibleBranch.getHead();
-				const activeBranchHead = targetCheckout.#transaction.activeBranch.getHead();
+				const branchHead = targetCheckout.#transaction.branch.getHead();
 
-				if (isAncestor(commitToRevert, activeBranchHead, true) === false) {
+				if (isAncestor(commitToRevert, branchHead, true) === false) {
 					throw new UsageError(
 						"Cannot clone revertible for a commit that is not present on the given branch.",
 					);
@@ -1308,7 +1308,7 @@ export class TreeCheckout implements ITreeCheckout {
 			throw new UsageError("A view cannot be forked while it has a pending transaction.");
 		}
 
-		const branch = this.#transaction.activeBranch.fork();
+		const branch = this.#transaction.branch.fork();
 		const storedSchema = this.storedSchema.clone();
 		const forkBreaker = new Breakable("TreeCheckout", this.logger);
 		const forest = this.forest.clone(storedSchema, forkBreaker);
@@ -1381,7 +1381,7 @@ export class TreeCheckout implements ITreeCheckout {
 			0xa5d /* Shared branches cannot be rebased onto another branch. */,
 		);
 
-		checkout.#transaction.activeBranch.rebaseOnto(this.#transaction.activeBranch);
+		checkout.#transaction.branch.rebaseOnto(this.#transaction.branch);
 	}
 
 	public rebaseOnto(branch: TreeBranch): void {
@@ -1446,7 +1446,7 @@ export class TreeCheckout implements ITreeCheckout {
 				"Views with an open transaction cannot be merged into another view.",
 			);
 		}
-		this.#transaction.activeBranch.merge(checkout.#transaction.activeBranch);
+		this.#transaction.branch.merge(checkout.#transaction.branch);
 		if (disposeMerged && !checkout.isSharedBranch) {
 			// Dispose the merged checkout unless it is a shared branch.
 			checkout[disposeSymbol]();
@@ -1545,7 +1545,7 @@ export class TreeCheckout implements ITreeCheckout {
 			revisionForInvert,
 		);
 
-		const headCommit = this.#transaction.activeBranch.getHead();
+		const headCommit = this.#transaction.branch.getHead();
 		// Rebase the inverted change onto any commits that occurred after the undoable commits.
 		if (commitToRevert !== headCommit) {
 			// The inverse may be rebased over newer commits which (despite being present in the history)
@@ -1578,7 +1578,7 @@ export class TreeCheckout implements ITreeCheckout {
 		const previousLabelTreeNode = this.labelTreeNode;
 		this.labelTreeNode = labelTree;
 		try {
-			this.#transaction.activeBranch.apply(
+			this.#transaction.branch.apply(
 				change,
 				kind === CommitKind.Default || kind === CommitKind.Redo
 					? CommitKind.Undo