Reduce direct references to SharedTree class and its factory class (#24312)

## Description

Tweak SharedTree tests to make less direct use of the SharedTreeClass
and instead prefer its interfaces.

Also reduce unnecessary use of its factory.

These changes make the test suite more compatible with changes like
#23729 which adjust how
the kernel is used to implement the SharedObject.

Author: CraigMacomber

packages/dds/tree/src/test/shared-tree-core/sharedTreeCore.spec.ts

@@ -251,7 +251,7 @@ describe("SharedTreeCore", () => {
 			{
 				deltaConnection: dataStoreRuntime2.createDeltaConnection(),
 				objectStorage: MockStorage.createFromSummary(
-					tree1.summarizeCore(mockSerializer).summary,
+					tree1.kernel.summarizeCore(mockSerializer).summary,
 				),
 			},
 			factory.attributes,

packages/dds/tree/src/test/shared-tree/fuzz/fuzzEditGenerators.ts

@@ -24,7 +24,7 @@ import type {
 	TreeNodeSchemaIdentifier,
 } from "../../../core/index.js";
 import { type DownPath, toDownPath } from "../../../feature-libraries/index.js";
-import { Tree, type ITreePrivate, type SharedTree } from "../../../shared-tree/index.js";
+import { Tree, type ISharedTree, type ITreePrivate } from "../../../shared-tree/index.js";
 import { getOrCreate, makeArray } from "../../../util/index.js";
 
 import {
@@ -102,7 +102,7 @@ export interface FuzzTestState extends DDSFuzzTestState<TreeFactory> {
 	 * SharedTrees undergoing a transaction will have a forked view in {@link transactionViews} instead,
 	 * which should be used in place of this view until the transaction is complete.
 	 */
-	clientViews?: Map<SharedTree, FuzzView>;
+	clientViews?: Map<ISharedTree, FuzzView>;
 	/**
 	 * Schematized view of clients undergoing transactions with their nodeSchemas.
 	 * Edits to this view are not visible to other clients until the transaction is closed.
@@ -118,7 +118,7 @@ export interface FuzzTestState extends DDSFuzzTestState<TreeFactory> {
 	 * SharedTrees undergoing a transaction will have a forked view in {@link transactionViews} instead,
 	 * which should be used in place of this view until the transaction is complete.
 	 */
-	forkedViews?: Map<SharedTree, FuzzView[]>;
+	forkedViews?: Map<ISharedTree, FuzzView[]>;
 }
 
 export function viewFromState(

packages/dds/tree/src/test/shared-tree/fuzz/fuzzEditReducers.ts

@@ -12,7 +12,7 @@ import type { IFluidHandle } from "@fluidframework/core-interfaces";
 
 import type { Revertible } from "../../../core/index.js";
 import type { DownPath } from "../../../feature-libraries/index.js";
-import { Tree, type SharedTree } from "../../../shared-tree/index.js";
+import { Tree, type ISharedTree } from "../../../shared-tree/index.js";
 import { validateFuzzTreeConsistency } from "../../utils.js";
 
 import {
@@ -190,7 +190,7 @@ export function applySchemaOp(state: FuzzTestState, operation: SchemaChange) {
 export function applyForkMergeOperation(state: FuzzTestState, branchEdit: ForkMergeOperation) {
 	switch (branchEdit.contents.type) {
 		case "fork": {
-			const forkedViews = state.forkedViews ?? new Map<SharedTree, FuzzView[]>();
+			const forkedViews = state.forkedViews ?? new Map<ISharedTree, FuzzView[]>();
 			const clientForkedViews = forkedViews.get(state.client.channel) ?? [];
 
 			if (branchEdit.contents.branchNumber !== undefined) {
@@ -211,7 +211,7 @@ export function applyForkMergeOperation(state: FuzzTestState, branchEdit: ForkMe
 		}
 		case "merge": {
 			const forkBranchIndex = branchEdit.contents.forkBranch;
-			const forkedViews = state.forkedViews ?? new Map<SharedTree, FuzzView[]>();
+			const forkedViews = state.forkedViews ?? new Map<ISharedTree, FuzzView[]>();
 			const clientForkedViews = forkedViews.get(state.client.channel) ?? [];
 
 			const baseBranch =

packages/dds/tree/src/test/shared-tree/fuzz/fuzzUtils.ts

@@ -27,7 +27,6 @@ import {
 import type {
 	ITreeCheckout,
 	SchematizingSimpleTreeView,
-	SharedTree,
 	TreeCheckout,
 } from "../../../shared-tree/index.js";
 import { testSrcPath } from "../../testSrcPath.cjs";
@@ -45,8 +44,11 @@ import {
 } from "../../../simple-tree/index.js";
 import type { IFluidHandle } from "@fluidframework/core-interfaces";
 
-// eslint-disable-next-line import/no-internal-modules
-import type { SharedTreeOptionsInternal } from "../../../shared-tree/sharedTree.js";
+import type {
+	ISharedTree,
+	SharedTreeOptionsInternal,
+	// eslint-disable-next-line import/no-internal-modules
+} from "../../../shared-tree/sharedTree.js";
 import { typeboxValidator } from "../../../external-utilities/index.js";
 import type { FuzzView } from "./fuzzEditGenerators.js";
 
@@ -161,8 +163,8 @@ export class SharedTreeFuzzTestFactory extends SharedTreeTestFactory {
 	 * @param onLoad - Called once for each tree that is loaded from a summary.
 	 */
 	public constructor(
-		protected override readonly onCreate: (tree: SharedTree) => void,
-		protected override readonly onLoad?: (tree: SharedTree) => void,
+		protected override readonly onCreate: (tree: ISharedTree) => void,
+		protected override readonly onLoad?: (tree: ISharedTree) => void,
 		options: SharedTreeOptionsInternal = {},
 	) {
 		super(onCreate, onLoad, {

packages/dds/tree/src/test/shared-tree/sharedTree.spec.ts

@@ -48,8 +48,8 @@ import {
 	ForestTypeOptimized,
 	ForestTypeReference,
 	getBranch,
+	type ISharedTree,
 	type ITreePrivate,
-	type SharedTree,
 	Tree,
 	type TreeCheckout,
 } from "../../shared-tree/index.js";
@@ -92,23 +92,30 @@ import {
 	TreeFactory,
 	SharedTree as SharedTreeKind,
 } from "../../treeFactory.js";
-import type { ISharedObjectKind } from "@fluidframework/shared-object-base/internal";
+import {
+	SharedObjectCore,
+	type ISharedObjectKind,
+} from "@fluidframework/shared-object-base/internal";
 import { TestAnchor } from "../testAnchor.js";
 // eslint-disable-next-line import/no-internal-modules
 import { handleSchema, numberSchema, stringSchema } from "../../simple-tree/leafNodeSchema.js";
 import { singleJsonCursor } from "../json/index.js";
 import { AttachState } from "@fluidframework/container-definitions";
 import { JsonAsTree } from "../../jsonDomainSchema.js";
-// eslint-disable-next-line import/no-internal-modules
-import { toSimpleTreeSchema } from "../../simple-tree/api/index.js";
+import {
+	asTreeViewAlpha,
+	toSimpleTreeSchema,
+	type ITree,
+	// eslint-disable-next-line import/no-internal-modules
+} from "../../simple-tree/api/index.js";
 import type { IChannel } from "@fluidframework/datastore-definitions/internal";
 
 const enableSchemaValidation = true;
 
 const DebugSharedTree = configuredSharedTree({
 	jsonValidator: typeboxValidator,
 	forest: ForestTypeReference,
-}) as ISharedObjectKind<unknown> as ISharedObjectKind<SharedTree>;
+}) as ISharedObjectKind<unknown> as ISharedObjectKind<ISharedTree>;
 
 class MockSharedTreeRuntime extends MockFluidDataStoreRuntime {
 	public constructor() {
@@ -661,6 +668,7 @@ describe("SharedTree", () => {
 		view.root.insertAtEnd("b");
 
 		const tree2 = sharedTreeFactory.create(runtime, "tree2");
+		assert(tree2 instanceof SharedObjectCore);
 		await tree2.load({
 			deltaConnection: runtime.createDeltaConnection(),
 			objectStorage: MockStorage.createFromSummary((await tree.summarize()).summary),
@@ -727,7 +735,7 @@ describe("SharedTree", () => {
 	});
 
 	it("can summarize local edits in the attach summary", async () => {
-		const onCreate = (tree: SharedTree) => {
+		const onCreate = (tree: ITreePrivate) => {
 			const view = tree.viewWith(
 				new TreeViewConfiguration({ schema: StringArray, enableSchemaValidation }),
 			);
@@ -764,7 +772,7 @@ describe("SharedTree", () => {
 	});
 
 	it("can tolerate local edits submitted as part of a transaction in the attach summary", async () => {
-		const onCreate = (tree: SharedTree) => {
+		const onCreate = (tree: ITreePrivate) => {
 			// Schematize uses a transaction as well
 			const view = tree.viewWith(
 				new TreeViewConfiguration({ schema: StringArray, enableSchemaValidation }),
@@ -804,7 +812,7 @@ describe("SharedTree", () => {
 	// AB#5745: Enable this test once it passes.
 	// TODO: above mentioned task is done, but this still fails. Fix it.
 	it.skip("can tolerate incomplete transactions when attaching", async () => {
-		const onCreate = (tree: SharedTree) => {
+		const onCreate = (tree: ITreePrivate) => {
 			const view = tree.viewWith(
 				new TreeViewConfiguration({ schema: StringArray, enableSchemaValidation }),
 			);
@@ -902,7 +910,7 @@ describe("SharedTree", () => {
 	});
 
 	it("can process changes while detached", async () => {
-		const onCreate = (t: SharedTree) => {
+		const onCreate = (t: ITree) => {
 			const viewInit = t.viewWith(
 				new TreeViewConfiguration({ schema: StringArray, enableSchemaValidation }),
 			);
@@ -1781,7 +1789,7 @@ describe("SharedTree", () => {
 	});
 
 	it("process changes while detached", async () => {
-		const onCreate = (parentTree: SharedTree) => {
+		const onCreate = (parentTree: ISharedTree) => {
 			const parentView = parentTree.viewWith(
 				new TreeViewConfiguration({
 					schema: StringArray,
@@ -2209,7 +2217,9 @@ describe("SharedTree", () => {
 		const tree = sharedTreeFactory.create(runtime, "tree");
 		const runtimeFactory = new MockContainerRuntimeFactory();
 		runtimeFactory.createContainerRuntime(runtime);
-		const view = tree.viewWith(new TreeViewConfiguration({ schema: StringArray }));
+		const view = asTreeViewAlpha(
+			tree.viewWith(new TreeViewConfiguration({ schema: StringArray })),
+		);
 		view.initialize([]);
 		assert.throws(
 			() => {
@@ -2230,6 +2240,7 @@ describe("SharedTree", () => {
 		const schema = sf.object("myObject", {});
 		const config = new TreeViewConfiguration({ schema, enableSchemaValidation });
 		const view = tree.viewWith(config);
+		assert(view instanceof SchematizingSimpleTreeView);
 
 		view.initialize({});
 		assert.equal(view.breaker, tree.kernel.breaker);

packages/dds/tree/src/test/shared-tree/undo.spec.ts

@@ -17,6 +17,7 @@ import {
 	chunkFromJsonTrees,
 	createTestUndoRedoStacks,
 	expectJsonTree,
+	getView,
 	moveWithin,
 	TestTreeProviderLite,
 } from "../utils.js";
@@ -491,7 +492,7 @@ describe("Undo and redo", () => {
 		const sharedTreeFactory = new TreeFactory({});
 		const runtime = new MockFluidDataStoreRuntime({ idCompressor: createIdCompressor() });
 		const tree = sharedTreeFactory.create(runtime, "tree");
-		const view = tree.viewWith(new TreeViewConfiguration({ schema: Schema }));
+		const view = asTreeViewAlpha(tree.viewWith(new TreeViewConfiguration({ schema: Schema })));
 		view.initialize({ foo: 1 });
 		assert.equal(tree.isAttached(), false);
 		let revertible: Revertible | undefined;
@@ -505,6 +506,22 @@ describe("Undo and redo", () => {
 		assert.equal(view.root.foo, 1);
 	});
 
+	it("can undo while independent", () => {
+		const sf = new SchemaFactory(undefined);
+		class Schema extends sf.object("Object", { foo: sf.number }) {}
+		const view = getView(new TreeViewConfiguration({ schema: Schema }));
+		view.initialize({ foo: 1 });
+		let revertible: Revertible | undefined;
+		view.events.on("changed", (_, getRevertible) => {
+			revertible = getRevertible?.();
+		});
+		view.root.foo = 2;
+		assert.equal(view.root.foo, 2);
+		assert(revertible !== undefined);
+		revertible.revert();
+		assert.equal(view.root.foo, 1);
+	});
+
 	// TODO:#24414: Enable forkable revertibles tests to run on attached/detached mode.
 	it("reverts original & forked revertibles after making change to the original view", () => {
 		const originalView = createInitializedView();