@fluidframework/tree 2.70.0-361248 → 2.70.0

package/lib/simple-tree/unhydratedFlexTreeFromInsertable.js

@@ -6,7 +6,7 @@ import { UsageError } from "@fluidframework/telemetry-utils/internal";
 import { assert } from "@fluidframework/core-utils/internal";
 import { hasSingle } from "../util/index.js";
 import { normalizeFieldSchema, FieldKind } from "./fieldSchema.js";
-import { CompatibilityLevel, getKernel, getTreeNodeSchemaPrivateData, isTreeNode, UnhydratedFlexTreeNode, } from "./core/index.js";
+import { CompatibilityLevel, getKernel, getTreeNodeSchemaPrivateData, isTreeNode, contentSchemaSymbol, UnhydratedFlexTreeNode, } from "./core/index.js";
 import { getUnhydratedContext } from "./createContext.js";
 /**
  * Transforms an input {@link TypedNode} tree to an {@link UnhydratedFlexTreeNode}.
@@ -86,12 +86,24 @@ For class-based schema, this can be done by replacing an expression like "{foo:
 }
 /**
  * Returns all types for which the data is schema-compatible.
+ * @remarks This will respect the {@link contentSchemaSymbol} property on data to disambiguate types - if present, only that type will be returned.
  */
 export function getPossibleTypes(allowedTypes, data) {
     assert(data !== undefined, 0x889 /* undefined cannot be used as FactoryContent. */);
+    const type = typeof data === "object" && data !== null
+        ? data[contentSchemaSymbol]
+        : undefined;
     let best = CompatibilityLevel.None;
     const possibleTypes = [];
     for (const schema of allowedTypes) {
+        if (type !== undefined) {
+            if (schema.identifier === type) {
+                return [schema];
+            }
+            else {
+                continue;
+            }
+        }
         const handler = getTreeNodeSchemaPrivateData(schema).idempotentInitialize();
         const level = handler.shallowCompatibilityTest(data);
         if (level > best) {

package/lib/simple-tree/unhydratedFlexTreeFromInsertable.js.map

@@ -1 +1 @@
-{"version":3,"file":"unhydratedFlexTreeFromInsertable.js","sourceRoot":"","sources":["../../src/simple-tree/unhydratedFlexTreeFromInsertable.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 type { IFluidHandle } from \"@fluidframework/core-interfaces\";\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\n\nimport { hasSingle } from \"../util/index.js\";\n\nimport { normalizeFieldSchema, FieldKind, type ImplicitFieldSchema } from \"./fieldSchema.js\";\nimport {\n\tCompatibilityLevel,\n\tgetKernel,\n\tgetTreeNodeSchemaPrivateData,\n\tisTreeNode,\n\ttype TreeNode,\n\ttype TreeNodeSchema,\n\ttype Unhydrated,\n\tUnhydratedFlexTreeNode,\n} from \"./core/index.js\";\nimport { getUnhydratedContext } from \"./createContext.js\";\n\n/**\n * Transforms an input {@link TypedNode} tree to an {@link UnhydratedFlexTreeNode}.\n * @param data - The input tree to be converted.\n * If the data is an unsupported value (e.g. NaN), a fallback value will be used when supported,\n * otherwise an error will be thrown.\n *\n * Fallbacks:\n *\n * * `NaN` =\\> `null`\n *\n * * `+/-∞` =\\> `null`\n *\n * * `-0` =\\> `+0`\n *\n * For fields with a default value, the field may be omitted.\n * If `context` is not provided, defaults which require a context will be left empty which can be out of schema.\n *\n * @param allowedTypes - The set of types allowed by the parent context. Used to validate the input tree.\n * @remarks\n * The resulting tree will be populated with any defaults from {@link FieldProvider}s in the schema.\n *\n * Often throws UsageErrors for invalid data, but may miss some cases.\n *\n * Output should comply with the provided view schema, but this is not explicitly validated:\n * validation against stored schema (to guard against document corruption) is done elsewhere.\n */\nexport function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent | undefined>(\n\tdata: TIn,\n\tallowedTypes: ImplicitFieldSchema,\n): TIn extends undefined ? undefined : UnhydratedFlexTreeNode {\n\tconst normalizedFieldSchema = normalizeFieldSchema(allowedTypes);\n\n\tif (data === undefined) {\n\t\t// TODO: this code-path should support defaults\n\t\tif (normalizedFieldSchema.kind !== FieldKind.Optional) {\n\t\t\tthrow new UsageError(\"Got undefined for non-optional field.\");\n\t\t}\n\t\treturn undefined as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;\n\t}\n\n\tconst flexTree: UnhydratedFlexTreeNode = unhydratedFlexTreeFromInsertableNode(\n\t\tdata,\n\t\tnormalizedFieldSchema.allowedTypeSet,\n\t);\n\n\treturn flexTree as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;\n}\n\n/**\n * Copy content from `data` into a UnhydratedFlexTreeNode.\n */\nexport function unhydratedFlexTreeFromInsertableNode(\n\tdata: InsertableContent,\n\tallowedTypes: ReadonlySet<TreeNodeSchema>,\n): UnhydratedFlexTreeNode {\n\tif (isTreeNode(data)) {\n\t\tconst kernel = getKernel(data);\n\t\tconst inner = kernel.getInnerNodeIfUnhydrated();\n\t\tif (inner === undefined) {\n\t\t\t// The node is already hydrated, meaning that it already got inserted into the tree previously\n\t\t\tthrow new UsageError(\"A node may not be inserted into the tree more than once\");\n\t\t} else {\n\t\t\tif (!allowedTypes.has(kernel.schema)) {\n\t\t\t\tthrow new UsageError(\"Invalid schema for this context.\");\n\t\t\t}\n\t\t\treturn inner;\n\t\t}\n\t}\n\n\tconst schema = getType(data, allowedTypes);\n\tconst handler = getTreeNodeSchemaPrivateData(schema).idempotentInitialize();\n\tconst result = handler.toFlexContent(data, allowedTypes);\n\n\treturn new UnhydratedFlexTreeNode(...result, getUnhydratedContext(schema));\n}\n\nfunction getType(\n\tdata: FactoryContent,\n\tallowedTypes: ReadonlySet<TreeNodeSchema>,\n): TreeNodeSchema {\n\tconst possibleTypes = getPossibleTypes(allowedTypes, data);\n\tif (possibleTypes.length === 0) {\n\t\tthrow new UsageError(\n\t\t\t`The provided data is incompatible with all of the types allowed by the schema. The set of allowed types is: ${JSON.stringify(\n\t\t\t\t[...allowedTypes].map((schema) => schema.identifier),\n\t\t\t)}.`,\n\t\t);\n\t}\n\tif (!hasSingle(possibleTypes)) {\n\t\tthrow new UsageError(\n\t\t\t`The provided data is compatible with more than one type allowed by the schema.\nThe set of possible types is ${JSON.stringify([\n\t\t\t\t...possibleTypes.map((schema) => schema.identifier),\n\t\t\t])}.\nExplicitly construct an unhydrated node of the desired type to disambiguate.\nFor class-based schema, this can be done by replacing an expression like \"{foo: 1}\" with \"new MySchema({foo: 1})\".`,\n\t\t);\n\t}\n\treturn possibleTypes[0];\n}\n\n/**\n * Returns all types for which the data is schema-compatible.\n */\nexport function getPossibleTypes(\n\tallowedTypes: ReadonlySet<TreeNodeSchema>,\n\tdata: FactoryContent,\n): TreeNodeSchema[] {\n\tassert(data !== undefined, 0x889 /* undefined cannot be used as FactoryContent. */);\n\n\tlet best = CompatibilityLevel.None;\n\tconst possibleTypes: TreeNodeSchema[] = [];\n\tfor (const schema of allowedTypes) {\n\t\tconst handler = getTreeNodeSchemaPrivateData(schema).idempotentInitialize();\n\t\tconst level = handler.shallowCompatibilityTest(data);\n\t\tif (level > best) {\n\t\t\tpossibleTypes.length = 0;\n\t\t\tbest = level;\n\t\t}\n\t\tif (best === level) {\n\t\t\tpossibleTypes.push(schema);\n\t\t}\n\t}\n\treturn best === CompatibilityLevel.None ? [] : possibleTypes;\n}\n\n/**\n * Content which can be used to build a node.\n * @remarks\n * Can contain unhydrated nodes, but can not be an unhydrated node at the root.\n * @system @alpha\n */\nexport type FactoryContent =\n\t| IFluidHandle\n\t| string\n\t| number\n\t| boolean\n\t// eslint-disable-next-line @rushstack/no-new-null\n\t| null\n\t| Iterable<readonly [string, InsertableContent]>\n\t| readonly InsertableContent[]\n\t| FactoryContentObject;\n\n/**\n * Record-like object which can be used to build some kinds of nodes.\n * @remarks\n * Can contain unhydrated nodes, but can not be an unhydrated node at the root.\n *\n * Supports object and map nodes.\n * @system @alpha\n */\nexport type FactoryContentObject = {\n\treadonly [P in string]?: InsertableContent;\n};\n\n/**\n * Content which can be inserted into a tree.\n * @system @alpha\n */\nexport type InsertableContent = Unhydrated<TreeNode> | FactoryContent;\n"]}
+{"version":3,"file":"unhydratedFlexTreeFromInsertable.js","sourceRoot":"","sources":["../../src/simple-tree/unhydratedFlexTreeFromInsertable.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 type { IFluidHandle } from \"@fluidframework/core-interfaces\";\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\n\nimport { hasSingle } from \"../util/index.js\";\n\nimport { normalizeFieldSchema, FieldKind, type ImplicitFieldSchema } from \"./fieldSchema.js\";\nimport {\n\tCompatibilityLevel,\n\tgetKernel,\n\tgetTreeNodeSchemaPrivateData,\n\tisTreeNode,\n\ttype TreeNode,\n\ttype TreeNodeSchema,\n\tcontentSchemaSymbol,\n\ttype Unhydrated,\n\tUnhydratedFlexTreeNode,\n} from \"./core/index.js\";\nimport { getUnhydratedContext } from \"./createContext.js\";\n\n/**\n * Transforms an input {@link TypedNode} tree to an {@link UnhydratedFlexTreeNode}.\n * @param data - The input tree to be converted.\n * If the data is an unsupported value (e.g. NaN), a fallback value will be used when supported,\n * otherwise an error will be thrown.\n *\n * Fallbacks:\n *\n * * `NaN` =\\> `null`\n *\n * * `+/-∞` =\\> `null`\n *\n * * `-0` =\\> `+0`\n *\n * For fields with a default value, the field may be omitted.\n * If `context` is not provided, defaults which require a context will be left empty which can be out of schema.\n *\n * @param allowedTypes - The set of types allowed by the parent context. Used to validate the input tree.\n * @remarks\n * The resulting tree will be populated with any defaults from {@link FieldProvider}s in the schema.\n *\n * Often throws UsageErrors for invalid data, but may miss some cases.\n *\n * Output should comply with the provided view schema, but this is not explicitly validated:\n * validation against stored schema (to guard against document corruption) is done elsewhere.\n */\nexport function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent | undefined>(\n\tdata: TIn,\n\tallowedTypes: ImplicitFieldSchema,\n): TIn extends undefined ? undefined : UnhydratedFlexTreeNode {\n\tconst normalizedFieldSchema = normalizeFieldSchema(allowedTypes);\n\n\tif (data === undefined) {\n\t\t// TODO: this code-path should support defaults\n\t\tif (normalizedFieldSchema.kind !== FieldKind.Optional) {\n\t\t\tthrow new UsageError(\"Got undefined for non-optional field.\");\n\t\t}\n\t\treturn undefined as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;\n\t}\n\n\tconst flexTree: UnhydratedFlexTreeNode = unhydratedFlexTreeFromInsertableNode(\n\t\tdata,\n\t\tnormalizedFieldSchema.allowedTypeSet,\n\t);\n\n\treturn flexTree as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;\n}\n\n/**\n * Copy content from `data` into a UnhydratedFlexTreeNode.\n */\nexport function unhydratedFlexTreeFromInsertableNode(\n\tdata: InsertableContent,\n\tallowedTypes: ReadonlySet<TreeNodeSchema>,\n): UnhydratedFlexTreeNode {\n\tif (isTreeNode(data)) {\n\t\tconst kernel = getKernel(data);\n\t\tconst inner = kernel.getInnerNodeIfUnhydrated();\n\t\tif (inner === undefined) {\n\t\t\t// The node is already hydrated, meaning that it already got inserted into the tree previously\n\t\t\tthrow new UsageError(\"A node may not be inserted into the tree more than once\");\n\t\t} else {\n\t\t\tif (!allowedTypes.has(kernel.schema)) {\n\t\t\t\tthrow new UsageError(\"Invalid schema for this context.\");\n\t\t\t}\n\t\t\treturn inner;\n\t\t}\n\t}\n\n\tconst schema = getType(data, allowedTypes);\n\tconst handler = getTreeNodeSchemaPrivateData(schema).idempotentInitialize();\n\tconst result = handler.toFlexContent(data, allowedTypes);\n\n\treturn new UnhydratedFlexTreeNode(...result, getUnhydratedContext(schema));\n}\n\nfunction getType(\n\tdata: FactoryContent,\n\tallowedTypes: ReadonlySet<TreeNodeSchema>,\n): TreeNodeSchema {\n\tconst possibleTypes = getPossibleTypes(allowedTypes, data);\n\tif (possibleTypes.length === 0) {\n\t\tthrow new UsageError(\n\t\t\t`The provided data is incompatible with all of the types allowed by the schema. The set of allowed types is: ${JSON.stringify(\n\t\t\t\t[...allowedTypes].map((schema) => schema.identifier),\n\t\t\t)}.`,\n\t\t);\n\t}\n\tif (!hasSingle(possibleTypes)) {\n\t\tthrow new UsageError(\n\t\t\t`The provided data is compatible with more than one type allowed by the schema.\nThe set of possible types is ${JSON.stringify([\n\t\t\t\t...possibleTypes.map((schema) => schema.identifier),\n\t\t\t])}.\nExplicitly construct an unhydrated node of the desired type to disambiguate.\nFor class-based schema, this can be done by replacing an expression like \"{foo: 1}\" with \"new MySchema({foo: 1})\".`,\n\t\t);\n\t}\n\treturn possibleTypes[0];\n}\n\n/**\n * Returns all types for which the data is schema-compatible.\n * @remarks This will respect the {@link contentSchemaSymbol} property on data to disambiguate types - if present, only that type will be returned.\n */\nexport function getPossibleTypes(\n\tallowedTypes: ReadonlySet<TreeNodeSchema>,\n\tdata: FactoryContent,\n): TreeNodeSchema[] {\n\tassert(data !== undefined, 0x889 /* undefined cannot be used as FactoryContent. */);\n\tconst type =\n\t\ttypeof data === \"object\" && data !== null\n\t\t\t? (data as Partial<{ [contentSchemaSymbol]: string }>)[contentSchemaSymbol]\n\t\t\t: undefined;\n\n\tlet best = CompatibilityLevel.None;\n\tconst possibleTypes: TreeNodeSchema[] = [];\n\tfor (const schema of allowedTypes) {\n\t\tif (type !== undefined) {\n\t\t\tif (schema.identifier === type) {\n\t\t\t\treturn [schema];\n\t\t\t} else {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t}\n\t\tconst handler = getTreeNodeSchemaPrivateData(schema).idempotentInitialize();\n\t\tconst level = handler.shallowCompatibilityTest(data);\n\t\tif (level > best) {\n\t\t\tpossibleTypes.length = 0;\n\t\t\tbest = level;\n\t\t}\n\t\tif (best === level) {\n\t\t\tpossibleTypes.push(schema);\n\t\t}\n\t}\n\treturn best === CompatibilityLevel.None ? [] : possibleTypes;\n}\n\n/**\n * Content which can be used to build a node.\n * @remarks\n * Can contain unhydrated nodes, but can not be an unhydrated node at the root.\n * @system @alpha\n */\nexport type FactoryContent =\n\t| IFluidHandle\n\t| string\n\t| number\n\t| boolean\n\t// eslint-disable-next-line @rushstack/no-new-null\n\t| null\n\t| Iterable<readonly [string, InsertableContent]>\n\t| readonly InsertableContent[]\n\t| FactoryContentObject;\n\n/**\n * Record-like object which can be used to build some kinds of nodes.\n * @remarks\n * Can contain unhydrated nodes, but can not be an unhydrated node at the root.\n *\n * Supports object and map nodes.\n * @system @alpha\n */\nexport type FactoryContentObject = {\n\treadonly [P in string]?: InsertableContent;\n};\n\n/**\n * Content which can be inserted into a tree.\n * @system @alpha\n */\nexport type InsertableContent = Unhydrated<TreeNode> | FactoryContent;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/tree",
-  "version": "2.70.0-361248",
+  "version": "2.70.0",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -101,17 +101,17 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.70.0-361248",
-    "@fluidframework/container-runtime": "2.70.0-361248",
-    "@fluidframework/core-interfaces": "2.70.0-361248",
-    "@fluidframework/core-utils": "2.70.0-361248",
-    "@fluidframework/datastore-definitions": "2.70.0-361248",
-    "@fluidframework/driver-definitions": "2.70.0-361248",
-    "@fluidframework/id-compressor": "2.70.0-361248",
-    "@fluidframework/runtime-definitions": "2.70.0-361248",
-    "@fluidframework/runtime-utils": "2.70.0-361248",
-    "@fluidframework/shared-object-base": "2.70.0-361248",
-    "@fluidframework/telemetry-utils": "2.70.0-361248",
+    "@fluid-internal/client-utils": "~2.70.0",
+    "@fluidframework/container-runtime": "~2.70.0",
+    "@fluidframework/core-interfaces": "~2.70.0",
+    "@fluidframework/core-utils": "~2.70.0",
+    "@fluidframework/datastore-definitions": "~2.70.0",
+    "@fluidframework/driver-definitions": "~2.70.0",
+    "@fluidframework/id-compressor": "~2.70.0",
+    "@fluidframework/runtime-definitions": "~2.70.0",
+    "@fluidframework/runtime-utils": "~2.70.0",
+    "@fluidframework/shared-object-base": "~2.70.0",
+    "@fluidframework/telemetry-utils": "~2.70.0",
     "@sinclair/typebox": "^0.34.13",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "@types/ungap__structured-clone": "^1.2.0",
@@ -122,19 +122,19 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "2.70.0-361248",
-    "@fluid-private/stochastic-test-utils": "2.70.0-361248",
-    "@fluid-private/test-dds-utils": "2.70.0-361248",
-    "@fluid-private/test-drivers": "2.70.0-361248",
+    "@fluid-internal/mocha-test-setup": "~2.70.0",
+    "@fluid-private/stochastic-test-utils": "~2.70.0",
+    "@fluid-private/test-dds-utils": "~2.70.0",
+    "@fluid-private/test-drivers": "~2.70.0",
     "@fluid-tools/benchmark": "^0.51.0",
     "@fluid-tools/build-cli": "^0.58.3",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.58.3",
-    "@fluidframework/container-definitions": "2.70.0-361248",
-    "@fluidframework/container-loader": "2.70.0-361248",
+    "@fluidframework/container-definitions": "~2.70.0",
+    "@fluidframework/container-loader": "~2.70.0",
     "@fluidframework/eslint-config-fluid": "^6.1.0",
-    "@fluidframework/test-runtime-utils": "2.70.0-361248",
-    "@fluidframework/test-utils": "2.70.0-361248",
+    "@fluidframework/test-runtime-utils": "~2.70.0",
+    "@fluidframework/test-utils": "~2.70.0",
     "@fluidframework/tree-previous": "npm:@fluidframework/tree@2.63.0",
     "@microsoft/api-extractor": "7.52.11",
     "@types/diff": "^3.5.1",
@@ -147,7 +147,7 @@
     "concurrently": "^8.2.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "dependency-cruiser": "^14.1.0",
+    "dependency-cruiser": "^17.1.0",
     "diff": "^3.5.0",
     "easy-table": "^1.1.1",
     "eslint": "~8.57.1",

package/src/api.ts

@@ -6,6 +6,7 @@
 import {
 	type TreeView,
 	type TreeViewAlpha,
+	type TreeViewBeta,
 	type ImplicitFieldSchema,
 	// eslint-disable-next-line import/no-deprecated
 	asTreeViewAlpha,
@@ -28,3 +29,13 @@ export function asAlpha<TSchema extends ImplicitFieldSchema>(
 	// eslint-disable-next-line import/no-deprecated
 	return asTreeViewAlpha(view);
 }
+
+/**
+ * Retrieve the {@link TreeViewBeta | beta API} for a {@link TreeView}.
+ * @beta
+ */
+export function asBeta<TSchema extends ImplicitFieldSchema>(
+	view: TreeView<TSchema>,
+): TreeViewBeta<TSchema> {
+	return view as TreeViewBeta<TSchema>;
+}

package/src/core/forest/forest.ts

@@ -84,15 +84,14 @@ export interface IForestSubscription {
 	clone(schema: TreeStoredSchemaSubscription, anchors: AnchorSet): IEditableForest;
 
 	/**
-	 * Generate a TreeChunk for the content in the given field cursor.
+	 * Generate a TreeChunk[] for the current field (and its children) of cursor.
 	 * This can be used to chunk data that is then inserted into the forest.
 	 *
 	 * @remarks
-	 * Like {@link chunkField}, but forces the results into a single TreeChunk.
-	 * While any TreeChunk is compatible with any forest, this method creates one optimized for this specific forest.
+	 * Similar to {@link chunkField} but it creates chunks optimized for this specific forest by using its compression policy.
 	 * The provided data must be compatible with the forest's current schema.
 	 */
-	chunkField(cursor: ITreeCursorSynchronous): TreeChunk;
+	chunkField(cursor: ITreeCursorSynchronous): TreeChunk[];
 
 	/**
 	 * Allocates a cursor in the "cleared" state.

package/src/feature-libraries/chunked-forest/chunkTree.ts

@@ -197,6 +197,15 @@ export function chunkFieldSingle(
 	policy: ChunkCompressor,
 ): TreeChunk {
 	const chunks = chunkField(cursor, policy);
+	return combineChunks(chunks);
+}
+
+/**
+ * Create a single TreeChunk from an array of TreeChunks.
+ * @remarks
+ * This takes ownership of the provided TreeChunk references, and returns an owned referenced.
+ */
+export function combineChunks(chunks: TreeChunk[]): TreeChunk {
 	if (chunks.length === 1) {
 		return chunks[0] ?? oob();
 	}

package/src/feature-libraries/chunked-forest/chunkedForest.ts

@@ -44,7 +44,7 @@ import {
 } from "../../util/index.js";
 
 import { BasicChunk, BasicChunkCursor, type SiblingsOrKey } from "./basicChunk.js";
-import { type IChunker, basicChunkTree, chunkFieldSingle, chunkTree } from "./chunkTree.js";
+import { type IChunker, basicChunkTree, chunkField, chunkTree } from "./chunkTree.js";
 
 function makeRoot(): BasicChunk {
 	return new BasicChunk(aboveRootPlaceholder, new Map());
@@ -90,8 +90,8 @@ export class ChunkedForest implements IEditableForest {
 		return new ChunkedForest(this.roots, schema, this.chunker.clone(schema), anchors);
 	}
 
-	public chunkField(cursor: ITreeCursorSynchronous): TreeChunk {
-		return chunkFieldSingle(cursor, { idCompressor: this.idCompressor, policy: this.chunker });
+	public chunkField(cursor: ITreeCursorSynchronous): TreeChunk[] {
+		return chunkField(cursor, { idCompressor: this.idCompressor, policy: this.chunker });
 	}
 
 	public forgetAnchor(anchor: Anchor): void {

package/src/feature-libraries/chunked-forest/codec/compressedEncode.ts

@@ -36,7 +36,7 @@ import {
 	SpecialField,
 	version,
 } from "./format.js";
-import type { ChunkReferenceId, IncrementalEncoder } from "./codecs.js";
+import type { IncrementalEncoder } from "./codecs.js";
 
 /**
  * Encode data from `FieldBatch` into an `EncodedFieldBatch`.
@@ -223,8 +223,8 @@ export const anyNodeEncoder: NodeEncoder = {
 		outputBuffer: BufferFormat,
 	): void {
 		// TODO: Fast path uniform chunk content.
-		const shape = context.nodeEncoderFromSchema(cursor.type);
-		AnyShape.encodeNode(cursor, context, outputBuffer, shape);
+		const nodeEncoder = context.nodeEncoderFromSchema(cursor.type);
+		AnyShape.encodeNode(cursor, context, outputBuffer, nodeEncoder);
 	},
 
 	shape: AnyShape.instance,
@@ -350,7 +350,7 @@ export class InlineArrayEncoder
 }
 
 /**
- * Encodes the shape for a nested array as {@link EncodedNestedArray} shape.
+ * Encodes the shape for a nested array as {@link EncodedNestedArrayShape} shape.
  */
 export class NestedArrayShape extends ShapeGeneric<EncodedChunkShape> {
 	/**
@@ -420,30 +420,9 @@ export class NestedArrayEncoder implements FieldEncoder {
 }
 
 /**
- * Encodes a chunk with the {@link EncodedIncrementalChunkShape} shape.
- * This chunks will be encoded separately, i.e., the contents of the chunk will not be part of the main buffer.
- * A reference to the chunk will be stored in the main buffer as an {@link ChunkReferenceId}.
+ * Encodes the shape for an incremental chunk as {@link EncodedIncrementalChunkShape} shape.
  */
 export class IncrementalChunkShape extends ShapeGeneric<EncodedChunkShape> {
-	/**
-	 * Encodes all the nodes in the chunk at the cursor position using `InlineArrayShape`.
-	 */
-	public static encodeChunk(chunk: TreeChunk, context: EncoderContext): BufferFormat {
-		const chunkOutputBuffer: BufferFormat = [];
-		const nodesEncoder = asNodesEncoder(anyNodeEncoder);
-		const chunkCursor = chunk.cursor();
-		chunkCursor.firstNode();
-		const chunkLength = chunkCursor.chunkLength;
-		for (let index = 0; index < chunkLength; index++) {
-			nodesEncoder.encodeNodes(chunkCursor, context, chunkOutputBuffer);
-		}
-		assert(
-			chunkCursor.mode === CursorLocationType.Fields,
-			0xc29 /* should return to fields mode when finished encoding */,
-		);
-		return chunkOutputBuffer;
-	}
-
 	public encodeShape(
 		identifiers: DeduplicationTable<string>,
 		shapes: DeduplicationTable<Shape>,
@@ -464,9 +443,10 @@ export class IncrementalChunkShape extends ShapeGeneric<EncodedChunkShape> {
 }
 
 /**
- * Encodes an incremental field whose chunks are encoded separately and referenced by their {@link ChunkReferenceId}.
- * The shape of the content of this field is {@link NestedShape} where the items in the array are
- * the {@link ChunkReferenceId}s of the encoded chunks.
+ * Encodes an incremental field whose tree chunks are encoded separately and referenced by their {@link ChunkReferenceId}.
+ * The shape of the content of this field is {@link NestedArrayShape}.
+ * The inner items of the array have shape {@link IncrementalChunkShape} and are {@link ChunkReferenceId}s
+ * of the encoded chunks.
  */
 export const incrementalFieldEncoder: FieldEncoder = {
 	encodeField(
@@ -475,12 +455,13 @@ export const incrementalFieldEncoder: FieldEncoder = {
 		outputBuffer: BufferFormat,
 	): void {
 		assert(
-			context.shouldEncodeIncrementally,
-			0xc2a /* incremental encoding must be enabled to use IncrementalFieldShape */,
+			context.incrementalEncoder !== undefined,
+			0xc88 /* incremental encoder must be defined to use incrementalFieldEncoder */,
 		);
 
-		const chunkReferenceIds = context.encodeIncrementalField(cursor, (chunk: TreeChunk) =>
-			IncrementalChunkShape.encodeChunk(chunk, context),
+		const chunkReferenceIds = context.incrementalEncoder.encodeIncrementalField(
+			cursor,
+			(chunk: TreeChunk) => compressedEncode([chunk.cursor()], context),
 		);
 		outputBuffer.push(chunkReferenceIds);
 	},
@@ -540,7 +521,12 @@ export class EncoderContext implements NodeEncodeBuilder, FieldEncodeBuilder {
 		private readonly fieldEncoderFromPolicy: FieldEncoderPolicy,
 		public readonly fieldShapes: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,
 		public readonly idCompressor: IIdCompressor,
-		private readonly incrementalEncoder: IncrementalEncoder | undefined,
+		/**
+		 * To be used to encode incremental chunks, if any.
+		 * @remarks
+		 * See {@link IncrementalEncoder} for more information.
+		 */
+		public readonly incrementalEncoder: IncrementalEncoder | undefined,
 	) {}
 
 	public nodeEncoderFromSchema(schemaName: TreeNodeSchemaIdentifier): NodeEncoder {
@@ -556,30 +542,6 @@ export class EncoderContext implements NodeEncodeBuilder, FieldEncodeBuilder {
 	public nestedArrayEncoder(inner: NodeEncoder): NestedArrayEncoder {
 		return getOrCreate(this.nestedArrayEncoders, inner, () => new NestedArrayEncoder(inner));
 	}
-
-	public get shouldEncodeIncrementally(): boolean {
-		return this.incrementalEncoder !== undefined;
-	}
-
-	/**
-	 * {@link IncrementalEncoder.encodeIncrementalField}
-	 */
-	public encodeIncrementalField(
-		cursor: ITreeCursorSynchronous,
-		encoder: (chunk: TreeChunk) => BufferFormat,
-	): ChunkReferenceId[] {
-		assert(
-			this.incrementalEncoder !== undefined,
-			0xc2b /* incremental encoding must be enabled */,
-		);
-		// Encoder for the chunk that encodes its data using the provided encoder function and
-		// updates the encoded data for shapes and identifiers.
-		const chunkEncoder = (chunk: TreeChunk): EncodedFieldBatch => {
-			const chunkOutputBuffer = encoder(chunk);
-			return updateShapesAndIdentifiersEncoding(version, [chunkOutputBuffer]);
-		};
-		return this.incrementalEncoder.encodeIncrementalField(cursor, chunkEncoder);
-	}
 }
 
 export interface NodeEncodeBuilder {

package/src/feature-libraries/chunked-forest/index.ts

@@ -12,6 +12,7 @@ export {
 	type IChunker,
 	chunkFieldSingle,
 	chunkField,
+	combineChunks,
 } from "./chunkTree.js";
 export { buildChunkedForest } from "./chunkedForest.js";
 export {

package/src/feature-libraries/flex-tree/lazyField.ts

@@ -53,6 +53,7 @@ import {
 import { LazyEntity } from "./lazyEntity.js";
 import { type LazyTreeNode, getOrCreateHydratedFlexTreeNode } from "./lazyNode.js";
 import { indexForAt, treeStatusFromAnchorCache } from "./utilities.js";
+import { combineChunks } from "../chunked-forest/index.js";
 
 /**
  * Reuse fields.
@@ -247,7 +248,8 @@ export abstract class LazyField extends LazyEntity<FieldAnchor> implements FlexT
 	protected getEditor(): IDefaultEditBuilder<ITreeCursorSynchronous> {
 		return new MappedEditBuilder(
 			this.context.checkout.editor,
-			(cursor: ITreeCursorSynchronous) => this.context.checkout.forest.chunkField(cursor),
+			(cursor: ITreeCursorSynchronous) =>
+				combineChunks(this.context.checkout.forest.chunkField(cursor)),
 		);
 	}
 }

package/src/feature-libraries/forest-summary/incrementalSummaryBuilder.ts

@@ -288,7 +288,7 @@ export class ForestIncrementalSummaryBuilder implements IncrementalEncoderDecode
 
 	public constructor(
 		private readonly enableIncrementalSummary: boolean,
-		private readonly getChunkAtCursor: (cursor: ITreeCursorSynchronous) => TreeChunk,
+		private readonly getChunkAtCursor: (cursor: ITreeCursorSynchronous) => TreeChunk[],
 		public readonly shouldEncodeIncrementally: IncrementalEncodingPolicy,
 		private readonly initialSequenceNumber: number,
 	) {}
@@ -392,80 +392,74 @@ export class ForestIncrementalSummaryBuilder implements IncrementalEncoderDecode
 		// Validate that a summary is currently being tracked and that the tracked summary properties are defined.
 		validateTrackingSummary(this.forestSummaryState, this.trackedSummaryProperties);
 
-		if (cursor.getFieldLength() === 0) {
-			return [];
-		}
-
-		let chunkReferenceId: ChunkReferenceId;
-		let chunkProperties: ChunkSummaryProperties;
+		const chunkReferenceIds: ChunkReferenceId[] = [];
+		const chunks = this.getChunkAtCursor(cursor);
+		for (const chunk of chunks) {
+			let chunkProperties: ChunkSummaryProperties;
+
+			// Try and get the properties of the chunk from the latest successful summary.
+			// If it exists and the summary is not a full tree, use the properties to generate a summary handle.
+			// If it does not exist, encode the chunk and generate new properties for it.
+			const previousChunkProperties = tryGetFromNestedMap(
+				this.chunkTrackingPropertiesMap,
+				this.latestSummarySequenceNumber,
+				chunk,
+			);
+			if (previousChunkProperties !== undefined && !this.trackedSummaryProperties.fullTree) {
+				chunkProperties = previousChunkProperties;
+				this.trackedSummaryProperties.parentSummaryBuilder.addHandle(
+					`${chunkProperties.referenceId}`,
+					SummaryType.Tree,
+					`${this.trackedSummaryProperties.latestSummaryBasePath}/${chunkProperties.summaryPath}`,
+				);
+			} else {
+				// Generate a new reference ID for the chunk.
+				const newReferenceId: ChunkReferenceId = brand(this.nextReferenceId++);
+
+				// Add the reference ID of this chunk to the chunk summary path and use the path as the summary path
+				// for the chunk in its summary properties.
+				// This is done before encoding the chunk so that the summary path is updated correctly when encoding
+				// any incremental chunks that are under this chunk.
+				this.trackedSummaryProperties.chunkSummaryPath.push(newReferenceId);
+
+				chunkProperties = {
+					referenceId: newReferenceId,
+					summaryPath: this.trackedSummaryProperties.chunkSummaryPath.join("/"),
+				};
+
+				const parentSummaryBuilder = this.trackedSummaryProperties.parentSummaryBuilder;
+				// Create a new summary builder for this chunk to build its summary tree which will be stored in the
+				// parent's summary tree under its reference ID.
+				// Before encoding the chunk, set the parent summary builder to this chunk's summary builder so that
+				// any incremental chunks in the subtree of this chunk will use that as their parent summary builder.
+				const chunkSummaryBuilder = new SummaryTreeBuilder();
+				this.trackedSummaryProperties.parentSummaryBuilder = chunkSummaryBuilder;
+				chunkSummaryBuilder.addBlob(
+					chunkContentsBlobKey,
+					this.trackedSummaryProperties.stringify(chunkEncoder(chunk)),
+				);
 
-		// An additional ref-count must be added to these chunks representing a reference from the summary tree to the chunk.
-		// This will ensure that the blob's content never change and thus the reference stays accurate: instead of modifying it,
-		// a copy will be created without the blob reference.
-		// The "getChunkAtCursor" adds this additional ref-count.
-		const chunk = this.getChunkAtCursor(cursor);
+				// Add this chunk's summary tree to the parent's summary tree. The summary tree contains its encoded
+				// contents and the summary trees of any incremental chunks under it.
+				parentSummaryBuilder.addWithStats(
+					`${newReferenceId}`,
+					chunkSummaryBuilder.getSummaryTree(),
+				);
 
-		// Try and get the properties of the chunk from the latest successful summary.
-		// If it exists and the summary is not a full tree, use the properties to generate a summary handle.
-		// If it does not exist, encode the chunk and generate new properties for it.
-		const previousChunkProperties = tryGetFromNestedMap(
-			this.chunkTrackingPropertiesMap,
-			this.latestSummarySequenceNumber,
-			chunk,
-		);
-		if (previousChunkProperties !== undefined && !this.trackedSummaryProperties.fullTree) {
-			chunkProperties = previousChunkProperties;
-			chunkReferenceId = previousChunkProperties.referenceId;
-			this.trackedSummaryProperties.parentSummaryBuilder.addHandle(
-				`${chunkReferenceId}`,
-				SummaryType.Tree,
-				`${this.trackedSummaryProperties.latestSummaryBasePath}/${previousChunkProperties.summaryPath}`,
-			);
-		} else {
-			// Generate a new reference ID for the chunk.
-			chunkReferenceId = brand(this.nextReferenceId++);
-			// Add the reference ID of this chunk to the chunk summary path and use the path as the summary path
-			// for the chunk in its summary properties.
-			// This is done before encoding the chunk so that the summary path is updated correctly when encoding
-			// any incremental chunks that are under this chunk.
-			this.trackedSummaryProperties.chunkSummaryPath.push(chunkReferenceId);
-
-			chunkProperties = {
-				referenceId: chunkReferenceId,
-				summaryPath: this.trackedSummaryProperties.chunkSummaryPath.join("/"),
-			};
-
-			const parentSummaryBuilder = this.trackedSummaryProperties.parentSummaryBuilder;
-			// Create a new summary builder for this chunk to build its summary tree which will be stored in the
-			// parent's summary tree under its reference ID.
-			// Before encoding the chunk, set the parent summary builder to this chunk's summary builder so that
-			// any incremental chunks in the subtree of this chunk will use that as their parent summary builder.
-			const chunkSummaryBuilder = new SummaryTreeBuilder();
-			this.trackedSummaryProperties.parentSummaryBuilder = chunkSummaryBuilder;
-			chunkSummaryBuilder.addBlob(
-				chunkContentsBlobKey,
-				this.trackedSummaryProperties.stringify(chunkEncoder(chunk)),
-			);
+				// Restore the parent summary builder and chunk summary path.
+				this.trackedSummaryProperties.parentSummaryBuilder = parentSummaryBuilder;
+				this.trackedSummaryProperties.chunkSummaryPath.pop();
+			}
 
-			// Add this chunk's summary tree to the parent's summary tree. The summary tree contains its encoded
-			// contents and the summary trees of any incremental chunks under it.
-			parentSummaryBuilder.addWithStats(
-				`${chunkReferenceId}`,
-				chunkSummaryBuilder.getSummaryTree(),
+			setInNestedMap(
+				this.chunkTrackingPropertiesMap,
+				this.trackedSummaryProperties.summarySequenceNumber,
+				chunk,
+				chunkProperties,
 			);
-
-			// Restore the parent summary builder and chunk summary path.
-			this.trackedSummaryProperties.parentSummaryBuilder = parentSummaryBuilder;
-			this.trackedSummaryProperties.chunkSummaryPath.pop();
+			chunkReferenceIds.push(chunkProperties.referenceId);
 		}
-
-		setInNestedMap(
-			this.chunkTrackingPropertiesMap,
-			this.trackedSummaryProperties.summarySequenceNumber,
-			chunk,
-			chunkProperties,
-		);
-		return [chunkReferenceId];
+		return chunkReferenceIds;
 	}
 
 	/**
@@ -535,7 +529,7 @@ export class ForestIncrementalSummaryBuilder implements IncrementalEncoderDecode
 		chunkDecoder: (encoded: EncodedFieldBatch) => TreeChunk,
 	): TreeChunk {
 		const ChunkLoadProperties = this.loadedChunksMap.get(`${referenceId}`);
-		assert(ChunkLoadProperties !== undefined, "Encoded incremental chunk not found");
+		assert(ChunkLoadProperties !== undefined, 0xc86 /* Encoded incremental chunk not found */);
 		const chunk = chunkDecoder(ChunkLoadProperties.encodedContents);
 
 		// Account for the reference about to be added in `chunkTrackingPropertiesMap`

package/src/feature-libraries/index.ts

@@ -110,6 +110,7 @@ export {
 	fluidVersionToFieldBatchCodecWriteVersion,
 	type FieldBatchEncodingContext,
 	emptyChunk,
+	combineChunks,
 	type IncrementalEncodingPolicy,
 	defaultIncrementalEncodingPolicy,
 } from "./chunked-forest/index.js";

package/src/feature-libraries/object-forest/objectForest.ts

@@ -49,7 +49,7 @@ import {
 	type Breakable,
 	type WithBreakable,
 } from "../../util/index.js";
-import { chunkFieldSingle, defaultChunkPolicy } from "../chunked-forest/index.js";
+import { chunkField, defaultChunkPolicy } from "../chunked-forest/index.js";
 import { cursorForMapTreeNode, mapTreeFromCursor } from "../mapTreeCursor.js";
 import { type CursorWithNode, SynchronousCursor } from "../treeCursorUtils.js";
 import {
@@ -128,8 +128,8 @@ export class ObjectForest implements IEditableForest, WithBreakable {
 		return new ObjectForest(this.breaker, schema, anchors, this.additionalAsserts, this.roots);
 	}
 
-	public chunkField(cursor: ITreeCursorSynchronous): TreeChunk {
-		return chunkFieldSingle(cursor, { idCompressor: undefined, policy: defaultChunkPolicy });
+	public chunkField(cursor: ITreeCursorSynchronous): TreeChunk[] {
+		return chunkField(cursor, { idCompressor: undefined, policy: defaultChunkPolicy });
 	}
 
 	public forgetAnchor(anchor: Anchor): void {

package/src/index.ts

@@ -123,6 +123,7 @@ export {
 	type WithType,
 	type NodeChangedData,
 	type SchemaUpgrade,
+	contentSchemaSymbol,
 	// Types not really intended for public use, but used in links.
 	// Can not be moved to internalTypes since doing so causes app code to throw errors like:
 	// Error: src/simple-tree/objectNode.ts:72:1 - (ae-unresolved-link) The @link reference could not be resolved: The package "@fluidframework/tree" does not have an export "TreeNodeApi"
@@ -164,6 +165,7 @@ export {
 	singletonSchema,
 	type UnsafeUnknownSchema,
 	type TreeViewAlpha,
+	type TreeViewBeta,
 	type InsertableField,
 	type Insertable,
 	type InsertableContent,
@@ -234,6 +236,7 @@ export {
 	type InsertableTreeNodeFromAllowedTypes,
 	type Input,
 	type TreeBranch,
+	type TreeBranchAlpha,
 	type TreeBranchEvents,
 	asTreeViewAlpha,
 	type NodeSchemaOptions,
@@ -337,4 +340,4 @@ export type { MapNodeInsertableData } from "./simple-tree/index.js";
 export { JsonAsTree } from "./jsonDomainSchema.js";
 export { FluidSerializableAsTree } from "./serializableDomainSchema.js";
 export { TableSchema, type System_TableSchema } from "./tableSchema.js";
-export { asAlpha } from "./api.js";
+export { asAlpha, asBeta } from "./api.js";

package/src/packageVersion.ts

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