@fluidframework/tree 2.43.0-343119 → 2.50.0-345060

package/src/core/forest/forest.ts

@@ -252,8 +252,6 @@ export interface ITreeSubscriptionCursor extends ITreeCursor {
 	// getParentInfo(id: NodeId): TreeLocation;
 }
 
-/**
- */
 export enum ITreeSubscriptionCursorState {
 	/**
 	 * On the current revision of the forest.
@@ -269,8 +267,6 @@ export enum ITreeSubscriptionCursorState {
 	Freed,
 }
 
-/**
- */
 export const enum TreeNavigationResult {
 	/**
 	 * Attempt to navigate cursor to a key or index that is outside the client's view.

package/src/core/rebase/changeRebaser.ts

@@ -96,8 +96,6 @@ export interface ChangeRebaser<TChangeset> {
 	): TChangeset;
 }
 
-/**
- */
 export interface TaggedChange<TChangeset, TTag = RevisionTag | undefined> {
 	readonly revision: TTag;
 	/**
@@ -127,16 +125,12 @@ export function mapTaggedChange<TIn, TOut>(
  */
 export type RevisionIndexer = (tag: RevisionTag) => number | undefined;
 
-/**
- */
 export interface RevisionMetadataSource {
 	readonly getIndex: RevisionIndexer;
 	readonly tryGetInfo: (tag: RevisionTag | undefined) => RevisionInfo | undefined;
 	readonly hasRollback: (tag: RevisionTag) => boolean;
 }
 
-/**
- */
 export interface RevisionInfo {
 	readonly revision: RevisionTag;
 	/**

package/src/core/rebase/types.ts

@@ -65,8 +65,6 @@ export interface ChangeAtomId {
 
 export type EncodedChangeAtomId = [ChangesetLocalId, EncodedRevisionTag] | ChangesetLocalId;
 
-/**
- */
 export type ChangeAtomIdMap<T> = NestedMap<RevisionTag | undefined, ChangesetLocalId, T>;
 
 /**

package/src/core/schema-stored/schema.ts

@@ -185,8 +185,6 @@ export const storedEmptyFieldSchema: TreeFieldStoredSchema = {
  */
 export const identifierFieldKindIdentifier = "Identifier";
 
-/**
- */
 export abstract class TreeNodeStoredSchema {
 	protected _typeCheck!: MakeNominal;
 
@@ -213,8 +211,6 @@ export abstract class TreeNodeStoredSchema {
 	public abstract getFieldSchema(field: FieldKey): TreeFieldStoredSchema;
 }
 
-/**
- */
 export class ObjectNodeStoredSchema extends TreeNodeStoredSchema {
 	/**
 	 * @param objectNodeFields -
@@ -272,8 +268,6 @@ export class ObjectNodeStoredSchema extends TreeNodeStoredSchema {
 	}
 }
 
-/**
- */
 export class MapNodeStoredSchema extends TreeNodeStoredSchema {
 	/**
 	 * @param mapFields -
@@ -306,8 +300,6 @@ export class MapNodeStoredSchema extends TreeNodeStoredSchema {
 	}
 }
 
-/**
- */
 export class LeafNodeStoredSchema extends TreeNodeStoredSchema {
 	/**
 	 * @param leafValue -

package/src/core/schema-view/view.ts

@@ -9,8 +9,6 @@ import type { TreeNodeSchemaIdentifier, TreeStoredSchema } from "../schema-store
  * APIs for applying `view schema` to documents.
  */
 
-/**
- */
 export interface TreeAdapter {
 	readonly output: TreeNodeSchemaIdentifier;
 	readonly input: TreeNodeSchemaIdentifier;

package/src/core/tree/cursor.ts

@@ -312,8 +312,6 @@ export interface PathRootPrefix {
 	indexOffset?: number;
 }
 
-/**
- */
 export const enum CursorLocationType {
 	/**
 	 * Can iterate through nodes in a field.

package/src/core/tree/delta.ts

@@ -158,8 +158,6 @@ export interface DetachedNodeId {
 	readonly minor: number;
 }
 
-/**
- */
 export type FieldMap = ReadonlyMap<FieldKey, FieldChanges>;
 
 /**

package/src/core/tree/types.ts

@@ -18,8 +18,6 @@ import type {
 	ValueSchema,
 } from "../schema-stored/index.js";
 
-/**
- */
 export type TreeType = TreeNodeSchemaIdentifier;
 
 /**
@@ -43,8 +41,6 @@ export const EmptyKey: FieldKey = brand("");
  */
 export const rootFieldKey: FieldKey = brand("rootFieldKey");
 
-/**
- */
 export const rootField = keyAsDetachedField(rootFieldKey);
 
 /**

package/src/feature-libraries/default-schema/defaultEditBuilder.ts

@@ -410,8 +410,6 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 	}
 }
 
-/**
- */
 export interface ValueFieldEditBuilder<TContent> {
 	/**
 	 * Issues a change which replaces the current newContent of the field with `newContent`.
@@ -421,8 +419,6 @@ export interface ValueFieldEditBuilder<TContent> {
 	set(newContent: TContent): void;
 }
 
-/**
- */
 export interface OptionalFieldEditBuilder<TContent> {
 	/**
 	 * Issues a change which replaces the current newContent of the field with `newContent`

package/src/feature-libraries/default-schema/defaultFieldKinds.ts

@@ -257,20 +257,10 @@ export const fieldKinds: ReadonlyMap<FieldKindIdentifier, FieldKindWithEditor> =
 // TODO: Find a way to make docs like {@inheritDoc required} work in vscode.
 // TODO: ensure thy work in generated docs.
 // TODO: add these comments to the rest of the cases below.
-/**
- */
 export interface Required extends FlexFieldKind<"Value", Multiplicity.Single> {}
-/**
- */
 export interface Optional extends FlexFieldKind<"Optional", Multiplicity.Optional> {}
-/**
- */
 export interface Sequence extends FlexFieldKind<"Sequence", Multiplicity.Sequence> {}
-/**
- */
 export interface Identifier extends FlexFieldKind<"Identifier", Multiplicity.Single> {}
-/**
- */
 export interface Forbidden
 	extends FlexFieldKind<typeof forbiddenFieldKindIdentifier, Multiplicity.Forbidden> {}
 

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

@@ -47,8 +47,6 @@ export function isFlexTreeNode(t: unknown): t is FlexTreeNode {
 	return isFlexTreeEntity(t) && t[flexTreeMarker] === FlexTreeEntityKind.Node;
 }
 
-/**
- */
 export enum FlexTreeEntityKind {
 	Node,
 	Field,
@@ -169,7 +167,7 @@ export interface FlexTreeNode extends FlexTreeEntity, MapTreeNodeViewGeneric<Fle
 	 * @remarks
 	 * All fields implicitly exist, so `getBoxed` can be called with any key and will always return a field.
 	 * Even if the field is empty, it will still be returned, and can be edited to insert content if allowed by the field kind.
-	 * See {@link FlexTreeNode.tryGetField} for a variant that does not allocate afield in the empty case.
+	 * See {@link FlexTreeNode.tryGetField} for a variant that does not allocate a field in the empty case.
 	 */
 	getBoxed(key: FieldKey): FlexTreeField;
 

package/src/feature-libraries/modular-schema/crossFieldQueries.ts

@@ -44,8 +44,6 @@ export function getFirstFromCrossFieldMap<T>(
 	return map.getFirst({ revision, localId: id }, count);
 }
 
-/**
- */
 export enum CrossFieldTarget {
 	Source,
 	Destination,

package/src/feature-libraries/modular-schema/fieldChangeHandler.ts

@@ -216,19 +216,13 @@ export interface FieldEditor<TChangeset> {
  */
 export type ToDelta = (child: NodeId) => DeltaFieldMap;
 
-/**
- */
 export type NodeChangeInverter = (change: NodeId) => NodeId;
 
-/**
- */
 export enum NodeAttachState {
 	Attached,
 	Detached,
 }
 
-/**
- */
 export type NodeChangeRebaser = (
 	change: NodeId | undefined,
 	baseChange: NodeId | undefined,
@@ -239,15 +233,11 @@ export type NodeChangeRebaser = (
 	state?: NodeAttachState,
 ) => NodeId | undefined;
 
-/**
- */
 export type NodeChangeComposer = (
 	change1: NodeId | undefined,
 	change2: NodeId | undefined,
 ) => NodeId;
 
-/**
- */
 export type NodeChangePruner = (change: NodeId) => NodeId | undefined;
 
 /**

package/src/feature-libraries/modular-schema/modularChangeFamily.ts

@@ -2285,8 +2285,6 @@ function newCrossFieldTable<T>(): CrossFieldTable<T> {
 	};
 }
 
-/**
- */
 interface ConstraintState {
 	violationCount: number;
 }
@@ -2913,8 +2911,6 @@ function buildModularChangesetFromNode(props: {
 	});
 }
 
-/**
- */
 export interface FieldEditDescription {
 	type: "field";
 	field: FieldUpPath;
@@ -2923,16 +2919,12 @@ export interface FieldEditDescription {
 	revision: RevisionTag;
 }
 
-/**
- */
 export interface GlobalEditDescription {
 	type: "global";
 	revision: RevisionTag;
 	builds?: ChangeAtomIdBTree<TreeChunk>;
 }
 
-/**
- */
 export type EditDescription = FieldEditDescription | GlobalEditDescription;
 
 function getRevInfoFromTaggedChanges(changes: TaggedChange<ModularChangeset>[]): {

package/src/feature-libraries/modular-schema/modularChangeTypes.ts

@@ -17,8 +17,6 @@ import type { TreeChunk } from "../chunked-forest/index.js";
 
 import type { CrossFieldTarget } from "./crossFieldQueries.js";
 
-/**
- */
 export interface ModularChangeset extends HasFieldChanges {
 	/**
 	 * The numerically highest `ChangesetLocalId` used in this changeset.
@@ -110,8 +108,6 @@ export interface FieldId {
 	readonly field: FieldKey;
 }
 
-/**
- */
 export interface NodeExistsConstraint {
 	violated: boolean;
 }
@@ -128,23 +124,15 @@ export interface NodeChangeset extends HasFieldChanges {
 
 export type NodeId = ChangeAtomId;
 
-/**
- */
 export interface HasFieldChanges {
 	fieldChanges?: FieldChangeMap;
 }
 
-/**
- */
 export type FieldChangeMap = Map<FieldKey, FieldChange>;
 
-/**
- */
 export interface FieldChange {
 	fieldKind: FieldKindIdentifier;
 	change: FieldChangeset;
 }
 
-/**
- */
 export type FieldChangeset = Brand<unknown, "FieldChangeset">;

package/src/feature-libraries/sequence-field/types.ts

@@ -24,8 +24,6 @@ export interface HasMoveId {
 	id: MoveId;
 }
 
-/**
- */
 export interface CellId extends ChangeAtomId {}
 
 /**

package/src/index.ts

@@ -130,6 +130,7 @@ export {
 	type FieldSchemaAlphaUnsafe,
 	type ArrayNodeCustomizableSchemaUnsafe,
 	type MapNodeCustomizableSchemaUnsafe,
+	type TreeRecordNodeUnsafe,
 	// System types (not in Internal types for various reasons, like doc links or cannot be named errors).
 	type typeSchemaSymbol,
 	type TreeNodeSchemaNonClass,
@@ -158,6 +159,7 @@ export {
 	type ImplicitAnnotatedFieldSchema,
 	type AnnotatedAllowedType,
 	type AnnotatedAllowedTypes,
+	type NormalizedAnnotatedAllowedTypes,
 	type AllowedTypeMetadata,
 	type AllowedTypesMetadata,
 	type InsertableObjectFromAnnotatedSchemaRecord,
@@ -195,6 +197,8 @@ export {
 	type JsonRefPath,
 	type JsonSchemaType,
 	type JsonLeafSchemaType,
+	type JsonRecordNodeSchema,
+	type JsonStringKeyPatternProperties,
 	getJsonSchema,
 	type LazyItem,
 	type Unenforced,
@@ -208,6 +212,7 @@ export {
 	type SimpleArrayNodeSchema,
 	type SimpleObjectNodeSchema,
 	type SimpleObjectFieldSchema,
+	type SimpleRecordNodeSchema,
 	normalizeAllowedTypes,
 	getSimpleSchema,
 	type ReadonlyArrayNode,
@@ -248,6 +253,11 @@ export {
 	type ObjectFromSchemaRecord,
 	type ValidateRecursiveSchemaTemplate,
 	type FixRecursiveRecursionLimit,
+	RecordNodeSchema,
+	type RecordNodeCustomizableSchema,
+	type RecordNodeInsertableData,
+	type RecordNodePojoEmulationSchema,
+	type TreeRecordNode,
 } from "./simple-tree/index.js";
 export {
 	SharedTree,

package/src/jsonDomainSchema.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { SchemaFactory } from "./simple-tree/index.js";
+import { SchemaFactory, SchemaFactoryAlpha } from "./simple-tree/index.js";
 import type {
 	AllowedTypes,
 	FixRecursiveArraySchema,
@@ -22,7 +22,7 @@ import type {
 	// #endregion
 } from "./simple-tree/index.js";
 
-const sf = new SchemaFactory("com.fluidframework.json");
+const sf = new SchemaFactoryAlpha("com.fluidframework.json");
 
 /**
  * Utilities for storing JSON data in {@link TreeNode}s.
@@ -80,7 +80,7 @@ export namespace JsonAsTree {
 	 * Do not use. Exists only as a workaround for {@link https://github.com/microsoft/TypeScript/issues/59550} and {@link https://github.com/microsoft/rushstack/issues/4429}.
 	 * @system @alpha
 	 */
-	export const _APIExtractorWorkaroundObjectBase = sf.mapRecursive("object", Tree);
+	export const _APIExtractorWorkaroundObjectBase = sf.recordRecursive("object", Tree);
 
 	/**
 	 * Arbitrary JSON object as a {@link TreeNode}.

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/tree";
-export const pkgVersion = "2.43.0-343119";
+export const pkgVersion = "2.50.0-345060";

package/src/shared-tree/schematizingTreeView.ts

@@ -22,12 +22,11 @@ import {
 	TreeStatus,
 } from "../feature-libraries/index.js";
 import {
-	type FieldSchema,
 	type ImplicitFieldSchema,
 	type SchemaCompatibilityStatus,
 	type TreeView,
 	type TreeViewEvents,
-	getTreeNodeForField,
+	tryGetTreeNodeForField,
 	setField,
 	normalizeFieldSchema,
 	SchemaCompatibilityTester,
@@ -53,6 +52,7 @@ import {
 	areImplicitFieldSchemaEqual,
 	createUnknownOptionalFieldPolicy,
 	prepareForInsertionContextless,
+	type FieldSchema,
 } from "../simple-tree/index.js";
 import {
 	type Breakable,
@@ -353,7 +353,10 @@ export class SchematizingSimpleTreeView<
 			);
 			this.checkout.forest.anchors.slots.set(
 				SimpleContextSlot,
-				new HydratedContext(this.rootFieldSchema.allowedTypeSet, view.context),
+				new HydratedContext(
+					normalizeFieldSchema(this.rootFieldSchema).annotatedAllowedTypesNormalized,
+					view.context,
+				),
 			);
 
 			const unregister = this.checkout.storedSchema.events.on("afterSchemaChange", () => {
@@ -428,7 +431,7 @@ export class SchematizingSimpleTreeView<
 			);
 		}
 		const view = this.getView();
-		return getTreeNodeForField(view.flexTree) as ReadableField<TRootSchema>;
+		return tryGetTreeNodeForField(view.flexTree) as ReadableField<TRootSchema>;
 	}
 
 	public set root(newRoot: InsertableField<TRootSchema>) {
@@ -525,7 +528,7 @@ export function addConstraintsToTransaction(
 						`Attempted to add a "nodeInDocument" constraint${revertText}, but the node is not currently in the document. Node status: ${nodeStatus}`,
 					);
 				}
-				assert(node.isHydrated(), "In document node must be hydrated.");
+				assert(node.isHydrated(), 0xbc2 /* In document node must be hydrated. */);
 				if (constraintsOnRevert) {
 					checkout.editor.addNodeExistsConstraintOnRevert(node.anchorNode);
 				} else {